Merge pull request #17166 from johngmyers/automated-cherry-pick-of-#1…

…7161-upstream-release-1.31

Automated cherry pick of #17161: Only configure STS region for Route 53 when we obtain it using IDMS

dnsprovider/pkg/dnsprovider/providers/aws/route53/route53.go

@@ -71,34 +71,37 @@ func newRoute53() (*Interface, error) {
 		region = imdsRegionResp.Region
 	}
 
-	stsCfg, err := awsconfig.LoadDefaultConfig(ctx,
-		awsconfig.WithClientLogMode(aws.LogRetries),
-		awslog.WithAWSLogger(),
-		awsconfig.WithRetryer(func() aws.Retryer {
-			return retry.AddWithMaxAttempts(retry.NewStandard(), 5)
-		}),
-		awsconfig.WithRegion(region),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load default aws config for STS client: %w", err)
-	}
-
 	awsOptions := []func(*awsconfig.LoadOptions) error{
 		awsconfig.WithClientLogMode(aws.LogRetries),
 		awslog.WithAWSLogger(),
 		awsconfig.WithRetryer(func() aws.Retryer {
 			return retry.AddWithMaxAttempts(retry.NewStandard(), 5)
 		}),
-		awsconfig.WithAssumeRoleCredentialOptions(func(aro *stscreds.AssumeRoleOptions) {
-			// Ensure the STS client has a region configured, if discovered by IMDS
-			aro.Client = sts.NewFromConfig(stsCfg)
-		}),
 	}
 
 	if imdsClient != nil {
-		awsOptions = append(awsOptions, awsconfig.WithEC2IMDSRegion(func(o *awsconfig.UseEC2IMDSRegion) {
-			o.Client = imdsClient
-		}))
+		stsCfg, err := awsconfig.LoadDefaultConfig(ctx,
+			awsconfig.WithClientLogMode(aws.LogRetries),
+			awslog.WithAWSLogger(),
+			awsconfig.WithRetryer(func() aws.Retryer {
+				return retry.AddWithMaxAttempts(retry.NewStandard(), 5)
+			}),
+			awsconfig.WithRegion(region),
+		)
+		if err != nil {
+			return nil, fmt.Errorf("failed to load default aws config for STS client: %w", err)
+		}
+
+		awsOptions = append(
+			awsOptions,
+			awsconfig.WithEC2IMDSRegion(func(o *awsconfig.UseEC2IMDSRegion) {
+				o.Client = imdsClient
+			}),
+			awsconfig.WithAssumeRoleCredentialOptions(func(aro *stscreds.AssumeRoleOptions) {
+				// Ensure the STS client has a region configured, if discovered by IMDS
+				aro.Client = sts.NewFromConfig(stsCfg)
+			}),
+		)
 	}
 
 	cfg, err := awsconfig.LoadDefaultConfig(ctx, awsOptions...)