chore: kickoff release

Author: sebaland

AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AWSPinpointAnalyticsPluginIntegrationTests/README.md

@@ -42,20 +42,19 @@ At the time this was written, it follows the steps from here https://docs.amplif
 {
   ...
   "devDependencies": {
-    "@aws-amplify/backend": "^0.13.0-beta.14",
-    "@aws-amplify/backend-cli": "^0.12.0-beta.16",
-    "aws-cdk": "^2.134.0",
-    "aws-cdk-lib": "^2.134.0",
+    "@aws-amplify/backend": "^0.15.0",
+    "@aws-amplify/backend-cli": "^0.15.0",
+    "aws-cdk": "^2.139.0",
+    "aws-cdk-lib": "^2.139.0",
     "constructs": "^10.3.0",
     "esbuild": "^0.20.2",
-    "tsx": "^4.7.1",
-    "typescript": "^5.4.3"
+    "tsx": "^4.7.3",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "aws-amplify": "^6.0.25"
-  }
+    "aws-amplify": "^6.2.0"
+  },
 }
-
 ```
 2. Update `amplify/auth/resource.ts`. The resulting file should look like this
 
@@ -69,27 +68,11 @@ import { defineAuth, defineFunction } from '@aws-amplify/backend';
 export const auth = defineAuth({
   loginWith: {
     email: true
-  },
-  triggers: {
-    // configure a trigger to point to a function definition
-    preSignUp: defineFunction({
-      entry: './pre-sign-up-handler.ts'
-    })
   }
 });
 
 ```
 
