chore: Fixing Xcode syntax warnings/suggestions. (#2676)

sebaland · web-flow · commit fb24bd30ccbc · 2023-02-03T12:00:04.000-05:00
diff --git a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGraphQLIAMTests/GraphQLWithIAMIntegrationTests.swift b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGraphQLIAMTests/GraphQLWithIAMIntegrationTests.swift
@@ -220,7 +220,7 @@ class GraphQLWithIAMIntegrationTests: XCTestCase {
     }
     
     func signOut() async {
-        await Amplify.Auth.signOut()
+        _ = await Amplify.Auth.signOut()
     }
 
     // MARK: - Model
diff --git a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGraphQLUserPoolTests/GraphQLWithUserPoolIntegrationTests.swift b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGraphQLUserPoolTests/GraphQLWithUserPoolIntegrationTests.swift
@@ -326,7 +326,7 @@ class GraphQLWithUserPoolIntegrationTests: XCTestCase {
             }
             XCTAssertTrue(!listTodos.items.isEmpty)
         case .failure(let error):
-            print("\(error.underlyingError)")
+            print("\(String(describing: error.underlyingError))")
             XCTFail("Unexpected .failed event: \(error)")
         }
     }
diff --git a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginRESTUserPoolTests/RESTWithUserPoolIntegrationTests.swift b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginRESTUserPoolTests/RESTWithUserPoolIntegrationTests.swift
@@ -36,7 +36,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {
 
     override func tearDown() async throws {
         if try await isSignedIn() {
-            try await signOut()
+            await signOut()
         }
         await Amplify.reset()
     }
@@ -93,7 +93,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {
     }
 
     func testGetAPIFailedWithSignedOutError() async throws {
-        try await signOut()
+        await signOut()
         let request = RESTRequest(path: "/items")
         do {
             _ = try await Amplify.API.get(request: request)
@@ -125,7 +125,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {
     
     func createAuthenticatedUser() async throws {
         if try await isSignedIn() {
-            try await signOut()
+            await signOut()
         }
         try await signUp()
         try await signIn()
@@ -154,7 +154,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {
         }
     }
     
-    func signOut() async throws {
-        try await Amplify.Auth.signOut()
+    func signOut() async {
+        _ = await Amplify.Auth.signOut()
     }
 }
diff --git a/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/AWSAuthBaseTest.swift b/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/AWSAuthBaseTest.swift
@@ -56,7 +56,6 @@ class AWSAuthBaseTest: XCTestCase {
         let region = JSONValue(stringLiteral: "xx")
         let userPoolID = JSONValue(stringLiteral: "xx")
         let userPooldAppClientID = JSONValue(stringLiteral: "xx")
-        let userPooldAppClientSecret = JSONValue(stringLiteral: "xx")
 
         let identityPoolID = JSONValue(stringLiteral: "xx")
         do {
diff --git a/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthStressTests/AuthStressBaseTest.swift b/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthStressTests/AuthStressBaseTest.swift
@@ -56,7 +56,6 @@ class AuthStressBaseTest: XCTestCase {
         let region = JSONValue(stringLiteral: "xx")
         let userPoolID = JSONValue(stringLiteral: "xx")
         let userPooldAppClientID = JSONValue(stringLiteral: "xx")
-        let userPooldAppClientSecret = JSONValue(stringLiteral: "xx")
 
         let identityPoolID = JSONValue(stringLiteral: "xx")
         do {
diff --git a/AmplifyPlugins/DataStore/Tests/AWSDataStorePluginTests/Sync/MutationQueue/ProcessMutationErrorFromCloudOperationTests.swift b/AmplifyPlugins/DataStore/Tests/AWSDataStorePluginTests/Sync/MutationQueue/ProcessMutationErrorFromCloudOperationTests.swift
@@ -310,7 +310,6 @@ class ProcessMutationErrorFromCloudOperationTests: XCTestCase {
     }
 
     func testProcessMutationErrorFromCloudOperationSuccessForUnauthorized() throws {
-        let remotePost = Post(id: localPost.id, title: "remoteTitle", content: "remoteContent", createdAt: .now())
         let mutationEvent = try MutationEvent(model: localPost, modelSchema: localPost.schema, mutationType: .delete)
         let graphQLResponseError = GraphQLResponseError<MutationSync<AnyModel>>.error([graphQLError(.unauthorized)])
         let expectCompletion = expectation(description: "Expect to complete error processing")
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthCognitoTests/AWSDataStoreAuthBaseTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthCognitoTests/AWSDataStoreAuthBaseTest.swift
@@ -217,7 +217,7 @@ extension AWSDataStoreAuthBaseTest {
     func signOut(file: StaticString = #file,
                  line: UInt = #line) async throws {
         do {
-            _ = try await Amplify.Auth.signOut()
+            _ = await Amplify.Auth.signOut()
             print("signOut successfull")
             let isSignedIn = try await isSignedIn()
             XCTAssertFalse(isSignedIn)
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthIAMTests/AWSDataStoreAuthBaseTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthIAMTests/AWSDataStoreAuthBaseTest.swift
@@ -225,16 +225,9 @@ extension AWSDataStoreAuthBaseTest {
     func signOut(file: StaticString = #file,
                  line: UInt = #line) async {
         let signoutInvoked = AsyncExpectation(description: "sign out completed")
-        do {
-            _ = try await Amplify.Auth.signOut()
-            Task {
-                await signoutInvoked.fulfill()
-            }
-        } catch(let error) {
-            XCTFail("Signout failure \(error)", file: file, line: line)
-            Task {
-                await signoutInvoked.fulfill() // won't count as pass
-            }
+        Task {
+            _ = await Amplify.Auth.signOut()
+            await signoutInvoked.fulfill()
         }
         
         await waitForExpectations([signoutInvoked], timeout: TestCommonConstants.networkTimeout)
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/Connection/DataStoreConnectionScenario5Tests.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/Connection/DataStoreConnectionScenario5Tests.swift
@@ -69,7 +69,7 @@ class DataStoreConnectionScenario5Tests: SyncEngineIntegrationTestBase {
         try await startAmplifyAndWaitForSync()
         let post = try await savePost(title: "title")
         let user = try await saveUser(username: "username")
-        try await savePostEditor(post: post, editor: user)
+        _ = try await savePostEditor(post: post, editor: user)
         let predicateByUserId = PostEditor5.keys.editor.eq(user.id)
         _ = try await Amplify.DataStore.query(PostEditor5.self, where: predicateByUserId)
     }
@@ -79,7 +79,7 @@ class DataStoreConnectionScenario5Tests: SyncEngineIntegrationTestBase {
         try await startAmplifyAndWaitForSync()
         let post = try await savePost(title: "title")
         let user = try await saveUser(username: "username")
-        let postEditor = try await savePostEditor(post: post, editor: user)
+        _ = try await savePostEditor(post: post, editor: user)
 
         let queriedPostOptional = try await Amplify.DataStore.query(Post5.self, byId: post.id)
         guard let queriedPost = queriedPostOptional else {
@@ -100,7 +100,7 @@ class DataStoreConnectionScenario5Tests: SyncEngineIntegrationTestBase {
         try await startAmplifyAndWaitForSync()
         let post = try await savePost(title: "title")
         let user = try await saveUser(username: "username")
-        let postEditor = try await savePostEditor(post: post, editor: user)
+        _ = try await savePostEditor(post: post, editor: user)
         
         let queriedUserOptional = try await Amplify.DataStore.query(User5.self, byId: user.id)
         guard let queriedUser = queriedUserOptional else {
@@ -123,7 +123,6 @@ class DataStoreConnectionScenario5Tests: SyncEngineIntegrationTestBase {
 
     func saveUser(id: String = UUID().uuidString, username: String) async throws -> User5 {
         let user = User5(id: id, username: username)
-        var result: User5?
         return try await Amplify.DataStore.save(user)
     }
 
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginMultiAuthTests/AWSDataStoreAuthBaseTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginMultiAuthTests/AWSDataStoreAuthBaseTest.swift
@@ -225,16 +225,9 @@ extension AWSDataStoreAuthBaseTest {
     func signOut(file: StaticString = #file,
                  line: UInt = #line) async {
         let signoutInvoked = AsyncExpectation(description: "sign out completed")
-        do {
-            _ = try await Amplify.Auth.signOut()
-            Task {
-                await signoutInvoked.fulfill()
-            }
-        } catch(let error) {
-            XCTFail("Signout failure \(error)", file: file, line: line)
-            Task {
-                await signoutInvoked.fulfill() // won't count as pass
-            }
+        Task {
+            _ = await Amplify.Auth.signOut()
+            await signoutInvoked.fulfill()
         }
         
         await waitForExpectations([signoutInvoked], timeout: TestCommonConstants.networkTimeout)
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginV2Tests/TransformerV2/DataStoreConnectionScenario7V2Tests.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginV2Tests/TransformerV2/DataStoreConnectionScenario7V2Tests.swift
@@ -49,7 +49,7 @@ class DataStoreConnectionScenario7V2Tests: SyncEngineIntegrationV2TestBase {
         try await startAmplifyAndWaitForSync()
         guard let blog = await saveBlog(name: "name"),
               let post1 = await savePost(title: "title", blog: blog),
-              let post2 = await savePost(title: "title", blog: blog),
+              let _ = await savePost(title: "title", blog: blog),
               let comment1post1 = await saveComment(post: post1, content: "content"),
               let comment2post1 = await saveComment(post: post1, content: "content") else {
             XCTFail("Could not create blog, posts, and comments")
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/DataStoreHostApp/HubListenerTestUtilities.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/DataStoreHostApp/HubListenerTestUtilities.swift
@@ -33,7 +33,7 @@ struct HubListenerTestUtilities {
 
         let deadline = Date(timeIntervalSinceNow: timeout)
         while !hasListener && Date() < deadline {
-            if await resolvedPlugin.hasListener(withToken: token) {
+            if resolvedPlugin.hasListener(withToken: token) {
                 hasListener = true
                 break
             }
diff --git a/AmplifyPlugins/Storage/Tests/StorageHostApp/AWSS3StoragePluginIntegrationTests/AWSS3StoragePluginBasicIntegrationTests.swift b/AmplifyPlugins/Storage/Tests/StorageHostApp/AWSS3StoragePluginIntegrationTests/AWSS3StoragePluginBasicIntegrationTests.swift
@@ -8,9 +8,7 @@
 import XCTest
 @testable import Amplify
 import AWSS3StoragePlugin
-import var CommonCrypto.CC_MD5_DIGEST_LENGTH
-import func CommonCrypto.CC_MD5
-import typealias CommonCrypto.CC_LONG
+import CryptoKit
 
 class AWSS3StoragePluginBasicIntegrationTests: AWSS3StoragePluginTestBase {
 
@@ -185,7 +183,7 @@ class AWSS3StoragePluginBasicIntegrationTests: AWSS3StoragePluginTestBase {
     /// Then: The operation completes successfully with the key retrieved
     func testListFromPublic() async throws {
         let key = UUID().uuidString
-        let expectedMD5Hex = "\"\(MD5(string: key).map { String(format: "%02hhx", $0) }.joined())\""
+        let expectedMD5Hex = "\"\(key.md5())\""
         await uploadData(key: key, dataString: key)
         let options = StorageListRequest.Options(accessLevel: .guest,
                                                  targetIdentityId: nil,
@@ -348,24 +346,11 @@ class AWSS3StoragePluginBasicIntegrationTests: AWSS3StoragePluginTestBase {
             }
         }
     }
+}
 
-    // Copied from accepted answer here:
-    // https://stackoverflow.com/questions/32163848/how-can-i-convert-a-string-to-an-md5-hash-in-ios-using-swift
-    func MD5(string: String) -> Data {
-        let length = Int(CC_MD5_DIGEST_LENGTH)
-        let messageData = string.data(using: .utf8)!
-        var digestData = Data(count: length)
-
-        _ = digestData.withUnsafeMutableBytes { digestBytes -> UInt8 in
-            messageData.withUnsafeBytes { messageBytes -> UInt8 in
-                if let messageBytesBaseAddress = messageBytes.baseAddress,
-                    let digestBytesBlindMemory = digestBytes.bindMemory(to: UInt8.self).baseAddress {
-                    let messageLength = CC_LONG(messageData.count)
-                    CC_MD5(messageBytesBaseAddress, messageLength, digestBytesBlindMemory)
-                }
-                return 0
-            }
-        }
-        return digestData
+private extension String {
+    func md5() -> String {
+        let digest = Insecure.MD5.hash(data: data(using: .utf8) ?? Data())
+        return digest.map { String(format: "%02hhx", $0) }.joined()
     }
 }
diff --git a/AmplifyPlugins/Storage/Tests/StorageHostApp/AWSS3StoragePluginIntegrationTests/AWSS3StoragePluginPrefixKeyResolverTests.swift b/AmplifyPlugins/Storage/Tests/StorageHostApp/AWSS3StoragePluginIntegrationTests/AWSS3StoragePluginPrefixKeyResolverTests.swift
@@ -107,7 +107,7 @@ class AWSS3StoragePluginKeyResolverTests: AWSS3StoragePluginTestBase {
                 let notDone = asyncExpectation(description: "not done", isInverted: true)
                 let caughtError = asyncExpectation(description: "caught error")
                 do {
-                    let data = try await Amplify.Storage.downloadData(key: key).value
+                    _ = try await Amplify.Storage.downloadData(key: key).value
                     await notDone.fulfill()
                 } catch {
                     guard case .keyNotFound = error as? StorageError else {
diff --git a/AmplifyTestCommon/Helpers/HubListenerTestUtilities.swift b/AmplifyTestCommon/Helpers/HubListenerTestUtilities.swift
@@ -33,7 +33,7 @@ struct HubListenerTestUtilities {
 
         let deadline = Date(timeIntervalSinceNow: timeout)
         while !hasListener && Date() < deadline {
-            if await resolvedPlugin.hasListener(withToken: token) {
+            if resolvedPlugin.hasListener(withToken: token) {
                 hasListener = true
                 break
             }
diff --git a/AmplifyTests/CategoryTests/Storage/StorageCategoryConfigurationTests.swift b/AmplifyTests/CategoryTests/Storage/StorageCategoryConfigurationTests.swift
@@ -116,15 +116,7 @@ class StorageCategoryConfigurationTests: XCTestCase {
         let amplifyConfig = AmplifyConfiguration(storage: storageConfig)
 
         try Amplify.configure(amplifyConfig)
-
-        let done = asyncExpectation(description: "done")
-
-        Task {
-            _ = try await Amplify.Storage.downloadData(key: "", options: nil)
-            await done.fulfill()
-        }
-
-        await waitForExpectations([done])
+        _ = Amplify.Storage.downloadData(key: "", options: nil)
     }
 
     func testCanUseSpecifiedPlugin() async throws {
@@ -163,15 +155,10 @@ class StorageCategoryConfigurationTests: XCTestCase {
 
         try Amplify.configure(amplifyConfig)
 
-        let done = asyncExpectation(description: "done")
-
-        Task {
-        _ = try await Amplify.Storage.getPlugin(for: "MockSecondStorageCategoryPlugin")
+        _ = try Amplify.Storage.getPlugin(for: "MockSecondStorageCategoryPlugin")
             .downloadData(key: "", options: nil)
-            await done.fulfill()
-        }
 
-        await waitForExpectations([methodShouldNotBeInvokedOnDefaultPlugin, methodShouldBeInvokedOnSecondPlugin, done])
+        await waitForExpectations([methodShouldNotBeInvokedOnDefaultPlugin, methodShouldBeInvokedOnSecondPlugin])
     }
 
     func testPreconditionFailureInvokingWithMultiplePlugins() async throws {
@@ -196,15 +183,8 @@ class StorageCategoryConfigurationTests: XCTestCase {
             MockStorageCategoryPlugin()
         }
 
-        let done = asyncExpectation(description: "done")
-
-        Task {
-            // a precondition failure will happen since 2 plugins are added
-            _ = try await Amplify.Storage.downloadData(key: "", options: nil)
-            await done.fulfill()
-        }
-
-        await waitForExpectations([done])
+        // a precondition failure will happen since 2 plugins are added
+        _ = Amplify.Storage.downloadData(key: "", options: nil)
 
         XCTAssertGreaterThan(registry.messages.count, 0)
     }
@@ -249,14 +229,7 @@ class StorageCategoryConfigurationTests: XCTestCase {
 
         // Remember, this test must be invoked with a category that doesn't include an Amplify-supplied default plugin
 
-        let done = asyncExpectation(description: "done")
-
-        Task {
-            _ = try await Amplify.Storage.downloadData(key: "foo", options: nil)
-            await done.fulfill()
-        }
-
-        await waitForExpectations([done])
+        _ = Amplify.Storage.downloadData(key: "foo", options: nil)
 
         XCTAssertEqual(registry.messages.count, 1)
     }

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ class GraphQLWithIAMIntegrationTests: XCTestCase {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`func signOut() async {`
`223`		`- await Amplify.Auth.signOut()`
	`223`	`+ _ = await Amplify.Auth.signOut()`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`// MARK: - Model`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ class GraphQLWithUserPoolIntegrationTests: XCTestCase {`
`326`	`326`	`}`
`327`	`327`	`XCTAssertTrue(!listTodos.items.isEmpty)`
`328`	`328`	`case .failure(let error):`
`329`		`- print("\(error.underlyingError)")`
	`329`	`+ print("\(String(describing: error.underlyingError))")`
`330`	`330`	`XCTFail("Unexpected .failed event: \(error)")`
`331`	`331`	`}`
`332`	`332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {`
`36`	`36`
`37`	`37`	`override func tearDown() async throws {`
`38`	`38`	`if try await isSignedIn() {`
`39`		`- try await signOut()`
	`39`	`+ await signOut()`
`40`	`40`	`}`
`41`	`41`	`await Amplify.reset()`
`42`	`42`	`}`
`@@ -93,7 +93,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`func testGetAPIFailedWithSignedOutError() async throws {`
`96`		`- try await signOut()`
	`96`	`+ await signOut()`
`97`	`97`	`let request = RESTRequest(path: "/items")`
`98`	`98`	`do {`
`99`	`99`	`_ = try await Amplify.API.get(request: request)`
`@@ -125,7 +125,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {`
`125`	`125`
`126`	`126`	`func createAuthenticatedUser() async throws {`
`127`	`127`	`if try await isSignedIn() {`
`128`		`- try await signOut()`
	`128`	`+ await signOut()`
`129`	`129`	`}`
`130`	`130`	`try await signUp()`
`131`	`131`	`try await signIn()`
`@@ -154,7 +154,7 @@ class RESTWithUserPoolIntegrationTests: XCTestCase {`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`- func signOut() async throws {`
`158`		`- try await Amplify.Auth.signOut()`
	`157`	`+ func signOut() async {`
	`158`	`+ _ = await Amplify.Auth.signOut()`
`159`	`159`	`}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,6 @@ class ProcessMutationErrorFromCloudOperationTests: XCTestCase {`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`func testProcessMutationErrorFromCloudOperationSuccessForUnauthorized() throws {`
`313`		`- let remotePost = Post(id: localPost.id, title: "remoteTitle", content: "remoteContent", createdAt: .now())`
`314`	`313`	`let mutationEvent = try MutationEvent(model: localPost, modelSchema: localPost.schema, mutationType: .delete)`
`315`	`314`	`let graphQLResponseError = GraphQLResponseError<MutationSync<AnyModel>>.error([graphQLError(.unauthorized)])`
`316`	`315`	`let expectCompletion = expectation(description: "Expect to complete error processing")`