Merge branch 'main' into jbe/sbs

Author: jbelkins

Package.swift

@@ -15,7 +15,7 @@ import PackageDescription
 
 // MARK: - Dynamic Content
 
-let clientRuntimeVersion: Version = "0.111.0"
+let clientRuntimeVersion: Version = "0.112.0"
 let crtVersion: Version = "0.43.0"
 
 let excludeRuntimeUnitTests = false

Package.version

@@ -1 +1 @@
-1.2.6
+1.2.11

Package.version.next

@@ -1 +1 @@
-1.2.7
+1.2.12

Sources/Core/AWSSDKForSwift/Documentation.docc/s3compatible.md

@@ -0,0 +1,95 @@
+# Compatibility with "S3-like" third-party storage services
+
+## Background
+
+Recently, AWS SDK for Swift dropped MD5 for payload checksums, in favor of more
+modern and secure algorithms.  This has caused problems when accessing certain
+operations on "S3-like" third-party cloud storage services that claim to be
+API-compatible with AWS S3. To our knowledge, this affects only the S3
+`DeleteObjects` operation.
+
+## Example Code
+
+If you are having issues with accessing such third-party services, the following interceptor
+code can be used to force the SDK to hash `DeleteObjects` request bodies with MD5:
+
+```swift
+class DeleteObjectsMD5InterceptorProvider: HttpInterceptorProvider {
+
+    class DeleteObjectsMD5Interceptor<InputType, OutputType>: Interceptor {
+        typealias RequestType = HTTPRequest
+        typealias ResponseType = HTTPResponse
+
+        let MD5_HEADER = "Content-MD5"
+        let OTHER_CHECKSUMS_PREFIX = "x-amz-checksum-"
+        let OTHER_CHECKSUMS_SDK_PREFIX = "x-amz-sdk-checksum-"
+
+        func readAfterSerialization(context: some AfterSerialization<InputType, HTTPRequest>) async throws {
+            let request = context.getRequest()
+
+            // Read the request body into memory.  Note that this may cause excess memory usage
+            // when used with large request bodies.
+            let bodyData: Data?
+            switch request.body {
+            case .stream(let stream):
+                bodyData = try await stream.readToEndAsync()
+            case .data:
+                return  // body is already in-memory data, no change needed
+            case .noStream:
+                bodyData = nil
+            }
+
+            // Re-assign the request body using in-memory data instead of a stream.
+            request.body = .data(bodyData)
+        }
+
+        func modifyBeforeSigning(context: some MutableRequest<InputType, HTTPRequest>) async throws {
+            let attributes = context.getAttributes()
+            let request = context.getRequest()
+            let body = request.body
+
+            // Leave request unmodified if not S3 DeleteObjects
+            guard attributes.getServiceName() == "S3", attributes.getOperation() == "deleteObjects" else { return }
+
+            // Remove all checksum-related headers & trailing headers
+            let checksumHeaders = request.headers.headers.map { $0.name }.filter { $0.hasPrefix(OTHER_CHECKSUMS_PREFIX) }
+            checksumHeaders.forEach { request.headers.remove(name: $0) }
+            let checksumSDKHeaders = request.headers.headers.map { $0.name }.filter { $0.hasPrefix(OTHER_CHECKSUMS_SDK_PREFIX) }
+            checksumSDKHeaders.forEach { request.headers.remove(name: $0) }
+            let checksumTrailingHeaders = request.trailingHeaders.headers.map { $0.name }.filter { $0.hasPrefix(OTHER_CHECKSUMS_PREFIX) }
+            checksumTrailingHeaders.forEach { request.headers.remove(name: $0) }
+
+            // If the body is in-memory data, set a MD5 header for the data.
+            if case .data(let data) = body, let data {
+                let md5data = try data.computeMD5()
+                request.headers.add(name: MD5_HEADER, value: md5data.base64EncodedString())
+            }
+        }
+    }
+
+    func create<InputType, OutputType>() -> any Interceptor<InputType, OutputType, HTTPRequest, HTTPResponse> {
+        return DeleteObjectsMD5Interceptor()
+    }
+}
+```
+
+Configure your S3 client with the interceptor as follows.  Feel free to add any other
+needed configuration:
+```swift
+let config = try await S3Client.Config(
+    region: "us-east-1",  // substitute your region here
+    httpInterceptorProviders: [DeleteObjectsMD5InterceptorProvider()]
+)
+let client = S3Client(config: config)
+```
+
+## Usage Notes
+
+- This code reads the entire request body into memory to perform the MD5 hashing.
+  This may cause performance issues when the request is extremely large.
+- The interceptor only modifies requests to S3 `DeleteObjects`.  All other requests
+  are sent without modification.
+- If your "S3-like" storage service supports the SDK's new checksum options, or adds
+  support in the future, we recommend not using the interceptor.
+- Do not use this interceptor with any AWS service, including AWS S3, or with any
+  third-party service other than a "S3-like" storage service.

