diff --git a/IntegrationTests/Services/AWSCognitoIdentityIntegrationTests/UnauthenticatedAPITests.swift b/IntegrationTests/Services/AWSCognitoIdentityIntegrationTests/UnauthenticatedAPITests.swift index 5b08113d537..d694342414b 100644 --- a/IntegrationTests/Services/AWSCognitoIdentityIntegrationTests/UnauthenticatedAPITests.swift +++ b/IntegrationTests/Services/AWSCognitoIdentityIntegrationTests/UnauthenticatedAPITests.swift @@ -32,8 +32,10 @@ class UnauthenticatedAPITests: XCTestCase { cognitoIdentityClient = try CognitoIdentityClient(region: region) // CognitoIdentity client for calling unauthenticated API against an identity pool. - let config = try await CognitoIdentityClient.CognitoIdentityClientConfiguration(region: region) - config.addInterceptorProvider(GetHeadersBeforeTransmitProvider()) + let config = try await CognitoIdentityClient.Config( + region: region, + httpInterceptorProviders: [GetHeadersBeforeTransmitProvider()] + ) cognitoIdentityUnauthenticatedCheckClient = CognitoIdentityClient(config: config) // Create identity pool & save its identity pool ID diff --git a/IntegrationTests/Services/AWSS3IntegrationTests/S3FlexibleChecksumsTests.swift b/IntegrationTests/Services/AWSS3IntegrationTests/S3FlexibleChecksumsTests.swift index aca7dcb6d02..0ba01ae7b7a 100644 --- a/IntegrationTests/Services/AWSS3IntegrationTests/S3FlexibleChecksumsTests.swift +++ b/IntegrationTests/Services/AWSS3IntegrationTests/S3FlexibleChecksumsTests.swift @@ -114,8 +114,10 @@ final class S3FlexibleChecksumsTests: S3XCTestCase { } func test_putGetObject_streamining_unsigned_chunked() async throws { - let config = try await S3Client.S3ClientConfiguration(region: region) - config.addInterceptorProvider(DisablePayloadSigningProvider()) + let config = try await S3Client.S3ClientConfiguration( + region: region, + httpInterceptorProviders: [DisablePayloadSigningProvider()] + ) let customizedClient = S3Client(config: config) let bufferedStream = BufferedStream(data: originalData, isClosed: true) diff --git a/IntegrationTests/Services/AWSS3IntegrationTests/S3ToggleUnsignedPayloadTests.swift b/IntegrationTests/Services/AWSS3IntegrationTests/S3ToggleUnsignedPayloadTests.swift index 5fb4dd680eb..a14b76ecbcb 100644 --- a/IntegrationTests/Services/AWSS3IntegrationTests/S3ToggleUnsignedPayloadTests.swift +++ b/IntegrationTests/Services/AWSS3IntegrationTests/S3ToggleUnsignedPayloadTests.swift @@ -16,13 +16,6 @@ import class SmithyStreams.BufferedStream /// Tests toggle unsigned payload using S3. class S3ToggleUnsignedPayloadTests: S3XCTestCase { - private var s3Config: S3Client.S3ClientConfiguration! - - override func setUp() async throws { - try await super.setUp() - s3Config = try await S3Client.S3ClientConfiguration(region: region) - s3Config.authSchemes = [SigV4AuthScheme(requestUnsignedBody: true)] - } class CheckUnsignedPayloadHeader: Interceptor { typealias RequestType = HTTPRequest @@ -68,7 +61,11 @@ class S3ToggleUnsignedPayloadTests: S3XCTestCase { ) // Upload - s3Config.addInterceptorProvider(CheckUnsignedPayloadHeaderProvider()) + let s3Config = try await S3Client.S3ClientConfiguration( + region: region, + authSchemes: [SigV4AuthScheme(requestUnsignedBody: true)], + httpInterceptorProviders: [CheckUnsignedPayloadHeaderProvider()] + ) let s3Client = S3Client(config: s3Config) _ = try await s3Client.putObject(input: putObjectInput) @@ -93,7 +90,11 @@ class S3ToggleUnsignedPayloadTests: S3XCTestCase { ) // Upload - s3Config.addInterceptorProvider(CheckStreamingUnsignedPayloadHeaderProvider()) + let s3Config = try await S3Client.S3ClientConfiguration( + region: region, + authSchemes: [SigV4AuthScheme(requestUnsignedBody: true)], + httpInterceptorProviders: [CheckStreamingUnsignedPayloadHeaderProvider()] + ) let s3Client = S3Client(config: s3Config) _ = try await s3Client.putObject(input: putObjectInput) diff --git a/IntegrationTests/Services/AWSS3IntegrationTests/SigV4ASigningRegionTest.swift b/IntegrationTests/Services/AWSS3IntegrationTests/SigV4ASigningRegionTest.swift index c3c5b8702ab..11dd921de3b 100644 --- a/IntegrationTests/Services/AWSS3IntegrationTests/SigV4ASigningRegionTest.swift +++ b/IntegrationTests/Services/AWSS3IntegrationTests/SigV4ASigningRegionTest.swift @@ -20,10 +20,12 @@ class SigV4ASigningRegionTest: XCTestCase { private var sigv4aConfig: S3Client.S3ClientConfiguration! override func setUp() async throws { - sigv4aConfig = try await S3Client.S3ClientConfiguration(region: "dummy-region") - sigv4aConfig.authSchemes = [SigV4AAuthScheme()] - sigv4aConfig.httpClientEngine = ProtocolTestClient() // Mock HTTP client that doesn't actually send a request - sigv4aConfig.addInterceptorProvider(SigningRegionAssertInterceptorProvider()) + sigv4aConfig = try await S3Client.Config( + region: "dummy-region", + httpClientEngine: ProtocolTestClient(), + authSchemes: [SigV4AAuthScheme()], + httpInterceptorProviders: [SigningRegionAssertInterceptorProvider()] + ) sigv4aClient = S3Client(config: sigv4aConfig) } diff --git a/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/awsrestjson/AWSRestJson1ProtocolGeneratorTests.kt b/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/awsrestjson/AWSRestJson1ProtocolGeneratorTests.kt index 4448c3c1056..311f1ebad28 100644 --- a/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/awsrestjson/AWSRestJson1ProtocolGeneratorTests.kt +++ b/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/awsrestjson/AWSRestJson1ProtocolGeneratorTests.kt @@ -334,14 +334,6 @@ extension ExampleClient { return "\(ExampleClient.clientName) - \(region ?? "")" } - public func addInterceptorProvider(_ provider: ClientRuntime.InterceptorProvider) { - self.interceptorProviders.append(provider) - } - - public func addInterceptorProvider(_ provider: ClientRuntime.HttpInterceptorProvider) { - self.httpInterceptorProviders.append(provider) - } - } public static func builder() -> ClientRuntime.ClientBuilder {