Detect newly added SigV4a trait and handle accordingly.

smithy-lang · Jan 12, 2024 · 6d36d57 · 6d36d57
1 parent e196e56
commit 6d36d57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...degen/src/main/kotlin/software/amazon/smithy/swift/codegen/AuthSchemeResolverGenerator.kt b/...degen/src/main/kotlin/software/amazon/smithy/swift/codegen/AuthSchemeResolverGenerator.kt
@@ -59,8 +59,8 @@ class AuthSchemeResolverGenerator {
                     //   endpoint resolver's auth scheme resolution to resolve an auth scheme.
                     renderEndpointParamFields(ctx, this)
                 } else {
-                    // If service supports SigV4 auth scheme, it's a special-case for now - change once sigv4a trait is added
-                    //   and it becomes possible at model level to notate custom members for a given auth scheme.
+                    // If service supports SigV4/SigV4a auth scheme, it's a special-case for now - change once
+                    // it becomes possible at model level to notate custom members for a given auth scheme.
                     // Region has to be in params in addition to operation string.
                     if (serviceIndex.getEffectiveAuthSchemes(ctx.service).contains(SigV4Trait.ID)) {
                         write("// Region is used for SigV4 auth scheme")

diff --git a/...main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolServiceClient.kt b/...main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolServiceClient.kt
@@ -5,6 +5,7 @@
 
 package software.amazon.smithy.swift.codegen.integration
 
+import software.amazon.smithy.aws.traits.auth.SigV4ATrait
 import software.amazon.smithy.aws.traits.auth.SigV4Trait
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.model.knowledge.ServiceIndex
@@ -45,6 +46,9 @@ open class HttpProtocolServiceClient(
                 if (ServiceIndex(ctx.model).getEffectiveAuthSchemes(ctx.service).contains(SigV4Trait.ID)) {
                     writer.write("modeledAuthSchemes.append(SigV4AuthScheme())")
                 }
+                if (ServiceIndex(ctx.model).getEffectiveAuthSchemes(ctx.service).contains(SigV4ATrait.ID)) {
+                    writer.write("modeledAuthSchemes.append(SigV4AAuthScheme())")
+                }
                 writer.write("config.authSchemes = config.authSchemes ?? modeledAuthSchemes")
                 writer.write("self.config = config")
             }