diff --git a/.github/workflows/nightly_repeated_unittest.yml b/.github/workflows/nightly_repeated_unittest.yml index 980962bbf1..3b663e1c0a 100644 --- a/.github/workflows/nightly_repeated_unittest.yml +++ b/.github/workflows/nightly_repeated_unittest.yml @@ -37,4 +37,4 @@ jobs: scheme: ${{ matrix.scheme }} timeout-minutes: 50 generate_coverage_report: false - test_iterations_flags: -test-iterations 100 -run-tests-until-failure + test_iterations_flags: -test-iterations 25 -run-tests-until-failure diff --git a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift index c151f9c50c..11d5296d87 100644 --- a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift +++ b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift @@ -125,7 +125,7 @@ class AppSyncRealTimeClientTests: XCTestCase { } func testMaxSubscriptionReached_throwMaxSubscriptionsReachedError() async throws { - let numOfMaxSubscriptionCount = 100 + let numOfMaxSubscriptionCount = 200 let maxSubsctiptionsSuccess = expectation(description: "Client can subscribe to max subscription count") maxSubsctiptionsSuccess.expectedFulfillmentCount = numOfMaxSubscriptionCount diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/UploadPartInput+presignURL.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/UploadPartInput+presignURL.swift index 32c08b3af5..7b702f2300 100644 --- a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/UploadPartInput+presignURL.swift +++ b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/UploadPartInput+presignURL.swift @@ -7,7 +7,7 @@ import Foundation import AWSS3 @_spi(SmithyReadWrite) import ClientRuntime -@_spi(UnknownAWSHTTPServiceError) @_spi(SmithyReadWrite) import AWSClientRuntime +@_spi(UnknownAWSHTTPServiceError) @_spi(SmithyReadWrite) @_spi(AWSEndpointResolverMiddleware) import AWSClientRuntime import Smithy import SmithyHTTPAPI import SmithyRetries @@ -60,12 +60,14 @@ extension UploadPartInput { builder.retryStrategy(SmithyRetries.DefaultRetryStrategy(options: config.retryStrategyOptions)) builder.retryErrorInfoProvider(AWSClientRuntime.AWSRetryErrorInfoProvider.errorInfo(for:)) builder.applySigner(ClientRuntime.SignerMiddleware()) - let endpointParams = EndpointParams(accelerate: config.accelerate ?? false, bucket: input.bucket, disableMultiRegionAccessPoints: config.disableMultiRegionAccessPoints ?? false, disableS3ExpressSessionAuth: config.disableS3ExpressSessionAuth, endpoint: config.endpoint, forcePathStyle: config.forcePathStyle ?? false, key: input.key, region: config.region, useArnRegion: config.useArnRegion, useDualStack: config.useDualStack ?? false, useFIPS: config.useFIPS ?? false, useGlobalEndpoint: config.useGlobalEndpoint ?? false) - context.set(key: Smithy.AttributeKey(name: "EndpointParams"), value: endpointParams) - builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware(endpointResolverBlock: { [config] in try config.endpointResolver.resolve(params: $0) }, endpointParams: endpointParams)) + let endpointParamsBlock = { [config] (context: Smithy.Context) in + EndpointParams(accelerate: config.accelerate ?? false, bucket: input.bucket, disableMultiRegionAccessPoints: config.disableMultiRegionAccessPoints ?? false, disableS3ExpressSessionAuth: config.disableS3ExpressSessionAuth, endpoint: config.endpoint, forcePathStyle: config.forcePathStyle ?? false, key: input.key, region: config.region, useArnRegion: config.useArnRegion, useDualStack: config.useDualStack ?? false, useFIPS: config.useFIPS ?? false, useGlobalEndpoint: config.useGlobalEndpoint ?? false) + } + context.set(key: Smithy.AttributeKey(name: "EndpointParams"), value: endpointParamsBlock(context)) + builder.applyEndpoint(AWSClientRuntime.AWSEndpointResolverMiddleware(paramsBlock: endpointParamsBlock, resolverBlock: { [config] in try config.endpointResolver.resolve(params: $0) })) builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware()) builder.interceptors.add(AWSClientRuntime.AWSS3ErrorWith200StatusXMLMiddleware()) - builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsRequestMiddleware(checksumAlgorithm: input.checksumAlgorithm?.rawValue)) + builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsRequestMiddleware(requestChecksumRequired: false, checksumAlgorithm: input.checksumAlgorithm?.rawValue, checksumAlgoHeaderName: "x-amz-sdk-checksum-algorithm")) builder.serialize(UploadPartPresignedMiddleware()) var metricsAttributes = Smithy.Attributes() metricsAttributes.set(key: ClientRuntime.OrchestratorMetricsAttributesKeys.service, value: "S3") diff --git a/Package.resolved b/Package.resolved index 7f3cbd6073..b4fa872d2d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-crt-swift", "state" : { - "revision" : "dd17a98750b6182edacd6e8f0c30aa289c472b22", - "version" : "0.40.0" + "revision" : "74d970dde8a0d6b2fe1d8374767ca9793088ce2c", + "version" : "0.48.0" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/awslabs/aws-sdk-swift", "state" : { - "revision" : "9ad12684f6cb9c9b60e840c051a2bba604024650", - "version" : "1.0.69" + "revision" : "104958a898543582bb01102616bf5d61ed237352", + "version" : "1.2.59" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/smithy-lang/smithy-swift", "state" : { - "revision" : "402f091374dcf72c1e7ed43af10e3ee7e634fad8", - "version" : "0.106.0" + "revision" : "755367ae4e10004f8b5a94fbfdf3f638a1f225bc", + "version" : "0.125.0" } }, { diff --git a/Package.swift b/Package.swift index bd9de4878b..39a926ec74 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let platforms: [SupportedPlatform] = [ .watchOS(.v9) ] let dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/awslabs/aws-sdk-swift", exact: "1.0.69"), + .package(url: "https://github.com/awslabs/aws-sdk-swift", exact: "1.2.59"), .package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.3"), .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"), .package(url: "https://github.com/aws-amplify/amplify-swift-utils-notifications.git", from: "1.1.0")