Skip to content

OCPBUGS-99755: OTE: fix AWS endpoint resolution for non-standard partitions #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tthvo wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −2
Open

OCPBUGS-99755: OTE: fix AWS endpoint resolution for non-standard partitions #494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions openshift-tests/ccm-aws-tests/e2e/aws/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func createAWSClientLoadBalancer(ctx context.Context) (*elbv2.Client, error) {
o.Retryer = customRetryer
// Use regional public endpoints to prevent malformed or unreachable
// (from test binary, which usually runs outside cluster's VPC) endpoints.
o.BaseEndpoint = aws.String(fmt.Sprintf("https://elasticloadbalancing.%s.amazonaws.com", cfg.Region))
o.BaseEndpoint = aws.String(fmt.Sprintf("https://elasticloadbalancing.%s.%s", cfg.Region, dnsSuffixForRegion(cfg.Region)))
}), nil
}

Expand Down Expand Up @@ -139,7 +139,7 @@ func createAWSClientEC2(ctx context.Context) (*ec2.Client, error) {
return ec2.NewFromConfig(cfg, func(o *ec2.Options) {
// Use regional public endpoints to prevent malformed or unreachable
// (from test binary, which usually runs outside cluster's VPC) endpoints.
o.BaseEndpoint = aws.String(fmt.Sprintf("https://ec2.%s.amazonaws.com", cfg.Region))
o.BaseEndpoint = aws.String(fmt.Sprintf("https://ec2.%s.%s", cfg.Region, dnsSuffixForRegion(cfg.Region)))
}), nil
}

Expand Down Expand Up @@ -197,6 +197,29 @@ func securityGroupExists(ctx context.Context, ec2Client *ec2.Client, sgID string
return true, nil
}

// dnsSuffixForRegion returns the DNS suffix for the AWS partition that the given region resides in.
// This is needed when constructing explicit public regional endpoints so that non-standard partitions
// like EUSC (.amazonaws.eu) are handled correctly instead of assuming suffix .amazonaws.com.
// Reference: https://github.com/aws/aws-sdk-go-v2/blob/main/internal/endpoints/awsrulesfn/partitions.go
func dnsSuffixForRegion(region string) string {
switch {
case strings.HasPrefix(region, "cn-"):
return "amazonaws.com.cn"
case strings.HasPrefix(region, "eusc-"):
return "amazonaws.eu"
case strings.HasPrefix(region, "us-iso-"):
return "c2s.ic.gov"
case strings.HasPrefix(region, "us-isob-"):
return "sc2s.sgov.gov"
case strings.HasPrefix(region, "eu-isoe-"):
return "cloud.adc-e.uk"
case strings.HasPrefix(region, "us-isof-"):
return "csp.hci.ic.gov"
default:
return "amazonaws.com"
}
}

// ec2IsNotFoundError checks if an error is an EC2 "not found" error.
func ec2IsNotFoundError(err error) bool {
if err == nil {
Expand Down