fix(image): use standardized HTTP client for ECR authentication (#9322)

manveer94 · web-flow · commit 84fbf8674dfc · 2025-08-22T05:56:21.000Z
diff --git a/pkg/fanal/image/registry/ecr/ecr.go b/pkg/fanal/image/registry/ecr/ecr.go
@@ -15,6 +15,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/fanal/image/registry/intf"
 	"github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/log"
+	xhttp "github.com/aquasecurity/trivy/pkg/x/http"
 )
 
 type ecrAPI interface {
@@ -37,10 +38,15 @@ func getSession(domain, region string, option types.RegistryOptions) (aws.Config
 		return config.LoadDefaultConfig(
 			context.TODO(),
 			config.WithRegion(region),
+			config.WithHTTPClient(xhttp.Client()),
 			config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(option.AWSAccessKey, option.AWSSecretKey, option.AWSSessionToken)),
 		)
 	}
-	return config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
+	return config.LoadDefaultConfig(
+		context.TODO(),
+		config.WithRegion(region),
+		config.WithHTTPClient(xhttp.Client()),
+	)
 }
 
 func (e *ECR) CheckOptions(domain string, option types.RegistryOptions) (intf.RegistryClient, error) {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"github.com/aquasecurity/trivy/pkg/fanal/image/registry/intf"`
`16`	`16`	`"github.com/aquasecurity/trivy/pkg/fanal/types"`
`17`	`17`	`"github.com/aquasecurity/trivy/pkg/log"`
	`18`	`+ xhttp "github.com/aquasecurity/trivy/pkg/x/http"`
`18`	`19`	`)`
`19`	`20`
`20`	`21`	`type ecrAPI interface {`
`@@ -37,10 +38,15 @@ func getSession(domain, region string, option types.RegistryOptions) (aws.Config`
`37`	`38`	`return config.LoadDefaultConfig(`
`38`	`39`	`context.TODO(),`
`39`	`40`	`config.WithRegion(region),`
	`41`	`+ config.WithHTTPClient(xhttp.Client()),`
`40`	`42`	`config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(option.AWSAccessKey, option.AWSSecretKey, option.AWSSessionToken)),`
`41`	`43`	`)`
`42`	`44`	`}`
`43`		`- return config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))`
	`45`	`+ return config.LoadDefaultConfig(`
	`46`	`+ context.TODO(),`
	`47`	`+ config.WithRegion(region),`
	`48`	`+ config.WithHTTPClient(xhttp.Client()),`
	`49`	`+ )`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`func (e *ECR) CheckOptions(domain string, option types.RegistryOptions) (intf.RegistryClient, error) {`