From ae394ded1654dfb48d3df315b83daaaf16dd0684 Mon Sep 17 00:00:00 2001 From: Harshdeep Singh <6162866+harsh62@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:53:19 -0400 Subject: [PATCH 1/5] fix(Auth): Add logging to non throwing tasks --- .../Task/Protocols/AmplifyAuthTaskNonThrowing.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AmplifyAuthTaskNonThrowing.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AmplifyAuthTaskNonThrowing.swift index aecfd2cd7e..9377e8707c 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AmplifyAuthTaskNonThrowing.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AmplifyAuthTaskNonThrowing.swift @@ -23,10 +23,12 @@ protocol AmplifyAuthTaskNonThrowing { } -extension AmplifyAuthTaskNonThrowing { +extension AmplifyAuthTaskNonThrowing where Self: DefaultLogger { var value: Success { get async { + log.info("Starting execution for \(eventName)") let valueReturned = await execute() + log.info("Successfully completed execution for \(eventName) with result:\n\(valueReturned)") dispatch(result: valueReturned) return valueReturned } From 463dab4d9383cdae58321b381f43289c1cee011b Mon Sep 17 00:00:00 2001 From: Harshdeep Singh <6162866+harsh62@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:08:27 -0400 Subject: [PATCH 2/5] update logs --- .../Core/AWSPluginsCore/Keychain/KeychainStore.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AmplifyPlugins/Core/AWSPluginsCore/Keychain/KeychainStore.swift b/AmplifyPlugins/Core/AWSPluginsCore/Keychain/KeychainStore.swift index 6327676c83..5734a79491 100644 --- a/AmplifyPlugins/Core/AWSPluginsCore/Keychain/KeychainStore.swift +++ b/AmplifyPlugins/Core/AWSPluginsCore/Keychain/KeychainStore.swift @@ -92,7 +92,7 @@ public struct KeychainStore: KeychainStoreBehavior { 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") + log.verbose("[KeychainStore] Successfully retrieved `String` from the store") return string } @@ -175,7 +175,7 @@ public struct KeychainStore: KeychainStoreBehavior { 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)") + log.verbose("[KeychainStore] Successfully updated `Data` in keychain for key=\(key)") #endif case errSecItemNotFound: log.verbose("[KeychainStore] Unable to find an existing item, creating new item") @@ -188,7 +188,7 @@ public struct KeychainStore: KeychainStoreBehavior { 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)") + log.verbose("[KeychainStore] Successfully added `Data` 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) @@ -206,7 +206,7 @@ public struct KeychainStore: KeychainStoreBehavior { let status = SecItemDelete(query as CFDictionary) if status != errSecSuccess && status != errSecItemNotFound { - log.error("[KeychainStore] Error removing itms from keychain with status=\(status)") + log.error("[KeychainStore] Error removing items from keychain with status=\(status)") throw KeychainStoreError.securityError(status) } log.verbose("[KeychainStore] Successfully removed item from keychain") From c18656e589ee6005f224fb9b7c902dd7c2c47df1 Mon Sep 17 00:00:00 2001 From: Harshdeep Singh <6162866+harsh62@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:10:21 -0400 Subject: [PATCH 3/5] update --- .../AWSCognitoAuthPlugin/Task/AWSAuthChangePasswordTask.swift | 1 - .../Task/AWSAuthClearFederationToIdentityPoolTask.swift | 1 - .../Task/AWSAuthConfirmResetPasswordTask.swift | 1 - .../AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignInTask.swift | 1 - .../AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignUpTask.swift | 1 - .../AWSCognitoAuthPlugin/Task/AWSAuthDeleteUserTask.swift | 1 - .../Task/AWSAuthFederateToIdentityPoolTask.swift | 1 - .../AWSCognitoAuthPlugin/Task/AWSAuthFetchSessionTask.swift | 1 - .../AWSCognitoAuthPlugin/Task/AWSAuthResendSignUpCodeTask.swift | 1 - .../AWSCognitoAuthPlugin/Task/AWSAuthResetPasswordTask.swift | 1 - .../Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignInTask.swift | 1 - .../Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignOutTask.swift | 1 - .../Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignUpTask.swift | 1 - .../AWSCognitoAuthPlugin/Task/AWSAuthWebUISignInTask.swift | 1 - 14 files changed, 14 deletions(-) diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthChangePasswordTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthChangePasswordTask.swift index 0fb50718c1..84921606c9 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthChangePasswordTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthChangePasswordTask.swift @@ -33,7 +33,6 @@ class AWSAuthChangePasswordTask: AuthChangePasswordTask, DefaultLogger { } func execute() async throws { - log.verbose("Starting execution") do { await taskHelper.didStateMachineConfigured() let accessToken = try await taskHelper.getAccessToken() diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthClearFederationToIdentityPoolTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthClearFederationToIdentityPoolTask.swift index 293ae92b2f..c42bbc3ff1 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthClearFederationToIdentityPoolTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthClearFederationToIdentityPoolTask.swift @@ -35,7 +35,6 @@ public class AWSAuthClearFederationToIdentityPoolTask: AuthClearFederationToIden } public func execute() async throws { - log.verbose("Starting execution") await taskHelper.didStateMachineConfigured() try await clearFederationHelper.clearFederation(authStateMachine) log.verbose("Cleared federation") diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmResetPasswordTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmResetPasswordTask.swift index ceabc14ed2..ffa1750e4a 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmResetPasswordTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmResetPasswordTask.swift @@ -27,7 +27,6 @@ class AWSAuthConfirmResetPasswordTask: AuthConfirmResetPasswordTask, DefaultLogg } func execute() async throws { - log.verbose("Starting execution") if let validationError = request.hasError() { throw validationError } diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignInTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignInTask.swift index 3c19a16d61..cc824c6f25 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignInTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignInTask.swift @@ -29,7 +29,6 @@ class AWSAuthConfirmSignInTask: AuthConfirmSignInTask, DefaultLogger { } func execute() async throws -> AuthSignInResult { - log.verbose("Starting execution") await taskHelper.didStateMachineConfigured() // Check if we have a user pool configuration diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignUpTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignUpTask.swift index dbbb086118..a7b7124245 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignUpTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignUpTask.swift @@ -24,7 +24,6 @@ class AWSAuthConfirmSignUpTask: AuthConfirmSignUpTask, DefaultLogger { } func execute() async throws -> AuthSignUpResult { - log.verbose("Starting execution") try request.hasError() let userPoolEnvironment = authEnvironment.userPoolEnvironment do { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthDeleteUserTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthDeleteUserTask.swift index 4539bcecba..2a0fbf7323 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthDeleteUserTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthDeleteUserTask.swift @@ -26,7 +26,6 @@ class AWSAuthDeleteUserTask: AuthDeleteUserTask, DefaultLogger { } func execute() async throws { - log.verbose("Starting execution") await taskHelper.didStateMachineConfigured() let accessToken = try await taskHelper.getAccessToken() diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFederateToIdentityPoolTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFederateToIdentityPoolTask.swift index 9f3151a63f..1770b532c9 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFederateToIdentityPoolTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFederateToIdentityPoolTask.swift @@ -34,7 +34,6 @@ public class AWSAuthFederateToIdentityPoolTask: AuthFederateToIdentityPoolTask, } public func execute() async throws -> FederateToIdentityPoolResult { - log.verbose("Starting execution") await taskHelper.didStateMachineConfigured() let state = await authStateMachine.currentState guard case .configured(let authNState, let authZState) = state else { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFetchSessionTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFetchSessionTask.swift index 7a00941ad9..f39263578d 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFetchSessionTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthFetchSessionTask.swift @@ -26,7 +26,6 @@ class AWSAuthFetchSessionTask: AuthFetchSessionTask, DefaultLogger { } func execute() async throws -> AuthSession { - log.verbose("Starting execution") await taskHelper.didStateMachineConfigured() let doesNeedForceRefresh = request.options.forceRefresh return try await fetchAuthSessionHelper.fetch(authStateMachine, diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResendSignUpCodeTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResendSignUpCodeTask.swift index 527b796585..ff81fc2a56 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResendSignUpCodeTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResendSignUpCodeTask.swift @@ -27,7 +27,6 @@ class AWSAuthResendSignUpCodeTask: AuthResendSignUpCodeTask, DefaultLogger { } func execute() async throws -> AuthCodeDeliveryDetails { - log.verbose("Starting execution") if let validationError = request.hasError() { throw validationError } diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResetPasswordTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResetPasswordTask.swift index 823b0178e1..7f86e40f58 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResetPasswordTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResetPasswordTask.swift @@ -28,7 +28,6 @@ class AWSAuthResetPasswordTask: AuthResetPasswordTask, DefaultLogger { } func execute() async throws -> AuthResetPasswordResult { - log.verbose("Starting execution") if let validationError = request.hasError() { throw validationError } diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignInTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignInTask.swift index 3a68e3aeff..abfe5ec41b 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignInTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignInTask.swift @@ -29,7 +29,6 @@ class AWSAuthSignInTask: AuthSignInTask, DefaultLogger { } func execute() async throws -> AuthSignInResult { - log.verbose("Starting execution") await taskHelper.didStateMachineConfigured() // Check if we have a user pool configuration guard let userPoolConfiguration = authConfiguration.getUserPoolConfiguration() else { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignOutTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignOutTask.swift index f5de608577..5363d3ffdf 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignOutTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignOutTask.swift @@ -25,7 +25,6 @@ class AWSAuthSignOutTask: AuthSignOutTask, DefaultLogger { } func execute() async -> AuthSignOutResult { - log.verbose("Starting execution") await taskHelper.didStateMachineConfigured() guard case .configured(let authNState, _) = await authStateMachine.currentState else { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignUpTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignUpTask.swift index 9e86b68daf..63194bcea9 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignUpTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignUpTask.swift @@ -25,7 +25,6 @@ class AWSAuthSignUpTask: AuthSignUpTask, DefaultLogger { } func execute() async throws -> AuthSignUpResult { - log.verbose("Starting execution") let userPoolEnvironment = authEnvironment.userPoolEnvironment try request.hasError() diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthWebUISignInTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthWebUISignInTask.swift index 564b5c177e..6e35e317ab 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthWebUISignInTask.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthWebUISignInTask.swift @@ -33,7 +33,6 @@ class AWSAuthWebUISignInTask: AuthWebUISignInTask, DefaultLogger { } func execute() async throws -> AuthSignInResult { - log.verbose("Starting execution") do { await taskHelper.didStateMachineConfigured() let result = try await helper.initiateSignIn() From 37874679d3c251b616136a76138c34cea25f0eac Mon Sep 17 00:00:00 2001 From: Harshdeep Singh <6162866+harsh62@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:02:48 -0400 Subject: [PATCH 4/5] added documentation --- .../Auth/AuthAWSCredentialsProvider.swift | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/AmplifyPlugins/Core/AWSPluginsCore/Auth/AuthAWSCredentialsProvider.swift b/AmplifyPlugins/Core/AWSPluginsCore/Auth/AuthAWSCredentialsProvider.swift index c08e8821c8..9739e1066f 100644 --- a/AmplifyPlugins/Core/AWSPluginsCore/Auth/AuthAWSCredentialsProvider.swift +++ b/AmplifyPlugins/Core/AWSPluginsCore/Auth/AuthAWSCredentialsProvider.swift @@ -35,16 +35,42 @@ public protocol AWSCredentialsProvider { func fetchAWSCredentials() async throws -> AWSCredentials } -public protocol AWSTemporaryCredentials: AWSCredentials { - - var sessionToken: String { get } +/** + Represents AWS credentials. - var expiration: Date { get } -} + Typically refers to long-term credentials that do not expire unless manually rotated or deactivated. + These credentials are generally associated with an IAM (Identity and Access Management) user and are used to authenticate API requests to AWS services. + - Properties: + - accessKeyId: A unique identifier. + - secretAccessKey: A secret key used to sign requests cryptographically. + */ public protocol AWSCredentials { + /// A unique identifier. var accessKeyId: String { get } + /// A secret key used to sign requests cryptographically. var secretAccessKey: String { get } } + +/** + Represents temporary AWS credentials. + + Refers to short-term credentials generated by AWS STS (Security Token Service). + These credentials are used for temporary access, often for applications, temporary roles, federated users, or scenarios requiring limited-time access. + + - Inherits: AWSCredentials + + - Properties: + - sessionToken: A token that is required when using temporary security credentials to sign requests. + - expiration: The expiration date and time of the temporary credentials. + */ +public protocol AWSTemporaryCredentials: AWSCredentials { + + /// A token that is required when using temporary security credentials to sign requests. + var sessionToken: String { get } + + /// The expiration date and time of the temporary credentials. + var expiration: Date { get } +} From 1b77ef21d9ac7d5bbc9fc78cc6d90c8b9904e0a5 Mon Sep 17 00:00:00 2001 From: aws-amplify-ops Date: Wed, 21 Aug 2024 15:03:55 +0000 Subject: [PATCH 5/5] Update API dumps for new version --- api-dump/AWSDataStorePlugin.json | 2 +- api-dump/AWSPluginsCore.json | 122 +++++++++++++------------- api-dump/Amplify.json | 2 +- api-dump/CoreMLPredictionsPlugin.json | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/api-dump/AWSDataStorePlugin.json b/api-dump/AWSDataStorePlugin.json index 47c0e792de..d436f34410 100644 --- a/api-dump/AWSDataStorePlugin.json +++ b/api-dump/AWSDataStorePlugin.json @@ -8205,7 +8205,7 @@ "-module", "AWSDataStorePlugin", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/AWSDataStorePlugin.json", + "\/var\/folders\/hw\/1f0gcr8d6kn9ms0_wn0_57qc0000gn\/T\/tmp.rjSPtedPzR\/AWSDataStorePlugin.json", "-I", ".build\/debug", "-sdk-version", diff --git a/api-dump/AWSPluginsCore.json b/api-dump/AWSPluginsCore.json index 19b8e2fb57..76cf8a6e6c 100644 --- a/api-dump/AWSPluginsCore.json +++ b/api-dump/AWSPluginsCore.json @@ -3644,13 +3644,13 @@ }, { "kind": "TypeDecl", - "name": "AWSTemporaryCredentials", - "printedName": "AWSTemporaryCredentials", + "name": "AWSCredentials", + "printedName": "AWSCredentials", "children": [ { "kind": "Var", - "name": "sessionToken", - "printedName": "sessionToken", + "name": "accessKeyId", + "printedName": "accessKeyId", "children": [ { "kind": "TypeNominal", @@ -3660,8 +3660,8 @@ } ], "declKind": "Var", - "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvp", - "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvp", + "usr": "s:14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvp", + "mangledName": "$s14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvp", "moduleName": "AWSPluginsCore", "protocolReq": true, "accessors": [ @@ -3678,10 +3678,10 @@ } ], "declKind": "Accessor", - "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvg", - "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvg", + "usr": "s:14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvg", + "mangledName": "$s14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvg", "moduleName": "AWSPluginsCore", - "genericSig": "", + "genericSig": "", "protocolReq": true, "reqNewWitnessTableEntry": true, "accessorKind": "get" @@ -3690,19 +3690,19 @@ }, { "kind": "Var", - "name": "expiration", - "printedName": "expiration", + "name": "secretAccessKey", + "printedName": "secretAccessKey", "children": [ { "kind": "TypeNominal", - "name": "Date", - "printedName": "Foundation.Date", - "usr": "s:10Foundation4DateV" + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" } ], "declKind": "Var", - "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvp", - "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvp", + "usr": "s:14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvp", + "mangledName": "$s14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvp", "moduleName": "AWSPluginsCore", "protocolReq": true, "accessors": [ @@ -3713,16 +3713,16 @@ "children": [ { "kind": "TypeNominal", - "name": "Date", - "printedName": "Foundation.Date", - "usr": "s:10Foundation4DateV" + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" } ], "declKind": "Accessor", - "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvg", - "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvg", + "usr": "s:14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvg", + "mangledName": "$s14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvg", "moduleName": "AWSPluginsCore", - "genericSig": "", + "genericSig": "", "protocolReq": true, "reqNewWitnessTableEntry": true, "accessorKind": "get" @@ -3731,29 +3731,19 @@ } ], "declKind": "Protocol", - "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP", - "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP", - "moduleName": "AWSPluginsCore", - "genericSig": "", - "conformances": [ - { - "kind": "Conformance", - "name": "AWSCredentials", - "printedName": "AWSCredentials", - "usr": "s:14AWSPluginsCore14AWSCredentialsP", - "mangledName": "$s14AWSPluginsCore14AWSCredentialsP" - } - ] + "usr": "s:14AWSPluginsCore14AWSCredentialsP", + "mangledName": "$s14AWSPluginsCore14AWSCredentialsP", + "moduleName": "AWSPluginsCore" }, { "kind": "TypeDecl", - "name": "AWSCredentials", - "printedName": "AWSCredentials", + "name": "AWSTemporaryCredentials", + "printedName": "AWSTemporaryCredentials", "children": [ { "kind": "Var", - "name": "accessKeyId", - "printedName": "accessKeyId", + "name": "sessionToken", + "printedName": "sessionToken", "children": [ { "kind": "TypeNominal", @@ -3763,8 +3753,8 @@ } ], "declKind": "Var", - "usr": "s:14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvp", - "mangledName": "$s14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvp", + "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvp", + "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvp", "moduleName": "AWSPluginsCore", "protocolReq": true, "accessors": [ @@ -3781,10 +3771,10 @@ } ], "declKind": "Accessor", - "usr": "s:14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvg", - "mangledName": "$s14AWSPluginsCore14AWSCredentialsP11accessKeyIdSSvg", + "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvg", + "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP12sessionTokenSSvg", "moduleName": "AWSPluginsCore", - "genericSig": "", + "genericSig": "", "protocolReq": true, "reqNewWitnessTableEntry": true, "accessorKind": "get" @@ -3793,19 +3783,19 @@ }, { "kind": "Var", - "name": "secretAccessKey", - "printedName": "secretAccessKey", + "name": "expiration", + "printedName": "expiration", "children": [ { "kind": "TypeNominal", - "name": "String", - "printedName": "Swift.String", - "usr": "s:SS" + "name": "Date", + "printedName": "Foundation.Date", + "usr": "s:10Foundation4DateV" } ], "declKind": "Var", - "usr": "s:14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvp", - "mangledName": "$s14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvp", + "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvp", + "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvp", "moduleName": "AWSPluginsCore", "protocolReq": true, "accessors": [ @@ -3816,16 +3806,16 @@ "children": [ { "kind": "TypeNominal", - "name": "String", - "printedName": "Swift.String", - "usr": "s:SS" + "name": "Date", + "printedName": "Foundation.Date", + "usr": "s:10Foundation4DateV" } ], "declKind": "Accessor", - "usr": "s:14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvg", - "mangledName": "$s14AWSPluginsCore14AWSCredentialsP15secretAccessKeySSvg", + "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvg", + "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP10expiration10Foundation4DateVvg", "moduleName": "AWSPluginsCore", - "genericSig": "", + "genericSig": "", "protocolReq": true, "reqNewWitnessTableEntry": true, "accessorKind": "get" @@ -3834,9 +3824,19 @@ } ], "declKind": "Protocol", - "usr": "s:14AWSPluginsCore14AWSCredentialsP", - "mangledName": "$s14AWSPluginsCore14AWSCredentialsP", - "moduleName": "AWSPluginsCore" + "usr": "s:14AWSPluginsCore23AWSTemporaryCredentialsP", + "mangledName": "$s14AWSPluginsCore23AWSTemporaryCredentialsP", + "moduleName": "AWSPluginsCore", + "genericSig": "", + "conformances": [ + { + "kind": "Conformance", + "name": "AWSCredentials", + "printedName": "AWSCredentials", + "usr": "s:14AWSPluginsCore14AWSCredentialsP", + "mangledName": "$s14AWSPluginsCore14AWSCredentialsP" + } + ] }, { "kind": "TypeDecl", @@ -24273,7 +24273,7 @@ "-module", "AWSPluginsCore", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/AWSPluginsCore.json", + "\/var\/folders\/hw\/1f0gcr8d6kn9ms0_wn0_57qc0000gn\/T\/tmp.rjSPtedPzR\/AWSPluginsCore.json", "-I", ".build\/debug", "-sdk-version", diff --git a/api-dump/Amplify.json b/api-dump/Amplify.json index 1bb4d36d2c..c8b9c833c4 100644 --- a/api-dump/Amplify.json +++ b/api-dump/Amplify.json @@ -179735,7 +179735,7 @@ "-module", "Amplify", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/Amplify.json", + "\/var\/folders\/hw\/1f0gcr8d6kn9ms0_wn0_57qc0000gn\/T\/tmp.rjSPtedPzR\/Amplify.json", "-I", ".build\/debug", "-sdk-version", diff --git a/api-dump/CoreMLPredictionsPlugin.json b/api-dump/CoreMLPredictionsPlugin.json index 1a9879407f..f7aeb94b9c 100644 --- a/api-dump/CoreMLPredictionsPlugin.json +++ b/api-dump/CoreMLPredictionsPlugin.json @@ -430,7 +430,7 @@ "-module", "CoreMLPredictionsPlugin", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/CoreMLPredictionsPlugin.json", + "\/var\/folders\/hw\/1f0gcr8d6kn9ms0_wn0_57qc0000gn\/T\/tmp.rjSPtedPzR\/CoreMLPredictionsPlugin.json", "-I", ".build\/debug", "-sdk-version",