feat!: Modularize event streams & event streams auth

.github/workflows/continuous-integration.yml

@@ -112,7 +112,7 @@ jobs:
           cd ../aws-sdk-swift
           set -o pipefail && \
           NSUnbufferedIO=YES xcodebuild \
-            -scheme aws-sdk-swift \
+            -scheme aws-sdk-swift-Package \
             -destination '${{ matrix.destination }}' \
             test 2>&1 \
             | xcbeautify

Package.swift

@@ -28,30 +28,51 @@ let package = Package(
         .watchOS(.v6)
     ],
     products: [
+        .library(name: "Smithy", targets: ["Smithy"]),
         .library(name: "ClientRuntime", targets: ["ClientRuntime"]),
         .library(name: "SmithyRetriesAPI", targets: ["SmithyRetriesAPI"]),
         .library(name: "SmithyRetries", targets: ["SmithyRetries"]),
         .library(name: "SmithyReadWrite", targets: ["SmithyReadWrite"]),
         .library(name: "SmithyXML", targets: ["SmithyXML"]),
         .library(name: "SmithyJSON", targets: ["SmithyJSON"]),
         .library(name: "SmithyFormURL", targets: ["SmithyFormURL"]),
+        .library(name: "SmithyIdentityAPI", targets: ["SmithyIdentityAPI"]),
+        .library(name: "SmithyHTTPAPI", targets: ["SmithyHTTPAPI"]),
+        .library(name: "SmithyHTTPAuthAPI", targets: ["SmithyHTTPAuthAPI"]),
+        .library(name: "SmithyEventStreamsAPI", targets: ["SmithyEventStreamsAPI"]),
+        .library(name: "SmithyEventStreamsAuthAPI", targets: ["SmithyEventStreamsAuthAPI"]),
+        .library(name: "SmithyEventStreams", targets: ["SmithyEventStreams"]),
+        .library(name: "SmithyChecksumsAPI", targets: ["SmithyChecksumsAPI"]),
         .library(name: "SmithyTestUtil", targets: ["SmithyTestUtil"]),
     ],
     dependencies: [
         .package(url: "https://github.com/awslabs/aws-crt-swift.git", exact: "0.30.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
     ],
     targets: [
+        .target(
+            name: "Smithy",
+            dependencies: [
+                .product(name: "Logging", package: "swift-log"),
+            ]
+        ),
         .target(
             name: "ClientRuntime",
             dependencies: [
+                "Smithy",
                 "SmithyRetriesAPI",
                 "SmithyRetries",
                 "SmithyXML",
                 "SmithyJSON",
                 "SmithyFormURL",
+                "SmithyIdentityAPI",
+                "SmithyHTTPAPI",
+                "SmithyHTTPAuthAPI",
+                "SmithyEventStreamsAPI",
+                "SmithyEventStreams",
+                "SmithyEventStreamsAuthAPI",
+                "SmithyChecksumsAPI",
                 .product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift"),
-                .product(name: "Logging", package: "swift-log"),
             ],
             resources: [
                 .copy("PrivacyInfo.xcprivacy")
@@ -72,9 +93,7 @@ let package = Package(
         ),
         .target(
             name: "SmithyReadWrite",
-            dependencies: [
-                "SmithyTimestamps"
-            ]
+            dependencies: ["SmithyTimestamps"]
         ),
         .target(
             name: "SmithyXML",
@@ -106,6 +125,39 @@ let package = Package(
             name: "SmithyTestUtil",
             dependencies: ["ClientRuntime"]
         ),
+        .target(
+            name: "SmithyIdentityAPI",
+            dependencies: ["Smithy"]
+        ),
+        .target(
+            name: "SmithyHTTPAPI",
+            dependencies: ["Smithy"]
+        ),
+        .target(
+            name: "SmithyHTTPAuthAPI",
+            dependencies: ["Smithy", "SmithyHTTPAPI"]
+        ),
+        .target(
+            name: "SmithyEventStreamsAPI",
+            dependencies: ["Smithy"]
+        ),
+        .target(
+            name: "SmithyEventStreamsAuthAPI",
+            dependencies: ["Smithy", "SmithyEventStreamsAPI"]
+        ),
+        .target(
+            name: "SmithyEventStreams",
+            dependencies: [
+                "Smithy",
+                "SmithyEventStreamsAPI",
+                "SmithyEventStreamsAuthAPI",
+                .product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift")
+            ]
+        ),
+        .target(
+            name: "SmithyChecksumsAPI",
+            dependencies: ["Smithy"]
+        ),
         .testTarget(
             name: "ClientRuntimeTests",
             dependencies: ["ClientRuntime", "SmithyTestUtil"],
@@ -131,6 +183,10 @@ let package = Package(
             name: "SmithyTestUtilTests",
             dependencies: ["SmithyTestUtil"]
         ),
+        .testTarget(
+            name: "SmithyEventStreamsTests",
+            dependencies: ["SmithyEventStreams"]
+        ),
     ].compactMap { $0 }
 )
 

Sources/ClientRuntime/Auth/HTTPAuth/DefaultIdentityResolverConfiguration.swift

@@ -5,14 +5,19 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import struct Smithy.Attributes
+import struct Smithy.AttributeKey
+import protocol SmithyIdentityAPI.IdentityResolver
+import protocol SmithyIdentityAPI.IdentityResolverConfiguration
+
 public struct DefaultIdentityResolverConfiguration: IdentityResolverConfiguration {
     let identityResolvers: Attributes
 
     public init(configuredIdResolvers: Attributes) {
         self.identityResolvers = configuredIdResolvers
     }
 
-    func getIdentityResolver(schemeID: String) throws -> (any IdentityResolver)? {
+    public func getIdentityResolver(schemeID: String) throws -> (any IdentityResolver)? {
         return self.identityResolvers.get(key: AttributeKey<any IdentityResolver>(name: schemeID))
     }
 }

Sources/ClientRuntime/Config/DefaultHttpClientConfiguration.swift

@@ -5,6 +5,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol SmithyHTTPAPI.HTTPClient
+import protocol SmithyHTTPAuthAPI.AuthScheme
+import protocol SmithyHTTPAuthAPI.AuthSchemeResolver
+
 public protocol DefaultHttpClientConfiguration: ClientConfiguration {
 
     /// The HTTP client to be used for the target platform, configured with the supplied configuration.
@@ -19,10 +23,10 @@ public protocol DefaultHttpClientConfiguration: ClientConfiguration {
     /// List of auth schemes to use for client calls.
     ///
     /// Defaults to auth schemes defined on the Smithy service model.
-    var authSchemes: [ClientRuntime.AuthScheme]? { get set }
+    var authSchemes: [AuthScheme]? { get set }
 
     /// The auth scheme resolver to use for resolving auth scheme.
     ///
     /// Defaults to a auth scheme resolver generated based on Smithy service model.
-    var authSchemeResolver: ClientRuntime.AuthSchemeResolver { get set }
+    var authSchemeResolver: AuthSchemeResolver { get set }
 }

Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift

@@ -5,6 +5,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import class Smithy.Context
+import protocol SmithyHTTPAPI.HTTPClient
+import enum Smithy.ClientError
+import struct SmithyHTTPAuthAPI.AuthOption
+import protocol SmithyHTTPAuthAPI.AuthSchemeResolver
+import protocol SmithyHTTPAuthAPI.AuthSchemeResolverParameters
 import protocol SmithyRetriesAPI.RetryStrategy
 import protocol SmithyRetriesAPI.RetryErrorInfoProvider
 import struct SmithyRetriesAPI.RetryStrategyOptions
@@ -86,7 +92,7 @@
     static func makeClient(
         httpClientConfiguration: HttpClientConfiguration = defaultHttpClientConfiguration
     ) -> HTTPClient {
         #if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS) || os(macOS)
         return URLSessionHTTPClient(httpClientConfiguration: httpClientConfiguration)
         #else
         let connectTimeoutMs = httpClientConfiguration.connectTimeout.map { UInt32($0 * 1000) }
@@ -137,7 +143,7 @@
         return []
     }
 
-    public func constructParameters(context: HttpContext) throws -> AuthSchemeResolverParameters {
+    public func constructParameters(context: Context) throws -> AuthSchemeResolverParameters {
         guard let opName = context.getOperation() else {
             throw ClientError.dataNotFound(
                 "Operation name not configured in middleware context for auth scheme resolver params construction.")

Sources/ClientRuntime/Endpoints/ServiceEndpointMetadata.swift

@@ -5,6 +5,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import enum SmithyHTTPAPI.ProtocolType
+import struct SmithyHTTPAPI.Endpoint
+
 public struct ServiceEndpointMetadata {
     public let defaultProtocol = ProtocolType.https.rawValue
     public let defaultSigner = "v4"

Sources/ClientRuntime/Endpoints/SmithyEndpoint.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import struct SmithyHTTPAPI.Endpoint
+
 /**
   A structure used by the service client to determine the endpoint.
   The SDK will automatically resolve endpoints per API client using an internal resolver.

Sources/ClientRuntime/Idempotency/Context+Idempotency.swift

@@ -0,0 +1,28 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import struct Smithy.AttributeKey
+import class Smithy.Context
+import class Smithy.ContextBuilder
+
+extension Context {
+
+    public func getIdempotencyTokenGenerator() -> IdempotencyTokenGenerator {
+        return attributes.get(key: idempotencyTokenGeneratorKey)!
+    }
+}
+
+extension ContextBuilder {
+
+    @discardableResult
+    public func withIdempotencyTokenGenerator(value: IdempotencyTokenGenerator) -> Self {
+        self.attributes.set(key: idempotencyTokenGeneratorKey, value: value)
+        return self
+    }
+}
+
+private let idempotencyTokenGeneratorKey = AttributeKey<IdempotencyTokenGenerator>(name: "IdempotencyTokenGeneratorKey")

Sources/ClientRuntime/Idempotency/IdempotencyTokenMiddleware.swift

@@ -5,23 +5,26 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public struct IdempotencyTokenMiddleware<OperationStackInput, OperationStackOutput>: ClientRuntime.Middleware {
+import protocol Smithy.HasAttributes
+import class Smithy.Context
+
+public struct IdempotencyTokenMiddleware<OperationStackInput, OperationStackOutput>: Middleware {
     public let id: Swift.String = "IdempotencyTokenMiddleware"
     private let keyPath: WritableKeyPath<OperationStackInput, String?>
 
     public init(keyPath: WritableKeyPath<OperationStackInput, String?>) {
         self.keyPath = keyPath
     }
 
-    public func handle<H>(context: Context,
+    public func handle<H>(context: Smithy.Context,
                           input: MInput,
                           next: H) async throws -> MOutput
-    where H: Handler, Self.MInput == H.Input, Self.MOutput == H.Output, Self.Context == H.Context {
+    where H: Handler, Self.MInput == H.Input, Self.MOutput == H.Output {
         let withToken = addToken(input: input, attributes: context)
         return try await next.handle(context: context, input: withToken)
     }
 
-    private func addToken(input: OperationStackInput, attributes: HttpContext) -> OperationStackInput {
+    private func addToken(input: OperationStackInput, attributes: Smithy.Context) -> OperationStackInput {
         var copiedInput = input
         if input[keyPath: keyPath] == nil {
             let idempotencyTokenGenerator = attributes.getIdempotencyTokenGenerator()
@@ -32,7 +35,7 @@ public struct IdempotencyTokenMiddleware<OperationStackInput, OperationStackOutp
 
     public typealias MInput = OperationStackInput
     public typealias MOutput = OperationOutput<OperationStackOutput>
-    public typealias Context = HttpContext
+    public typealias Context = Smithy.Context
 }
 
 extension IdempotencyTokenMiddleware: HttpInterceptor {

Sources/ClientRuntime/Interceptor/AnyInterceptor.swift

@@ -5,6 +5,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol Smithy.RequestMessage
+import protocol Smithy.ResponseMessage
+import protocol Smithy.HasAttributes
+
 /// Type-erased, concrete interceptor.
 ///
 /// In order to have multiple interceptors hooked into a single operation, we

Sources/ClientRuntime/Interceptor/DefaultInterceptorContext.swift

@@ -5,6 +5,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol Smithy.RequestMessage
+import protocol Smithy.ResponseMessage
+import protocol Smithy.HasAttributes
+
 /// Default implementation for all interceptor context types.
 ///
 /// This object will be created before operation execution, and passed through each interceptor

Sources/ClientRuntime/Interceptor/HasAttributes+Logger.swift

@@ -0,0 +1,20 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import protocol Smithy.HasAttributes
+import protocol Smithy.LogAgent
+import struct Smithy.AttributeKey
+
+extension HasAttributes {
+
+    var logger: LogAgent? {
+        get { get(key: loggerKey) }
+        set { set(key: loggerKey, value: newValue) }
+    }
+}
+
+private let loggerKey = AttributeKey<LogAgent>(name: "loggerKey")

Sources/ClientRuntime/Interceptor/HttpInterceptor.swift

@@ -5,8 +5,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import class Smithy.Context
+import class SmithyHTTPAPI.SdkHttpRequest
+import class SmithyHTTPAPI.HttpResponse
+
 public protocol HttpInterceptor<InputType, OutputType>: Interceptor
 where
     RequestType == SdkHttpRequest,
     ResponseType == HttpResponse,
-    AttributesType == HttpContext {}
+    AttributesType == Smithy.Context {}

Sources/ClientRuntime/Interceptor/Interceptor.swift

@@ -5,6 +5,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol Smithy.RequestMessage
+import protocol Smithy.ResponseMessage
+import protocol Smithy.HasAttributes
+
 /// An interceptor allows injecting code into the SDK's request execution pipeline.
 public protocol Interceptor<InputType, OutputType, RequestType, ResponseType, AttributesType> {
 

Sources/ClientRuntime/Interceptor/InterceptorContext.swift

@@ -5,6 +5,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol Smithy.RequestMessage
+import protocol Smithy.ResponseMessage
+import protocol Smithy.HasAttributes
+
 /// The base type of all context objects passed to `Interceptor` methods.
 public protocol InterceptorContext: AnyObject {