chore: merge most recent main into I&A project branch

.github/workflows/continuous-integration.yml

@@ -23,23 +23,29 @@ jobs:
           - macos-13
         xcode:
           - Xcode_14.0.1
-          - Xcode_15.0
+          - Xcode_15.1
         destination:
-          - 'platform=iOS Simulator,OS=16.0,name=iPhone 13'
-          - 'platform=iOS Simulator,OS=17.0,name=iPhone 15'
+          - 'platform=iOS Simulator,OS=16.0,name=iPhone 14'
+          - 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
+          - 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)'
+          - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
           - 'platform=OS X'
         exclude:
           # Don't run old macOS with new Xcode
           - runner: macos-12
-            xcode: Xcode_15.0
+            xcode: Xcode_15.1
           # Don't run new macOS with old Xcode
           - runner: macos-13
             xcode: Xcode_14.0.1
-          # Don't run old iOS simulator with new Xcode
-          - destination: 'platform=iOS Simulator,OS=16.0,name=iPhone 13'
-            xcode: Xcode_15.0
-          # Don't run new iOS simulator with old Xcode
-          - destination: 'platform=iOS Simulator,OS=17.0,name=iPhone 15'
+          # Don't run old iOS/tvOS simulator with new Xcode
+          - destination: 'platform=iOS Simulator,OS=16.0,name=iPhone 14'
+            xcode: Xcode_15.1
+          - destination: 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)'
+            xcode: Xcode_15.1
+          # Don't run new iOS/tvOS simulator with old Xcode
+          - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
+            xcode: Xcode_14.0.1
+          - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
             xcode: Xcode_14.0.1
     steps:
       - name: Checkout smithy-swift
@@ -89,6 +95,7 @@ jobs:
       - name: Build & Run smithy-swift Kotlin Unit Tests
         run: ./gradlew build
       - name: Build & Run smithy-swift Swift Unit Tests
+        timeout-minutes: 15
         run: |
           set -o pipefail && \
           NSUnbufferedIO=YES xcodebuild \

.swiftlint.yml

