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

fix: Fix signing region source #1845

Merged
merged 3 commits into from
Dec 10, 2024
Merged

fix: Fix signing region source #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c82b91
Fix signign region source. Get it from reoslved auth option, instead …
Dec 10, 2024
4539af2
The auth scheme property in endpoint rules may be missing signingRegi…
Dec 10, 2024
5825e4a
Merge branch 'main' into fix/signing-region-source
dayaffe Dec 10, 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
14 changes: 0 additions & 14 deletions ...Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/EndpointResolverMiddleware.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,6 @@ extension EndpointResolverMiddleware: ApplyEndpoint {
builder.withProtocol(protocolType)
}

if let signingName = signingName {
attributes.signingName = signingName
attributes.selectedAuthScheme = selectedAuthScheme?.getCopyWithUpdatedSigningProperty(
key: SigningPropertyKeys.signingName, value: signingName
)
}

if let signingRegion = signingRegion {
attributes.signingRegion = signingRegion
attributes.selectedAuthScheme = selectedAuthScheme?.getCopyWithUpdatedSigningProperty(
key: SigningPropertyKeys.signingRegion, value: signingRegion
)
}

if let signingAlgorithm = signingAlgorithm {
attributes.signingAlgorithm = SigningAlgorithm(rawValue: signingAlgorithm)
}
Expand Down
5 changes: 4 additions & 1 deletion Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/SigV4AAuthScheme.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ public struct SigV4AAuthScheme: AuthScheme {

// Set signing name and signing region flags
updatedSigningProperties.set(key: SigningPropertyKeys.signingName, value: context.signingName)
updatedSigningProperties.set(key: SigningPropertyKeys.signingRegion, value: context.signingRegion)
updatedSigningProperties.set(
key: SigningPropertyKeys.signingRegion,
value: signingProperties.get(key: SigningPropertyKeys.signingRegion) ?? context.signingRegion
)

// Set expiration flag
//
Expand Down
5 changes: 4 additions & 1 deletion Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/SigV4AuthScheme.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ public struct SigV4AuthScheme: AuthScheme {

// Set signing name and signing region flags
updatedSigningProperties.set(key: SigningPropertyKeys.signingName, value: context.signingName)
updatedSigningProperties.set(key: SigningPropertyKeys.signingRegion, value: context.signingRegion)
updatedSigningProperties.set(
key: SigningPropertyKeys.signingRegion,
value: signingProperties.get(key: SigningPropertyKeys.signingRegion) ?? context.signingRegion
)

// Set expiration flag
//
Expand Down
Loading