ecr: fix FIPS endpoint conflict with SDK v2#4850
Merged
Merged
Conversation
Contributor
|
Can you update the unit test too? |
SDK v2 rejects combining UseFIPSEndpoint with a custom endpoint override, returning "FIPS and custom endpoint are not supported". This breaks ECR auth when AWS_USE_FIPS_ENDPOINT=true and the ECS control plane sends a FIPS endpoint override (e.g., ecr-fips.us-west-2.amazonaws.com). Fix by disabling SDK FIPS resolution when the endpoint override is already FIPS-compliant. The endpoint is already FIPS-compliant, so this preserves FIPS compliance while avoiding the SDK validation error. Signed-off-by: Kyle Sessions <kssessio@amazon.com>
KCSesh
force-pushed
the
fix-ecr-fips-endpoint-conflict
branch
from
a5912ba to
f64cbe8
Compare
amogh09
approved these changes
Jan 22, 2026
singholt
approved these changes
Jan 23, 2026
This was referenced Jan 29, 2026
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Related: #4550
Summary
Fix ECR authentication failure when
AWS_USE_FIPS_ENDPOINT=trueand the ECS control plane sends a FIPS endpoint override.Implementation details
SDK v2 rejects combining
UseFIPSEndpointwith a custom endpoint override, returning "FIPS and custom endpoint are not supported". This breaks ECR auth whenAWS_USE_FIPS_ENDPOINT=trueand the ECS control plane sends a FIPS endpoint override (e.g.,ecr-fips.us-west-2.amazonaws.com).The fix disables SDK FIPS resolution when the endpoint override is already FIPS-compliant (detected via
//ecr-fips.in the URL). The endpoint is already FIPS-compliant, so this preserves FIPS compliance while avoiding the SDK validation error.Testing
AWS_USE_FIPS_ENDPOINT=trueNew tests cover the changes: yes
Description for the changelog
AWS_USE_FIPS_ENDPOINT=trueand ECS control plane sends a FIPS endpoint overrideAdditional Information
Does this PR include breaking model changes? If so, Have you added transformation functions?
No
Does this PR include the addition of new environment variables in the README?
No
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.