Merge pull request #1030 from cartermckinnon/misleading-log

k8s-ci-robot · web-flow · commit b1f753a6615a · 2025-01-27T10:33:23.000-08:00
ecr-credential-provider: Fix warning about no region in image ref
diff --git a/cmd/ecr-credential-provider/main.go b/cmd/ecr-credential-provider/main.go
@@ -63,11 +63,11 @@ func defaultECRProvider(ctx context.Context, region string) (ECR, error) {
 	var cfg aws.Config
 	var err error
 	if region != "" {
-		klog.Warningf("No region found in the image reference, the default region will be used. Please refer to AWS SDK documentation for configuration purpose.")
 		cfg, err = config.LoadDefaultConfig(ctx,
 			config.WithRegion(region),
 		)
 	} else {
+		klog.Warningf("No region found in the image reference, the default region will be used. Please refer to AWS SDK documentation for configuration purpose.")
 		cfg, err = config.LoadDefaultConfig(ctx)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,11 @@ func defaultECRProvider(ctx context.Context, region string) (ECR, error) {`
`63`	`63`	`var cfg aws.Config`
`64`	`64`	`var err error`
`65`	`65`	`if region != "" {`
`66`		`- klog.Warningf("No region found in the image reference, the default region will be used. Please refer to AWS SDK documentation for configuration purpose.")`
`67`	`66`	`cfg, err = config.LoadDefaultConfig(ctx,`
`68`	`67`	`config.WithRegion(region),`
`69`	`68`	`)`
`70`	`69`	`} else {`
	`70`	`+ klog.Warningf("No region found in the image reference, the default region will be used. Please refer to AWS SDK documentation for configuration purpose.")`
`71`	`71`	`cfg, err = config.LoadDefaultConfig(ctx)`
`72`	`72`	`}`
`73`	`73`