Skip to content
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

Extend AWS ECR regex for c2s support #20648

Merged
merged 14 commits into from
Aug 8, 2024
Merged

Extend AWS ECR regex for c2s support #20648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3e45902
Extend regex for c2s support
ethanchowell Jun 22, 2024
56eea44
Add more test cases
ethanchowell Jun 22, 2024
12af246
Update region
ethanchowell Jun 22, 2024
3bebf57
Fix region parsing
ethanchowell Jul 4, 2024
5ffa186
Merge branch 'main' into echowell/aws-ecr
ethanchowell Jul 11, 2024
a509cc8
Merge branch 'main' into echowell/aws-ecr
ethanchowell Jul 15, 2024
5b941fc
Merge branch 'main' into echowell/aws-ecr
ethanchowell Jul 17, 2024
3951724
Merge branch 'main' into echowell/aws-ecr
ethanchowell Jul 25, 2024
1d9a9ab
Add length check
ethanchowell Jul 25, 2024
be127d8
Update check
ethanchowell Jul 30, 2024
afd4def
Merge branch 'main' into echowell/aws-ecr
ethanchowell Aug 1, 2024
3a26c5d
Merge branch 'main' into echowell/aws-ecr
ethanchowell Aug 5, 2024
69b5a91
Merge branch 'main' into echowell/aws-ecr
ethanchowell Aug 6, 2024
7534738
Merge branch 'main' into echowell/aws-ecr
ethanchowell Aug 7, 2024
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
6 changes: 3 additions & 3 deletions src/pkg/reg/adapter/awsecr/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
)

const (
ecrPattern = "https://(?:api|(\\d+)\\.dkr)\\.ecr\\.([\\w\\-]+)\\.amazonaws\\.com"
ecrPattern = "https://(?:api|(\\d+)\\.dkr)\\.ecr(\\-fips)?\\.([\\w\\-]+)\\.(amazonaws\\.com(\\.cn)?|sc2s\\.sgov\\.gov|c2s\\.ic\\.gov)"
)

var (
Expand Down Expand Up @@ -64,10 +64,10 @@ func newAdapter(registry *model.Registry) (*adapter, error) {

func parseAccountRegion(url string) (string, string, error) {
rs := ecrRegexp.FindStringSubmatch(url)
if rs == nil {
if rs == nil || len(rs) < 4 {
return "", "", errors.New("bad aws url")
}
return rs[1], rs[2], nil
return rs[1], rs[3], nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add length check for rs before this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to add it, but shouldn't that always evaluate to true based on the docs for FindStringSubmatch? In the event of no match it would just be nil.

}

type factory struct {
Expand Down
32 changes: 32 additions & 0 deletions src/pkg/reg/adapter/awsecr/adapter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,38 @@ func TestAdapter_NewAdapter(t *testing.T) {
assert.Nil(t, adapter)
assert.NotNil(t, err)

adapter, err = newAdapter(&model.Registry{
Type: model.RegistryTypeAwsEcr,
Credential: &model.Credential{
AccessKey: "xxx",
AccessSecret: "ppp",
},
URL: "https://123456.dkr.ecr-fips.test-region.amazonaws.com",
})
assert.Nil(t, err)
assert.NotNil(t, adapter)

adapter, err = newAdapter(&model.Registry{
Type: model.RegistryTypeAwsEcr,
Credential: &model.Credential{
AccessKey: "xxx",
AccessSecret: "ppp",
},
URL: "https://123456.dkr.ecr.us-isob-east-1.sc2s.sgov.gov",
})
assert.Nil(t, err)
assert.NotNil(t, adapter)

adapter, err = newAdapter(&model.Registry{
Type: model.RegistryTypeAwsEcr,
Credential: &model.Credential{
AccessKey: "xxx",
AccessSecret: "ppp",
},
URL: "https://123456.dkr.ecr.us-iso-east-1.c2s.ic.gov",
})
assert.Nil(t, err)
assert.NotNil(t, adapter)
}

func getMockAdapter(t *testing.T, hasCred, health bool) (*adapter, *httptest.Server) {
Expand Down
Loading