chore: kickoff v1 release

Author: ameter

AWSPluginsCore.podspec

@@ -10,7 +10,7 @@
 $AMPLIFY_VERSION = '1.28.3'
 $AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
 
-$AWS_SDK_VERSION = '2.28.0'
+$AWS_SDK_VERSION = '2.29.1'
 $OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"
 
 Pod::Spec.new do |s|

AWSPredictionsPlugin.podspec

@@ -2,7 +2,7 @@
 $AMPLIFY_VERSION = '1.28.3'
 $AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
 
-$AWS_SDK_VERSION = '2.28.0'
+$AWS_SDK_VERSION = '2.29.1'
 $OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"
 
 Pod::Spec.new do |s|

AmplifyPlugins.podspec

@@ -10,7 +10,7 @@
 $AMPLIFY_VERSION = '1.28.3'
 $AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
 
-$AWS_SDK_VERSION = '2.28.0'
+$AWS_SDK_VERSION = '2.29.1'
 $OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"
 
 Pod::Spec.new do |s|

AmplifyPlugins/API/AWSAPICategoryPlugin/Operation/AWSGraphQLSubscriptionOperation.swift

@@ -189,6 +189,12 @@ final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscri
             return
         } else if case ConnectionProviderError.unauthorized = error {
             errorDescription += ": \(APIError.UnauthorizedMessageString)"
+        } else if case ConnectionProviderError.connection = error {
+            errorDescription += ": connection"
+            let error = URLError(.networkConnectionLost)
+            dispatch(result: .failure(APIError.networkError(errorDescription, nil, error)))
+            finish()
+            return
         }
 
         dispatch(result: .failure(APIError.operationError(errorDescription, "", error)))

AmplifyPlugins/API/AWSAPICategoryPluginTests/AWSAPICategoryPlugin+ConfigureTests.swift

@@ -10,9 +10,10 @@ import XCTest
 @testable import Amplify
 @testable import AWSAPICategoryPlugin
 
