Skip to content

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

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

Merged
DmitriyLewen merged 2 commits into from
Aug 22, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf8e44
fix(image): use standardized HTTP client for ECR authentication
manveer94 Aug 7, 2025
b4e5b1e
refactor(ecr): move HTTP client configuration to session level
manveer94 Aug 21, 2025
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
8 changes: 7 additions & 1 deletion pkg/fanal/image/registry/ecr/ecr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand Down
Loading