chore: kickoff release

Author: harsh62

.circleci/config.yml

@@ -11,6 +11,7 @@ parameters:
     default: platform=macOS,arch=x86_64
 
 orbs:
+  aws-cli: circleci/[email protected]
   # Using inline orb for now
   getting-started-smoke-test:
     orbs:
@@ -236,6 +237,47 @@ jobs:
           name: Release Amplify for Swift
           command: bundle exec fastlane << parameters.lane >>
           no_output_timeout: 60m
+  
+  fortify_scan:
+    <<: *defaults
+    steps:
+      - *restore_repo
+      - run:
+          name: Make source directory
+          command: |
+            mkdir source
+            cp -r Amplify source
+            cp -r AmplifyPlugins source
+      - aws-cli/setup:
+          role-arn: 'arn:aws:iam::971028514469:role/CircleCiOIDC'
+          role-session-name: 'aws-s3-session'
+      - run:
+          name: Download License
+          command: |
+            aws s3 cp s3://amplify-swift-fortify-prod/fortify.license fortify.license
+      - run:
+          name: Download Installer
+          command: |
+            aws s3 cp s3://amplify-swift-fortify-prod/Fortify_SCA_and_Apps_22.1.1_Mac.tar.gz Fortify_SCA_and_Apps_22.1.1_Mac.tar.gz
+            tar -xvf Fortify_SCA_and_Apps_22.1.1_Mac.tar.gz
+            unzip Fortify_SCA_and_Apps_22.1.1_osx_x64.app.zip
+      - run:
+          name: Download Scripts
+          command: |
+            aws s3 cp s3://amplify-swift-fortify-prod/amplify_swift_fortify_scan.sh fortify_scan.sh
+      - run:
+          name: Run Installer
+          command: |
+            Fortify_SCA_and_Apps_22.1.1_osx_x64.app/Contents/MacOS/installbuilder.sh --mode unattended --installdir Fortify --InstallSamples 0  --fortify_license_path fortify.license --MigrateSCA 0
+            export PATH=~/amplify-swift/Fortify/bin:$PATH
+            echo "export PATH=~/amplify-swift/Fortify/bin:\$PATH" >> "$BASH_ENV"
+            fortifyupdate -acceptKey
+            sourceanalyzer -version
+      - run:
+          name: Run Scan
+          command: |
+            sh ./fortify_scan.sh source
+
 
 deploy_requires: &deploy_requires
   requires:
@@ -257,6 +299,7 @@ deploy_requires: &deploy_requires
     - macos_unit_test_datastore
     - macos_unit_test_geo
     - macos_unit_test_storage
+    - fortify_scan
 
 workflows:
   build_test_deploy:
@@ -268,12 +311,17 @@ workflows:
       - install_gems:
           requires:
             - checkout_code
-      - build_amplify_ios_spm:
+      - fortify_scan:
+          context:
+            - amplify-swift-aws-s3-download
           requires:
             - install_gems
+      - build_amplify_ios_spm:
+          requires:
+            - fortify_scan
       - build_amplify_macos_spm:
           requires:
-            - install_gems         
+            - fortify_scan         
       - unit_test:
           name: ios_unit_test_amplify
           scheme: Amplify

Amplify/Core/Support/Optional+Extension.swift

@@ -0,0 +1,22 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+		
+
+import Foundation
+
+extension Optional {
+    ///
+    /// Performing side effect function when data is exist
+    /// - parameters:
+    ///     - then: a closure that takes wrapped data as a parameter
+    @_spi(OptionalExtension)
+    public func ifSome(_ then: (Wrapped) throws -> Void) rethrows {
+        if case .some(let wrapped) = self {
+            try then(wrapped)
+        }
+    }
+}

AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -49,6 +49,7 @@ class GraphQLConnectionScenario2Tests: XCTestCase {
 
     override func tearDown() async throws {
         await Amplify.reset()
+        try await Task.sleep(seconds: 1)
     }
 
     // Create Project2 in different ways, then retrieve it

AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/GraphQLConnectionScenario2Tests.swift

@@ -159,14 +159,18 @@ extension GraphQLConnectionScenario3Tests {
             XCTFail("Could not create comment")
             return
         }
+
         let predicate = Comment3.keys.postID.eq(post.id)
-        let result = try await Amplify.API.query(request: .list(Comment3.self, where: predicate))
-        switch result {
-        case .success(let comments):
-            XCTAssertEqual(comments.count, 1)
-        case .failure(let response):
-            XCTFail("Failed with: \(response)")
+        guard case .success(var comments) = try await Amplify.API.query(request: .list(Comment3.self, where: predicate))
+        else {
+            XCTFail("Failed to retrieve comments")
+            return
+        }
+
+        while comments.count == 0 && comments.hasNextPage() {
+            comments = try await comments.getNextPage()
         }
+        XCTAssertEqual(comments.count, 1)
     }
 
     /// Test paginated list query returns a List containing pagination functionality. This test also aggregates page

AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/GraphQLConnectionScenario3Tests+List.swift

@@ -49,6 +49,7 @@ class GraphQLConnectionScenario3Tests: XCTestCase {
 
     override func tearDown() async throws {
         await Amplify.reset()
+        try await Task.sleep(seconds: 1)
     }
 
     func testQuerySinglePost() async throws {

AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/GraphQLConnectionScenario3Tests.swift

@@ -21,6 +21,7 @@ class GraphQLLazyLoadBaseTest: XCTestCase {
 
     override func tearDown() async throws {
         await Amplify.reset()
+        try await Task.sleep(seconds: 1)
     }
 
     func setupConfig() {
@@ -185,10 +186,66 @@ class GraphQLLazyLoadBaseTest: XCTestCase {
                                          decodePath: document.name)
         return try await query(request)
     }
+
+    func subscribe<M: Model>(
+        of modelType: M.Type,
+        type: GraphQLSubscriptionType,
+        verifyChange: @escaping (M) async throws -> Bool
+    ) async throws -> (AsyncExpectation, AmplifyAsyncThrowingSequence<GraphQLSubscriptionEvent<M>>) {
+        let connected = asyncExpectation(description: "Subscription connected")
+        let eventReceived = asyncExpectation(description: "\(type.rawValue) received")
+        let subscription = Amplify.API.subscribe(request: .subscription(of: modelType, type: type))
+
+        Task {
+            for try await subscriptionEvent in subscription {
+                if subscriptionEvent.isConnected() {
+                    await connected.fulfill()
+                }
+
+                if let error = subscriptionEvent.extractError() {
+                    XCTFail("Failed to \(type.rawValue) \(modelType), error: \(error.errorDescription)")
+                }
+
+                if let data = subscriptionEvent.extractData(),
+                   try await verifyChange(data)
+                {
+                    await eventReceived.fulfill()
+                }
+            }
+        }
+
+        await waitForExpectations([connected], timeout: 10)
+        return (eventReceived, subscription)
+    }
 }
 
 extension LazyReferenceIdentifier: Equatable {
     public static func == (lhs: LazyReferenceIdentifier, rhs: LazyReferenceIdentifier) -> Bool {
         return lhs.name == rhs.name && lhs.value == rhs.value
     }
 }
+
+
+extension GraphQLSubscriptionEvent {
+    func isConnected() -> Bool {
+        if case .connection(.connected) = self {
+            return true
+        }
+        return false
+    }
+
+    func extractData() -> T? {
+        if case .data(.success(let data)) = self {
+            return data
+        }
+        return nil
+    }
+
+    func extractError() -> GraphQLResponseError<T>? {
+        if case .data(.failure(let error)) = self {
+            return error
+        }
+        return nil
+    }
+
+}

AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginLazyLoadTests/GraphQLLazyLoadBaseTest.swift

@@ -19,8 +19,8 @@ final class GraphQLLazyLoadPostComment4V2Tests: GraphQLLazyLoadBaseTest {
         await setup(withModels: PostComment4V2Models())
         let post = Post(title: "title")
         let comment = Comment(content: "content", post: post)
-        let createdPost = try await mutate(.create(post))
-        let createdComment = try await mutate(.create(comment))
+        try await mutate(.create(post))
+        try await mutate(.create(comment))
     }
 
     // Without `includes` and latest codegenerated types with the model path, the post should be lazy loaded
@@ -117,7 +117,16 @@ final class GraphQLLazyLoadPostComment4V2Tests: GraphQLLazyLoadBaseTest {
         assertLazyReference(comments.first!._post, state: .notLoaded(identifiers: [.init(name: "id", value: post.identifier)]))
     }
 
-    // This looks broken
+
+    /*
+     - Given: Api plugin is cleared
+     - When:
+        - Initialize with PostComment4V2Models
+        - Create post
+        - Create comment with [comment.post.comments.post] association path
+     - Then:
+        - The comment creation request GraphQL Selection Set represents the assocation path
+     */
     func testCommentWithEagerLoadPostAndPostCommentsAndPostCommentsPost() async throws {
         await setup(withModels: PostComment4V2Models())
         let post = Post(title: "title")
@@ -145,25 +154,21 @@ final class GraphQLLazyLoadPostComment4V2Tests: GraphQLLazyLoadBaseTest {
                   updatedAt
                   post {
                     id
+                    createdAt
+                    title
+                    updatedAt
                     __typename
                   }
                   __typename
                 }
               }
-              post {
-                id
-                createdAt
-                title
-                updatedAt
-                __typename
-              }
             }
             __typename
           }
         }
         """
         XCTAssertEqual(request.document, expectedDocument)
-        let createdComment = try await mutate(request)
+        try await mutate(request)
     }
 
     // Without `includes` and latest codegenerated types with the model path, the post's comments should be lazy loaded