feat: tie up some loose ends

Sources/ClientRuntime/Auth/HTTPAuth/DefaultIdentityResolverConfiguration.swift

@@ -6,16 +6,16 @@
 //
 
 public struct DefaultIdentityResolverConfiguration: IdentityResolverConfiguration {
-    let credentialsProvider: (any IdentityResolver)?
+    let credentialsProvider: Attributes
 
     public init(configuredIdResolvers: Attributes) {
-        self.credentialsProvider = configuredIdResolvers.get(key: AttributeKeys.awsIdResolver) ?? nil
+        self.credentialsProvider = configuredIdResolvers
     }
 
     func getIdentityResolver(identityKind: IdentityKind) -> (any IdentityResolver)? {
         switch identityKind {
         case .aws:
-            return self.credentialsProvider
+            return self.credentialsProvider.get(key: AttributeKeys.awsIdResolver)
         }
     }
 }

smithy-swift-codegen/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")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/ClientRuntimeTypes.kt

@@ -76,7 +76,7 @@ object ClientRuntimeTypes {
         val RetryMiddleware = runtimeSymbol("RetryMiddleware")
         val IdempotencyTokenMiddleware = runtimeSymbol("IdempotencyTokenMiddleware")
         val NoopHandler = runtimeSymbol("NoopHandler")
-        val SigningMiddleware = runtimeSymbol("SignerMiddleware")
+        val SignerMiddleware = runtimeSymbol("SignerMiddleware")
         val AuthSchemeMiddleware = runtimeSymbol("AuthSchemeMiddleware")
         val BodyMiddleware = runtimeSymbol("BodyMiddleware")
         val PayloadBodyMiddleware = runtimeSymbol("PayloadBodyMiddleware")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpBindingProtocolGenerator.kt

@@ -53,7 +53,7 @@ import software.amazon.smithy.swift.codegen.integration.middlewares.OperationInp
 import software.amazon.smithy.swift.codegen.integration.middlewares.OperationInputUrlHostMiddleware
 import software.amazon.smithy.swift.codegen.integration.middlewares.OperationInputUrlPathMiddleware
 import software.amazon.smithy.swift.codegen.integration.middlewares.RetryMiddleware
-import software.amazon.smithy.swift.codegen.integration.middlewares.SigningMiddleware
+import software.amazon.smithy.swift.codegen.integration.middlewares.SignerMiddleware
 import software.amazon.smithy.swift.codegen.integration.middlewares.providers.HttpHeaderProvider
 import software.amazon.smithy.swift.codegen.integration.middlewares.providers.HttpQueryItemProvider
 import software.amazon.smithy.swift.codegen.integration.middlewares.providers.HttpUrlPathProvider
@@ -465,7 +465,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             operationMiddleware.appendMiddleware(operation, LoggingMiddleware(ctx.model, ctx.symbolProvider))
             operationMiddleware.appendMiddleware(operation, RetryMiddleware(ctx.model, ctx.symbolProvider, retryErrorInfoProviderSymbol))
 
-            operationMiddleware.appendMiddleware(operation, SigningMiddleware(ctx.model, ctx.symbolProvider))
+            operationMiddleware.appendMiddleware(operation, SignerMiddleware(ctx.model, ctx.symbolProvider))
 
             addProtocolSpecificMiddleware(ctx, operation)
 

smithy-swift-codegen/src/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")
             }

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/middlewares/SigningMiddleware.kt → smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/middlewares/SignerMiddleware.kt

@@ -11,7 +11,7 @@ import software.amazon.smithy.swift.codegen.middleware.MiddlewarePosition
 import software.amazon.smithy.swift.codegen.middleware.MiddlewareRenderable
 import software.amazon.smithy.swift.codegen.middleware.MiddlewareStep
 
-class SigningMiddleware(
+class SignerMiddleware(
     val model: Model,
     val symbolProvider: SymbolProvider
 ) : MiddlewareRenderable {
@@ -31,7 +31,7 @@ class SigningMiddleware(
         val outputError = MiddlewareShapeUtils.outputErrorSymbol(op)
         writer.write(
             "$operationStackName.${middlewareStep.stringValue()}.intercept(position: ${position.stringValue()}, middleware: \$N<\$N, \$N>())",
-            ClientRuntimeTypes.Middleware.SigningMiddleware, output, outputError
+            ClientRuntimeTypes.Middleware.SignerMiddleware, output, outputError
         )
     }
 }