Sources/Services/AWSACM/Sources/AWSACM/ACMClient.swift

@@ -66,7 +66,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class ACMClient: ClientRuntime.Client {
     public static let clientName = "ACMClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: ACMClient.ACMClientConfiguration
     let serviceName = "ACM"

Sources/Services/AWSACMPCA/Sources/AWSACMPCA/ACMPCAClient.swift

@@ -66,7 +66,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class ACMPCAClient: ClientRuntime.Client {
     public static let clientName = "ACMPCAClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: ACMPCAClient.ACMPCAClientConfiguration
     let serviceName = "ACM PCA"

Sources/Services/AWSAPIGateway/Sources/AWSAPIGateway/APIGatewayClient.swift

@@ -70,7 +70,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class APIGatewayClient: ClientRuntime.Client {
     public static let clientName = "APIGatewayClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: APIGatewayClient.APIGatewayClientConfiguration
     let serviceName = "API Gateway"

Sources/Services/AWSARCZonalShift/Sources/AWSARCZonalShift/ARCZonalShiftClient.swift

@@ -66,7 +66,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class ARCZonalShiftClient: ClientRuntime.Client {
     public static let clientName = "ARCZonalShiftClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: ARCZonalShiftClient.ARCZonalShiftClientConfiguration
     let serviceName = "ARC Zonal Shift"

Sources/Services/AWSAccessAnalyzer/Sources/AWSAccessAnalyzer/AccessAnalyzerClient.swift

@@ -67,7 +67,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class AccessAnalyzerClient: ClientRuntime.Client {
     public static let clientName = "AccessAnalyzerClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: AccessAnalyzerClient.AccessAnalyzerClientConfiguration
     let serviceName = "AccessAnalyzer"

Sources/Services/AWSAccount/Sources/AWSAccount/AccountClient.swift

@@ -64,7 +64,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class AccountClient: ClientRuntime.Client {
     public static let clientName = "AccountClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: AccountClient.AccountClientConfiguration
     let serviceName = "Account"

Sources/Services/AWSAmp/Sources/AWSAmp/AmpClient.swift

@@ -67,7 +67,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class AmpClient: ClientRuntime.Client {
     public static let clientName = "AmpClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: AmpClient.AmpClientConfiguration
     let serviceName = "amp"

Sources/Services/AWSAmp/Sources/AWSAmp/Models.swift

@@ -631,6 +631,25 @@ extension AmpClientTypes {
     }
 }
 
+extension AmpClientTypes {
+
+    /// To configure roles that allows users to write to an Amazon Managed Service for Prometheus workspace in a different account.
+    public struct RoleConfiguration: Swift.Sendable {
+        /// A ARN identifying the source role configuration.
+        public var sourceRoleArn: Swift.String?
+        /// A ARN identifying the target role configuration.
+        public var targetRoleArn: Swift.String?
+
+        public init(
+            sourceRoleArn: Swift.String? = nil,
+            targetRoleArn: Swift.String? = nil
+        ) {
+            self.sourceRoleArn = sourceRoleArn
+            self.targetRoleArn = targetRoleArn
+        }
+    }
+}
+
 extension AmpClientTypes {
 
     /// A scrape configuration for a scraper, base 64 encoded. For more information, see [Scraper configuration](https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-collector-how-to.html#AMP-collector-configuration) in the Amazon Managed Service for Prometheus User Guide.
@@ -685,6 +704,8 @@ public struct CreateScraperInput: Swift.Sendable {
     /// The Amazon Managed Service for Prometheus workspace to send metrics to.
     /// This member is required.
     public var destination: AmpClientTypes.Destination?
+    /// The scraper role configuration for the workspace.
+    public var roleConfiguration: AmpClientTypes.RoleConfiguration?
     /// The configuration file to use in the new scraper. For more information, see [Scraper configuration](https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-collector-how-to.html#AMP-collector-configuration) in the Amazon Managed Service for Prometheus User Guide.
     /// This member is required.
     public var scrapeConfiguration: AmpClientTypes.ScrapeConfiguration?
@@ -698,13 +719,15 @@ public struct CreateScraperInput: Swift.Sendable {
         alias: Swift.String? = nil,
         clientToken: Swift.String? = nil,
         destination: AmpClientTypes.Destination? = nil,
+        roleConfiguration: AmpClientTypes.RoleConfiguration? = nil,
         scrapeConfiguration: AmpClientTypes.ScrapeConfiguration? = nil,
         source: AmpClientTypes.Source? = nil,
         tags: [Swift.String: Swift.String]? = nil
     ) {
         self.alias = alias
         self.clientToken = clientToken
         self.destination = destination
+        self.roleConfiguration = roleConfiguration
         self.scrapeConfiguration = scrapeConfiguration
         self.source = source
         self.tags = tags
@@ -875,6 +898,8 @@ extension AmpClientTypes {
         /// The Amazon Resource Name (ARN) of the IAM role that provides permissions for the scraper to discover and collect metrics on your behalf. For example, arn:aws:iam::123456789012:role/service-role/AmazonGrafanaServiceRole-12example.
         /// This member is required.
         public var roleArn: Swift.String?
+        /// To configure roles that allows users to write to an Amazon Managed Service for Prometheus workspace in a different account.
+        public var roleConfiguration: AmpClientTypes.RoleConfiguration?
         /// The configuration in use by the scraper.
         /// This member is required.
         public var scrapeConfiguration: AmpClientTypes.ScrapeConfiguration?
@@ -899,6 +924,7 @@ extension AmpClientTypes {
             destination: AmpClientTypes.Destination? = nil,
             lastModifiedAt: Foundation.Date? = nil,
             roleArn: Swift.String? = nil,
+            roleConfiguration: AmpClientTypes.RoleConfiguration? = nil,
             scrapeConfiguration: AmpClientTypes.ScrapeConfiguration? = nil,
             scraperId: Swift.String? = nil,
             source: AmpClientTypes.Source? = nil,
@@ -912,6 +938,7 @@ extension AmpClientTypes {
             self.destination = destination
             self.lastModifiedAt = lastModifiedAt
             self.roleArn = roleArn
+            self.roleConfiguration = roleConfiguration
             self.scrapeConfiguration = scrapeConfiguration
             self.scraperId = scraperId
             self.source = source
@@ -976,6 +1003,8 @@ extension AmpClientTypes {
         /// The Amazon Resource Name (ARN) of the IAM role that provides permissions for the scraper to discover and collect metrics on your behalf.
         /// This member is required.
         public var roleArn: Swift.String?
+        /// To configure roles that allows users to write to an Amazon Managed Service for Prometheus workspace in a different account.
+        public var roleConfiguration: AmpClientTypes.RoleConfiguration?
         /// The ID of the scraper.
         /// This member is required.
         public var scraperId: Swift.String?
@@ -997,6 +1026,7 @@ extension AmpClientTypes {
             destination: AmpClientTypes.Destination? = nil,
             lastModifiedAt: Foundation.Date? = nil,
             roleArn: Swift.String? = nil,
+            roleConfiguration: AmpClientTypes.RoleConfiguration? = nil,
             scraperId: Swift.String? = nil,
             source: AmpClientTypes.Source? = nil,
             status: AmpClientTypes.ScraperStatus? = nil,
@@ -1009,6 +1039,7 @@ extension AmpClientTypes {
             self.destination = destination
             self.lastModifiedAt = lastModifiedAt
             self.roleArn = roleArn
+            self.roleConfiguration = roleConfiguration
             self.scraperId = scraperId
             self.source = source
             self.status = status
@@ -1042,6 +1073,8 @@ public struct UpdateScraperInput: Swift.Sendable {
     public var clientToken: Swift.String?
     /// The new Amazon Managed Service for Prometheus workspace to send metrics to.
     public var destination: AmpClientTypes.Destination?
+    /// The scraper role configuration for the workspace.
+    public var roleConfiguration: AmpClientTypes.RoleConfiguration?
     /// Contains the base-64 encoded YAML configuration for the scraper. For more information about configuring a scraper, see [Using an Amazon Web Services managed collector](https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-collector-how-to.html) in the Amazon Managed Service for Prometheus User Guide.
     public var scrapeConfiguration: AmpClientTypes.ScrapeConfiguration?
     /// The ID of the scraper to update.
@@ -1052,12 +1085,14 @@ public struct UpdateScraperInput: Swift.Sendable {
         alias: Swift.String? = nil,
         clientToken: Swift.String? = nil,
         destination: AmpClientTypes.Destination? = nil,
+        roleConfiguration: AmpClientTypes.RoleConfiguration? = nil,
         scrapeConfiguration: AmpClientTypes.ScrapeConfiguration? = nil,
         scraperId: Swift.String? = nil
     ) {
         self.alias = alias
         self.clientToken = clientToken
         self.destination = destination
+        self.roleConfiguration = roleConfiguration
         self.scrapeConfiguration = scrapeConfiguration
         self.scraperId = scraperId
     }
@@ -2459,6 +2494,7 @@ extension CreateScraperInput {
         try writer["alias"].write(value.alias)
         try writer["clientToken"].write(value.clientToken)
         try writer["destination"].write(value.destination, with: AmpClientTypes.Destination.write(value:to:))
+        try writer["roleConfiguration"].write(value.roleConfiguration, with: AmpClientTypes.RoleConfiguration.write(value:to:))
         try writer["scrapeConfiguration"].write(value.scrapeConfiguration, with: AmpClientTypes.ScrapeConfiguration.write(value:to:))
         try writer["source"].write(value.source, with: AmpClientTypes.Source.write(value:to:))
         try writer["tags"].writeMap(value.tags, valueWritingClosure: SmithyReadWrite.WritingClosures.writeString(value:to:), keyNodeInfo: "key", valueNodeInfo: "value", isFlattened: false)
@@ -2518,6 +2554,7 @@ extension UpdateScraperInput {
         try writer["alias"].write(value.alias)
         try writer["clientToken"].write(value.clientToken)
         try writer["destination"].write(value.destination, with: AmpClientTypes.Destination.write(value:to:))
+        try writer["roleConfiguration"].write(value.roleConfiguration, with: AmpClientTypes.RoleConfiguration.write(value:to:))
         try writer["scrapeConfiguration"].write(value.scrapeConfiguration, with: AmpClientTypes.ScrapeConfiguration.write(value:to:))
     }
 }
@@ -3563,6 +3600,24 @@ extension AmpClientTypes.ScraperDescription {
         value.scrapeConfiguration = try reader["scrapeConfiguration"].readIfPresent(with: AmpClientTypes.ScrapeConfiguration.read(from:))
         value.source = try reader["source"].readIfPresent(with: AmpClientTypes.Source.read(from:))
         value.destination = try reader["destination"].readIfPresent(with: AmpClientTypes.Destination.read(from:))
+        value.roleConfiguration = try reader["roleConfiguration"].readIfPresent(with: AmpClientTypes.RoleConfiguration.read(from:))
+        return value
+    }
+}
+
+extension AmpClientTypes.RoleConfiguration {
+
+    static func write(value: AmpClientTypes.RoleConfiguration?, to writer: SmithyJSON.Writer) throws {
+        guard let value else { return }
+        try writer["sourceRoleArn"].write(value.sourceRoleArn)
+        try writer["targetRoleArn"].write(value.targetRoleArn)
+    }
+
+    static func read(from reader: SmithyJSON.Reader) throws -> AmpClientTypes.RoleConfiguration {
+        guard reader.hasContent else { throw SmithyReadWrite.ReaderError.requiredValueNotPresent }
+        var value = AmpClientTypes.RoleConfiguration()
+        value.sourceRoleArn = try reader["sourceRoleArn"].readIfPresent()
+        value.targetRoleArn = try reader["targetRoleArn"].readIfPresent()
         return value
     }
 }
@@ -3721,6 +3776,7 @@ extension AmpClientTypes.ScraperSummary {
         value.statusReason = try reader["statusReason"].readIfPresent()
         value.source = try reader["source"].readIfPresent(with: AmpClientTypes.Source.read(from:))
         value.destination = try reader["destination"].readIfPresent(with: AmpClientTypes.Destination.read(from:))
+        value.roleConfiguration = try reader["roleConfiguration"].readIfPresent(with: AmpClientTypes.RoleConfiguration.read(from:))
         return value
     }
 }

Sources/Services/AWSAmplify/Sources/AWSAmplify/AmplifyClient.swift

@@ -66,7 +66,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class AmplifyClient: ClientRuntime.Client {
     public static let clientName = "AmplifyClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: AmplifyClient.AmplifyClientConfiguration
     let serviceName = "Amplify"

Sources/Services/AWSAmplifyBackend/Sources/AWSAmplifyBackend/AmplifyBackendClient.swift

@@ -64,7 +64,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class AmplifyBackendClient: ClientRuntime.Client {
     public static let clientName = "AmplifyBackendClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: AmplifyBackendClient.AmplifyBackendClientConfiguration
     let serviceName = "AmplifyBackend"

Sources/Services/AWSAmplifyUIBuilder/Sources/AWSAmplifyUIBuilder/AmplifyUIBuilderClient.swift

@@ -67,7 +67,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class AmplifyUIBuilderClient: ClientRuntime.Client {
     public static let clientName = "AmplifyUIBuilderClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: AmplifyUIBuilderClient.AmplifyUIBuilderClientConfiguration
     let serviceName = "AmplifyUIBuilder"

Sources/Services/AWSApiGatewayManagementApi/Sources/AWSApiGatewayManagementApi/ApiGatewayManagementApiClient.swift

@@ -64,7 +64,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class ApiGatewayManagementApiClient: ClientRuntime.Client {
     public static let clientName = "ApiGatewayManagementApiClient"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: ApiGatewayManagementApiClient.ApiGatewayManagementApiClientConfiguration
     let serviceName = "ApiGatewayManagementApi"

Sources/Services/AWSApiGatewayV2/Sources/AWSApiGatewayV2/ApiGatewayV2Client.swift

@@ -66,7 +66,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
 
 public class ApiGatewayV2Client: ClientRuntime.Client {
     public static let clientName = "ApiGatewayV2Client"
-    public static let version = "1.2.6"
+    public static let version = "1.2.11"
     let client: ClientRuntime.SdkHttpClient
     let config: ApiGatewayV2Client.ApiGatewayV2ClientConfiguration
     let serviceName = "ApiGatewayV2"