weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7108 from inteon/bugfix_aws

Browse Source 
BUGFIX: AWS route53: Set global region for sts
This commit is contained in:
cert-manager-prow[bot] 2024-07-12 14:13:19 +00:00 committed by GitHub
commit 4e3c162734
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/issuer/acme/dns/route53/route53.go
View File

@ -82,7 +82,6 @@ func (d *sessionProvider) GetSession(ctx context.Context) (aws.Config, error) {
switch { switch {
case d.Role != "" && d.WebIdentityToken != "": case d.Role != "" && d.WebIdentityToken != "":
d.log.V(logf.DebugLevel).Info("using assume role with web identity") d.log.V(logf.DebugLevel).Info("using assume role with web identity")
optFns = append(optFns, config.WithRegion(d.Region))
case useAmbientCredentials: case useAmbientCredentials:
d.log.V(logf.DebugLevel).Info("using ambient credentials") d.log.V(logf.DebugLevel).Info("using ambient credentials")
// Leaving credentials unset results in a default credential chain being // Leaving credentials unset results in a default credential chain being
@ -98,9 +97,16 @@ func (d *sessionProvider) GetSession(ctx context.Context) (aws.Config, error) {
return aws.Config{}, fmt.Errorf("unable to create aws config: %s", err) return aws.Config{}, fmt.Errorf("unable to create aws config: %s", err)
} }
// For backwards compatibility with cert-manager <= 1.14, where we used the aws-sdk-go v1
// library, we configure the SDK here to use the global sts endpoint. This was the default
// behaviour of the SDK v1 library, but has to be explicitly set in the v2 library. For the
// route53 calls, we use the region provided by the user (see below).
stsCfg := cfg.Copy()
stsCfg.Region = "aws-global"
if d.Role != "" && d.WebIdentityToken == "" { if d.Role != "" && d.WebIdentityToken == "" {
d.log.V(logf.DebugLevel).WithValues("role", d.Role).Info("assuming role") d.log.V(logf.DebugLevel).WithValues("role", d.Role).Info("assuming role")
stsSvc := d.StsProvider(cfg) stsSvc := d.StsProvider(stsCfg)
result, err := stsSvc.AssumeRole(ctx, &sts.AssumeRoleInput{ result, err := stsSvc.AssumeRole(ctx, &sts.AssumeRoleInput{
RoleArn: aws.String(d.Role), RoleArn: aws.String(d.Role),
RoleSessionName: aws.String("cert-manager"), RoleSessionName: aws.String("cert-manager"),
@ -119,7 +125,7 @@ func (d *sessionProvider) GetSession(ctx context.Context) (aws.Config, error) {
if d.Role != "" && d.WebIdentityToken != "" { if d.Role != "" && d.WebIdentityToken != "" {
d.log.V(logf.DebugLevel).WithValues("role", d.Role).Info("assuming role with web identity") d.log.V(logf.DebugLevel).WithValues("role", d.Role).Info("assuming role with web identity")
stsSvc := d.StsProvider(cfg) stsSvc := d.StsProvider(stsCfg)
result, err := stsSvc.AssumeRoleWithWebIdentity(ctx, &sts.AssumeRoleWithWebIdentityInput{ result, err := stsSvc.AssumeRoleWithWebIdentity(ctx, &sts.AssumeRoleWithWebIdentityInput{
RoleArn: aws.String(d.Role), RoleArn: aws.String(d.Role),
RoleSessionName: aws.String("cert-manager"), RoleSessionName: aws.String("cert-manager"),
@ -138,7 +144,8 @@ func (d *sessionProvider) GetSession(ctx context.Context) (aws.Config, error) {
// If ambient credentials aren't permitted, always set the region, even if to // If ambient credentials aren't permitted, always set the region, even if to
// empty string, to avoid it falling back on the environment. // empty string, to avoid it falling back on the environment.
// this has to be set after session is constructed // This has to be set after session is constructed, as a different region (aws-global)
// is used for the STS service.
if d.Region != "" || !useAmbientCredentials { if d.Region != "" || !useAmbientCredentials {
cfg.Region = d.Region cfg.Region = d.Region
} }

3
pkg/issuer/acme/dns/route53/route53_test.go
View File

@ -253,7 +253,8 @@ func TestAssumeRole(t *testing.T) {
for _, c := range cases { for _, c := range cases {
t.Run(c.name, func(t *testing.T) { t.Run(c.name, func(t *testing.T) {
provider := makeMockSessionProvider(func(aws.Config) StsClient { provider := makeMockSessionProvider(func(cfg aws.Config) StsClient {
assert.Equal(t, "aws-global", cfg.Region) // verify that the global sts endpoint is used
return c.mockSTS return c.mockSTS
}, c.key, c.secret, c.region, c.role, c.webIdentityToken, c.ambient) }, c.key, c.secret, c.region, c.role, c.webIdentityToken, c.ambient)
cfg, err := provider.GetSession(context.TODO()) cfg, err := provider.GetSession(context.TODO())