Merge branch 'main' into hosted-ui-logout-ignore-user-cancel

harsh62 · harsh62 · commit fa08cf45c3b3 · 2025-05-05T14:55:39.000-04:00
diff --git a/.github/workflows/build_scheme.yml b/.github/workflows/build_scheme.yml
@@ -47,7 +47,7 @@ jobs:
         id: dependencies-cache
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/Library/Developer/Xcode/DerivedData/Amplify
           key: amplify-packages-${{ hashFiles('Package.resolved') }}
@@ -59,7 +59,7 @@ jobs:
         if: steps.dependencies-cache.outputs.cache-hit
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ github.workspace }}/Build
           key: Amplify-${{ inputs.platform }}-build-cache
@@ -78,7 +78,7 @@ jobs:
 
       - name: Save the dependencies cache in main
         if: inputs.save_build_cache && steps.dependencies-cache.outputs.cache-hit != 'true' && github.ref_name == 'main'
-        uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/Library/Developer/Xcode/DerivedData/Amplify
           key: ${{ steps.dependencies-cache.outputs.cache-primary-key }}
@@ -93,7 +93,7 @@ jobs:
 
       - name: Save the build cache
         if: inputs.save_build_cache && github.ref_name == 'main'
-        uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ github.workspace }}/Build
           key: ${{ steps.build-cache.outputs.cache-primary-key }}
diff --git a/.github/workflows/integ_test_auth_webauthn.yml b/.github/workflows/integ_test_auth_webauthn.yml
@@ -47,7 +47,7 @@ jobs:
         id: dependencies-cache
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/Library/Developer/Xcode/DerivedData/Amplify
           key: amplify-packages-${{ hashFiles('Package.resolved') }}
@@ -59,7 +59,7 @@ jobs:
         if: steps.dependencies-cache.outputs.cache-hit
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ github.workspace }}/Build
           key: Amplify-iOS-build-cache
diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml
@@ -70,7 +70,7 @@ jobs:
         id: dependencies-cache
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/Library/Developer/Xcode/DerivedData/Amplify
           key: amplify-packages-${{ hashFiles('Package.resolved') }}
@@ -82,7 +82,7 @@ jobs:
         if: steps.dependencies-cache.outputs.cache-hit
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ github.workspace }}/Build
           key: Amplify-${{ matrix.platform }}-build-cache
diff --git 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/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
@@ -73,7 +73,7 @@ jobs:
         id: dependencies-cache
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/Library/Developer/Xcode/DerivedData/Amplify
           key: amplify-packages-${{ hashFiles('Package.resolved') }}
@@ -85,7 +85,7 @@ jobs:
         if: steps.dependencies-cache.outputs.cache-hit
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ github.workspace }}/Build
           key: Amplify-${{ inputs.platform }}-build-cache
diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml
@@ -61,7 +61,7 @@ jobs:
         id: dependencies-cache
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/Library/Developer/Xcode/DerivedData/Amplify
           key: amplify-packages-${{ hashFiles('Package.resolved') }}
@@ -73,7 +73,7 @@ jobs:
         if: steps.dependencies-cache.outputs.cache-hit
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ github.workspace }}/Build
           key: Amplify-${{ inputs.platform }}-build-cache
