gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-12 07:40:48 -08:00
Code Issues Packages Projects Releases Wiki Activity

feat(aws): Add support for dualstack ECR endpoints (#9862)

Browse Source
This commit is contained in:
fischaz
2025-12-02 17:17:16 +11:00
committed by GitHub
parent c274f5b986
commit e74e2b1b0a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/fanal/image/registry/ecr/ecr.go
View File

@@ -79,11 +79,13 @@ func (e *ECR) CheckOptions(domain string, option types.RegistryOptions) (intf.Re
// <registry-id>.dkr.ecr.<region>.amazonaws.com.cn
// <registry-id>.dkr.ecr.<region>.sc2s.sgov.gov
// <registry-id>.dkr.ecr.<region>.c2s.ic.gov
// <registry-id>.dkr-ecr.<region>.on.aws
// see
// - https://docs.aws.amazon.com/general/latest/gr/ecr.html
// - https://docs.amazonaws.cn/en_us/aws/latest/userguide/endpoints-arns.html
// - https://docs.aws.amazon.com/AmazonECR/latest/userguide/ecr-requests.html
// - https://github.com/boto/botocore/blob/1.34.51/botocore/data/endpoints.json
var ecrEndpointMatch = regexp.MustCompile(`^[^.]+\.dkr\.ecr(?:-fips)?\.([^.]+)\.(?:amazonaws\.com(?:\.cn)?|sc2s\.sgov\.gov|c2s\.ic\.gov)$`)
var ecrEndpointMatch = regexp.MustCompile(`^[^.]+\.dkr[.-]ecr(?:-fips)?\.([^.]+)\.(?:amazonaws\.com(?:\.cn)?|sc2s\.sgov\.gov|c2s\.ic\.gov|on\.aws)$`)
func determineRegion(domain string) string {
matches := ecrEndpointMatch.FindStringSubmatch(domain)

4
pkg/fanal/image/registry/ecr/ecr_test.go
View File

@@ -51,6 +51,10 @@ func TestCheckOptions(t *testing.T) {
domain: "xxx.dkr.ecr-fips.fips-region.amazonaws.com",
expectedRegion: "fips-region",
},
"dualstack-region-1": {
domain: "xxx.dkr-ecr.region-1.on.aws",
expectedRegion: "region-1",
},
"cn-region-1": {
domain: "xxx.dkr.ecr.region-1.amazonaws.com.cn",
expectedRegion: "region-1",