-```ts
-import type { PreSignUpTriggerHandler } from 'aws-lambda';
-
-export const handler: PreSignUpTriggerHandler = async (event) => {
-  // your code here
-  event.response.autoConfirmUser = true
-  return event;
-};
-```
-
 3. Update `amplify/backend.ts` to create the analytics stack (https://docs.amplify.aws/gen2/build-a-backend/add-aws-services/analytics/)
 
 Add the following imports
@@ -104,10 +87,7 @@ Create `backend` const
 
 ```ts
 const backend = defineBackend({
-  auth,
-  // data,
-  // storage
-  // additional resource
+  auth
 });
 ```
 
@@ -152,7 +132,7 @@ backend.addOutput({
 For example, this deploys to a sandbox env and generates the amplify_outputs.json file.
 
 ```
-npx amplify sandbox --config-out-dir ./config --config-version 1 --profile [PROFILE]
+npx amplify sandbox --config-out-dir ./config --profile [PROFILE]
 ```
 
 5. Copy the `amplify_outputs.json` file over to the test directory as `AWSPinpointAnalyticsPluginIntegrationTests-amplify_outputs.json`. The tests will automatically pick this file up. Create the directories in this path first if it currently doesn't exist.
@@ -180,6 +160,6 @@ If you want to be able utilize Git commits for deployments
 7. Generate the `amplify_outputs.json` configuration file
 
 ```
-npx amplify generate config --branch main --app-id [APP_ID] --profile [AWS_PROFILE] --config-version 1
+npx amplify generate outputs --branch main --app-id [APP_ID] --profile [AWS_PROFILE]
 ```
 

AmplifyPlugins/Core/AWSPluginsCore/Keychain/KeychainStore.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import Security
+import Amplify
 
 // swiftlint:disable identifier_name
 public protocol KeychainStoreBehavior {
@@ -76,6 +77,7 @@ public struct KeychainStore: KeychainStoreBehavior {
         var attributes = KeychainStoreAttributes(service: service)
         attributes.accessGroup = accessGroup
         self.init(attributes: attributes)
+        log.verbose("[KeychainStore] Initialized keychain with service=\(service), attributes=\(attributes), accessGroup=\(accessGroup ?? "")")
     }
 
     @_spi(KeychainStore)
@@ -84,12 +86,13 @@ public struct KeychainStore: KeychainStoreBehavior {
     /// - Parameter key: A String key use to look up the value in the Keychain
     /// - Returns: A string value
     public func _getString(_ key: String) throws -> String {
-
+        log.verbose("[KeychainStore] Started retrieving `String` from the store with key=\(key)")
         let data = try _getData(key)
-
         guard let string = String(data: data, encoding: .utf8) else {
+            log.error("[KeychainStore] Unable to create String from Data retrieved")
             throw KeychainStoreError.conversionError("Unable to create String from Data retrieved")
         }
+        log.verbose("[KeychainStore] Successfully retrieved string from the store")
         return string
 
     }
@@ -100,6 +103,7 @@ public struct KeychainStore: KeychainStoreBehavior {
     /// - Parameter key: A String key use to look up the value in the Keychain
     /// - Returns: A data value
     public func _getData(_ key: String) throws -> Data {
+        log.verbose("[KeychainStore] Started retrieving `Data` from the store with key=\(key)")
         var query = attributes.defaultGetQuery()
 
         query[Constants.MatchLimit] = Constants.MatchLimitOne
@@ -113,12 +117,16 @@ public struct KeychainStore: KeychainStoreBehavior {
         switch status {
         case errSecSuccess:
             guard let data = result as? Data else {
+                log.error("[KeychainStore] The keychain item retrieved is not the correct type")
                 throw KeychainStoreError.unknown("The keychain item retrieved is not the correct type")
             }
+            log.verbose("[KeychainStore] Successfully retrieved `Data` from the store with key=\(key)")
             return data
         case errSecItemNotFound:
+            log.verbose("[KeychainStore] No Keychain item found for key=\(key)")
             throw KeychainStoreError.itemNotFound
         default:
+            log.error("[KeychainStore] Error of status=\(status) occurred when attempting to retrieve a Keychain item for key=\(key)")
             throw KeychainStoreError.securityError(status)
         }
     }
@@ -130,10 +138,13 @@ public struct KeychainStore: KeychainStoreBehavior {
     ///   - value: A string value to store in Keychain
     ///   - key: A String key for the value to store in the Keychain
     public func _set(_ value: String, key: String) throws {
+        log.verbose("[KeychainStore] Started setting `String` for key=\(key)")
         guard let data = value.data(using: .utf8, allowLossyConversion: false) else {
+            log.error("[KeychainStore] Unable to create Data from String retrieved for key=\(key)")
             throw KeychainStoreError.conversionError("Unable to create Data from String retrieved")
         }
         try _set(data, key: key)
+        log.verbose("[KeychainStore] Successfully added `String` for key=\(key)")
     }
 
     @_spi(KeychainStore)
@@ -143,34 +154,43 @@ public struct KeychainStore: KeychainStoreBehavior {
     ///   - value: A data value to store in Keychain
     ///   - key: A String key for the value to store in the Keychain
     public func _set(_ value: Data, key: String) throws {
+        log.verbose("[KeychainStore] Started setting `Data` for key=\(key)")
         var getQuery = attributes.defaultGetQuery()
         getQuery[Constants.AttributeAccount] = key
-
+        log.verbose("[KeychainStore] Initialized fetching to decide whether update or add")
         let fetchStatus = SecItemCopyMatching(getQuery as CFDictionary, nil)
         switch fetchStatus {
         case errSecSuccess:
             #if os(macOS)
+            log.verbose("[KeychainStore] Deleting item on MacOS to add an item.")
             SecItemDelete(getQuery as CFDictionary)
             fallthrough
             #else
+            log.verbose("[KeychainStore] Found existing item, updating")
             var attributesToUpdate = [String: Any]()
             attributesToUpdate[Constants.ValueData] = value
 
             let updateStatus = SecItemUpdate(getQuery as CFDictionary, attributesToUpdate as CFDictionary)
             if updateStatus != errSecSuccess {
+                log.error("[KeychainStore] Error updating item to keychain with status=\(updateStatus)")
                 throw KeychainStoreError.securityError(updateStatus)
             }
+            log.verbose("[KeychainStore] Successfully updated `String` in keychain for key=\(key)")
             #endif
         case errSecItemNotFound:
+            log.verbose("[KeychainStore] Unable to find an existing item, creating new item")
             var attributesToSet = attributes.defaultSetQuery()
             attributesToSet[Constants.AttributeAccount] = key
             attributesToSet[Constants.ValueData] = value
 
             let addStatus = SecItemAdd(attributesToSet as CFDictionary, nil)
             if addStatus != errSecSuccess {
+                log.error("[KeychainStore] Error adding item to keychain with status=\(addStatus)")
                 throw KeychainStoreError.securityError(addStatus)
             }
+            log.verbose("[KeychainStore] Successfully added `String` in keychain for key=\(key)")
         default:
+            log.error("[KeychainStore] Error occurred while retrieving data from keychain when deciding to update or add with status=\(fetchStatus)")
             throw KeychainStoreError.securityError(fetchStatus)
         }
     }
@@ -180,28 +200,34 @@ public struct KeychainStore: KeychainStoreBehavior {
     /// This System Programming Interface (SPI) may have breaking changes in future updates.
     /// - Parameter key: A String key to delete the key-value pair
     public func _remove(_ key: String) throws {
+        log.verbose("[KeychainStore] Starting to remove item from keychain with key=\(key)")
         var query = attributes.defaultGetQuery()
         query[Constants.AttributeAccount] = key
 
         let status = SecItemDelete(query as CFDictionary)
         if status != errSecSuccess && status != errSecItemNotFound {
+            log.error("[KeychainStore] Error removing itms from keychain with status=\(status)")
             throw KeychainStoreError.securityError(status)
         }
+        log.verbose("[KeychainStore] Successfully removed item from keychain")
     }
 
     @_spi(KeychainStore)
     /// Removes all key-value pair in the Keychain.
     /// This System Programming Interface (SPI) may have breaking changes in future updates.
     public func _removeAll() throws {
+        log.verbose("[KeychainStore] Starting to remove all items from keychain")
         var query = attributes.defaultGetQuery()
 #if !os(iOS) && !os(watchOS) && !os(tvOS)
         query[Constants.MatchLimit] = Constants.MatchLimitAll
 #endif
 
         let status = SecItemDelete(query as CFDictionary)
         if status != errSecSuccess && status != errSecItemNotFound {
+            log.error("[KeychainStore] Error removing all items from keychain with status=\(status)")
             throw KeychainStoreError.securityError(status)
         }
+        log.verbose("[KeychainStore] Successfully removed all items from keychain")
     }
 
 }
@@ -241,3 +267,11 @@ extension KeychainStore {
     }
 }
 // swiftlint:enable identifier_name
+
+extension KeychainStore: DefaultLogger {
+    public static var log: Logger {
+        Amplify.Logging.logger(forNamespace: String(describing: self))
+    }
+
+    public nonisolated var log: Logger { Self.log }
+}

AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift

@@ -265,7 +265,7 @@ extension WebSocketClient: URLSessionWebSocketDelegate {
 extension WebSocketClient {
     /// Monitor network status. Disconnect or reconnect when the network drops or comes back online.
     private func startNetworkMonitor() {
-        networkMonitor.publisher.sink(receiveValue: { stateChange in
+        networkMonitor.publisher.sink(receiveValue: { [weak self] stateChange in
             Task { [weak self] in
                 await self?.onNetworkStateChange(stateChange)
             }
@@ -304,7 +304,7 @@ extension WebSocketClient {
             return closeCode
         }
         .compactMap { $0 }
-        .sink(receiveCompletion: { _ in }) { closeCode in
+        .sink(receiveCompletion: { _ in }) { [weak self] closeCode in
             Task { [weak self] in await self?.retryOnCloseCode(closeCode) }
         }
         .store(in: &cancelables)
@@ -319,7 +319,7 @@ extension WebSocketClient {
             }
             return false
         }
-        .sink(receiveCompletion: { _ in }) { _ in
+        .sink(receiveCompletion: { _ in }) { [weak self] _ in
             Task { [weak self] in
                 await self?.retryWithJitter.reset()
             }