chore: Refactor non-AWS context config into runtime (#941)

jbelkins · web-flow · commit ff088ff833d4 · 2025-06-25T16:07:09.000-05:00
diff --git a/Sources/ClientRuntime/Config/ContextBuilder+withSmithyDefaultConfig.swift b/Sources/ClientRuntime/Config/ContextBuilder+withSmithyDefaultConfig.swift
@@ -0,0 +1,26 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import class Smithy.ContextBuilder
+
+extension ContextBuilder {
+
+    public func withSmithyDefaultConfig<Config: DefaultClientConfiguration & DefaultHttpClientConfiguration>(
+        _ config: Config
+    ) -> Smithy.ContextBuilder {
+        return self
+            .withIdempotencyTokenGenerator(value: config.idempotencyTokenGenerator)
+            .withLogger(value: config.logger)
+            .withPartitionID(value: config.partitionID)
+            .withAuthSchemes(value: config.authSchemes ?? [])
+            .withAuthSchemePreference(value: config.authSchemePreference)
+            .withAuthSchemeResolver(value: config.authSchemeResolver)
+            .withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
+            .withIdentityResolver(value: config.bearerTokenIdentityResolver, schemeID: "smithy.api#httpBearerAuth")
+            .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4")
+    }
+}
diff --git a/Sources/ClientRuntime/Config/DefaultClientConfiguration.swift b/Sources/ClientRuntime/Config/DefaultClientConfiguration.swift
@@ -5,14 +5,19 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol Smithy.LogAgent
 import struct SmithyRetriesAPI.RetryStrategyOptions
 
 public protocol DefaultClientConfiguration: ClientConfiguration {
+
     /// The configuration for retry of failed network requests.
     ///
     /// Default options are used if none are set.
     var retryStrategyOptions: RetryStrategyOptions { get set }
 
+    /// The LogAgent to be used when logging messages related to API calls.
+    var logger: LogAgent { get }
+
     /// The log mode to use for request / response messages.
     ///
     /// If none is provided, `.none` will be used.
diff --git a/Sources/ClientRuntime/Config/DefaultHttpClientConfiguration.swift b/Sources/ClientRuntime/Config/DefaultHttpClientConfiguration.swift
@@ -8,6 +8,7 @@
 import protocol SmithyHTTPAPI.HTTPClient
 import protocol SmithyHTTPAuthAPI.AuthScheme
 import protocol SmithyHTTPAuthAPI.AuthSchemeResolver
+import protocol SmithyIdentity.AWSCredentialIdentityResolver
 import protocol SmithyIdentity.BearerTokenIdentityResolver
 
 public protocol DefaultHttpClientConfiguration: ClientConfiguration {
@@ -21,11 +22,19 @@ public protocol DefaultHttpClientConfiguration: ClientConfiguration {
     /// Configuration for the HTTP client.
     var httpClientConfiguration: HttpClientConfiguration { get set }
 
+    var partitionID: String? { get }
+
     /// List of auth schemes to use for requests.
     ///
     /// Defaults to auth schemes defined on the underlying Smithy model of a service.
     var authSchemes: [AuthScheme]? { get set }
 
+    /// An ordered, prioritized list of auth scheme IDs that should be used for this client's requests.
+    ///
+    /// If no auth scheme preference is given, the first supported auth scheme defined in `authSchemes`
+    /// will be used.  If a value was not provided for `authSchemes`, then the service's first defined, supported auth scheme will be used.
+    var authSchemePreference: [String]? { get set }
+
     /// The auth scheme resolver to use for resolving the auth scheme.
     ///
     /// Defaults to an auth scheme resolver generated based on the underlying Smithy model of a service.
@@ -36,6 +45,9 @@ public protocol DefaultHttpClientConfiguration: ClientConfiguration {
     /// Default resolver will look for the token in the `~/.aws/sso/cache` directory.
     var bearerTokenIdentityResolver: any BearerTokenIdentityResolver { get set }
 
+    /// The AWS credential identity resolver to be used for AWS credentials.
+    var awsCredentialIdentityResolver: any AWSCredentialIdentityResolver { get set }
+
     /// Adds a `HttpInterceptorProvider` that will be used to provide interceptors for all HTTP operations.
     ///
     /// - Parameter provider: The `HttpInterceptorProvider` to add.
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/ExtractTelemetryLoggerConfig.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/ExtractTelemetryLoggerConfig.kt
@@ -24,7 +24,7 @@ class ExtractTelemetryLoggerConfig : SwiftIntegration {
             writer: SwiftWriter,
             section: ConfigClassVariablesCustomization,
         ) {
-            writer.write("internal let logger: \$N", SmithyTypes.LogAgent)
+            writer.write("public let logger: \$N", SmithyTypes.LogAgent)
             writer.write("")
         }
     }
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolClientGenerator.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolClientGenerator.kt
@@ -46,9 +46,17 @@ open class HttpProtocolClientGenerator(
         val operationsIndex = OperationIndex.of(model)
 
         writer.openBlock("extension \$L {", "}", serviceSymbol.name) {
-            operations.forEach {
-                val serviceName = ctx.settings.sdkId.toUpperCamelCase()
-                ServiceGenerator.renderOperationDefinition(serviceName, model, serviceShape, symbolProvider, writer, operationsIndex, it)
+            val serviceName = ctx.settings.sdkId.toUpperCamelCase()
+            operations.forEach { operation ->
+                ServiceGenerator.renderOperationDefinition(
+                    serviceName,
+                    model,
+                    serviceShape,
+                    symbolProvider,
+                    writer,
+                    operationsIndex,
+                    operation,
+                )
                 writer.openBlock(" {", "}") {
                     val operationStackName = "operation"
                     val generator =
@@ -60,11 +68,12 @@ open class HttpProtocolClientGenerator(
                             operationMiddleware,
                             operationStackName,
                         )
-                    generator.render(serviceShape, it)
+                    generator.render(serviceShape, operation)
                     writer.write("return try await op.execute(input: input)")
                 }
                 writer.write("")
             }
+            writer.unwrite("\n")
         }
     }
 }
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/middleware/MiddlewareExecutionGenerator.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/middleware/MiddlewareExecutionGenerator.kt
@@ -94,15 +94,8 @@ class MiddlewareExecutionGenerator(
         writer.write("  .withMethod(value: .\$L)", httpMethod)
         writer.write("  .withServiceName(value: serviceName)")
         writer.write("  .withOperation(value: \$S)", op.toLowerCamelCase())
-        writer.write("  .withIdempotencyTokenGenerator(value: config.idempotencyTokenGenerator)")
-        writer.write("  .withLogger(value: config.logger)")
-        writer.write("  .withPartitionID(value: config.partitionID)")
-        writer.write("  .withAuthSchemes(value: config.authSchemes ?? [])")
-        writer.write("  .withAuthSchemePreference(value: config.authSchemePreference)")
-        writer.write("  .withAuthSchemeResolver(value: config.authSchemeResolver)")
         writer.write("  .withUnsignedPayloadTrait(value: \$L)", op.hasTrait<UnsignedPayloadTrait>())
-        writer.write("  .withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)")
-        writer.write("  .withIdentityResolver(value: config.bearerTokenIdentityResolver, schemeID: \$S)", "smithy.api#httpBearerAuth")
+        writer.write("  .withSmithyDefaultConfig(config)")
 
         // Add flag for presign / presign-url flows
         if (flowType == ContextAttributeCodegenFlowType.PRESIGN_REQUEST) {
diff --git a/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/HttpProtocolClientGeneratorTests.kt b/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/HttpProtocolClientGeneratorTests.kt
@@ -167,15 +167,8 @@ extension RestJsonProtocolClient {
                       .withMethod(value: .post)
                       .withServiceName(value: serviceName)
                       .withOperation(value: "getStatus")
-                      .withIdempotencyTokenGenerator(value: config.idempotencyTokenGenerator)
-                      .withLogger(value: config.logger)
-                      .withPartitionID(value: config.partitionID)
-                      .withAuthSchemes(value: config.authSchemes ?? [])
-                      .withAuthSchemePreference(value: config.authSchemePreference)
-                      .withAuthSchemeResolver(value: config.authSchemeResolver)
                       .withUnsignedPayloadTrait(value: false)
-                      .withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
-                      .withIdentityResolver(value: config.bearerTokenIdentityResolver, schemeID: "smithy.api#httpBearerAuth")
+                      .withSmithyDefaultConfig(config)
                       .build()
 """
         contents.shouldContainOnlyOnce(expectedFragment)
@@ -200,15 +193,8 @@ extension RestJsonProtocolClient {
                       .withMethod(value: .post)
                       .withServiceName(value: serviceName)
                       .withOperation(value: "allocateWidget")
-                      .withIdempotencyTokenGenerator(value: config.idempotencyTokenGenerator)
-                      .withLogger(value: config.logger)
-                      .withPartitionID(value: config.partitionID)
-                      .withAuthSchemes(value: config.authSchemes ?? [])
-                      .withAuthSchemePreference(value: config.authSchemePreference)
-                      .withAuthSchemeResolver(value: config.authSchemeResolver)
                       .withUnsignedPayloadTrait(value: false)
-                      .withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
-                      .withIdentityResolver(value: config.bearerTokenIdentityResolver, schemeID: "smithy.api#httpBearerAuth")
+                      .withSmithyDefaultConfig(config)
                       .build()
         let builder = ClientRuntime.OrchestratorBuilder<AllocateWidgetInput, AllocateWidgetOutput, SmithyHTTPAPI.HTTPRequest, SmithyHTTPAPI.HTTPResponse>()
         config.interceptorProviders.forEach { provider in
diff --git a/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/requestandresponse/EventStreamTests.kt b/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/requestandresponse/EventStreamTests.kt
@@ -216,15 +216,8 @@ extension EventStreamTestClientTypes.TestStream {
                       .withMethod(value: .post)
                       .withServiceName(value: serviceName)
                       .withOperation(value: "testStreamOp")
-                      .withIdempotencyTokenGenerator(value: config.idempotencyTokenGenerator)
-                      .withLogger(value: config.logger)
-                      .withPartitionID(value: config.partitionID)
-                      .withAuthSchemes(value: config.authSchemes ?? [])
-                      .withAuthSchemePreference(value: config.authSchemePreference)
-                      .withAuthSchemeResolver(value: config.authSchemeResolver)
                       .withUnsignedPayloadTrait(value: false)
-                      .withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
-                      .withIdentityResolver(value: config.bearerTokenIdentityResolver, schemeID: "smithy.api#httpBearerAuth")
+                      .withSmithyDefaultConfig(config)
                       .build()
         let builder = ClientRuntime.OrchestratorBuilder<TestStreamOpInput, TestStreamOpOutput, SmithyHTTPAPI.HTTPRequest, SmithyHTTPAPI.HTTPResponse>()
         config.interceptorProviders.forEach { provider in

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ExtractTelemetryLoggerConfig : SwiftIntegration {`
`24`	`24`	`writer: SwiftWriter,`
`25`	`25`	`section: ConfigClassVariablesCustomization,`
`26`	`26`	`) {`
`27`		`- writer.write("internal let logger: \$N", SmithyTypes.LogAgent)`
	`27`	`+ writer.write("public let logger: \$N", SmithyTypes.LogAgent)`
`28`	`28`	`writer.write("")`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,17 @@ open class HttpProtocolClientGenerator(`
`46`	`46`	`val operationsIndex = OperationIndex.of(model)`
`47`	`47`
`48`	`48`	`writer.openBlock("extension \$L {", "}", serviceSymbol.name) {`
`49`		`- operations.forEach {`
`50`		`- val serviceName = ctx.settings.sdkId.toUpperCamelCase()`
`51`		`- ServiceGenerator.renderOperationDefinition(serviceName, model, serviceShape, symbolProvider, writer, operationsIndex, it)`
	`49`	`+ val serviceName = ctx.settings.sdkId.toUpperCamelCase()`
	`50`	`+ operations.forEach { operation ->`
	`51`	`+ ServiceGenerator.renderOperationDefinition(`
	`52`	`+ serviceName,`
	`53`	`+ model,`
	`54`	`+ serviceShape,`
	`55`	`+ symbolProvider,`
	`56`	`+ writer,`
	`57`	`+ operationsIndex,`
	`58`	`+ operation,`
	`59`	`+ )`
`52`	`60`	`writer.openBlock(" {", "}") {`
`53`	`61`	`val operationStackName = "operation"`
`54`	`62`	`val generator =`
`@@ -60,11 +68,12 @@ open class HttpProtocolClientGenerator(`
`60`	`68`	`operationMiddleware,`
`61`	`69`	`operationStackName,`
`62`	`70`	`)`
`63`		`- generator.render(serviceShape, it)`
	`71`	`+ generator.render(serviceShape, operation)`
`64`	`72`	`writer.write("return try await op.execute(input: input)")`
`65`	`73`	`}`
`66`	`74`	`writer.write("")`
`67`	`75`	`}`
	`76`	`+ writer.unwrite("\n")`
`68`	`77`	`}`
`69`	`78`	`}`
`70`	`79`	`}`