@@ -3,6 +3,8 @@ excluded:
   - Sources/SmithyTestUtil/*
   - Tests/ClientRuntimeTests/*
   - Tests/SmithyTestUtilTests/*
+  - Tests/SmithyXMLTests/*
+  - Tests/SmithyTimestampsTests/*
 
 analyzer_rules:
   - unused_import

Package.swift

@@ -2,41 +2,84 @@
 
 import PackageDescription
 
+// Define libxml2 only on Linux, since it causes warnings
+// about "pkgconfig not found" on Mac
+#if os(Linux)
+let libXML2DependencyOrNil: Target.Dependency? = "libxml2"
+let libXML2TargetOrNil: Target? = Target.systemLibrary(
+    name: "libxml2",
+    pkgConfig: "libxml-2.0",
+    providers: [
+        .apt(["libxml2 libxml2-dev"]),
+        .yum(["libxml2 libxml2-devel"])
+    ]
+)
+#else
+let libXML2DependencyOrNil: Target.Dependency? = nil
+let libXML2TargetOrNil: Target? = nil
+#endif
+
 let package = Package(
     name: "smithy-swift",
     platforms: [
         .macOS(.v10_15),
-        .iOS(.v13)
+        .iOS(.v13),
+        .tvOS(.v13),
+        .watchOS(.v6)
     ],
     products: [
         .library(name: "ClientRuntime", targets: ["ClientRuntime"]),
-        .library(name: "SmithyTestUtil", targets: ["SmithyTestUtil"])
+        .library(name: "SmithyReadWrite", targets: ["SmithyReadWrite"]),
+        .library(name: "SmithyXML", targets: ["SmithyXML"]),
+        .library(name: "SmithyTestUtil", targets: ["SmithyTestUtil"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/awslabs/aws-crt-swift.git", exact: "0.17.0"),
+        .package(url: "https://github.com/awslabs/aws-crt-swift.git", exact: "0.20.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/MaxDesiatov/XMLCoder.git", exact: "0.17.0")
     ],
     targets: [
         .target(
             name: "ClientRuntime",
             dependencies: [
+                "SmithyXML",
                 .product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "XMLCoder", package: "XMLCoder")
             ]
         ),
-        .testTarget(
-            name: "ClientRuntimeTests",
-            dependencies: ["ClientRuntime", "SmithyTestUtil"]
+        .target(name: "SmithyReadWrite"),
+        .target(
+            name: "SmithyXML",
+            dependencies: [
+                "SmithyReadWrite",
+                "SmithyTimestamps",
+                libXML2DependencyOrNil
+            ].compactMap { $0 }
+        ),
+        libXML2TargetOrNil,
+        .target(
+            name: "SmithyTimestamps"
         ),
         .target(
             name: "SmithyTestUtil",
             dependencies: ["ClientRuntime"]
         ),
+        .testTarget(
+            name: "ClientRuntimeTests",
+            dependencies: ["ClientRuntime", "SmithyTestUtil"]
+        ),
+        .testTarget(
+            name: "SmithyXMLTests",
+            dependencies: ["SmithyXML"]
+        ),
+        .testTarget(
+            name: "SmithyTimestampsTests",
+            dependencies: ["SmithyTimestamps"]
+        ),
         .testTarget(
             name: "SmithyTestUtilTests",
             dependencies: ["SmithyTestUtil"]
-        )
-    ]
+        ),
+    ].compactMap { $0 }
 )

Package.version

@@ -1 +1 @@
-0.35.0
+0.37.0

Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift

@@ -28,7 +28,7 @@ public struct DefaultSDKRuntimeConfiguration<DefaultSDKRuntimeRetryStrategy: Ret
     /// The HTTP client to be used for HTTP connections.
     ///
     /// If none is provided, the AWS CRT HTTP client will be used.
-    public var httpClientEngine: HttpClientEngine
+    public var httpClientEngine: HTTPClient
 
     /// The HTTP client configuration.
     ///
@@ -72,8 +72,8 @@ public struct DefaultSDKRuntimeConfiguration<DefaultSDKRuntimeRetryStrategy: Ret
         self.clientName = clientName
         self.encoder = nil
         self.decoder = nil
-        self.httpClientEngine = Self.defaultHttpClientEngine
         self.httpClientConfiguration = Self.defaultHttpClientConfiguration
+        self.httpClientEngine = Self.makeClient(httpClientConfiguration: self.httpClientConfiguration)
         self.idempotencyTokenGenerator = Self.defaultIdempotencyTokenGenerator
         self.retryStrategyOptions = Self.defaultRetryStrategyOptions
         self.logger = Self.defaultLogger(clientName: clientName)
@@ -85,16 +85,18 @@ public struct DefaultSDKRuntimeConfiguration<DefaultSDKRuntimeRetryStrategy: Ret
 // Exposing these as static properties/methods allows them to be used by custom config objects.
 public extension DefaultSDKRuntimeConfiguration {
 
-    /// The default HTTP client to use when none is configured
+    /// The default HTTP client for the target platform, configured with the supplied configuration.
     ///
-    /// Is the CRT HTTP client.
-    static var defaultHttpClientEngine: HttpClientEngine { CRTClientEngine() }
-
-    /// The default HTTP client with a specified timeout
-    ///
-    /// Is the CRT HTTP client.
-    static func httpClientEngineWithTimeout(timeoutMs: UInt32) -> HttpClientEngine {
-        return CRTClientEngine(config: CRTClientEngineConfig(connectTimeoutMs: timeoutMs))
+    /// - Parameter httpClientConfiguration: The configuration for the HTTP client.
+    /// - Returns: The `CRTClientEngine` client on Mac & Linux platforms, returns `URLSessionHttpClient` on non-Mac Apple platforms.
+    static func makeClient(httpClientConfiguration: HttpClientConfiguration) -> HTTPClient {
+        #if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
+        return URLSessionHTTPClient(httpClientConfiguration: httpClientConfiguration)
+        #else
+        let connectTimeoutMs = httpClientConfiguration.connectTimeout.map { UInt32($0 * 1_000_000) }
+        let config = CRTClientEngineConfig(connectTimeoutMs: connectTimeoutMs)
+        return CRTClientEngine(config: config)
+        #endif
     }
 
     /// The HTTP client configuration to use when none is provided.

Sources/ClientRuntime/EventStream/DefaultMessageDecoderStream.swift

@@ -11,22 +11,22 @@ extension EventStream {
     public struct DefaultMessageDecoderStream<Event: MessageUnmarshallable>: MessageDecoderStream {
         public typealias Element = Event
 
-        let stream: Stream
+        let stream: ReadableStream
         let messageDecoder: MessageDecoder
         let responseDecoder: ResponseDecoder
 
-        public init(stream: Stream, messageDecoder: MessageDecoder, responseDecoder: ResponseDecoder) {
+        public init(stream: ReadableStream, messageDecoder: MessageDecoder, responseDecoder: ResponseDecoder) {
             self.stream = stream
             self.messageDecoder = messageDecoder
             self.responseDecoder = responseDecoder
         }
 
         public struct AsyncIterator: AsyncIteratorProtocol {
-            let stream: Stream
+            let stream: ReadableStream
             let messageDecoder: MessageDecoder
             let responseDecoder: ResponseDecoder
 
-            init(stream: Stream, messageDecoder: MessageDecoder, responseDecoder: ResponseDecoder) {
+            init(stream: ReadableStream, messageDecoder: MessageDecoder, responseDecoder: ResponseDecoder) {
                 self.stream = stream
                 self.messageDecoder = messageDecoder
                 self.responseDecoder = responseDecoder

Sources/ClientRuntime/EventStream/DefaultMessageEncoderStream.swift

@@ -12,27 +12,27 @@ extension EventStream {
     public class DefaultMessageEncoderStream<Event: MessageMarshallable>: MessageEncoderStream, Stream {
         let stream: AsyncThrowingStream<Event, Error>
         let messageEncoder: MessageEncoder
-        let messageSinger: MessageSigner
+        let messageSigner: MessageSigner
         let requestEncoder: RequestEncoder
         var readAsyncIterator: AsyncIterator?
 
         public init(
             stream: AsyncThrowingStream<Event, Error>,
             messageEncoder: MessageEncoder,
             requestEncoder: RequestEncoder,
-            messageSinger: MessageSigner
+            messageSigner: MessageSigner
         ) {
             self.stream = stream
             self.messageEncoder = messageEncoder
-            self.messageSinger = messageSinger
+            self.messageSigner = messageSigner
             self.requestEncoder = requestEncoder
             self.readAsyncIterator = makeAsyncIterator()
         }
 
         public struct AsyncIterator: AsyncIteratorProtocol {
             let stream: AsyncThrowingStream<Event, Error>
             let messageEncoder: MessageEncoder
-            var messageSinger: MessageSigner
+            var messageSigner: MessageSigner
             let requestEncoder: RequestEncoder
 
             private var lastMessageSent: Bool = false
@@ -42,12 +42,12 @@ extension EventStream {
                 stream: AsyncThrowingStream<Event, Error>,
                 messageEncoder: MessageEncoder,
                 requestEncoder: RequestEncoder,
-                messageSinger: MessageSigner
+                messageSigner: MessageSigner
             ) {
                 self.stream = stream
                 self.streamIterator = stream.makeAsyncIterator()
                 self.messageEncoder = messageEncoder
-                self.messageSinger = messageSinger
+                self.messageSigner = messageSigner
                 self.requestEncoder = requestEncoder
             }
 
@@ -56,7 +56,7 @@ extension EventStream {
                     // There are no more messages in the base stream
                     // if we have not sent the last message, send it now
                     guard lastMessageSent else {
-                        let emptySignedMessage = try await messageSinger.signEmpty()
+                        let emptySignedMessage = try await messageSigner.signEmpty()
                         let data = try messageEncoder.encode(message: emptySignedMessage)
                         lastMessageSent = true
                         return data
@@ -70,7 +70,7 @@ extension EventStream {
                 let message = try event.marshall(encoder: requestEncoder)
 
                 // sign the message
-                let signedMessage = try await messageSinger.sign(message: message)
+                let signedMessage = try await messageSigner.sign(message: message)
 
                 // encode again the signed message
                 let data = try messageEncoder.encode(message: signedMessage)
@@ -83,7 +83,7 @@ extension EventStream {
                 stream: stream,
                 messageEncoder: messageEncoder,
                 requestEncoder: requestEncoder,
-                messageSinger: messageSinger
+                messageSigner: messageSigner
             )
         }
 
@@ -114,7 +114,11 @@ extension EventStream {
         }
 
         public func readToEndAsync() async throws -> ClientRuntime.Data? {
-            fatalError("readToEndAsync() is not supported by AsyncStream backed streams")
+            var data = Data()
+            while let moreData = try await readAsync(upToCount: Int.max) {
+                data.append(moreData)
+            }
+            return data
         }
 
         /// Reads up to `count` bytes from the stream asynchronously
@@ -167,7 +171,11 @@ extension EventStream {
         }
 
         /// Closing the stream is a no-op because the underlying async stream is not owned by this stream
-        public func close() throws {
+        public func close() {
+            // no-op
+        }
+
+        public func closeWithError(_ error: Error) {
             // no-op
         }
     }

Sources/ClientRuntime/Idempotency/IdempotencyTokenMiddleware.swift

@@ -5,9 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public struct IdempotencyTokenMiddleware<OperationStackInput,
-                                         OperationStackOutput: HttpResponseBinding,
-                                         OperationStackError: HttpResponseErrorBinding>: ClientRuntime.Middleware {
+public struct IdempotencyTokenMiddleware<OperationStackInput, OperationStackOutput>: ClientRuntime.Middleware {
     public let id: Swift.String = "IdempotencyTokenMiddleware"
     private let keyPath: WritableKeyPath<OperationStackInput, String?>
 

Sources/ClientRuntime/Logging/SDKLoggingSystem.swift

@@ -7,15 +7,17 @@
 
 import Logging
 
-public class SDKLoggingSystem {
+public actor SDKLoggingSystem {
+    private static var isInitialized = false
     private static var factories: [String: SDKLogHandlerFactory] = [:]
 
-    public class func add(logHandlerFactory: SDKLogHandlerFactory) {
+    public static func add(logHandlerFactory: SDKLogHandlerFactory) {
         let label = logHandlerFactory.label
         factories[label] = logHandlerFactory
     }
 
-    public class func initialize(defaultLogLevel: SDKLogLevel = .info) {
+    public static func initialize(defaultLogLevel: SDKLogLevel = .info) async {
+        if isInitialized { return } else { isInitialized = true }
         LoggingSystem.bootstrap { label in
             if let factory = factories[label] {
                 return factory.construct(label: label)
@@ -26,7 +28,8 @@ public class SDKLoggingSystem {
         }
     }
 
-    public class func initialize(logLevel: SDKLogLevel) {
+    public static func initialize(logLevel: SDKLogLevel) async {
+        if isInitialized { return } else { isInitialized = true }
         LoggingSystem.bootstrap { label in
             var handler = StreamLogHandler.standardOutput(label: label)
             handler.logLevel = logLevel.toLoggerType()

Sources/ClientRuntime/Middleware/NoopHandler.swift

@@ -5,10 +5,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public struct NoopHandler<Output: HttpResponseBinding>: Handler {
+public struct NoopHandler<OperationStackOutput>: Handler {
     public init() {}
 
-    public func handle(context: HttpContext, input: SdkHttpRequest) async throws -> OperationOutput<Output> {
-        return OperationOutput<Output>(httpResponse: HttpResponse())
+    public func handle(
+        context: HttpContext,
+        input: SdkHttpRequest
+    ) async throws -> OperationOutput<OperationStackOutput> {
+        return OperationOutput<OperationStackOutput>(httpResponse: HttpResponse())
     }
 }