Write the new current version to AWSClientRuntime/Resources/sdk-version.txt as well, and use that to initialize user agent middleware during runtime.

Author: Sichan Yoo

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")
     }
 }