Add utility method for parsing dual-stack and fips URIs #4612
+308
−21
Conversation
This file contains hidden or 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
TheanLim
reviewed
May 2, 2025
| // 123456789.dkr.ecr.cn-north-1.amazonaws.com.cn/ | ||
| // 98765432.dkr.starport.us-west-2.amazonaws.com/ | ||
| // 98765432.dkr.starport-fips.us-west-2.amazonaws.com/ | ||
| ECRImagePattern = regexp.MustCompile(`(^[a-zA-Z0-9][a-zA-Z0-9-_]*)\.dkr\.((ecr|starport)(` + FIPSKeyword + `)?)\.([\w\-_]+)\.([\w\.\-]+).*`) |
There was a problem hiding this comment.
let's check with team but i think starport is for Gamma so we might not want to expose it here. We will continue getting endpoint overrides for Gamma so it might not be necessary to check it there
TheanLim
reviewed
May 2, 2025
| foundFips := (matchedPattern || matchedDualstackPattern) && strings.Contains(uri, FIPSKeyword) | ||
|
|
||
| logger.Info(fmt.Sprintf("URI: %s, Matched Pattern: %t, Matched Dualstack Pattern: %t, IsFIPS: %t", uri, matchedPattern, matchedDualstackPattern, foundFips)) | ||
| return matchedPattern, matchedDualstackPattern, foundFips |
There was a problem hiding this comment.
Wondering what are the benefits of having three return outputs
vs (isDualStackPattern, isFipsPattern)
I might be wrong but image URI validation is done somewhere elses already?
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.
Summary
Add a utility method to ecs-agent
utilspackage to allow parsing a URI (string) and check if it matches ipv4, dual-stack regex patterns and if it is a FIPS endpoint.Implementation details
Using 2 separate patterns for regex (ipv4/dual-stack) check if the supplied URI (string) matches either pattern. If it matches either pattern also check if the URI is a FIPS endpoint
Testing
make testand local debuggingNew tests cover the changes: yes
Description for the changelog
Add utility method for parsing dual-stack and fips URIs
Additional Information
Does this PR include breaking model changes? If so, Have you added transformation functions?
N/A
Does this PR include the addition of new environment variables in the README?
N/A
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.