fix: Fix SDK version metadata in UserAgent header

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/PrepareRelease.swift

@@ -165,6 +165,14 @@ struct PrepareRelease {
         do {
             try "\(newVersion)".write(toFile: "Package.version" , atomically: true, encoding: .utf8)
             log("Updated Package.version: \(newVersion)")
+            if (repoType == .awsSdkSwift) {
+                try "\(newVersion)".write(
+                    toFile: "Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Resources/sdk-version.txt",
+                    atomically: true,
+                    encoding: .utf8
+                )
+                log("Updated AWSClientRuntime/Resources/Package.version: \(newVersion)")
+            }
         } catch {
           throw Error("Failed to write version \(newVersion) to Package.version")
         }

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/UserAgentMiddleware.swift

@@ -21,11 +21,10 @@ public struct UserAgentMiddleware<OperationStackInput, OperationStackOutput> {
 
     public init(
         serviceID: String,
-        version: String,
         config: DefaultClientConfiguration & AWSDefaultClientConfiguration
     ) {
         self.serviceID = serviceID
-        self.version = version
+        self.version = sdkVersion
         self.config = config
     }
 }

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Resources/sdk-version.txt

@@ -0,0 +1 @@
+1.0.5

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/UserAgent/CurrentSDKVersion.swift

@@ -0,0 +1,15 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+
+// SDK guarantees sdk-version.txt will be present
+let sdkVersionFile = Bundle.module.url(forResource: "sdk-version", withExtension: "txt")!
+
+// First-time load will take longer but subsequent calls will use cached data
+// swiftlint:disable:next force_try
+public let sdkVersion = try! String(contentsOf: sdkVersionFile, encoding: .utf8)

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/middleware/UserAgentMiddleware.kt

@@ -34,9 +34,6 @@ class UserAgentMiddleware(val settings: SwiftSettings) : MiddlewareRenderable {
     }
 
     private fun middlewareParamsString(writer: SwiftWriter): String {
-        return writer.format(
-            "serviceID: serviceName, version: \$S, config: config",
-            settings.moduleVersion,
-        )
+        return writer.format("serviceID: serviceName, config: config")
     }
 }

codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGeneratorTests.kt

@@ -55,7 +55,7 @@ extension GetFooInput {
         builder.applySigner(ClientRuntime.SignerMiddleware<GetFooOutput>())
         let endpointParams = EndpointParams()
         builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<GetFooOutput, EndpointParams>(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: ${'$'}0) }, endpointParams: endpointParams))
-        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<GetFooInput, GetFooOutput>(serviceID: serviceName, version: "1.0.0", config: config))
+        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<GetFooInput, GetFooOutput>(serviceID: serviceName, config: config))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<GetFooOutput>())
         var metricsAttributes = Smithy.Attributes()
         metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "Example")
@@ -127,7 +127,7 @@ extension PostFooInput {
         builder.applySigner(ClientRuntime.SignerMiddleware<PostFooOutput>())
         let endpointParams = EndpointParams()
         builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<PostFooOutput, EndpointParams>(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: ${'$'}0) }, endpointParams: endpointParams))
-        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<PostFooInput, PostFooOutput>(serviceID: serviceName, version: "1.0.0", config: config))
+        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<PostFooInput, PostFooOutput>(serviceID: serviceName, config: config))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<PostFooOutput>())
         var metricsAttributes = Smithy.Attributes()
         metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "Example")
@@ -199,7 +199,7 @@ extension PutFooInput {
         builder.applySigner(ClientRuntime.SignerMiddleware<PutFooOutput>())
         let endpointParams = EndpointParams()
         builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<PutFooOutput, EndpointParams>(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: ${'$'}0) }, endpointParams: endpointParams))
-        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<PutFooInput, PutFooOutput>(serviceID: serviceName, version: "1.0.0", config: config))
+        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<PutFooInput, PutFooOutput>(serviceID: serviceName, config: config))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<PutFooOutput>())
         var metricsAttributes = Smithy.Attributes()
         metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "Example")
@@ -272,7 +272,7 @@ extension PutObjectInput {
         let endpointParams = EndpointParams()
         context.attributes.set(key: Smithy.AttributeKey<EndpointParams>(name: "EndpointParams"), value: endpointParams)
         builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<PutObjectOutput, EndpointParams>(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: ${'$'}0) }, endpointParams: endpointParams))
-        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<PutObjectInput, PutObjectOutput>(serviceID: serviceName, version: "1.0.0", config: config))
+        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<PutObjectInput, PutObjectOutput>(serviceID: serviceName, config: config))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<PutObjectOutput>())
         var metricsAttributes = Smithy.Attributes()
         metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "S3")

codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/awsquery/AWSQueryOperationStackTest.kt

@@ -38,7 +38,7 @@ class AWSQueryOperationStackTest {
         builder.applySigner(ClientRuntime.SignerMiddleware<NoInputAndOutputOutput>())
         let endpointParams = EndpointParams()
         builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<NoInputAndOutputOutput, EndpointParams>(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: ${'$'}0) }, endpointParams: endpointParams))
-        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<NoInputAndOutputInput, NoInputAndOutputOutput>(serviceID: serviceName, version: "1.0.0", config: config))
+        builder.interceptors.add(AWSClientRuntime.UserAgentMiddleware<NoInputAndOutputInput, NoInputAndOutputOutput>(serviceID: serviceName, config: config))
         builder.serialize(ClientRuntime.BodyMiddleware<NoInputAndOutputInput, NoInputAndOutputOutput, SmithyFormURL.Writer>(rootNodeInfo: "", inputWritingClosure: NoInputAndOutputInput.write(value:to:)))
         builder.interceptors.add(ClientRuntime.ContentTypeMiddleware<NoInputAndOutputInput, NoInputAndOutputOutput>(contentType: "application/x-www-form-urlencoded"))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<NoInputAndOutputOutput>())