Skip to content

fix: authSchemePreference in config + remove from default resolver #948

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

Merged
merged 5 commits into from
Jul 14, 2025
Merged

fix: authSchemePreference in config + remove from default resolver #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bdb382
fix authSchemePreference in config and remove from init in default re…
dayaffe Jul 11, 2025
1ada0e8
fix codegen test
dayaffe Jul 11, 2025
e230d60
fix more tests
dayaffe Jul 11, 2025
dc541be
ktlint
dayaffe Jul 11, 2025
19e5888
Merge branch 'main' into day/fix-auth-scheme-pref
jbelkins Jul 14, 2025
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
25 changes: 7 additions & 18 deletions ...degen/src/main/kotlin/software/amazon/smithy/swift/codegen/AuthSchemeResolverGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class AuthSchemeResolverGenerator(
"}",
SmithyHTTPAuthAPITypes.AuthSchemeResolverParams,
) {
writer.write("public let authSchemePreference: \$N?", SwiftTypes.StringList)
write("public let operation: \$N", SwiftTypes.String)

if (usesRulesBasedAuthResolver(ctx)) {
Expand Down Expand Up @@ -146,8 +147,6 @@ class AuthSchemeResolverGenerator(
defaultResolverName,
serviceSpecificAuthResolverProtocol,
) {
write("")
renderInit(writer)
write("")
renderResolveAuthSchemeMethod(serviceIndex, ctx, writer)
write("")
Expand All @@ -160,19 +159,6 @@ class AuthSchemeResolverGenerator(
}
}

private fun renderInit(writer: SwiftWriter) {
writer.apply {
write("public let authSchemePreference: [String]")
write("")
openBlock(
"public init(authSchemePreference: [String] = []) {",
"}",
) {
write("self.authSchemePreference = authSchemePreference")
}
}
}

private fun renderResolveAuthSchemeMethod(
serviceIndex: ServiceIndex,
ctx: ProtocolGenerator.GenerationContext,
Expand Down Expand Up @@ -200,7 +186,9 @@ class AuthSchemeResolverGenerator(
// Render switch block
renderSwitchBlock(serviceIndex, ctx, writer)
// Call reprioritizeAuthOptions and return result
write("return self.reprioritizeAuthOptions(authSchemePreference: authSchemePreference, authOptions: validAuthOptions)")
write(
"return self.reprioritizeAuthOptions(authSchemePreference: serviceParams.authSchemePreference, authOptions: validAuthOptions)",
)
}
}
}
Expand Down Expand Up @@ -317,12 +305,13 @@ class AuthSchemeResolverGenerator(
SmithyTypes.ClientError,
)
}
writer.write("let authSchemePreference = context.getAuthSchemePreference()")
val paramType = getSdkId(ctx) + SmithyHTTPAuthAPITypes.AuthSchemeResolverParams.name
if (hasSigV4) {
write("let opRegion = context.getRegion()")
write("return $paramType(operation: opName, region: opRegion)")
write("return $paramType(authSchemePreference: authSchemePreference, operation: opName, region: opRegion)")
} else {
write("return $paramType(operation: opName)")
write("return $paramType(authSchemePreference: authSchemePreference, operation: opName)")
}
}
}
Expand Down
12 changes: 4 additions & 8 deletions ...n/smithy/swift/codegen/requestandresponse/requestflow/AuthSchemeResolverGeneratorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class AuthSchemeResolverGeneratorTests {
contents.shouldSyntacticSanityCheck()
val expected = """
public struct ExampleAuthSchemeResolverParameters: SmithyHTTPAuthAPI.AuthSchemeResolverParameters {
public let authSchemePreference: [String]?
public let operation: Swift.String
// Region is used for SigV4 auth scheme
public let region: Swift.String?
Expand All @@ -34,12 +35,6 @@ public protocol ExampleAuthSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver

public struct DefaultExampleAuthSchemeResolver: ExampleAuthSchemeResolver {

public let authSchemePreference: [String]

public init(authSchemePreference: [String] = []) {
self.authSchemePreference = authSchemePreference
}

public func resolveAuthScheme(params: SmithyHTTPAuthAPI.AuthSchemeResolverParameters) throws -> [SmithyHTTPAuthAPI.AuthOption] {
var validAuthOptions = [SmithyHTTPAuthAPI.AuthOption]()
guard let serviceParams = params as? ExampleAuthSchemeResolverParameters else {
Expand Down Expand Up @@ -103,15 +98,16 @@ public struct DefaultExampleAuthSchemeResolver: ExampleAuthSchemeResolver {
sigv4Option.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingRegion, value: region)
validAuthOptions.append(sigv4Option)
}
return self.reprioritizeAuthOptions(authSchemePreference: authSchemePreference, authOptions: validAuthOptions)
return self.reprioritizeAuthOptions(authSchemePreference: serviceParams.authSchemePreference, authOptions: validAuthOptions)
}

public func constructParameters(context: Smithy.Context) throws -> SmithyHTTPAuthAPI.AuthSchemeResolverParameters {
guard let opName = context.getOperation() else {
throw Smithy.ClientError.dataNotFound("Operation name not configured in middleware context for auth scheme resolver params construction.")
}
let authSchemePreference = context.getAuthSchemePreference()
let opRegion = context.getRegion()
return ExampleAuthSchemeResolverParameters(operation: opName, region: opRegion)
return ExampleAuthSchemeResolverParameters(authSchemePreference: authSchemePreference, operation: opName, region: opRegion)
}
}
"""
Expand Down
Loading