Update ECR parsing regex to include non-public AWS partitions #835
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ngearhart
force-pushed
the
update-ecr-parsing
branch
5 times, most recently
from
16ad2a1 to
5a82673
Compare
Signed-off-by: Noah Gearhart <[email protected]>
ngearhart
force-pushed
the
update-ecr-parsing
branch
from
5a82673 to
3647c40
Compare
ngearhart
changed the title
darkowlzz
reviewed
Dec 23, 2024
| var registryPartRe = regexp.MustCompile(`([0-9+]*).dkr.ecr(?:-fips)?\.([^/.]*)\.(amazonaws\.com[.cn]*)`) | ||
| // This regex is sourced from the AWS ECR Credential Helper (https://github.com/awslabs/amazon-ecr-credential-helper). | ||
| // It covers both public AWS partitions like amazonaws.com, China partitions like amazonaws.com.cn, and non-public partitions. | ||
| var registryPartRe = regexp.MustCompile(`(\d{12})\.dkr\.ecr(\-fips)?\.([a-zA-Z0-9][a-zA-Z0-9-_]*)\.(amazonaws\.com(\.cn)?|sc2s\.sgov\.gov|c2s\.ic\.gov|cloud\.adc-e\.uk|csp\.hci\.ic\.gov)`) |
There was a problem hiding this comment.
I'm afraid of completely replacing the previous expression. It was introduced several years ago in https://github.com/fluxcd/image-reflector-controller/pull/174/files#diff-922fcbfbe2565443329918a2b0d49b2b03588007ec6464a20d3feb824f3f80a2R199 and I see some weirdness with it, compared to the new one. I think it would be safer to only append what's needed here, instead of replacing the whole expression, and also needing to change the registryParts slice index below.
Suggested change
| var registryPartRe = regexp.MustCompile(`(\d{12})\.dkr\.ecr(\-fips)?\.([a-zA-Z0-9][a-zA-Z0-9-_]*)\.(amazonaws\.com(\.cn)?|sc2s\.sgov\.gov|c2s\.ic\.gov|cloud\.adc-e\.uk|csp\.hci\.ic\.gov)`) | |
| var registryPartRe = regexp.MustCompile(`([0-9+]*).dkr.ecr(?:-fips)?\.([^/.]*)\.(amazonaws\.com[.cn]*|sc2s\.sgov\.gov|c2s\.ic\.gov|cloud\.adc-e\.uk|csp\.hci\.ic\.gov)`) |
Comment on lines
+104
to
+107
| { | ||
| registry: ".dkr.ecr.error.amazonaws.com", | ||
| wantOK: false, | ||
| }, |
There was a problem hiding this comment.
This test case is unrelated. Please revert it with its comment as before.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #832 and references https://github.com/awslabs/amazon-ecr-credential-helper/blob/69e8c24e6fc115fd00d7c363cde156570ce73144/ecr-login/api/client.go#L40.
Public AWS Documentation about hidden partitions (non-amazonaws.com or .com.cn) is limited. Read more about AWS partitions here.