-class AWSAPICategoryPluginConfigureTests: AWSAPICategoryPluginTestBase {
+class AWSAPICategoryPluginConfigureTests {
 
     func testPluginKey() {
+        let apiPlugin = AWSAPIPlugin()
         XCTAssertEqual(apiPlugin.key, "awsAPIPlugin")
     }
 

AmplifyPlugins/API/AWSAPICategoryPluginTests/AWSAPICategoryPluginTestBase.swift

@@ -30,6 +30,7 @@ class AWSAPICategoryPluginTestBase: XCTestCase {
     let testPath = "testPath"
 
     override func setUp() {
+        Amplify.reset()
         apiPlugin = AWSAPIPlugin()
 
         let authService = MockAWSAuthService()
@@ -62,7 +63,6 @@ class AWSAPICategoryPluginTestBase: XCTestCase {
             XCTFail("Failed to create endpoint config")
         }
 
-        Amplify.reset()
         let config = AmplifyConfiguration()
         do {
             try Amplify.configure(config)
@@ -72,9 +72,6 @@ class AWSAPICategoryPluginTestBase: XCTestCase {
     }
 
     override func tearDown() {
-        if let api = apiPlugin {
-            api.reset {
-            }
-        }
+        Amplify.reset()
     }
 }

AmplifyPlugins/API/AWSAPICategoryPluginTests/Operation/GraphQLSubscribeTests.swift

@@ -33,6 +33,8 @@ class GraphQLSubscribeTests: OperationTestBase {
     var subscriptionItem: SubscriptionItem!
     var subscriptionEventHandler: SubscriptionEventHandler!
 
+    var expectedCompletionFailureError: APIError?
+
     override func setUpWithError() throws {
         try super.setUpWithError()
 
@@ -122,7 +124,23 @@ class GraphQLSubscribeTests: OperationTestBase {
     /// - The value handler is not invoked with with a data value
     /// - The value handler is invoked with a disconnection message
     /// - The completion handler is invoked with an error termination
-    func testConnectionError() throws {
+    func testConnectionErrorWithLimitExceeded() throws {
+        receivedCompletionFinish.shouldTrigger = false
+        receivedCompletionFailure.shouldTrigger = true
+        receivedConnected.shouldTrigger = false
+        receivedDisconnected.shouldTrigger = false
+        receivedSubscriptionEventData.shouldTrigger = false
+        receivedSubscriptionEventError.shouldTrigger = false
+
+        subscribe()
+        wait(for: [onSubscribeInvoked], timeout: 0.05)
+
+        subscriptionEventHandler(.failed(ConnectionProviderError.limitExceeded(nil)), subscriptionItem)
+        expectedCompletionFailureError = APIError.operationError("", "", ConnectionProviderError.limitExceeded(nil))
+        waitForExpectations(timeout: 0.05)
+    }
+
+    func testConnectionErrorWithSubscriptionError() throws {
         receivedCompletionFinish.shouldTrigger = false
         receivedCompletionFailure.shouldTrigger = true
         receivedConnected.shouldTrigger = false
@@ -134,8 +152,42 @@ class GraphQLSubscribeTests: OperationTestBase {
         wait(for: [onSubscribeInvoked], timeout: 0.05)
 
         subscriptionEventHandler(.connection(.connecting), subscriptionItem)
-        subscriptionEventHandler(.failed("Error"), subscriptionItem)
+        subscriptionEventHandler(.failed(ConnectionProviderError.subscription("", nil)), subscriptionItem)
+        expectedCompletionFailureError = APIError.operationError("", "", ConnectionProviderError.subscription("", nil))
+        waitForExpectations(timeout: 0.05)
+    }
+
+    func testConnectionErrorWithConnectionUnauthorizedError() throws {
+        receivedCompletionFinish.shouldTrigger = false
+        receivedCompletionFailure.shouldTrigger = true
+        receivedConnected.shouldTrigger = false
+        receivedDisconnected.shouldTrigger = false
+        receivedSubscriptionEventData.shouldTrigger = false
+        receivedSubscriptionEventError.shouldTrigger = false
 
+        subscribe()
+        wait(for: [onSubscribeInvoked], timeout: 0.05)
+
+        subscriptionEventHandler(.connection(.connecting), subscriptionItem)
+        subscriptionEventHandler(.failed(ConnectionProviderError.unauthorized), subscriptionItem)
+        expectedCompletionFailureError = APIError.operationError("", "", ConnectionProviderError.unauthorized)
+        waitForExpectations(timeout: 0.05)
+    }
+
+    func testConnectionErrorWithConnectionProviderConnectionError() throws {
+        receivedCompletionFinish.shouldTrigger = false
+        receivedCompletionFailure.shouldTrigger = true
+        receivedConnected.shouldTrigger = false
+        receivedDisconnected.shouldTrigger = false
+        receivedSubscriptionEventData.shouldTrigger = false
+        receivedSubscriptionEventError.shouldTrigger = false
+
+        subscribe()
+        wait(for: [onSubscribeInvoked], timeout: 0.05)
+
+        subscriptionEventHandler(.connection(.connecting), subscriptionItem)
+        subscriptionEventHandler(.failed(ConnectionProviderError.connection), subscriptionItem)
+        expectedCompletionFailureError = APIError.networkError("", nil, URLError(.networkConnectionLost))
         waitForExpectations(timeout: 0.05)
     }
 
@@ -286,7 +338,11 @@ class GraphQLSubscribeTests: OperationTestBase {
                 }
         }, completionListener: { result in
             switch result {
-            case .failure:
+            case .failure(let error):
+                if let apiError = error as? APIError,
+                   let expectedError = self.expectedCompletionFailureError {
+                    XCTAssertEqual(apiError, expectedError)
+                }
                 self.receivedCompletionFailure.fulfill()
             case .success:
                 self.receivedCompletionFinish.fulfill()
@@ -296,3 +352,43 @@ class GraphQLSubscribeTests: OperationTestBase {
         return operation
     }
 }
+
+extension APIError: Equatable {
+    public static func == (lhs: APIError, rhs: APIError) -> Bool {
+        switch (lhs, rhs) {
+        case (.unknown, .unknown),
+            (.invalidConfiguration, .invalidConfiguration),
+            (.httpStatusError, .httpStatusError),
+            (.pluginError, .pluginError):
+            return true
+        case (.operationError(_, _, let lhs), .operationError(_, _, let rhs)):
+            if let lhs = lhs as? ConnectionProviderError, let rhs = rhs as? ConnectionProviderError {
+                switch (lhs, rhs) {
+                case (.connection, .connection),
+                    (.jsonParse, .jsonParse),
+                    (.limitExceeded, .limitExceeded),
+                    (.subscription, .subscription),
+                    (.unauthorized, .unauthorized),
+                    (.unknown, .unknown):
+                    return true
+                default:
+                    return false
+                }
+            } else if lhs == nil && rhs == nil {
+                return true
+            } else {
+                return false
+            }
+        case (.networkError(_, _, let lhs), .networkError(_, _, let rhs)):
+            if let lhs = lhs as? URLError, let rhs = rhs as? URLError {
+                return lhs.code == rhs.code
+            } else if lhs == nil && rhs == nil {
+                return true
+            } else {
+                return false
+            }
+        default:
+            return false
+        }
+    }
+}

AmplifyPlugins/API/Podfile.lock

@@ -3,40 +3,40 @@ PODS:
     - Amplify/Default (= 1.28.3)
   - Amplify/Default (1.28.3)
   - AmplifyPlugins/AWSCognitoAuthPlugin (1.28.3):
-    - AWSAuthCore (~> 2.28.0)
-    - AWSCognitoIdentityProvider (~> 2.28.0)
-    - AWSCognitoIdentityProviderASF (~> 2.28.0)
-    - AWSCore (~> 2.28.0)
-    - AWSMobileClient (~> 2.28.0)
+    - AWSAuthCore (~> 2.29.1)
+    - AWSCognitoIdentityProvider (~> 2.29.1)
+    - AWSCognitoIdentityProviderASF (~> 2.29.1)
+    - AWSCore (~> 2.29.1)
+    - AWSMobileClient (~> 2.29.1)
     - AWSPluginsCore (= 1.28.3)
   - AmplifyTestCommon (1.28.3):
     - Amplify (= 1.28.3)
     - AmplifyTestCommon/AWSPluginsTestCommon (= 1.28.3)
     - CwlPreconditionTesting (~> 2.0)
   - AmplifyTestCommon/AWSPluginsTestCommon (1.28.3):
     - Amplify (= 1.28.3)
-    - AWSCore (~> 2.28.0)
-    - AWSMobileClient (~> 2.28.0)
+    - AWSCore (~> 2.29.1)
+    - AWSMobileClient (~> 2.29.1)
     - AWSPluginsCore (= 1.28.3)
     - CwlPreconditionTesting (~> 2.0)
   - AppSyncRealTimeClient (2.1.1):
     - Starscream (~> 4.0.4)
-  - AWSAuthCore (2.28.3):
-    - AWSCore (= 2.28.3)
-  - AWSCognitoIdentityProvider (2.28.3):
-    - AWSCognitoIdentityProviderASF (= 2.28.3)
-    - AWSCore (= 2.28.3)
-  - AWSCognitoIdentityProviderASF (2.28.3):
-    - AWSCore (= 2.28.3)
-  - AWSCore (2.28.3)
-  - AWSMobileClient (2.28.3):
-    - AWSAuthCore (= 2.28.3)
-    - AWSCognitoIdentityProvider (= 2.28.3)
-    - AWSCognitoIdentityProviderASF (= 2.28.3)
-    - AWSCore (= 2.28.3)
+  - AWSAuthCore (2.29.1):
+    - AWSCore (= 2.29.1)
+  - AWSCognitoIdentityProvider (2.29.1):
+    - AWSCognitoIdentityProviderASF (= 2.29.1)
+    - AWSCore (= 2.29.1)
+  - AWSCognitoIdentityProviderASF (2.29.1):
+    - AWSCore (= 2.29.1)
+  - AWSCore (2.29.1)
+  - AWSMobileClient (2.29.1):
+    - AWSAuthCore (= 2.29.1)
+    - AWSCognitoIdentityProvider (= 2.29.1)
+    - AWSCognitoIdentityProviderASF (= 2.29.1)
+    - AWSCore (= 2.29.1)
   - AWSPluginsCore (1.28.3):
     - Amplify (= 1.28.3)
-    - AWSCore (~> 2.28.0)
+    - AWSCore (~> 2.29.1)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
   - CwlCatchExceptionSupport (2.1.1)
@@ -58,7 +58,7 @@ DEPENDENCIES:
   - AWSPluginsCore (from `../../`)
   - CwlPreconditionTesting (from `https://github.com/mattgallagher/CwlPreconditionTesting.git`, tag `2.1.0`)
   - SwiftFormat/CLI (= 0.44.17)
-  - SwiftLint
+  - SwiftLint (= 0.49.1)
 
 SPEC REPOS:
   trunk:
@@ -96,15 +96,15 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   Amplify: e89b493fc2fe840ac044bd4ddf71ad9828f8c364
-  AmplifyPlugins: 98bcd23f2c13179f75c733b887e80dd06243be5e
-  AmplifyTestCommon: 7a6b9d4e05e2f7b4a95c912ddccea18ed1ad4ab0
+  AmplifyPlugins: 6aa4605f70d0e252299f0638f9cd969506a7469f
+  AmplifyTestCommon: 033836d9c3f885727bc7246078b1c5fa044276f3
   AppSyncRealTimeClient: 937360221f2b664c4c33ae142a60643e64f480cd
-  AWSAuthCore: 2062ef888b45b7e4426124f7c68930b04a9fe426
-  AWSCognitoIdentityProvider: f608ba338bc3b1676ab8a027f8c17a0a8de7fa25
-  AWSCognitoIdentityProviderASF: 3c0a873dcb270e770da06772c7762b1648897e41
-  AWSCore: 27c26d9c0a2f072f7aeb26337f3a5f4098eea8b8
-  AWSMobileClient: 0b8bb9f3d7f04ee9febed719887189e86794a721
-  AWSPluginsCore: 93f813579479fa4c5bfff58817df89e0e10f9f3b
+  AWSAuthCore: 47c24a59f47501358803c58045b03e0fe10f451e
+  AWSCognitoIdentityProvider: ecd914518152f6d645485b9431265eedf2ff84d0
+  AWSCognitoIdentityProviderASF: c845b376143e69b1f34899f0572654cf816f9c5e
+  AWSCore: aa4a494c8bbcefe97723621fa51cfb1fad15fbd1
+  AWSMobileClient: 1c98e24ad0afcbed09febdeda4ad59fd7e7a5feb
+  AWSPluginsCore: c3dacbb0e28c944f520c93aaa0a1a2afacc369e3
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: a004322095d7101b945442c86adc7cec0650f676
   CwlMachBadInstructionHandler: aa1fe9f2d08b29507c150d099434b2890247e7f8