diff --git 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/Core/AmplifyCredentials/AmplifyAWSServiceConfiguration.swift b/AmplifyPlugins/Core/AmplifyCredentials/AmplifyAWSServiceConfiguration.swift
@@ -15,7 +15,7 @@ import Amplify
 public class AmplifyAWSServiceConfiguration {
 
     /// - Tag: AmplifyAWSServiceConfiguration.amplifyVersion
-    public static let amplifyVersion = "2.46.0"
+    public static let amplifyVersion = "2.47.0"
 
     /// - Tag: AmplifyAWSServiceConfiguration.platformName
     public static let platformName = "amplify-swift"
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Service/WebSocketSession.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Service/WebSocketSession.swift
@@ -128,7 +128,9 @@ final class WebSocketSession {
             }
             
             let dateFormatter = DateFormatter()
+            dateFormatter.locale = Locale(identifier: "en_US_POSIX")
             dateFormatter.dateFormat = "EEE, d MMM yyyy HH:mm:ss z"
+            dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
             guard let serverDate = dateFormatter.date(from: dateString) else {
                 Amplify.log.verbose("\(#function): Error parsing Date header in expected format")
                 onServerDateReceived(nil)
diff --git 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<UploadPartOutput>())
-        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<EndpointParams>(name: "EndpointParams"), value: endpointParams)
-        builder.applyEndpoint(AWSClientRuntime.EndpointResolverMiddleware<UploadPartOutput, EndpointParams>(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<EndpointParams>(name: "EndpointParams"), value: endpointParamsBlock(context))
+        builder.applyEndpoint(AWSClientRuntime.AWSEndpointResolverMiddleware<UploadPartOutput, EndpointParams>(paramsBlock: endpointParamsBlock, resolverBlock: { [config] in try config.endpointResolver.resolve(params: $0) }))
         builder.selectAuthScheme(ClientRuntime.AuthSchemeMiddleware<UploadPartOutput>())
         builder.interceptors.add(AWSClientRuntime.AWSS3ErrorWith200StatusXMLMiddleware<UploadPartInput, UploadPartOutput>())
-        builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsRequestMiddleware<UploadPartInput, UploadPartOutput>(checksumAlgorithm: input.checksumAlgorithm?.rawValue))
+        builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsRequestMiddleware<UploadPartInput, UploadPartOutput>(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/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Support/Internal/StorageMultipartUploadClient.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Support/Internal/StorageMultipartUploadClient.swift
@@ -146,6 +146,10 @@ class DefaultStorageMultipartUploadClient: StorageMultipartUploadClient {
             Task {
                 do {
                     let partialFileURL = try result.get()
+                    defer {
+                        // Clean up the temporary file after we're done with it
+                        self.fileSystem.removeFileIfExists(fileURL: partialFileURL)
+                    }
 
                     let operation = AWSS3SigningOperation.uploadPart(partNumber: partNumber, uploadId: uploadId)
                     let preSignedURL = try await serviceProxy.preSignedURLBuilder.getPreSignedURL(
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 2.47.0 (2025-04-24)
+
+### Features
+
+- bumping the sdk version to 1.2.59 (#3979)
+
+## 2.46.2 (2025-04-09)
+
+### Bug Fixes
+
+- **storage**: clean up cached files upon completion (#3967)
+
+## 2.46.1 (2025-03-18)
+
+### Bug Fixes
+
+- **predictions**: use UTC timezone in date formatter (#3965)
+
 ## 2.46.0 (2025-02-27)
 
 ### Features
diff --git a/Package.resolved b/Package.resolved
@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/awslabs/aws-crt-swift",
       "state" : {
-        "revision" : "dd17a98750b6182edacd6e8f0c30aa289c472b22",
-        "version" : "0.40.0"
+        "revision" : "74d970dde8a0d6b2fe1d8374767ca9793088ce2c",
+        "version" : "0.48.0"
       }
     },
     {
       "identity" : "aws-sdk-swift",
       "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"
       }
     },
     {
@@ -68,8 +68,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "revision" : "96a2f8a0fa41e9e09af4585e2724c4e825410b91",
-        "version" : "1.6.2"
+        "revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
+        "version" : "1.6.3"
       }
     }
   ],
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ class AppSyncRealTimeClientTests: XCTestCase {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`func testMaxSubscriptionReached_throwMaxSubscriptionsReachedError() async throws {`
`128`		`- let numOfMaxSubscriptionCount = 100`
	`128`	`+ let numOfMaxSubscriptionCount = 200`
`129`	`129`	`let maxSubsctiptionsSuccess = expectation(description: "Client can subscribe to max subscription count")`
`130`	`130`	`maxSubsctiptionsSuccess.expectedFulfillmentCount = numOfMaxSubscriptionCount`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,9 @@ final class WebSocketSession {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`let dateFormatter = DateFormatter()`
	`131`	`+ dateFormatter.locale = Locale(identifier: "en_US_POSIX")`
`131`	`132`	`dateFormatter.dateFormat = "EEE, d MMM yyyy HH:mm:ss z"`
	`133`	`+ dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)`
`132`	`134`	`guard let serverDate = dateFormatter.date(from: dateString) else {`
`133`	`135`	`Amplify.log.verbose("\(#function): Error parsing Date header in expected format")`
`134`	`136`	`onServerDateReceived(nil)`
Original file line number	Diff line number	Diff line change
`@@ -14,17 +14,17 @@`
`14`	`14`	`"kind" : "remoteSourceControl",`
`15`	`15`	`"location" : "https://github.com/awslabs/aws-crt-swift",`
`16`	`16`	`"state" : {`
`17`		`- "revision" : "dd17a98750b6182edacd6e8f0c30aa289c472b22",`
`18`		`- "version" : "0.40.0"`
	`17`	`+ "revision" : "74d970dde8a0d6b2fe1d8374767ca9793088ce2c",`
	`18`	`+ "version" : "0.48.0"`
`19`	`19`	`}`
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`"identity" : "aws-sdk-swift",`
`23`	`23`	`"kind" : "remoteSourceControl",`
`24`	`24`	`"location" : "https://github.com/awslabs/aws-sdk-swift",`
`25`	`25`	`"state" : {`
`26`		`- "revision" : "9ad12684f6cb9c9b60e840c051a2bba604024650",`
`27`		`- "version" : "1.0.69"`
	`26`	`+ "revision" : "104958a898543582bb01102616bf5d61ed237352",`
	`27`	`+ "version" : "1.2.59"`
`28`	`28`	`}`
`29`	`29`	`},`
`30`	`30`	`{`
`@@ -50,8 +50,8 @@`
`50`	`50`	`"kind" : "remoteSourceControl",`
`51`	`51`	`"location" : "https://github.com/smithy-lang/smithy-swift",`
`52`	`52`	`"state" : {`
`53`		`- "revision" : "402f091374dcf72c1e7ed43af10e3ee7e634fad8",`
`54`		`- "version" : "0.106.0"`
	`53`	`+ "revision" : "755367ae4e10004f8b5a94fbfdf3f638a1f225bc",`
	`54`	`+ "version" : "0.125.0"`
`55`	`55`	`}`
`56`	`56`	`},`
`57`	`57`	`{`
`@@ -68,8 +68,8 @@`
`68`	`68`	`"kind" : "remoteSourceControl",`
`69`	`69`	`"location" : "https://github.com/apple/swift-log.git",`
`70`	`70`	`"state" : {`
`71`		`- "revision" : "96a2f8a0fa41e9e09af4585e2724c4e825410b91",`
`72`		`- "version" : "1.6.2"`
	`71`	`+ "revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",`
	`72`	`+ "version" : "1.6.3"`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`],`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ let platforms: [SupportedPlatform] = [`
`9`	`9`	`.watchOS(.v9)`
`10`	`10`	`]`
`11`	`11`	`let dependencies: [Package.Dependency] = [`
`12`		`- .package(url: "https://github.com/awslabs/aws-sdk-swift", exact: "1.0.69"),`
	`12`	`+ .package(url: "https://github.com/awslabs/aws-sdk-swift", exact: "1.2.59"),`
`13`	`13`	`.package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.3"),`
`14`	`14`	`.package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"),`
`15`	`15`	`.package(url: "https://github.com/aws-amplify/amplify-swift-utils-notifications.git", from: "1.1.0")`