diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4ef355683..015b69d6e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -25,7 +25,7 @@ jobs: - Xcode_26.0 destination: - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - - 'platform=iOS Simulator,OS=26.0,name=iPhone 17' + - 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17' - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' @@ -48,7 +48,7 @@ jobs: # Don't run new simulators with old Xcode - destination: 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_15.2 - - destination: 'platform=iOS Simulator,OS=26.0,name=iPhone 17' + - destination: 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17' xcode: Xcode_15.2 - destination: 'platform=visionOS Simulator,OS=26.0,name=Apple Vision Pro' xcode: Xcode_15.2 @@ -61,6 +61,8 @@ jobs: uses: actions/checkout@v4 - name: Setup common tools uses: ./.github/actions/setup-common-tools-composite-action + - name: List all sims installed + run: xcrun simctl list - name: Build & Run smithy-swift Kotlin Unit Tests run: ./gradlew build - name: Build & Run smithy-swift Swift Unit Tests @@ -88,7 +90,7 @@ jobs: - Xcode_26.0 destination: - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - - 'platform=iOS Simulator,OS=26.0,name=iPhone 17' + - 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17' - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' @@ -111,7 +113,7 @@ jobs: # Don't run new simulators with old Xcode - destination: 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_15.2 - - destination: 'platform=iOS Simulator,OS=26.0,name=iPhone 17' + - destination: 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17' xcode: Xcode_15.2 - destination: 'platform=visionOS Simulator,OS=26.0,name=Apple Vision Pro' xcode: Xcode_15.2 @@ -133,6 +135,8 @@ jobs: uses: ./smithy-swift/.github/actions/setup-common-tools-composite-action - name: Tools Versions run: ./aws-sdk-swift/scripts/ci_steps/log_tool_versions.sh + - name: List all sims installed + run: xcrun simctl list - name: Prepare aws-sdk-swift Protocol & Unit Tests run: | cd aws-sdk-swift @@ -166,8 +170,8 @@ jobs: - ubuntu-24.04 - ubuntu-24.04-arm swift: - - 5.9-focal - - 6.2-jammy + - 5.9-jammy + - 6.2-noble container: image: swift:${{ matrix.swift }} env: @@ -199,8 +203,8 @@ jobs: - ubuntu-24.04 - ubuntu-24.04-arm swift: - - 5.9-focal - - 6.2-jammy + - 5.9-jammy + - 6.2-noble container: image: swift:${{ matrix.swift }} env: diff --git a/Package.swift b/Package.swift index a781bbcb8..755b40342 100644 --- a/Package.swift +++ b/Package.swift @@ -56,7 +56,7 @@ let package = Package( ], dependencies: { var dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/awslabs/aws-crt-swift.git", exact: "0.54.0"), + .package(url: "https://github.com/awslabs/aws-crt-swift.git", exact: "0.54.2"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), .package(url: "https://github.com/open-telemetry/opentelemetry-swift", from: "1.13.0"), ] diff --git a/Package.version b/Package.version index 1a1a8b1ac..1d80af247 100644 --- a/Package.version +++ b/Package.version @@ -1 +1 @@ -0.164.0 \ No newline at end of file +0.170.0 \ No newline at end of file diff --git a/Package.version.next b/Package.version.next index 7df908678..5d1fe6b31 100644 --- a/Package.version.next +++ b/Package.version.next @@ -1 +1 @@ -0.165.0 \ No newline at end of file +0.171.0 \ No newline at end of file diff --git a/Sources/ClientRuntime/Config/ClientConfigDefaultsProvider.swift b/Sources/ClientRuntime/Config/ClientConfigDefaultsProvider.swift index fd6ed7864..cf2895c3b 100644 --- a/Sources/ClientRuntime/Config/ClientConfigDefaultsProvider.swift +++ b/Sources/ClientRuntime/Config/ClientConfigDefaultsProvider.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import protocol SmithyHTTPAPI.HTTPClient import SmithyIdentity import SmithyIdentityAPI -import protocol SmithyHTTPAPI.HTTPClient import struct SmithyRetries.DefaultRetryStrategy import struct SmithyRetries.ExponentialBackoffStrategy import struct SmithyRetriesAPI.RetryStrategyOptions diff --git a/Sources/ClientRuntime/Config/Context+Config.swift b/Sources/ClientRuntime/Config/Context+Config.swift index 7dc98f38d..126f9fd48 100644 --- a/Sources/ClientRuntime/Config/Context+Config.swift +++ b/Sources/ClientRuntime/Config/Context+Config.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.AttributeKey import class Smithy.Context import class Smithy.ContextBuilder -import struct Smithy.AttributeKey public extension Context { diff --git a/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift b/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift index 9d347b24f..21e48406f 100644 --- a/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift +++ b/Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift @@ -5,17 +5,17 @@ // SPDX-License-Identifier: Apache-2.0 // +import enum Smithy.ClientError 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 import struct SmithyRetries.DefaultRetryStrategy import struct SmithyRetries.ExponentialBackoffStrategy +import protocol SmithyRetriesAPI.RetryErrorInfoProvider +import protocol SmithyRetriesAPI.RetryStrategy +import struct SmithyRetriesAPI.RetryStrategyOptions public struct DefaultSDKRuntimeConfiguration { diff --git a/Sources/ClientRuntime/Endpoints/DefaultEndpointResolver.swift b/Sources/ClientRuntime/Endpoints/DefaultEndpointResolver.swift index 68423c024..a77b8ddc8 100644 --- a/Sources/ClientRuntime/Endpoints/DefaultEndpointResolver.swift +++ b/Sources/ClientRuntime/Endpoints/DefaultEndpointResolver.swift @@ -6,8 +6,8 @@ // import struct SmithyHTTPAPI.Endpoint -import struct SmithyHTTPAPI.Headers import enum SmithyHTTPAPI.EndpointPropertyValue +import struct SmithyHTTPAPI.Headers public struct DefaultEndpointResolver { diff --git a/Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift b/Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift index 460f08e2d..4eab0bf56 100644 --- a/Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift +++ b/Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift @@ -3,23 +3,23 @@ * SPDX-License-Identifier: Apache-2.0. */ +import AwsCommonRuntimeKit import Foundation -import enum Smithy.URIScheme import struct Smithy.Attributes -import struct Smithy.SwiftLogger +import enum Smithy.ByteStreamError import protocol Smithy.LogAgent import enum Smithy.StreamError -import enum Smithy.ByteStreamError -import protocol SmithyHTTPAPI.HTTPClient -import struct SmithyHTTPAPI.Headers -import struct SmithyHTTPAPI.Endpoint +import struct Smithy.SwiftLogger +import enum Smithy.URIScheme +import class SmithyChecksums.ChunkedStream import enum SmithyHTTPAPI.ALPNProtocol +import struct SmithyHTTPAPI.Endpoint +import struct SmithyHTTPAPI.Headers +import protocol SmithyHTTPAPI.HTTPClient import class SmithyHTTPAPI.HTTPRequest import class SmithyHTTPAPI.HTTPResponse import enum SmithyHTTPAPI.HTTPStatusCode -import class SmithyChecksums.ChunkedStream import class SmithyStreams.BufferedStream -import AwsCommonRuntimeKit #if os(Linux) import Glibc #elseif !os(Windows) diff --git a/Sources/ClientRuntime/Networking/Http/CRT/HTTP2Stream+ByteStream.swift b/Sources/ClientRuntime/Networking/Http/CRT/HTTP2Stream+ByteStream.swift index f2a7cd79d..6e3192c82 100644 --- a/Sources/ClientRuntime/Networking/Http/CRT/HTTP2Stream+ByteStream.swift +++ b/Sources/ClientRuntime/Networking/Http/CRT/HTTP2Stream+ByteStream.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // -import enum Smithy.ByteStream -import struct Smithy.Attributes import AwsCommonRuntimeKit +import struct Smithy.Attributes +import enum Smithy.ByteStream extension HTTP2Stream { /// Returns the recommended size, in bytes, for the data to write diff --git a/Sources/ClientRuntime/Networking/Http/HTTPResponse+WireDataProviding.swift b/Sources/ClientRuntime/Networking/Http/HTTPResponse+WireDataProviding.swift index 38b514db5..9083b66f6 100644 --- a/Sources/ClientRuntime/Networking/Http/HTTPResponse+WireDataProviding.swift +++ b/Sources/ClientRuntime/Networking/Http/HTTPResponse+WireDataProviding.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // -import class SmithyHTTPAPI.HTTPResponse +import struct Foundation.Data import enum Smithy.ByteStream +import class SmithyHTTPAPI.HTTPResponse @_spi(SmithyReadWrite) import protocol SmithyReadWrite.WireDataProviding -import struct Foundation.Data @_spi(SmithyReadWrite) extension HTTPResponse: WireDataProviding { diff --git a/Sources/ClientRuntime/Networking/Http/HttpClientConfiguration.swift b/Sources/ClientRuntime/Networking/Http/HttpClientConfiguration.swift index efdb14260..1f09b439a 100644 --- a/Sources/ClientRuntime/Networking/Http/HttpClientConfiguration.swift +++ b/Sources/ClientRuntime/Networking/Http/HttpClientConfiguration.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.TimeInterval import enum Smithy.URIScheme import struct SmithyHTTPAPI.Headers -import struct Foundation.TimeInterval -import AwsCommonRuntimeKit public class HttpClientConfiguration { diff --git a/Sources/ClientRuntime/Networking/Http/HttpTelemetry.swift b/Sources/ClientRuntime/Networking/Http/HttpTelemetry.swift index d944a2c7a..900747f75 100644 --- a/Sources/ClientRuntime/Networking/Http/HttpTelemetry.swift +++ b/Sources/ClientRuntime/Networking/Http/HttpTelemetry.swift @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0. */ -import protocol SmithyHTTPAPI.HTTPClient -import struct Smithy.Attributes -import struct Smithy.AttributeKey import class Foundation.NSRecursiveLock +import struct Smithy.AttributeKey +import struct Smithy.Attributes +import protocol SmithyHTTPAPI.HTTPClient /// Container for HTTPClient telemetry, including configurable attributes and names. /// diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/AuthSchemeMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/AuthSchemeMiddleware.swift index 34ac08c89..d87df1899 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/AuthSchemeMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/AuthSchemeMiddleware.swift @@ -5,14 +5,14 @@ // SPDX-License-Identifier: Apache-2.0 // -import enum Smithy.ClientError -import struct Smithy.Attributes import struct Smithy.AttributeKey +import struct Smithy.Attributes +import enum Smithy.ClientError import class Smithy.Context import class SmithyHTTPAPI.HTTPRequestBuilder -import struct SmithyHTTPAuthAPI.SelectedAuthScheme -import protocol SmithyHTTPAuthAPI.AuthScheme import struct SmithyHTTPAuth.DefaultIdentityResolverConfiguration +import protocol SmithyHTTPAuthAPI.AuthScheme +import struct SmithyHTTPAuthAPI.SelectedAuthScheme public struct AuthSchemeMiddleware { public let id: String = "AuthSchemeMiddleware" diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/ContentMD5Middleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/ContentMD5Middleware.swift index b272a90a4..3ec3ca191 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/ContentMD5Middleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/ContentMD5Middleware.swift @@ -1,10 +1,10 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0. -import Smithy -import enum SmithyChecksumsAPI.ChecksumAlgorithm import AwsCommonRuntimeKit +import Smithy import SmithyChecksums +import enum SmithyChecksumsAPI.ChecksumAlgorithm import SmithyHTTPAPI public struct ContentMD5Middleware { diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/DeserializeMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/DeserializeMiddleware.swift index d4fe79fcf..1f17a9777 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/DeserializeMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/DeserializeMiddleware.swift @@ -5,8 +5,6 @@ // SPDX-License-Identifier: Apache-2.0 // -import SmithyHTTPAPI -@_spi(SmithyReadWrite) import SmithyReadWrite import struct Foundation.Date import class Foundation.DateFormatter import struct Foundation.Locale @@ -15,6 +13,8 @@ import struct Foundation.TimeZone import struct Foundation.UUID import class Smithy.Context import protocol Smithy.ResponseMessageDeserializer +import SmithyHTTPAPI +@_spi(SmithyReadWrite) import SmithyReadWrite @_spi(SmithyReadWrite) public struct DeserializeMiddleware { diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/HeaderMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/HeaderMiddleware.swift index 7a31d0622..fc7b34870 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/HeaderMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/HeaderMiddleware.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import class Smithy.Context import protocol Smithy.RequestMessageSerializer import class SmithyHTTPAPI.HTTPRequest import class SmithyHTTPAPI.HTTPRequestBuilder -import class Smithy.Context public struct HeaderMiddleware { public let id: String = "\(String(describing: OperationStackInput.self))HeadersMiddleware" diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/LoggerMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/LoggerMiddleware.swift index d250873ca..901ada485 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/LoggerMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/LoggerMiddleware.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol Smithy.LogAgent import class Smithy.Context +import protocol Smithy.LogAgent import class SmithyHTTPAPI.HTTPRequest import class SmithyHTTPAPI.HTTPResponse diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/MutateHeadersMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/MutateHeadersMiddleware.swift index d74e85c25..613e379aa 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/MutateHeadersMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/MutateHeadersMiddleware.swift @@ -3,8 +3,8 @@ import class Smithy.Context import struct SmithyHTTPAPI.Headers -import class SmithyHTTPAPI.HTTPRequestBuilder import class SmithyHTTPAPI.HTTPRequest +import class SmithyHTTPAPI.HTTPRequestBuilder import class SmithyHTTPAPI.HTTPResponse public struct MutateHeadersMiddleware { diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/QueryItemMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/QueryItemMiddleware.swift index 4207806a2..6d569684d 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/QueryItemMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/QueryItemMiddleware.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol Smithy.RequestMessageSerializer import class Smithy.Context +import protocol Smithy.RequestMessageSerializer import SmithyHTTPAPI public struct QueryItemMiddleware { diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobBodyMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobBodyMiddleware.swift index 312cb3318..f1b1bf6ff 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobBodyMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobBodyMiddleware.swift @@ -5,11 +5,11 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol Smithy.RequestMessageSerializer +import struct Foundation.Data import class Smithy.Context +import protocol Smithy.RequestMessageSerializer import class SmithyHTTPAPI.HTTPRequest import class SmithyHTTPAPI.HTTPRequestBuilder -import struct Foundation.Data public struct BlobBodyMiddleware { public let id: Swift.String = "BlobBodyMiddleware" diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobStreamBodyMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobStreamBodyMiddleware.swift index 39ebff846..df0eeee63 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobStreamBodyMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BlobStreamBodyMiddleware.swift @@ -5,12 +5,12 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol Smithy.RequestMessageSerializer -import class Smithy.Context +import struct Foundation.Data import enum Smithy.ByteStream +import class Smithy.Context +import protocol Smithy.RequestMessageSerializer import class SmithyHTTPAPI.HTTPRequest import class SmithyHTTPAPI.HTTPRequestBuilder -import struct Foundation.Data public struct BlobStreamBodyMiddleware { public let id: Swift.String = "BlobStreamBodyMiddleware" diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BodyMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BodyMiddleware.swift index 46308d05e..dc35cccc0 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BodyMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/BodyMiddleware.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import Smithy import SmithyHTTPAPI -import struct Foundation.Data @_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter @_spi(SmithyReadWrite) import typealias SmithyReadWrite.WritingClosure diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/EnumBodyMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/EnumBodyMiddleware.swift index 03000f8bc..1445f8e70 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/EnumBodyMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/EnumBodyMiddleware.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import class Smithy.Context import protocol Smithy.RequestMessageSerializer -import struct Foundation.Data import SmithyHTTPAPI public struct EnumBodyMiddleware { diff --git a/Sources/ClientRuntime/Networking/Http/Middlewares/SignerMiddleware.swift b/Sources/ClientRuntime/Networking/Http/Middlewares/SignerMiddleware.swift index 1e7432eaa..6edab561a 100644 --- a/Sources/ClientRuntime/Networking/Http/Middlewares/SignerMiddleware.swift +++ b/Sources/ClientRuntime/Networking/Http/Middlewares/SignerMiddleware.swift @@ -5,12 +5,12 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Smithy.Context -import enum Smithy.ClientError import Foundation +import struct Smithy.AttributeKey +import enum Smithy.ClientError +import class Smithy.Context import SmithyHTTPAPI import SmithyHTTPAuthAPI -import struct Smithy.AttributeKey public struct SignerMiddleware { public let id: String = "SignerMiddleware" diff --git a/Sources/ClientRuntime/Networking/Http/URLSession/FoundationStreamBridge.swift b/Sources/ClientRuntime/Networking/Http/URLSession/FoundationStreamBridge.swift index da8a55133..bbfacedd1 100644 --- a/Sources/ClientRuntime/Networking/Http/URLSession/FoundationStreamBridge.swift +++ b/Sources/ClientRuntime/Networking/Http/URLSession/FoundationStreamBridge.swift @@ -7,21 +7,21 @@ #if os(iOS) || os(macOS) || os(watchOS) || os(tvOS) || os(visionOS) -import protocol Smithy.LogAgent -import protocol Smithy.ReadableStream -import struct Smithy.Attributes import func Foundation.CFWriteStreamSetDispatchQueue +import struct Foundation.Data import class Foundation.DispatchQueue -import class Foundation.NSObject -import class Foundation.Stream import class Foundation.InputStream +import class Foundation.NSObject import class Foundation.OutputStream -import class Foundation.Thread import class Foundation.RunLoop -import class Foundation.Timer -import struct Foundation.TimeInterval -import struct Foundation.Data +import class Foundation.Stream import protocol Foundation.StreamDelegate +import class Foundation.Thread +import struct Foundation.TimeInterval +import class Foundation.Timer +import struct Smithy.Attributes +import protocol Smithy.LogAgent +import protocol Smithy.ReadableStream /// Reads data from a smithy-swift native `ReadableStream` and streams the data through to a Foundation `InputStream`. /// diff --git a/Sources/ClientRuntime/Networking/Http/URLSession/URLSessionHTTPClient.swift b/Sources/ClientRuntime/Networking/Http/URLSession/URLSessionHTTPClient.swift index 3b9ad4849..9a7b475ae 100644 --- a/Sources/ClientRuntime/Networking/Http/URLSession/URLSessionHTTPClient.swift +++ b/Sources/ClientRuntime/Networking/Http/URLSession/URLSessionHTTPClient.swift @@ -7,41 +7,41 @@ #if os(iOS) || os(macOS) || os(watchOS) || os(tvOS) || os(visionOS) -import struct Smithy.Attributes -import struct Smithy.SwiftLogger -import protocol Smithy.LogAgent -import protocol SmithyHTTPAPI.HTTPClient -import struct SmithyHTTPAPI.Headers -import class SmithyHTTPAPI.HTTPResponse -import class SmithyHTTPAPI.HTTPRequest -import enum SmithyHTTPAPI.HTTPStatusCode -import protocol Smithy.ReadableStream -import enum Smithy.ByteStream -import class SmithyStreams.BufferedStream -import struct Foundation.Date +import AwsCommonRuntimeKit import class Foundation.Bundle +import struct Foundation.Data +import struct Foundation.Date +import class Foundation.HTTPURLResponse import class Foundation.InputStream import class Foundation.NSObject import class Foundation.NSRecursiveLock import var Foundation.NSURLAuthenticationMethodClientCertificate import var Foundation.NSURLAuthenticationMethodServerTrust +import struct Foundation.TimeInterval import class Foundation.URLAuthenticationChallenge import struct Foundation.URLComponents import class Foundation.URLCredential import struct Foundation.URLQueryItem import struct Foundation.URLRequest import class Foundation.URLResponse -import class Foundation.HTTPURLResponse -import struct Foundation.TimeInterval import class Foundation.URLSession import class Foundation.URLSessionConfiguration +import protocol Foundation.URLSessionDataDelegate +import class Foundation.URLSessionDataTask import class Foundation.URLSessionTask import class Foundation.URLSessionTaskMetrics -import class Foundation.URLSessionDataTask -import protocol Foundation.URLSessionDataDelegate -import struct Foundation.Data -import AwsCommonRuntimeKit import Security +import struct Smithy.Attributes +import enum Smithy.ByteStream +import protocol Smithy.LogAgent +import protocol Smithy.ReadableStream +import struct Smithy.SwiftLogger +import struct SmithyHTTPAPI.Headers +import protocol SmithyHTTPAPI.HTTPClient +import class SmithyHTTPAPI.HTTPRequest +import class SmithyHTTPAPI.HTTPResponse +import enum SmithyHTTPAPI.HTTPStatusCode +import class SmithyStreams.BufferedStream /// A client that can be used to make requests to AWS services using `Foundation`'s `URLSession` HTTP client. /// diff --git a/Sources/ClientRuntime/Networking/Streaming/ByteStream+FileHandle.swift b/Sources/ClientRuntime/Networking/Streaming/ByteStream+FileHandle.swift index 1e3af77e3..03926371c 100644 --- a/Sources/ClientRuntime/Networking/Streaming/ByteStream+FileHandle.swift +++ b/Sources/ClientRuntime/Networking/Streaming/ByteStream+FileHandle.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import class Foundation.FileHandle import enum Smithy.ByteStream import class SmithyStreams.FileStream -import class Foundation.FileHandle extension ByteStream { diff --git a/Sources/ClientRuntime/Networking/Streaming/ByteStream+Validating.swift b/Sources/ClientRuntime/Networking/Streaming/ByteStream+Validating.swift index 0913d8f91..0ef7894fd 100644 --- a/Sources/ClientRuntime/Networking/Streaming/ByteStream+Validating.swift +++ b/Sources/ClientRuntime/Networking/Streaming/ByteStream+Validating.swift @@ -5,11 +5,11 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol Smithy.Stream import enum Smithy.ByteStream -import class SmithyStreams.BufferedStream -import enum SmithyChecksumsAPI.ChecksumAlgorithm +import protocol Smithy.Stream import class SmithyChecksums.ValidatingBufferedStream +import enum SmithyChecksumsAPI.ChecksumAlgorithm +import class SmithyStreams.BufferedStream extension ByteStream { diff --git a/Sources/ClientRuntime/Orchestrator/Orchestrator.swift b/Sources/ClientRuntime/Orchestrator/Orchestrator.swift index 313c56f36..526481448 100644 --- a/Sources/ClientRuntime/Orchestrator/Orchestrator.swift +++ b/Sources/ClientRuntime/Orchestrator/Orchestrator.swift @@ -7,15 +7,15 @@ import struct Foundation.Date import struct Foundation.TimeInterval -import class Smithy.Context +import struct Smithy.AttributeKey +import struct Smithy.Attributes import enum Smithy.ClientError +import class Smithy.Context import protocol Smithy.RequestMessage import protocol Smithy.ResponseMessage -import struct Smithy.AttributeKey -import struct Smithy.Attributes import SmithyHTTPAPI -import protocol SmithyRetriesAPI.RetryStrategy import struct SmithyRetriesAPI.RetryErrorInfo +import protocol SmithyRetriesAPI.RetryStrategy /// Orchestrates operation execution /// diff --git a/Sources/ClientRuntime/Orchestrator/OrchestratorBuilder.swift b/Sources/ClientRuntime/Orchestrator/OrchestratorBuilder.swift index e9280794c..4b8835c11 100644 --- a/Sources/ClientRuntime/Orchestrator/OrchestratorBuilder.swift +++ b/Sources/ClientRuntime/Orchestrator/OrchestratorBuilder.swift @@ -10,12 +10,12 @@ import struct Foundation.TimeInterval import class Smithy.Context import class Smithy.ContextBuilder import protocol Smithy.RequestMessage -import protocol Smithy.ResponseMessage import protocol Smithy.RequestMessageSerializer +import protocol Smithy.ResponseMessage import protocol Smithy.ResponseMessageDeserializer import struct SmithyHTTPAuthAPI.SelectedAuthScheme -import protocol SmithyRetriesAPI.RetryStrategy import struct SmithyRetriesAPI.RetryErrorInfo +import protocol SmithyRetriesAPI.RetryStrategy /// Builds an Orchestrator, combining runtime components, interceptors, serializers, and deserializers. /// diff --git a/Sources/ClientRuntime/Orchestrator/OrchestratorTelemetry.swift b/Sources/ClientRuntime/Orchestrator/OrchestratorTelemetry.swift index c073f54de..6dcc0e5f3 100644 --- a/Sources/ClientRuntime/Orchestrator/OrchestratorTelemetry.swift +++ b/Sources/ClientRuntime/Orchestrator/OrchestratorTelemetry.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Smithy.Context -import struct Smithy.Attributes import struct Smithy.AttributeKey +import struct Smithy.Attributes +import class Smithy.Context import enum SmithyHTTPAPI.SmithyHTTPAPIKeys /// Container for Orchestrator telemetry, including configurable attributes and names. diff --git a/Sources/ClientRuntime/PrimitiveTypeExtensions/String+Extensions.swift b/Sources/ClientRuntime/PrimitiveTypeExtensions/String+Extensions.swift index ea1b3cc0e..96ee02b5f 100644 --- a/Sources/ClientRuntime/PrimitiveTypeExtensions/String+Extensions.swift +++ b/Sources/ClientRuntime/PrimitiveTypeExtensions/String+Extensions.swift @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0. */ -import enum Smithy.ClientError -import struct Foundation.Data import AwsCommonRuntimeKit +import struct Foundation.Data +import enum Smithy.ClientError extension StringProtocol where Self.Index == String.Index { func escape(_ characterSet: [(character: String, escapedCharacter: String)]) -> String { diff --git a/Sources/ClientRuntime/Retries/DefaultRetryErrorInfoProvider.swift b/Sources/ClientRuntime/Retries/DefaultRetryErrorInfoProvider.swift index 250adae58..e7f16265e 100644 --- a/Sources/ClientRuntime/Retries/DefaultRetryErrorInfoProvider.swift +++ b/Sources/ClientRuntime/Retries/DefaultRetryErrorInfoProvider.swift @@ -5,15 +5,15 @@ // SPDX-License-Identifier: Apache-2.0 // +import enum AwsCommonRuntimeKit.CommonRunTimeError +import struct AwsCommonRuntimeKit.CRTError +import class Foundation.NSError +import var Foundation.NSURLErrorDomain +import struct Foundation.TimeInterval import enum SmithyHTTPAPI.HTTPStatusCode import struct SmithyRetriesAPI.RetryErrorInfo -import enum SmithyRetriesAPI.RetryErrorType import protocol SmithyRetriesAPI.RetryErrorInfoProvider -import struct Foundation.TimeInterval -import class Foundation.NSError -import var Foundation.NSURLErrorDomain -import struct AwsCommonRuntimeKit.CRTError -import enum AwsCommonRuntimeKit.CommonRunTimeError +import enum SmithyRetriesAPI.RetryErrorType public enum DefaultRetryErrorInfoProvider: RetryErrorInfoProvider, Sendable { /// Returns information used to determine how & if to retry an error. diff --git a/Sources/ClientRuntime/Serialization/SerializationUtils/TimestampFormatter.swift b/Sources/ClientRuntime/Serialization/SerializationUtils/TimestampFormatter.swift index 1b0e6cced..c0e12294a 100644 --- a/Sources/ClientRuntime/Serialization/SerializationUtils/TimestampFormatter.swift +++ b/Sources/ClientRuntime/Serialization/SerializationUtils/TimestampFormatter.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter @_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat +@_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter @_spi(SmithyTimestamps) public typealias TimestampFormatter = SmithyTimestamps.TimestampFormatter diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift index df095976c..cd068bb11 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift @@ -6,19 +6,19 @@ // #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) -// OpenTelemetryApi specific imports -@preconcurrency import protocol OpenTelemetryApi.Tracer +@preconcurrency import enum OpenTelemetryApi.AttributeValue @preconcurrency import protocol OpenTelemetryApi.Span @preconcurrency import enum OpenTelemetryApi.SpanKind @preconcurrency import enum OpenTelemetryApi.Status -@preconcurrency import enum OpenTelemetryApi.AttributeValue +// OpenTelemetryApi specific imports +@preconcurrency import protocol OpenTelemetryApi.Tracer -// OpenTelemetrySdk specific imports -@preconcurrency import class OpenTelemetrySdk.TracerProviderSdk -@preconcurrency import class OpenTelemetrySdk.TracerProviderBuilder +@preconcurrency import struct OpenTelemetrySdk.Resource @preconcurrency import struct OpenTelemetrySdk.SimpleSpanProcessor @preconcurrency import protocol OpenTelemetrySdk.SpanExporter -@preconcurrency import struct OpenTelemetrySdk.Resource +@preconcurrency import class OpenTelemetrySdk.TracerProviderBuilder +// OpenTelemetrySdk specific imports +@preconcurrency import class OpenTelemetrySdk.TracerProviderSdk // Smithy specific imports import struct Smithy.AttributeKey diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift index 1246d2421..d95855e6d 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift @@ -6,13 +6,13 @@ // #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) +@preconcurrency import class OpenTelemetryApi.AttributeArray // OpenTelemetryApi specific imports @preconcurrency import enum OpenTelemetryApi.AttributeValue -@preconcurrency import class OpenTelemetryApi.AttributeArray +import struct Smithy.AttributeKey // Smithy imports import struct Smithy.Attributes -import struct Smithy.AttributeKey extension Attributes { public func toOtelAttributes() -> [String: AttributeValue] { diff --git a/Sources/ClientRuntime/Telemetry/Tracing/TraceSpan.swift b/Sources/ClientRuntime/Telemetry/Tracing/TraceSpan.swift index fb24e2d8a..4bd55bb2c 100644 --- a/Sources/ClientRuntime/Telemetry/Tracing/TraceSpan.swift +++ b/Sources/ClientRuntime/Telemetry/Tracing/TraceSpan.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Smithy.Attributes import struct Smithy.AttributeKey +import struct Smithy.Attributes /// A Trace Span represents a single unit of work which has a beginning and end time, and may be connected to other /// spans as part of a parent / child relationship. diff --git a/Sources/ClientRuntime/protocols/rpcv2cbor/RpcV2CborError.swift b/Sources/ClientRuntime/protocols/rpcv2cbor/RpcV2CborError.swift index 13f9a466f..3baf6d468 100644 --- a/Sources/ClientRuntime/protocols/rpcv2cbor/RpcV2CborError.swift +++ b/Sources/ClientRuntime/protocols/rpcv2cbor/RpcV2CborError.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import class SmithyHTTPAPI.HTTPResponse @_spi(SmithyReadWrite) import class SmithyCBOR.Reader +import class SmithyHTTPAPI.HTTPResponse public struct RpcV2CborError: BaseError { public let code: String diff --git a/Sources/Smithy/ByteStream.swift b/Sources/Smithy/ByteStream.swift index 9a13b3338..d1d1cd1ad 100644 --- a/Sources/Smithy/ByteStream.swift +++ b/Sources/Smithy/ByteStream.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Foundation.FileHandle import struct Foundation.Data +import class Foundation.FileHandle public enum ByteStream: Sendable { case data(Data?) diff --git a/Sources/SmithyCBOR/Reader/Reader.swift b/Sources/SmithyCBOR/Reader/Reader.swift index 813bda173..497a18c05 100644 --- a/Sources/SmithyCBOR/Reader/Reader.swift +++ b/Sources/SmithyCBOR/Reader/Reader.swift @@ -8,11 +8,11 @@ import AwsCommonRuntimeKit import Foundation -@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyReader -@_spi(SmithyReadWrite) import enum SmithyReadWrite.ReaderError -@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter @_spi(Smithy) import struct Smithy.Document @_spi(Smithy) import protocol Smithy.SmithyDocument +@_spi(SmithyReadWrite) import enum SmithyReadWrite.ReaderError +@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyReader +@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter @_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter diff --git a/Sources/SmithyCBOR/Writer/Writer.swift b/Sources/SmithyCBOR/Writer/Writer.swift index 01a2577ec..641fdfe08 100644 --- a/Sources/SmithyCBOR/Writer/Writer.swift +++ b/Sources/SmithyCBOR/Writer/Writer.swift @@ -8,11 +8,11 @@ import AwsCommonRuntimeKit import Foundation +@_spi(Smithy) import struct Smithy.Document +@_spi(Smithy) import protocol Smithy.SmithyDocument @_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyReader @_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter @_spi(SmithyReadWrite) import enum SmithyReadWrite.WriterError -@_spi(Smithy) import struct Smithy.Document -@_spi(Smithy) import protocol Smithy.SmithyDocument @_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter diff --git a/Sources/SmithyChecksums/CRC32.swift b/Sources/SmithyChecksums/CRC32.swift index 713020669..2d0c3fa7f 100644 --- a/Sources/SmithyChecksums/CRC32.swift +++ b/Sources/SmithyChecksums/CRC32.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.HashResult -import struct Foundation.Data -import AwsCommonRuntimeKit class CRC32 { let checksumName = "crc32" diff --git a/Sources/SmithyChecksums/CRC32C.swift b/Sources/SmithyChecksums/CRC32C.swift index 134e7c951..8f260870f 100644 --- a/Sources/SmithyChecksums/CRC32C.swift +++ b/Sources/SmithyChecksums/CRC32C.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.HashResult -import struct Foundation.Data -import AwsCommonRuntimeKit class CRC32C { let checksumName = "crc32c" diff --git a/Sources/SmithyChecksums/CRC64NVME.swift b/Sources/SmithyChecksums/CRC64NVME.swift index c38b8848f..58fa84661 100644 --- a/Sources/SmithyChecksums/CRC64NVME.swift +++ b/Sources/SmithyChecksums/CRC64NVME.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.HashResult -import struct Foundation.Data -import AwsCommonRuntimeKit class CRC64NVME { let checksumName = "crc64nvme" diff --git a/Sources/SmithyChecksums/ChecksumAlgorithm.swift b/Sources/SmithyChecksums/ChecksumAlgorithm.swift index be36d3015..e53864347 100644 --- a/Sources/SmithyChecksums/ChecksumAlgorithm.swift +++ b/Sources/SmithyChecksums/ChecksumAlgorithm.swift @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0. */ +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.ChecksumAlgorithm import enum SmithyChecksumsAPI.HashResult -import struct Foundation.Data -import AwsCommonRuntimeKit public enum HashError: Error { case invalidInput diff --git a/Sources/SmithyChecksums/ChunkedReader.swift b/Sources/SmithyChecksums/ChunkedReader.swift index 2a9fae77a..941b09e2c 100644 --- a/Sources/SmithyChecksums/ChunkedReader.swift +++ b/Sources/SmithyChecksums/ChunkedReader.swift @@ -5,13 +5,13 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data +import Smithy import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.ChecksumAlgorithm import struct SmithyHTTPAPI.Headers -import AwsCommonRuntimeKit import SmithyHTTPClient -import struct Foundation.Data -import Smithy public class ChunkedReader { private var stream: ReadableStream diff --git a/Sources/SmithyChecksums/ChunkedStream.swift b/Sources/SmithyChecksums/ChunkedStream.swift index 4b7b1cc37..5583eda82 100644 --- a/Sources/SmithyChecksums/ChunkedStream.swift +++ b/Sources/SmithyChecksums/ChunkedStream.swift @@ -5,12 +5,12 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data +import class Smithy.Context import protocol Smithy.Stream import struct SmithyHTTPAPI.Headers -import struct Foundation.Data -import AwsCommonRuntimeKit import class SmithyStreams.BufferedStream -import class Smithy.Context /// Reads data from the input stream, chunks it, and passes it out through its output stream. /// diff --git a/Sources/SmithyChecksums/MD5.swift b/Sources/SmithyChecksums/MD5.swift index f88325d8f..2c5e5e98f 100644 --- a/Sources/SmithyChecksums/MD5.swift +++ b/Sources/SmithyChecksums/MD5.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.HashResult -import struct Foundation.Data -import AwsCommonRuntimeKit class MD5 { let checksumName = "md5" diff --git a/Sources/SmithyChecksums/SHA1.swift b/Sources/SmithyChecksums/SHA1.swift index 748f8005b..2777163e5 100644 --- a/Sources/SmithyChecksums/SHA1.swift +++ b/Sources/SmithyChecksums/SHA1.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.HashResult -import struct Foundation.Data -import AwsCommonRuntimeKit class SHA1 { let checksumName = "sha1" diff --git a/Sources/SmithyChecksums/SHA256.swift b/Sources/SmithyChecksums/SHA256.swift index 4763ad9c4..6bebd330d 100644 --- a/Sources/SmithyChecksums/SHA256.swift +++ b/Sources/SmithyChecksums/SHA256.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.HashResult -import struct Foundation.Data -import AwsCommonRuntimeKit class SHA256 { let checksumName = "sha256" diff --git a/Sources/SmithyChecksums/ValidatingBufferedStream.swift b/Sources/SmithyChecksums/ValidatingBufferedStream.swift index dbe2c92b7..e4beaaac5 100644 --- a/Sources/SmithyChecksums/ValidatingBufferedStream.swift +++ b/Sources/SmithyChecksums/ValidatingBufferedStream.swift @@ -5,11 +5,11 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import protocol Smithy.Stream import protocol SmithyChecksumsAPI.Checksum import enum SmithyChecksumsAPI.ChecksumAlgorithm -import struct Foundation.Data -import AwsCommonRuntimeKit import class SmithyStreams.BufferedStream public class ValidatingBufferedStream: @unchecked Sendable { diff --git a/Sources/SmithyChecksumsAPI/Context+Checksum.swift b/Sources/SmithyChecksumsAPI/Context+Checksum.swift index d591de4ff..034101d1d 100644 --- a/Sources/SmithyChecksumsAPI/Context+Checksum.swift +++ b/Sources/SmithyChecksumsAPI/Context+Checksum.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Smithy.Context import struct Smithy.AttributeKey +import class Smithy.Context public extension Context { diff --git a/Sources/SmithyEventStreams/DefaultMessageDecoder.swift b/Sources/SmithyEventStreams/DefaultMessageDecoder.swift index 8a7549a01..8c016b8ad 100644 --- a/Sources/SmithyEventStreams/DefaultMessageDecoder.swift +++ b/Sources/SmithyEventStreams/DefaultMessageDecoder.swift @@ -5,13 +5,13 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit +import struct Foundation.Data import Smithy import enum SmithyEventStreamsAPI.EventStreamError -import struct SmithyEventStreamsAPI.Message import struct SmithyEventStreamsAPI.Header +import struct SmithyEventStreamsAPI.Message import protocol SmithyEventStreamsAPI.MessageDecoder -import AwsCommonRuntimeKit -import struct Foundation.Data /// AWS implementation of `MessageDecoder` for decoding event stream messages /// Note: This is class because struct does not allow using `self` in closure diff --git a/Sources/SmithyEventStreams/DefaultMessageDecoderStream.swift b/Sources/SmithyEventStreams/DefaultMessageDecoderStream.swift index a95d6b2ca..f06c907db 100644 --- a/Sources/SmithyEventStreams/DefaultMessageDecoderStream.swift +++ b/Sources/SmithyEventStreams/DefaultMessageDecoderStream.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import Smithy import SmithyEventStreamsAPI import SmithyEventStreamsAuthAPI -import struct Foundation.Data /// Stream adapter that decodes input data into `EventStream.Message` objects. public struct DefaultMessageDecoderStream: MessageDecoderStream, Sendable { diff --git a/Sources/SmithyEventStreams/DefaultMessageEncoder.swift b/Sources/SmithyEventStreams/DefaultMessageEncoder.swift index 315f5534a..61642694e 100644 --- a/Sources/SmithyEventStreams/DefaultMessageEncoder.swift +++ b/Sources/SmithyEventStreams/DefaultMessageEncoder.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import struct SmithyEventStreamsAPI.Message import protocol SmithyEventStreamsAPI.MessageEncoder -import struct Foundation.Data /// Encodes a `Message` into a `Data` object /// to be sent over the wire. diff --git a/Sources/SmithyEventStreams/DefaultMessageEncoderStream.swift b/Sources/SmithyEventStreams/DefaultMessageEncoderStream.swift index a48245c99..5f26eebad 100644 --- a/Sources/SmithyEventStreams/DefaultMessageEncoderStream.swift +++ b/Sources/SmithyEventStreams/DefaultMessageEncoderStream.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import Smithy import SmithyEventStreamsAPI import SmithyEventStreamsAuthAPI -import struct Foundation.Data /// Stream adapter that encodes input into `Data` objects. public class DefaultMessageEncoderStream: MessageEncoderStream, Stream, @unchecked Sendable { diff --git a/Sources/SmithyEventStreams/Header+CRT.swift b/Sources/SmithyEventStreams/Header+CRT.swift index 19cd7c597..71aaa40a7 100644 --- a/Sources/SmithyEventStreams/Header+CRT.swift +++ b/Sources/SmithyEventStreams/Header+CRT.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct SmithyEventStreamsAPI.Header -import enum SmithyEventStreamsAPI.HeaderValue import AwsCommonRuntimeKit import Foundation +import struct SmithyEventStreamsAPI.Header +import enum SmithyEventStreamsAPI.HeaderValue extension Header { diff --git a/Sources/SmithyEventStreams/Message+CRT.swift b/Sources/SmithyEventStreams/Message+CRT.swift index 300200a82..f1e5be8a8 100644 --- a/Sources/SmithyEventStreams/Message+CRT.swift +++ b/Sources/SmithyEventStreams/Message+CRT.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit import enum SmithyEventStreamsAPI.EventStreamError -import enum SmithyEventStreamsAPI.MessageType import struct SmithyEventStreamsAPI.Message -import AwsCommonRuntimeKit +import enum SmithyEventStreamsAPI.MessageType extension Message { /// Parses the protocol level headers into a `MessageType` diff --git a/Sources/SmithyEventStreamsAPI/Context+EventStreamsAPI.swift b/Sources/SmithyEventStreamsAPI/Context+EventStreamsAPI.swift index 39b22e509..62e92623f 100644 --- a/Sources/SmithyEventStreamsAPI/Context+EventStreamsAPI.swift +++ b/Sources/SmithyEventStreamsAPI/Context+EventStreamsAPI.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Smithy.Context import struct Smithy.AttributeKey +import class Smithy.Context public extension Context { diff --git a/Sources/SmithyEventStreamsAuthAPI/Context+EventStreamsAuthAPI.swift b/Sources/SmithyEventStreamsAuthAPI/Context+EventStreamsAuthAPI.swift index 3cae68bf6..9430b4b8c 100644 --- a/Sources/SmithyEventStreamsAuthAPI/Context+EventStreamsAuthAPI.swift +++ b/Sources/SmithyEventStreamsAuthAPI/Context+EventStreamsAuthAPI.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Smithy.Context import struct Smithy.AttributeKey +import class Smithy.Context public extension Context { diff --git a/Sources/SmithyEventStreamsAuthAPI/MessageDataSigner.swift b/Sources/SmithyEventStreamsAuthAPI/MessageDataSigner.swift index b87606d7a..c4bc10e88 100644 --- a/Sources/SmithyEventStreamsAuthAPI/MessageDataSigner.swift +++ b/Sources/SmithyEventStreamsAuthAPI/MessageDataSigner.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import struct Smithy.Attributes import struct SmithyEventStreamsAPI.Message -import struct Foundation.Data /// Protocol for signing messages. public protocol MessageDataSigner: Sendable { diff --git a/Sources/SmithyEventStreamsAuthAPI/MessageEncoderStream.swift b/Sources/SmithyEventStreamsAuthAPI/MessageEncoderStream.swift index e56b6ccbd..1afd6b8c8 100644 --- a/Sources/SmithyEventStreamsAuthAPI/MessageEncoderStream.swift +++ b/Sources/SmithyEventStreamsAuthAPI/MessageEncoderStream.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import Smithy import SmithyEventStreamsAPI -import struct Foundation.Data /// Stream adapter that encodes input into `Data` objects that are encoded, signed events. public protocol MessageEncoderStream: Stream, AsyncSequence where Element == Data { diff --git a/Sources/SmithyFormURL/Writer.swift b/Sources/SmithyFormURL/Writer.swift index 2d1f76e9b..d27fe7e61 100644 --- a/Sources/SmithyFormURL/Writer.swift +++ b/Sources/SmithyFormURL/Writer.swift @@ -5,13 +5,13 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter +import struct Foundation.CharacterSet +import struct Foundation.Data +import struct Foundation.Date import protocol Smithy.SmithyDocument +@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter @_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter -import struct Foundation.Data -import struct Foundation.Date -import struct Foundation.CharacterSet @_spi(SmithyReadWrite) public final class Writer: SmithyWriter { diff --git a/Sources/SmithyHTTPAPI/Context+HTTP.swift b/Sources/SmithyHTTPAPI/Context+HTTP.swift index 2c5e48934..3d0465b34 100644 --- a/Sources/SmithyHTTPAPI/Context+HTTP.swift +++ b/Sources/SmithyHTTPAPI/Context+HTTP.swift @@ -5,11 +5,11 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Smithy.Attributes +import struct Foundation.TimeInterval import struct Smithy.AttributeKey +import struct Smithy.Attributes import class Smithy.Context import class Smithy.ContextBuilder -import struct Foundation.TimeInterval /// This extends `OperationContext` for all http middleware operations extension Context { diff --git a/Sources/SmithyHTTPAPI/Endpoint.swift b/Sources/SmithyHTTPAPI/Endpoint.swift index cce3a0ec4..ad0a66c51 100644 --- a/Sources/SmithyHTTPAPI/Endpoint.swift +++ b/Sources/SmithyHTTPAPI/Endpoint.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import enum AwsCommonRuntimeKit.EndpointProperty import Foundation import Smithy -import enum AwsCommonRuntimeKit.EndpointProperty public struct Endpoint: Sendable, Equatable { public let uri: URI diff --git a/Sources/SmithyHTTPAPI/EndpointPropertyValue.swift b/Sources/SmithyHTTPAPI/EndpointPropertyValue.swift index 3d6a9dd31..a05d0d611 100644 --- a/Sources/SmithyHTTPAPI/EndpointPropertyValue.swift +++ b/Sources/SmithyHTTPAPI/EndpointPropertyValue.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import enum AwsCommonRuntimeKit.EndpointProperty import Foundation import Smithy -import enum AwsCommonRuntimeKit.EndpointProperty public enum EndpointPropertyValue: Sendable, Equatable { case bool(Bool) diff --git a/Sources/SmithyHTTPAPI/HTTPRequest.swift b/Sources/SmithyHTTPAPI/HTTPRequest.swift index 5e6cde596..82350e381 100644 --- a/Sources/SmithyHTTPAPI/HTTPRequest.swift +++ b/Sources/SmithyHTTPAPI/HTTPRequest.swift @@ -5,18 +5,18 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.CharacterSet +import struct Foundation.Date +import struct Foundation.URLComponents +import struct Foundation.URLQueryItem +import enum Smithy.ByteStream +import enum Smithy.ClientError +import protocol Smithy.RequestMessage +import protocol Smithy.RequestMessageBuilder import struct Smithy.URI import class Smithy.URIBuilder -import enum Smithy.URIScheme import struct Smithy.URIQueryItem -import protocol Smithy.RequestMessage -import protocol Smithy.RequestMessageBuilder -import enum Smithy.ByteStream -import enum Smithy.ClientError -import struct Foundation.Date -import struct Foundation.CharacterSet -import struct Foundation.URLQueryItem -import struct Foundation.URLComponents +import enum Smithy.URIScheme // In Linux, Foundation.URLRequest is moved to FoundationNetworking. #if canImport(FoundationNetworking) import FoundationNetworking diff --git a/Sources/SmithyHTTPAPI/HTTPResponse.swift b/Sources/SmithyHTTPAPI/HTTPResponse.swift index 20e430c1e..009847a39 100644 --- a/Sources/SmithyHTTPAPI/HTTPResponse.swift +++ b/Sources/SmithyHTTPAPI/HTTPResponse.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import class Foundation.NSRecursiveLock +import enum Smithy.ByteStream import protocol Smithy.ResponseMessage import protocol Smithy.Stream -import enum Smithy.ByteStream -import class Foundation.NSRecursiveLock public final class HTTPResponse: ResponseMessage, @unchecked Sendable { private var lock = NSRecursiveLock() diff --git a/Sources/SmithyHTTPAPI/URL+getQueryItems.swift b/Sources/SmithyHTTPAPI/URL+getQueryItems.swift index 40f6c15f1..16d5bb786 100644 --- a/Sources/SmithyHTTPAPI/URL+getQueryItems.swift +++ b/Sources/SmithyHTTPAPI/URL+getQueryItems.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Smithy.URIQueryItem import struct Foundation.URL import struct Foundation.URLComponents +import struct Smithy.URIQueryItem public func getQueryItems(url: URL) -> [URIQueryItem]? { URLComponents(url: url, resolvingAgainstBaseURL: false)? diff --git a/Sources/SmithyHTTPAuth/AWSSigningConfig.swift b/Sources/SmithyHTTPAuth/AWSSigningConfig.swift index 4765ca3f7..02e43e6c1 100644 --- a/Sources/SmithyHTTPAuth/AWSSigningConfig.swift +++ b/Sources/SmithyHTTPAuth/AWSSigningConfig.swift @@ -5,17 +5,17 @@ // SPDX-License-Identifier: Apache-2.0 // -import class SmithyIdentity.CRTAWSCredentialIdentity -import enum SmithyHTTPAuthAPI.SigningAlgorithm -import enum SmithyHTTPAuthAPI.AWSSignedBodyHeader -import enum SmithyHTTPAuthAPI.AWSSignedBodyValue -import enum SmithyHTTPAuthAPI.AWSSignatureType -import protocol SmithyIdentity.AWSCredentialIdentityResolver import struct Foundation.Date import struct Foundation.Locale import struct Foundation.TimeInterval +import enum SmithyHTTPAuthAPI.AWSSignatureType +import enum SmithyHTTPAuthAPI.AWSSignedBodyHeader +import enum SmithyHTTPAuthAPI.AWSSignedBodyValue +import enum SmithyHTTPAuthAPI.SigningAlgorithm import struct SmithyHTTPAuthAPI.SigningFlags import struct SmithyIdentity.AWSCredentialIdentity +import protocol SmithyIdentity.AWSCredentialIdentityResolver +import class SmithyIdentity.CRTAWSCredentialIdentity public struct AWSSigningConfig: Sendable { public let credentials: AWSCredentialIdentity? diff --git a/Sources/SmithyHTTPAuth/AuthSchemes/BearerTokenAuthScheme.swift b/Sources/SmithyHTTPAuth/AuthSchemes/BearerTokenAuthScheme.swift index a3fe6f2d1..b0e64aecd 100644 --- a/Sources/SmithyHTTPAuth/AuthSchemes/BearerTokenAuthScheme.swift +++ b/Sources/SmithyHTTPAuth/AuthSchemes/BearerTokenAuthScheme.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.Attributes import class Smithy.Context import protocol SmithyHTTPAuthAPI.AuthScheme import protocol SmithyHTTPAuthAPI.Signer -import struct Smithy.Attributes public struct BearerTokenAuthScheme: AuthScheme { public let schemeID: String = "smithy.api#httpBearerAuth" diff --git a/Sources/SmithyHTTPAuth/CRTAdapters.swift b/Sources/SmithyHTTPAuth/CRTAdapters.swift index 27c77c417..ae5e566f4 100644 --- a/Sources/SmithyHTTPAuth/CRTAdapters.swift +++ b/Sources/SmithyHTTPAuth/CRTAdapters.swift @@ -5,16 +5,16 @@ // SPDX-License-Identifier: Apache-2.0 // -import enum AwsCommonRuntimeKit.SigningAlgorithmType +import enum AwsCommonRuntimeKit.SignatureType import enum AwsCommonRuntimeKit.SignedBodyHeaderType import enum AwsCommonRuntimeKit.SignedBodyValue -import enum AwsCommonRuntimeKit.SignatureType +import enum AwsCommonRuntimeKit.SigningAlgorithmType import struct AwsCommonRuntimeKit.SigningConfig -import enum SmithyHTTPAuthAPI.SigningAlgorithm +import enum SmithyHTTPAuthAPI.AWSSignatureType import enum SmithyHTTPAuthAPI.AWSSignedBodyHeader import enum SmithyHTTPAuthAPI.AWSSignedBodyValue -import enum SmithyHTTPAuthAPI.AWSSignatureType +import enum SmithyHTTPAuthAPI.SigningAlgorithm import struct Foundation.Locale import class SmithyIdentity.CRTAWSCredentialIdentity diff --git a/Sources/SmithyHTTPAuth/DefaultIdentityResolverConfiguration.swift b/Sources/SmithyHTTPAuth/DefaultIdentityResolverConfiguration.swift index 1d1350348..c11dbf64a 100644 --- a/Sources/SmithyHTTPAuth/DefaultIdentityResolverConfiguration.swift +++ b/Sources/SmithyHTTPAuth/DefaultIdentityResolverConfiguration.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol SmithyIdentityAPI.IdentityResolver -import protocol SmithyHTTPAuthAPI.IdentityResolverConfiguration -import struct Smithy.Attributes import struct Smithy.AttributeKey +import struct Smithy.Attributes +import protocol SmithyHTTPAuthAPI.IdentityResolverConfiguration +import protocol SmithyIdentityAPI.IdentityResolver public struct DefaultIdentityResolverConfiguration: IdentityResolverConfiguration { let identityResolvers: Attributes diff --git a/Sources/SmithyHTTPAuth/SigV4AuthScheme.swift b/Sources/SmithyHTTPAuth/SigV4AuthScheme.swift index 62b4fb441..cac242fcb 100644 --- a/Sources/SmithyHTTPAuth/SigV4AuthScheme.swift +++ b/Sources/SmithyHTTPAuth/SigV4AuthScheme.swift @@ -5,13 +5,13 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.Attributes import class Smithy.Context -import enum SmithyHTTPAuthAPI.AWSSignedBodyHeader -import enum SmithyHTTPAuthAPI.SigningPropertyKeys +import SmithyChecksumsAPI import protocol SmithyHTTPAuthAPI.AuthScheme +import enum SmithyHTTPAuthAPI.AWSSignedBodyHeader import protocol SmithyHTTPAuthAPI.Signer -import struct Smithy.Attributes -import SmithyChecksumsAPI +import enum SmithyHTTPAuthAPI.SigningPropertyKeys public struct SigV4AuthScheme: AuthScheme { public let schemeID: String = "aws.auth#sigv4" diff --git a/Sources/SmithyHTTPAuth/SigV4Signer.swift b/Sources/SmithyHTTPAuth/SigV4Signer.swift index 9c04fbb9f..2f7c197e0 100644 --- a/Sources/SmithyHTTPAuth/SigV4Signer.swift +++ b/Sources/SmithyHTTPAuth/SigV4Signer.swift @@ -5,30 +5,30 @@ // SPDX-License-Identifier: Apache-2.0 // +import enum AwsCommonRuntimeKit.CommonRunTimeError +import class AwsCommonRuntimeKit.HTTPRequestBase +import class AwsCommonRuntimeKit.Signer +import struct AwsCommonRuntimeKit.SigningConfig import struct Foundation.Date import struct Foundation.TimeInterval import struct Foundation.URL -import class AwsCommonRuntimeKit.HTTPRequestBase -import class AwsCommonRuntimeKit.Signer +import struct Smithy.AttributeKey +import struct Smithy.Attributes +import enum Smithy.ClientError +import struct Smithy.SwiftLogger import class SmithyHTTPAPI.HTTPRequest import class SmithyHTTPAPI.HTTPRequestBuilder -import enum AwsCommonRuntimeKit.CommonRunTimeError -import enum Smithy.ClientError +import enum SmithyHTTPAuthAPI.AWSSignatureType import enum SmithyHTTPAuthAPI.AWSSignedBodyHeader import enum SmithyHTTPAuthAPI.AWSSignedBodyValue -import enum SmithyHTTPAuthAPI.AWSSignatureType +import protocol SmithyHTTPAuthAPI.Signer import enum SmithyHTTPAuthAPI.SigningAlgorithm +import struct SmithyHTTPAuthAPI.SigningFlags import enum SmithyHTTPAuthAPI.SigningPropertyKeys +import SmithyHTTPClient +import struct SmithyIdentity.AWSCredentialIdentity import protocol SmithyIdentity.AWSCredentialIdentityResolver import protocol SmithyIdentityAPI.Identity -import protocol SmithyHTTPAuthAPI.Signer -import struct AwsCommonRuntimeKit.SigningConfig -import struct Smithy.AttributeKey -import struct Smithy.Attributes -import struct Smithy.SwiftLogger -import struct SmithyIdentity.AWSCredentialIdentity -import struct SmithyHTTPAuthAPI.SigningFlags -import SmithyHTTPClient public class SigV4Signer: SmithyHTTPAuthAPI.Signer, @unchecked Sendable { public init() {} diff --git a/Sources/SmithyHTTPAuth/Signers/BearerTokenSigner.swift b/Sources/SmithyHTTPAuth/Signers/BearerTokenSigner.swift index d7e9fdaf8..fb3df6abc 100644 --- a/Sources/SmithyHTTPAuth/Signers/BearerTokenSigner.swift +++ b/Sources/SmithyHTTPAuth/Signers/BearerTokenSigner.swift @@ -5,12 +5,12 @@ // SPDX-License-Identifier: Apache-2.0 // -import class SmithyHTTPAPI.HTTPRequestBuilder +import struct Smithy.Attributes import enum Smithy.ClientError -import protocol SmithyIdentityAPI.Identity +import class SmithyHTTPAPI.HTTPRequestBuilder import protocol SmithyHTTPAuthAPI.Signer -import struct Smithy.Attributes import struct SmithyIdentity.BearerTokenIdentity +import protocol SmithyIdentityAPI.Identity /// The signer for HTTP bearer auth. /// Adds the Authorization header to the request using the resolved bearer token identity as its value. diff --git a/Sources/SmithyHTTPAuthAPI/AuthScheme.swift b/Sources/SmithyHTTPAuthAPI/AuthScheme.swift index a88e11d20..5831afa15 100644 --- a/Sources/SmithyHTTPAuthAPI/AuthScheme.swift +++ b/Sources/SmithyHTTPAuthAPI/AuthScheme.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.Attributes import class Smithy.Context import protocol SmithyIdentityAPI.IdentityResolver -import struct Smithy.Attributes public protocol AuthScheme: Sendable { var schemeID: String { get } diff --git a/Sources/SmithyHTTPAuthAPI/Context/Context+Chunked.swift b/Sources/SmithyHTTPAuthAPI/Context/Context+Chunked.swift index c50ebeaa4..f3c3e41fb 100644 --- a/Sources/SmithyHTTPAuthAPI/Context/Context+Chunked.swift +++ b/Sources/SmithyHTTPAuthAPI/Context/Context+Chunked.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Smithy.Context import struct Smithy.AttributeKey +import class Smithy.Context public extension Context { var isChunkedEligibleStream: Bool? { diff --git a/Sources/SmithyHTTPAuthAPI/Context/Context+EstimatedSkew.swift b/Sources/SmithyHTTPAuthAPI/Context/Context+EstimatedSkew.swift index acf77d628..4dcfec15c 100644 --- a/Sources/SmithyHTTPAuthAPI/Context/Context+EstimatedSkew.swift +++ b/Sources/SmithyHTTPAuthAPI/Context/Context+EstimatedSkew.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // -import class Smithy.Context -import class Smithy.ContextBuilder import struct Foundation.TimeInterval import struct Smithy.AttributeKey +import class Smithy.Context +import class Smithy.ContextBuilder public extension Context { var estimatedSkew: TimeInterval? { diff --git a/Sources/SmithyHTTPAuthAPI/Context/Context+HTTPAuth.swift b/Sources/SmithyHTTPAuthAPI/Context/Context+HTTPAuth.swift index fb5ed3708..76b894c43 100644 --- a/Sources/SmithyHTTPAuthAPI/Context/Context+HTTPAuth.swift +++ b/Sources/SmithyHTTPAuthAPI/Context/Context+HTTPAuth.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.AttributeKey +import struct Smithy.Attributes import class Smithy.Context import class Smithy.ContextBuilder -import struct Smithy.Attributes -import struct Smithy.AttributeKey public extension Context { diff --git a/Sources/SmithyHTTPAuthAPI/Context/Context+RequestSignature.swift b/Sources/SmithyHTTPAuthAPI/Context/Context+RequestSignature.swift index 82ceb9c27..9cfe4a8db 100644 --- a/Sources/SmithyHTTPAuthAPI/Context/Context+RequestSignature.swift +++ b/Sources/SmithyHTTPAuthAPI/Context/Context+RequestSignature.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.AttributeKey import class Smithy.Context import class Smithy.ContextBuilder -import struct Smithy.AttributeKey public extension Context { diff --git a/Sources/SmithyHTTPAuthAPI/Context/SigningPropertyKeys.swift b/Sources/SmithyHTTPAuthAPI/Context/SigningPropertyKeys.swift index 923ef7658..85d95c000 100644 --- a/Sources/SmithyHTTPAuthAPI/Context/SigningPropertyKeys.swift +++ b/Sources/SmithyHTTPAuthAPI/Context/SigningPropertyKeys.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Smithy.AttributeKey import struct Foundation.TimeInterval +import struct Smithy.AttributeKey public enum SigningPropertyKeys { public static let signingName = AttributeKey(name: "SigningName") diff --git a/Sources/SmithyHTTPAuthAPI/SelectedAuthScheme.swift b/Sources/SmithyHTTPAuthAPI/SelectedAuthScheme.swift index 33e163b6c..b6a4f613e 100644 --- a/Sources/SmithyHTTPAuthAPI/SelectedAuthScheme.swift +++ b/Sources/SmithyHTTPAuthAPI/SelectedAuthScheme.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol SmithyIdentityAPI.Identity -import struct Smithy.Attributes import struct Smithy.AttributeKey +import struct Smithy.Attributes +import protocol SmithyIdentityAPI.Identity public struct SelectedAuthScheme: Sendable { public let schemeID: String diff --git a/Sources/SmithyHTTPAuthAPI/Signer.swift b/Sources/SmithyHTTPAuthAPI/Signer.swift index 0675d3765..71b500bbe 100644 --- a/Sources/SmithyHTTPAuthAPI/Signer.swift +++ b/Sources/SmithyHTTPAuthAPI/Signer.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.Attributes import class SmithyHTTPAPI.HTTPRequestBuilder import protocol SmithyIdentityAPI.Identity -import struct Smithy.Attributes public protocol Signer: Sendable { diff --git a/Sources/SmithyHTTPClient/SdkHttpRequest+CRT.swift b/Sources/SmithyHTTPClient/SdkHttpRequest+CRT.swift index 3c891b8d0..0324f0ea9 100644 --- a/Sources/SmithyHTTPClient/SdkHttpRequest+CRT.swift +++ b/Sources/SmithyHTTPClient/SdkHttpRequest+CRT.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit import struct Smithy.URI -import class SmithyStreams.StreamableHttpBody import class SmithyHTTPAPI.HTTPRequest -import AwsCommonRuntimeKit +import class SmithyStreams.StreamableHttpBody extension HTTPRequest { diff --git a/Sources/SmithyHTTPClient/SdkHttpRequestBuilder+HTTPRequestBase.swift b/Sources/SmithyHTTPClient/SdkHttpRequestBuilder+HTTPRequestBase.swift index b943b9caa..0da9372c5 100644 --- a/Sources/SmithyHTTPClient/SdkHttpRequestBuilder+HTTPRequestBase.swift +++ b/Sources/SmithyHTTPClient/SdkHttpRequestBuilder+HTTPRequestBase.swift @@ -5,13 +5,13 @@ // SPDX-License-Identifier: Apache-2.0 // +import AwsCommonRuntimeKit import struct Foundation.Date import struct Foundation.URLComponents import struct Smithy.URIQueryItem +import struct SmithyHTTPAPI.Headers import class SmithyHTTPAPI.HTTPRequest import class SmithyHTTPAPI.HTTPRequestBuilder -import struct SmithyHTTPAPI.Headers -import AwsCommonRuntimeKit extension HTTPRequestBuilder { diff --git a/Sources/SmithyIdentity/AWSCredentialIdentity.swift b/Sources/SmithyIdentity/AWSCredentialIdentity.swift index a5c7e7fed..803aeb65e 100644 --- a/Sources/SmithyIdentity/AWSCredentialIdentity.swift +++ b/Sources/SmithyIdentity/AWSCredentialIdentity.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol SmithyIdentityAPI.Identity import struct Foundation.Date import struct Smithy.Attributes +import protocol SmithyIdentityAPI.Identity /// A type representing AWS credentials for authenticating with an AWS service /// diff --git a/Sources/SmithyIdentity/AWSCredentialIdentityResolver.swift b/Sources/SmithyIdentity/AWSCredentialIdentityResolver.swift index f418e3805..1e3e47a8b 100644 --- a/Sources/SmithyIdentity/AWSCredentialIdentityResolver.swift +++ b/Sources/SmithyIdentity/AWSCredentialIdentityResolver.swift @@ -6,8 +6,8 @@ // import class AwsCommonRuntimeKit.CredentialsProvider -import protocol SmithyIdentityAPI.IdentityResolver import struct Smithy.Attributes +import protocol SmithyIdentityAPI.IdentityResolver /// A type that can provide credentials for authenticating with an AWS service public protocol AWSCredentialIdentityResolver: IdentityResolver where IdentityT == AWSCredentialIdentity {} diff --git a/Sources/SmithyIdentity/AWSCredentialIdentityResolvers/StaticAWSCredentialIdentityResolver.swift b/Sources/SmithyIdentity/AWSCredentialIdentityResolvers/StaticAWSCredentialIdentityResolver.swift index 87d018c8e..350bc15c3 100644 --- a/Sources/SmithyIdentity/AWSCredentialIdentityResolvers/StaticAWSCredentialIdentityResolver.swift +++ b/Sources/SmithyIdentity/AWSCredentialIdentityResolvers/StaticAWSCredentialIdentityResolver.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(ClientConfigDefaultIdentityResolver) import protocol SmithyIdentityAPI.ClientConfigDefaultIdentityResolver import struct Smithy.Attributes +@_spi(ClientConfigDefaultIdentityResolver) import protocol SmithyIdentityAPI.ClientConfigDefaultIdentityResolver /// A credential identity resolver that provides a fixed set of credentials public struct StaticAWSCredentialIdentityResolver: AWSCredentialIdentityResolver { diff --git a/Sources/SmithyIdentity/BearerTokenIdentity.swift b/Sources/SmithyIdentity/BearerTokenIdentity.swift index f7cf2ec81..c248a0cda 100644 --- a/Sources/SmithyIdentity/BearerTokenIdentity.swift +++ b/Sources/SmithyIdentity/BearerTokenIdentity.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // -import protocol SmithyIdentityAPI.Identity import struct Foundation.Date import struct Smithy.Attributes +import protocol SmithyIdentityAPI.Identity /// The type representing bearer token identity, used in HTTP bearer auth. public struct BearerTokenIdentity: Identity { diff --git a/Sources/SmithyIdentity/BearerTokenIdentityResolvers/StaticBearerTokenIdentityResolver.swift b/Sources/SmithyIdentity/BearerTokenIdentityResolvers/StaticBearerTokenIdentityResolver.swift index 792752515..cdd558456 100644 --- a/Sources/SmithyIdentity/BearerTokenIdentityResolvers/StaticBearerTokenIdentityResolver.swift +++ b/Sources/SmithyIdentity/BearerTokenIdentityResolvers/StaticBearerTokenIdentityResolver.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(ClientConfigDefaultIdentityResolver) import protocol SmithyIdentityAPI.ClientConfigDefaultIdentityResolver import struct Smithy.Attributes +@_spi(ClientConfigDefaultIdentityResolver) import protocol SmithyIdentityAPI.ClientConfigDefaultIdentityResolver /// The token identity resolver that returns a static token identity given to it at initialization. public struct StaticBearerTokenIdentityResolver: BearerTokenIdentityResolver { diff --git a/Sources/SmithyIdentityAPI/Context/Context+AuthSchemePreference.swift b/Sources/SmithyIdentityAPI/Context/Context+AuthSchemePreference.swift index 6df1e36a2..723a89af8 100644 --- a/Sources/SmithyIdentityAPI/Context/Context+AuthSchemePreference.swift +++ b/Sources/SmithyIdentityAPI/Context/Context+AuthSchemePreference.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Smithy.Attributes import struct Smithy.AttributeKey +import struct Smithy.Attributes import class Smithy.Context import class Smithy.ContextBuilder diff --git a/Sources/SmithyIdentityAPI/Context/Context+FlowType.swift b/Sources/SmithyIdentityAPI/Context/Context+FlowType.swift index 3e5aa221a..74c1390e7 100644 --- a/Sources/SmithyIdentityAPI/Context/Context+FlowType.swift +++ b/Sources/SmithyIdentityAPI/Context/Context+FlowType.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Smithy.AttributeKey import class Smithy.Context import class Smithy.ContextBuilder -import struct Smithy.AttributeKey public let flowTypeKey = AttributeKey(name: "FlowType") diff --git a/Sources/SmithyIdentityAPI/Context/Context+IdentityResolver.swift b/Sources/SmithyIdentityAPI/Context/Context+IdentityResolver.swift index 73617f193..c9861b2bc 100644 --- a/Sources/SmithyIdentityAPI/Context/Context+IdentityResolver.swift +++ b/Sources/SmithyIdentityAPI/Context/Context+IdentityResolver.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Smithy.Attributes import struct Smithy.AttributeKey +import struct Smithy.Attributes import class Smithy.Context import class Smithy.ContextBuilder diff --git a/Sources/SmithyJSON/Document+JSONUtils.swift b/Sources/SmithyJSON/Document+JSONUtils.swift index dd0386229..a7dcc4d86 100644 --- a/Sources/SmithyJSON/Document+JSONUtils.swift +++ b/Sources/SmithyJSON/Document+JSONUtils.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import func CoreFoundation.CFGetTypeID import func CoreFoundation.CFBooleanGetTypeID +import func CoreFoundation.CFGetTypeID import struct Foundation.Data import struct Foundation.Date import class Foundation.DateFormatter diff --git a/Sources/SmithyJSON/Reader/Reader+JSONDeserialization.swift b/Sources/SmithyJSON/Reader/Reader+JSONDeserialization.swift index 42c660101..8f44ce0be 100644 --- a/Sources/SmithyJSON/Reader/Reader+JSONDeserialization.swift +++ b/Sources/SmithyJSON/Reader/Reader+JSONDeserialization.swift @@ -6,8 +6,8 @@ // import struct Foundation.Data -import class Foundation.NSError import class Foundation.JSONSerialization +import class Foundation.NSError import class Foundation.NSNull extension Reader { diff --git a/Sources/SmithyJSON/Reader/Reader.swift b/Sources/SmithyJSON/Reader/Reader.swift index 9836bd14b..9dc375cb2 100644 --- a/Sources/SmithyJSON/Reader/Reader.swift +++ b/Sources/SmithyJSON/Reader/Reader.swift @@ -5,20 +5,20 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyReader -import protocol Smithy.SmithyDocument -import struct Smithy.Document -import typealias SmithyReadWrite.ReadingClosure -import enum SmithyReadWrite.ReaderError -@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat -@_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter +import func CoreFoundation.CFBooleanGetTypeID +import func CoreFoundation.CFGetTypeID import struct Foundation.Data import struct Foundation.Date +import class Foundation.NSDecimalNumber import class Foundation.NSNull import class Foundation.NSNumber -import class Foundation.NSDecimalNumber -import func CoreFoundation.CFGetTypeID -import func CoreFoundation.CFBooleanGetTypeID +import struct Smithy.Document +import protocol Smithy.SmithyDocument +import enum SmithyReadWrite.ReaderError +import typealias SmithyReadWrite.ReadingClosure +@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyReader +@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat +@_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter @_spi(SmithyReadWrite) public final class Reader: SmithyReader { diff --git a/Sources/SmithyJSON/Writer/Writer.swift b/Sources/SmithyJSON/Writer/Writer.swift index b76f7c4f4..10b0c13dd 100644 --- a/Sources/SmithyJSON/Writer/Writer.swift +++ b/Sources/SmithyJSON/Writer/Writer.swift @@ -5,14 +5,14 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter -@_spi(SmithyDocumentImpl) import protocol Smithy.SmithyDocument -import enum Smithy.DocumentError -@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat -@_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter import struct Foundation.Data import struct Foundation.Date import class Foundation.NSNumber +import enum Smithy.DocumentError +@_spi(SmithyDocumentImpl) import protocol Smithy.SmithyDocument +@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter +@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat +@_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter @_spi(SmithyReadWrite) public final class Writer: SmithyWriter { diff --git a/Sources/SmithyReadWrite/SmithyReader.swift b/Sources/SmithyReadWrite/SmithyReader.swift index 7fc95afe1..47819f431 100644 --- a/Sources/SmithyReadWrite/SmithyReader.swift +++ b/Sources/SmithyReadWrite/SmithyReader.swift @@ -7,8 +7,8 @@ import struct Foundation.Data import struct Foundation.Date -@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat import struct Smithy.Document +@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyReadWrite) public protocol SmithyReader: AnyObject { diff --git a/Sources/SmithyReadWrite/SmithyWriter.swift b/Sources/SmithyReadWrite/SmithyWriter.swift index e27d4132f..b6cbf71c7 100644 --- a/Sources/SmithyReadWrite/SmithyWriter.swift +++ b/Sources/SmithyReadWrite/SmithyWriter.swift @@ -7,9 +7,9 @@ import struct Foundation.Data import struct Foundation.Date -@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat import enum Smithy.ByteStream import protocol Smithy.SmithyDocument +@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyReadWrite) public protocol SmithyWriter: AnyObject { diff --git a/Sources/SmithyReadWrite/WritingClosure.swift b/Sources/SmithyReadWrite/WritingClosure.swift index fcc3fe20a..98187785a 100644 --- a/Sources/SmithyReadWrite/WritingClosure.swift +++ b/Sources/SmithyReadWrite/WritingClosure.swift @@ -7,8 +7,8 @@ import struct Foundation.Data import struct Foundation.Date -@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat import protocol Smithy.SmithyDocument +@_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyReadWrite) public typealias WritingClosure = (T, Writer) throws -> Void diff --git a/Sources/SmithyRetries/DefaultRetryStrategy/ClientSideRateLimiter.swift b/Sources/SmithyRetries/DefaultRetryStrategy/ClientSideRateLimiter.swift index e742e181a..237a88aec 100644 --- a/Sources/SmithyRetries/DefaultRetryStrategy/ClientSideRateLimiter.swift +++ b/Sources/SmithyRetries/DefaultRetryStrategy/ClientSideRateLimiter.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Foundation.TimeInterval import struct Foundation.Date import func Foundation.pow +import struct Foundation.TimeInterval actor ClientSideRateLimiter { diff --git a/Sources/SmithyRetries/DefaultRetryStrategy/DefaultRetryStrategy.swift b/Sources/SmithyRetries/DefaultRetryStrategy/DefaultRetryStrategy.swift index fea3e08bc..09107cc5b 100644 --- a/Sources/SmithyRetries/DefaultRetryStrategy/DefaultRetryStrategy.swift +++ b/Sources/SmithyRetries/DefaultRetryStrategy/DefaultRetryStrategy.swift @@ -6,10 +6,10 @@ // import struct Foundation.TimeInterval +import enum SmithyRetriesAPI.RetryError +import struct SmithyRetriesAPI.RetryErrorInfo import protocol SmithyRetriesAPI.RetryStrategy import struct SmithyRetriesAPI.RetryStrategyOptions -import struct SmithyRetriesAPI.RetryErrorInfo -import enum SmithyRetriesAPI.RetryError public struct DefaultRetryStrategy: RetryStrategy { public typealias Token = DefaultRetryToken diff --git a/Sources/SmithyStreams/FileStream.swift b/Sources/SmithyStreams/FileStream.swift index c9431fadf..a5646ac7c 100644 --- a/Sources/SmithyStreams/FileStream.swift +++ b/Sources/SmithyStreams/FileStream.swift @@ -5,9 +5,9 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct Foundation.Data import class Foundation.FileHandle import class Foundation.NSRecursiveLock -import struct Foundation.Data import protocol Smithy.Stream /// A `Stream` that wraps a `FileHandle` for reading the file. diff --git a/Sources/SmithyStreams/StreamableHttpBody.swift b/Sources/SmithyStreams/StreamableHttpBody.swift index 434312903..e6f80bbed 100644 --- a/Sources/SmithyStreams/StreamableHttpBody.swift +++ b/Sources/SmithyStreams/StreamableHttpBody.swift @@ -5,12 +5,12 @@ // SPDX-License-Identifier: Apache-2.0 // -import struct Foundation.Data import AwsCommonRuntimeKit -import struct Smithy.SwiftLogger -import protocol Smithy.Stream +import struct Foundation.Data import enum Smithy.ByteStream +import protocol Smithy.Stream import enum Smithy.StreamError +import struct Smithy.SwiftLogger /// A class that implements the `IStreamable` protocol for `ByteStream`. /// It acts as a bridge between AWS SDK and CRT. diff --git a/Sources/SmithyTimestamps/DateFormatters.swift b/Sources/SmithyTimestamps/DateFormatters.swift index e31f666f8..e422f8b0b 100644 --- a/Sources/SmithyTimestamps/DateFormatters.swift +++ b/Sources/SmithyTimestamps/DateFormatters.swift @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0. */ +import struct Foundation.Date import class Foundation.DateFormatter -import struct Foundation.TimeZone import struct Foundation.Locale -import struct Foundation.Date +import struct Foundation.TimeZone public typealias DateFormatter = Foundation.DateFormatter diff --git a/Sources/SmithyTimestamps/TimestampSerdeUtils.swift b/Sources/SmithyTimestamps/TimestampSerdeUtils.swift index 26310cae2..2d5a249f6 100644 --- a/Sources/SmithyTimestamps/TimestampSerdeUtils.swift +++ b/Sources/SmithyTimestamps/TimestampSerdeUtils.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -import func Foundation.floor import struct Foundation.Date +import func Foundation.floor /// Custom timestamp serialization formats /// https://smithy.io/2.0/spec/protocol-traits.html#smithy-api-timestampformat-trait diff --git a/Sources/SmithyXML/Reader/Reader+libxml2.swift b/Sources/SmithyXML/Reader/Reader+libxml2.swift index f8c8f110d..3ae5c35f2 100644 --- a/Sources/SmithyXML/Reader/Reader+libxml2.swift +++ b/Sources/SmithyXML/Reader/Reader+libxml2.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -@preconcurrency import libxml2 import struct Foundation.Data +@preconcurrency import libxml2 extension Reader { diff --git a/Sources/SmithyXML/Reader/Reader.swift b/Sources/SmithyXML/Reader/Reader.swift index 85d3f3f73..88189cf8a 100644 --- a/Sources/SmithyXML/Reader/Reader.swift +++ b/Sources/SmithyXML/Reader/Reader.swift @@ -5,11 +5,11 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyReader +import struct Foundation.Data +import struct Foundation.Date import struct Smithy.Document @_spi(SmithyReadWrite) import typealias SmithyReadWrite.ReadingClosure -import struct Foundation.Date -import struct Foundation.Data +@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyReader @_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter diff --git a/Sources/SmithyXML/Writer/Writer+libxml2.swift b/Sources/SmithyXML/Writer/Writer+libxml2.swift index 65b6530c4..c9fc8e100 100644 --- a/Sources/SmithyXML/Writer/Writer+libxml2.swift +++ b/Sources/SmithyXML/Writer/Writer+libxml2.swift @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 // -@preconcurrency import libxml2 import struct Foundation.Data +@preconcurrency import libxml2 /// Extends Writer to copy its tree into libxml2, then write the tree to XML data. extension Writer { diff --git a/Sources/SmithyXML/Writer/Writer.swift b/Sources/SmithyXML/Writer/Writer.swift index 867cfb538..ee58bb391 100644 --- a/Sources/SmithyXML/Writer/Writer.swift +++ b/Sources/SmithyXML/Writer/Writer.swift @@ -5,10 +5,10 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter -import protocol Smithy.SmithyDocument -import struct Foundation.Date import struct Foundation.Data +import struct Foundation.Date +import protocol Smithy.SmithyDocument +@_spi(SmithyReadWrite) import protocol SmithyReadWrite.SmithyWriter @_spi(SmithyReadWrite) import typealias SmithyReadWrite.WritingClosure @_spi(SmithyTimestamps) import enum SmithyTimestamps.TimestampFormat @_spi(SmithyTimestamps) import struct SmithyTimestamps.TimestampFormatter diff --git a/gradle.properties b/gradle.properties index 13e0cdb01..0bbd4b39b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ kotlin.code.style=official # config # codegen -smithyVersion=1.62.0 +smithyVersion=1.63.0 smithyGradleVersion=0.6.0 # kotlin diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/Utils.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/Utils.kt index 440914a17..30d7190b6 100644 --- a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/Utils.kt +++ b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/Utils.kt @@ -7,6 +7,7 @@ package software.amazon.smithy.swift.codegen import software.amazon.smithy.aws.traits.protocols.AwsJson1_0Trait import software.amazon.smithy.aws.traits.protocols.AwsJson1_1Trait import software.amazon.smithy.model.shapes.ShapeId +import software.amazon.smithy.protocol.traits.Rpcv2CborTrait import software.amazon.smithy.swift.codegen.lang.reservedWords import software.amazon.smithy.utils.CaseUtils @@ -35,4 +36,9 @@ fun swiftEnumCaseName( return enumCaseName } -fun supportsStreamingAndIsRPC(protocolID: ShapeId): Boolean = arrayOf(AwsJson1_0Trait.ID, AwsJson1_1Trait.ID).contains(protocolID) +fun supportsStreamingAndIsRPC(protocolID: ShapeId): Boolean = + arrayOf( + AwsJson1_0Trait.ID, + AwsJson1_1Trait.ID, + Rpcv2CborTrait.ID, + ).contains(protocolID) diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolServiceClient.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolServiceClient.kt index 1c54c21c9..99ba1847e 100644 --- a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolServiceClient.kt +++ b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolServiceClient.kt @@ -22,15 +22,17 @@ open class HttpProtocolServiceClient( ) { private val serviceName: String = ctx.settings.sdkId + open val clientProtocolSymbol: Symbol = ClientRuntimeTypes.Core.Client + fun render(serviceSymbol: Symbol) { writer.openBlock( "${ctx.settings.visibility} class \$L: \$N {", "}", serviceSymbol.name, - ClientRuntimeTypes.Core.Client, + clientProtocolSymbol, ) { writer.write("public static let clientName = \$S", serviceSymbol.name) - writer.write("public static let version = \$S", ctx.settings.moduleVersion) + renderVersionProperty() writer.write("let client: \$N", ClientRuntimeTypes.Http.SdkHttpClient) writer.write("let config: \$L", serviceConfig.typeName) writer.write("let serviceName = \$S", serviceName) @@ -44,6 +46,10 @@ open class HttpProtocolServiceClient( renderServiceSpecificPlugins() } + open fun renderVersionProperty() { + writer.write("public static let version = \$S", ctx.settings.moduleVersion) + } + open fun renderInitFunction() { writer.openBlock("public required init(config: \$L) {", "}", serviceConfig.typeName) { writer.write( diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/serde/member/MemberShapeEncodeGenerator.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/serde/member/MemberShapeEncodeGenerator.kt index 8d21473ce..592fce731 100644 --- a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/serde/member/MemberShapeEncodeGenerator.kt +++ b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/serde/member/MemberShapeEncodeGenerator.kt @@ -11,6 +11,7 @@ import software.amazon.smithy.model.shapes.StructureShape import software.amazon.smithy.model.shapes.TimestampShape import software.amazon.smithy.model.shapes.UnionShape import software.amazon.smithy.model.traits.SparseTrait +import software.amazon.smithy.model.traits.StreamingTrait import software.amazon.smithy.model.traits.TimestampFormatTrait import software.amazon.smithy.model.traits.XmlFlattenedTrait import software.amazon.smithy.swift.codegen.SwiftWriter @@ -68,6 +69,14 @@ abstract class MemberShapeEncodeGenerator( memberShape: MemberShape, prefix: String, ) { + // If member shape is a event streaming member (union with streaming trait), + // we must ignore it when encoding input struct. + // The event streaming member will be set as body via EventStreamBodyMiddleware. + val targetShape = ctx.model.expectShape(memberShape.target) + if (targetShape is UnionShape && targetShape.hasTrait()) { + return + } + val memberName = ctx.symbolProvider.toMemberName(memberShape) val propertyKey = nodeInfoUtils.nodeInfo(memberShape) val writingClosure = writingClosureUtils.writingClosure(memberShape) diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftintegrations/InitialRequestIntegration.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftintegrations/InitialRequestIntegration.kt index 3427bf23d..e9729f0dc 100644 --- a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftintegrations/InitialRequestIntegration.kt +++ b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftintegrations/InitialRequestIntegration.kt @@ -7,6 +7,7 @@ import software.amazon.smithy.model.Model import software.amazon.smithy.model.knowledge.EventStreamIndex import software.amazon.smithy.model.knowledge.TopDownIndex import software.amazon.smithy.model.shapes.StructureShape +import software.amazon.smithy.protocol.traits.Rpcv2CborTrait import software.amazon.smithy.swift.codegen.SwiftDelegator import software.amazon.smithy.swift.codegen.SwiftSettings import software.amazon.smithy.swift.codegen.core.SwiftCodegenContext @@ -26,7 +27,7 @@ class InitialRequestIntegration : SwiftIntegration { settings: SwiftSettings, ): Boolean { val service = settings.getService(model) - return service.hasTrait() || service.hasTrait() + return service.hasTrait() || service.hasTrait() || service.hasTrait() } override fun writeAdditionalFiles(