chore: Use AWSSDKDynamic for version, partitions (#2039)

Author: jbelkins

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

@@ -209,7 +209,6 @@ struct PrepareRelease {
                 "Sources/Services",
                 "Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md",
                 "Sources/Core/SDKForSwift/Documentation.docc/SDKForSwift.md",
-                "Sources/Core/AWSSDKPartitions/Sources/AWSSDKPartitions/Partitions.swift",
                 "Sources/Core/AWSSDKIdentity/",
                 "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/PackageVersion.swift",
                 "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/Partitions.swift",

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt

@@ -11,7 +11,6 @@ extension Target.Dependency {
     static var AWSSDKIdentity: Self { "AWSSDKIdentity" }
     static var AWSSDKIdentityAPI: Self { "AWSSDKIdentityAPI" }
     static var AWSSDKChecksums: Self { "AWSSDKChecksums" }
-    static var AWSSDKPartitions: Self { "AWSSDKPartitions" }
     static var AWSSDKDynamic: Self { "AWSSDKDynamic" }
 
     // CRT module
@@ -135,7 +134,6 @@ private var runtimeTargets: [Target] {
                 .AWSSDKCommon,
                 .AWSSDKHTTPAuth,
                 .AWSSDKChecksums,
-                .AWSSDKPartitions,
                 .AWSSDKDynamic,
             ],
             path: "Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime",
@@ -227,10 +225,6 @@ private var runtimeTargets: [Target] {
             ],
             path: "Sources/Core/AWSSDKChecksums/Sources/AWSSDKChecksums"
         ),
-        .target(
-            name: "AWSSDKPartitions",
-            path: "Sources/Core/AWSSDKPartitions/Sources/AWSSDKPartitions"
-        ),
         .target(
             name: "AWSSDKDynamic",
             path: "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic"

AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/PrepareReleaseTests.swift

@@ -193,7 +193,6 @@ class PrepareReleaseTests: CLITestCase {
             "Sources/Services",
             "Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md",
             "Sources/Core/SDKForSwift/Documentation.docc/SDKForSwift.md",
-            "Sources/Core/AWSSDKPartitions/Sources/AWSSDKPartitions/Partitions.swift",
             "Sources/Core/AWSSDKIdentity/",
             "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/PackageVersion.swift",
             "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/Partitions.swift",

Package.swift

@@ -449,7 +449,6 @@ extension Target.Dependency {
     static var AWSSDKIdentity: Self { "AWSSDKIdentity" }
     static var AWSSDKIdentityAPI: Self { "AWSSDKIdentityAPI" }
     static var AWSSDKChecksums: Self { "AWSSDKChecksums" }
-    static var AWSSDKPartitions: Self { "AWSSDKPartitions" }
     static var AWSSDKDynamic: Self { "AWSSDKDynamic" }
 
     // CRT module
@@ -573,7 +572,6 @@ private var runtimeTargets: [Target] {
                 .AWSSDKCommon,
                 .AWSSDKHTTPAuth,
                 .AWSSDKChecksums,
-                .AWSSDKPartitions,
                 .AWSSDKDynamic,
             ],
             path: "Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime",
@@ -665,10 +663,6 @@ private var runtimeTargets: [Target] {
             ],
             path: "Sources/Core/AWSSDKChecksums/Sources/AWSSDKChecksums"
         ),
-        .target(
-            name: "AWSSDKPartitions",
-            path: "Sources/Core/AWSSDKPartitions/Sources/AWSSDKPartitions"
-        ),
         .target(
             name: "AWSSDKDynamic",
             path: "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic"

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/AWSClient.swift renamed to Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/AWSServiceClient.swift

@@ -8,10 +8,11 @@
 import protocol ClientRuntime.Client
 import let AWSSDKDynamic.packageVersion
 
-public protocol AWSClient: ClientRuntime.Client {}
+public protocol AWSServiceClient: ClientRuntime.Client {}
 
-public extension AWSClient {
+public extension AWSServiceClient {
 
+    /// The version identifier (i.e. `1.2.3`) for this AWS service client.
     static var version: String {
         AWSSDKDynamic.packageVersion
     }

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/AWSPartitionDefinition.swift

@@ -5,6 +5,6 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import let AWSSDKPartitions.partitions
+import let AWSSDKDynamic.partitions
 
 public let awsPartitionJSON = partitions

Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSCognitoIdentity/Sources/InternalAWSCognitoIdentity/CognitoIdentityClient.swift

@@ -30,7 +30,7 @@ import enum ClientRuntime.DefaultTelemetry
 import enum ClientRuntime.OrchestratorMetricsAttributesKeys
 import protocol AWSClientRuntime.AWSDefaultClientConfiguration
 import protocol AWSClientRuntime.AWSRegionClientConfiguration
-import protocol ClientRuntime.Client
+import protocol AWSClientRuntime.AWSServiceClient
 import protocol ClientRuntime.DefaultClientConfiguration
 import protocol ClientRuntime.DefaultHttpClientConfiguration
 import protocol ClientRuntime.HttpInterceptorProvider
@@ -65,9 +65,8 @@ import struct SmithyRetries.DefaultRetryStrategy
 import struct SmithyRetriesAPI.RetryStrategyOptions
 import typealias SmithyHTTPAuthAPI.AuthSchemes
 
-package class CognitoIdentityClient: ClientRuntime.Client {
+package class CognitoIdentityClient: AWSClientRuntime.AWSServiceClient {
     public static let clientName = "CognitoIdentityClient"
-    public static let version = "1.5.72"
     let client: ClientRuntime.SdkHttpClient
     let config: CognitoIdentityClient.CognitoIdentityClientConfiguration
     let serviceName = "Cognito Identity"

Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSSSO/Sources/InternalAWSSSO/SSOClient.swift

@@ -29,7 +29,7 @@ import enum ClientRuntime.DefaultTelemetry
 import enum ClientRuntime.OrchestratorMetricsAttributesKeys
 import protocol AWSClientRuntime.AWSDefaultClientConfiguration
 import protocol AWSClientRuntime.AWSRegionClientConfiguration
-import protocol ClientRuntime.Client
+import protocol AWSClientRuntime.AWSServiceClient
 import protocol ClientRuntime.DefaultClientConfiguration
 import protocol ClientRuntime.DefaultHttpClientConfiguration
 import protocol ClientRuntime.HttpInterceptorProvider
@@ -61,9 +61,8 @@ import struct SmithyRetries.DefaultRetryStrategy
 import struct SmithyRetriesAPI.RetryStrategyOptions
 import typealias SmithyHTTPAuthAPI.AuthSchemes
 
-package class SSOClient: ClientRuntime.Client {
+package class SSOClient: AWSClientRuntime.AWSServiceClient {
     public static let clientName = "SSOClient"
-    public static let version = "1.5.72"
     let client: ClientRuntime.SdkHttpClient
     let config: SSOClient.SSOClientConfiguration
     let serviceName = "SSO"

Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSSSOOIDC/Sources/InternalAWSSSOOIDC/SSOOIDCClient.swift

@@ -30,7 +30,7 @@ import enum ClientRuntime.DefaultTelemetry
 import enum ClientRuntime.OrchestratorMetricsAttributesKeys
 import protocol AWSClientRuntime.AWSDefaultClientConfiguration
 import protocol AWSClientRuntime.AWSRegionClientConfiguration
-import protocol ClientRuntime.Client
+import protocol AWSClientRuntime.AWSServiceClient
 import protocol ClientRuntime.DefaultClientConfiguration
 import protocol ClientRuntime.DefaultHttpClientConfiguration
 import protocol ClientRuntime.HttpInterceptorProvider
@@ -64,9 +64,8 @@ import struct SmithyRetries.DefaultRetryStrategy
 import struct SmithyRetriesAPI.RetryStrategyOptions
 import typealias SmithyHTTPAuthAPI.AuthSchemes
 
-package class SSOOIDCClient: ClientRuntime.Client {
+package class SSOOIDCClient: AWSClientRuntime.AWSServiceClient {
     public static let clientName = "SSOOIDCClient"
-    public static let version = "1.5.72"
     let client: ClientRuntime.SdkHttpClient
     let config: SSOOIDCClient.SSOOIDCClientConfiguration
     let serviceName = "SSO OIDC"

Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSSTS/Sources/InternalAWSSTS/STSClient.swift

@@ -30,7 +30,7 @@ import enum ClientRuntime.DefaultTelemetry
 import enum ClientRuntime.OrchestratorMetricsAttributesKeys
 import protocol AWSClientRuntime.AWSDefaultClientConfiguration
 import protocol AWSClientRuntime.AWSRegionClientConfiguration
-import protocol ClientRuntime.Client
+import protocol AWSClientRuntime.AWSServiceClient
 import protocol ClientRuntime.DefaultClientConfiguration
 import protocol ClientRuntime.DefaultHttpClientConfiguration
 import protocol ClientRuntime.HttpInterceptorProvider
@@ -64,9 +64,8 @@ import struct SmithyRetries.DefaultRetryStrategy
 import struct SmithyRetriesAPI.RetryStrategyOptions
 import typealias SmithyHTTPAuthAPI.AuthSchemes
 
-package class STSClient: ClientRuntime.Client {
+package class STSClient: AWSClientRuntime.AWSServiceClient {
     public static let clientName = "STSClient"
-    public static let version = "1.5.72"
     let client: ClientRuntime.SdkHttpClient
     let config: STSClient.STSClientConfiguration
     let serviceName = "STS"