rename the package to InternalAmplifyCredentials

aws-amplify · May 17, 2024 · 75b9a45 · 75b9a45
1 parent 7415441
commit 75b9a45
Show file tree

Hide file tree

Showing 53 changed files with 119 additions and 51 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme
@@ -496,6 +496,34 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AmplifyCredentials"
+               BuildableName = "AmplifyCredentials"
+               BlueprintName = "AmplifyCredentials"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "InternalAmplifyCredentials"
+               BuildableName = "InternalAmplifyCredentials"
+               BlueprintName = "InternalAmplifyCredentials"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -755,6 +783,26 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AmplifyNetworkUnitTests"
+               BuildableName = "AmplifyNetworkUnitTests"
+               BlueprintName = "AmplifyNetworkUnitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "InternalAmplifyNetworkUnitTests"
+               BuildableName = "InternalAmplifyNetworkUnitTests"
+               BlueprintName = "InternalAmplifyNetworkUnitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
@@ -765,6 +813,26 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AmplifyCredentialsTests"
+               BuildableName = "AmplifyCredentialsTests"
+               BlueprintName = "AmplifyCredentialsTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "InternalAmplifyCredentialsTests"
+               BuildableName = "InternalAmplifyCredentialsTests"
+               BlueprintName = "InternalAmplifyCredentialsTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+Configure.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+Configure.swift
@@ -7,7 +7,7 @@
 
 @_spi(InternalAmplifyConfiguration) import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import AwsCommonRuntimeKit
 
 public extension AWSAPIPlugin {

diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin.swift
@@ -7,7 +7,7 @@
 
 import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Foundation
 
 final public class AWSAPIPlugin: NSObject, APICategoryPlugin, AWSAPIAuthInformation {

diff --git a/...ifyPlugins/API/Sources/AWSAPIPlugin/Configuration/AWSAPICategoryPluginConfiguration.swift b/...ifyPlugins/API/Sources/AWSAPIPlugin/Configuration/AWSAPICategoryPluginConfiguration.swift
@@ -8,7 +8,7 @@
 @_spi(InternalAmplifyConfiguration) import Amplify
 import Foundation
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 
 // Convenience typealias
 typealias APIEndpointName = String

diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Configuration/AWSAPIEndpointInterceptors.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Configuration/AWSAPIEndpointInterceptors.swift
@@ -8,7 +8,7 @@
 import Amplify
 import Foundation
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 
 /// The order of interceptor decoration is as follows:
 /// 1. **prelude interceptors**

diff --git a/...API/Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/APIKeyURLRequestInterceptor.swift b/...API/Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/APIKeyURLRequestInterceptor.swift
@@ -7,7 +7,7 @@
 
 import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Foundation
 
 struct APIKeyURLRequestInterceptor: URLRequestInterceptor {

diff --git a/...ns/API/Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/AuthTokenProviderWrapper.swift b/...ns/API/Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/AuthTokenProviderWrapper.swift
@@ -7,7 +7,7 @@
 
 import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Foundation
 
 class AuthTokenProviderWrapper: AuthTokenProvider {

diff --git a/.../Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/AuthTokenURLRequestInterceptor.swift b/.../Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/AuthTokenURLRequestInterceptor.swift
@@ -7,7 +7,7 @@
 
 import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Foundation
 
 struct AuthTokenURLRequestInterceptor: URLRequestInterceptor {

diff --git a/...ns/API/Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/IAMURLRequestInterceptor.swift b/...ns/API/Sources/AWSAPIPlugin/Interceptor/RequestInterceptor/IAMURLRequestInterceptor.swift
@@ -7,7 +7,7 @@
 
 import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Foundation
 import ClientRuntime
 

diff --git a/...ins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift b/...ins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 @_spi(WebSocket) import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Amplify
 import AWSClientRuntime
 import ClientRuntime

diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift
@@ -8,7 +8,7 @@
 import Amplify
 import Foundation
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Combine
 
 public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner, InternalTaskAsyncThrowingSequence, InternalTaskThrowingChannel {

diff --git a/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift b/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift
@@ -9,7 +9,7 @@
 import Foundation
 import Amplify
 import Combine
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 @_spi(WebSocket) import AWSPluginsCore
 
 protocol AppSyncRealTimeClientFactoryProtocol {

diff --git a/...Plugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift b/...Plugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift
@@ -11,7 +11,7 @@ import Combine
 @testable import Amplify
 @testable import AWSAPIPlugin
 @testable @_spi(WebSocket) import AWSPluginsCore
-@testable import AWSPluginsSDKCore
+@testable import InternalAmplifyCredentials
 
 class AppSyncRealTimeClientTests: XCTestCase {
     let subscriptionRequest = """

diff --git a/...fyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+InterceptorBehaviorTests.swift b/...fyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+InterceptorBehaviorTests.swift
@@ -8,7 +8,7 @@
 import XCTest
 @testable import AWSAPIPlugin
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 
 // swiftlint:disable:next type_name
 class AWSAPICategoryPluginInterceptorBehaviorTests: AWSAPICategoryPluginTestBase {

diff --git a/...ns/API/Tests/AWSAPIPluginTests/Configuration/AWSAPICategoryPluginConfigurationTests.swift b/...ns/API/Tests/AWSAPIPluginTests/Configuration/AWSAPICategoryPluginConfigurationTests.swift
@@ -12,7 +12,7 @@ import Foundation
 @testable import AWSAPIPlugin
 @testable import AWSPluginsTestCommon
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 
 class AWSAPICategoryPluginConfigurationTests: XCTestCase {
     let graphQLAPI = "graphQLAPI"

diff --git a/...fyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPIEndpointInterceptorsTests.swift b/...fyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPIEndpointInterceptorsTests.swift
@@ -8,7 +8,7 @@
 import XCTest
 import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
 @testable import AWSPluginsTestCommon

diff --git a/...Plugins/API/Tests/AWSAPIPluginTests/Interceptor/AuthTokenURLRequestInterceptorTests.swift b/...Plugins/API/Tests/AWSAPIPluginTests/Interceptor/AuthTokenURLRequestInterceptorTests.swift
@@ -7,7 +7,7 @@
 
 import XCTest
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 @testable import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift
@@ -11,7 +11,7 @@ import Amplify
 import Combine
 @testable import AWSAPIPlugin
 @_spi(WebSocket) import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 
 struct MockSubscriptionConnectionFactory: AppSyncRealTimeClientFactoryProtocol {
 

diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift
@@ -13,7 +13,7 @@ import AWSCognitoIdentityProvider
 import AWSPluginsCore
 import ClientRuntime
 import AWSClientRuntime
-@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore
+@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
 @_spi(InternalHttpEngineProxy) import AWSPluginsCore
 
 extension AWSCognitoAuthPlugin {

diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+PluginExtension.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+PluginExtension.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalAmplifyPluginExtension) import AWSPluginsSDKCore
+@_spi(InternalAmplifyPluginExtension) import InternalAmplifyCredentials
 import Foundation
 import ClientRuntime
 

diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/HttpClientEngineProxy.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/HttpClientEngineProxy.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalHttpEngineProxy) @_spi(InternalAmplifyPluginExtension) import AWSPluginsSDKCore
+@_spi(InternalHttpEngineProxy) @_spi(InternalAmplifyPluginExtension) import InternalAmplifyCredentials
 import ClientRuntime
 import Foundation
 

diff --git a/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift b/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift
@@ -8,7 +8,7 @@
 import ClientRuntime
 import AWSClientRuntime
 import Amplify
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 
 public class MockAWSAuthService: AWSAuthCredentialsProviderBehavior {
 

diff --git a/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSSignatureV4Signer.swift b/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSSignatureV4Signer.swift
@@ -8,7 +8,7 @@
 import AWSPluginsCore
 import ClientRuntime
 import AWSClientRuntime
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Foundation
 
 class MockAWSSignatureV4Signer: AWSSignatureV4Signer {

diff --git a/.../AWSAuthCredentialsProviderBehavior.swift → .../AWSAuthCredentialsProviderBehavior.swift b/.../AWSAuthCredentialsProviderBehavior.swift → .../AWSAuthCredentialsProviderBehavior.swift
diff --git a/.../AWSAuthService+CredentialsProvider.swift → .../AWSAuthService+CredentialsProvider.swift b/.../AWSAuthService+CredentialsProvider.swift → .../AWSAuthService+CredentialsProvider.swift
diff --git a/...WSPluginsSDKCore/AWSPluginExtension.swift → ...plifyCredentials/AWSPluginExtension.swift b/...WSPluginsSDKCore/AWSPluginExtension.swift → ...plifyCredentials/AWSPluginExtension.swift
diff --git a/...KCore/AmplifyAWSCredentialsProvider.swift → ...tials/AmplifyAWSCredentialsProvider.swift b/...KCore/AmplifyAWSCredentialsProvider.swift → ...tials/AmplifyAWSCredentialsProvider.swift
diff --git a/...Core/AmplifyAWSServiceConfiguration.swift → ...ials/AmplifyAWSServiceConfiguration.swift b/...Core/AmplifyAWSServiceConfiguration.swift → ...ials/AmplifyAWSServiceConfiguration.swift
diff --git a/...SDKCore/AmplifyAWSSignatureV4Signer.swift → ...entials/AmplifyAWSSignatureV4Signer.swift b/...SDKCore/AmplifyAWSSignatureV4Signer.swift → ...entials/AmplifyAWSSignatureV4Signer.swift
diff --git a/...AWSPluginsSDKCore/AuthTokenProvider.swift → ...mplifyCredentials/AuthTokenProvider.swift b/...AWSPluginsSDKCore/AuthTokenProvider.swift → ...mplifyCredentials/AuthTokenProvider.swift
diff --git a/...ngine/ClientRuntimeFoundationBridge.swift → ...ngine/ClientRuntimeFoundationBridge.swift b/...ngine/ClientRuntimeFoundationBridge.swift → ...ngine/ClientRuntimeFoundationBridge.swift
diff --git a/...ClientEngine/FoundationClientEngine.swift → ...ClientEngine/FoundationClientEngine.swift b/...ClientEngine/FoundationClientEngine.swift → ...ClientEngine/FoundationClientEngine.swift
diff --git a/...tEngine/FoundationClientEngineError.swift → ...tEngine/FoundationClientEngineError.swift b/...tEngine/FoundationClientEngineError.swift → ...tEngine/FoundationClientEngineError.swift
diff --git a/...HttpClientEngine/PluginClientEngine.swift → ...HttpClientEngine/PluginClientEngine.swift b/...HttpClientEngine/PluginClientEngine.swift → ...HttpClientEngine/PluginClientEngine.swift
diff --git a/...ne/SdkHttpRequest+updatingUserAgent.swift → ...ne/SdkHttpRequest+updatingUserAgent.swift b/...ne/SdkHttpRequest+updatingUserAgent.swift → ...ne/SdkHttpRequest+updatingUserAgent.swift
diff --git a/...Engine/UserAgentSettingClientEngine.swift → ...Engine/UserAgentSettingClientEngine.swift b/...Engine/UserAgentSettingClientEngine.swift → ...Engine/UserAgentSettingClientEngine.swift
diff --git a/...lientEngine/UserAgentSuffixAppender.swift → ...lientEngine/UserAgentSuffixAppender.swift b/...lientEngine/UserAgentSuffixAppender.swift → ...lientEngine/UserAgentSuffixAppender.swift
diff --git a/...luginsSDKCore/IAMCredentialProvider.swift → ...fyCredentials/IAMCredentialProvider.swift b/...luginsSDKCore/IAMCredentialProvider.swift → ...fyCredentials/IAMCredentialProvider.swift
diff --git a/...nsSDKCore/Resources/PrivacyInfo.xcprivacy → ...edentials/Resources/PrivacyInfo.xcprivacy b/...nsSDKCore/Resources/PrivacyInfo.xcprivacy → ...edentials/Resources/PrivacyInfo.xcprivacy
diff --git a/...ifyAWSServiceConfiguration+Platform.swift → ...ifyAWSServiceConfiguration+Platform.swift b/...ifyAWSServiceConfiguration+Platform.swift → ...ifyAWSServiceConfiguration+Platform.swift
diff --git a/...SDKCoreTests/AWSPluginsSDKCore.xctestplan → ...entialsTests/AWSPluginsSDKCore.xctestplan b/...SDKCoreTests/AWSPluginsSDKCore.xctestplan → ...entialsTests/AWSPluginsSDKCore.xctestplan
@@ -15,8 +15,8 @@
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSPluginsSDKCoreTests",
-        "name" : "AWSPluginsSDKCoreTests"
+        "identifier" : "InternalAmplifyCredentialsTests",
+        "name" : "InternalAmplifyCredentialsTests"
       }
     }
   ],

diff --git a/...KCoreTests/Auth/AWSAuthServiceTests.swift → ...tialsTests/Auth/AWSAuthServiceTests.swift b/...KCoreTests/Auth/AWSAuthServiceTests.swift → ...tialsTests/Auth/AWSAuthServiceTests.swift
@@ -9,7 +9,7 @@ import XCTest
 
 @testable import Amplify
 @testable import AWSPluginsCore
-@testable import AWSPluginsSDKCore
+@testable import InternalAmplifyCredentials
 import AWSClientRuntime
 
 class AWSAuthServiceTests: XCTestCase {

diff --git a/...s/UserAgentSettingClientEngineTests.swift → ...s/UserAgentSettingClientEngineTests.swift b/...s/UserAgentSettingClientEngineTests.swift → ...s/UserAgentSettingClientEngineTests.swift
@@ -8,7 +8,7 @@
 @_spi(InternalAmplifyPluginExtension) 
 @_spi(PluginHTTPClientEngine)
 @_spi(InternalHttpEngineProxy)
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import ClientRuntime
 import XCTest
 

diff --git a/.../Utils/UserAgentSuffixAppenderTests.swift → .../Utils/UserAgentSuffixAppenderTests.swift b/.../Utils/UserAgentSuffixAppenderTests.swift → .../Utils/UserAgentSuffixAppenderTests.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalAmplifyPluginExtension) @_spi(InternalHttpEngineProxy) import AWSPluginsSDKCore
+@_spi(InternalAmplifyPluginExtension) @_spi(InternalHttpEngineProxy) import InternalAmplifyCredentials
 import ClientRuntime
 import XCTest
 

diff --git a/AmplifyPlugins/Geo/Sources/AWSLocationGeoPlugin/AWSLocationGeoPlugin+Configure.swift b/AmplifyPlugins/Geo/Sources/AWSLocationGeoPlugin/AWSLocationGeoPlugin+Configure.swift
@@ -8,7 +8,7 @@
 import Foundation
 @_spi(InternalAmplifyConfiguration) import Amplify
 import AWSPluginsCore
-@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore
+@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
 import AWSLocation
 import AWSClientRuntime
 

diff --git a/...ns/Internal/Sources/InternalAWSPinpoint/Analytics/PinpointEvent+PinpointClientTypes.swift b/...ns/Internal/Sources/InternalAWSPinpoint/Analytics/PinpointEvent+PinpointClientTypes.swift
@@ -7,7 +7,7 @@
 
 import AWSPinpoint
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import Foundation
 
 extension PinpointEvent {

diff --git a/.../Internal/Sources/InternalAWSPinpoint/Extensions/PinpointClient+CredentialsProvider.swift b/.../Internal/Sources/InternalAWSPinpoint/Extensions/PinpointClient+CredentialsProvider.swift
@@ -8,7 +8,7 @@
 import AWSClientRuntime
 import AWSPluginsCore
 import AWSPinpoint
-@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore
+@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
 
 extension PinpointClient {
     convenience init(region: String, credentialsProvider: CredentialsProviding) throws {

diff --git a/...Plugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift b/...Plugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift
@@ -8,7 +8,7 @@
 import Foundation
 import AWSPinpoint
 import ClientRuntime
-@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore
+@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
 
 @globalActor actor PinpointRequestsRegistry {
     static let shared = PinpointRequestsRegistry()

diff --git a/...ns/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingSessionController.swift b/...ns/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingSessionController.swift
@@ -6,7 +6,7 @@
 //
 
 import AWSPluginsCore
-@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore
+@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
 import Amplify
 import Combine
 import Foundation

diff --git a/...es/AWSCloudWatchLoggingPlugin/Configuration/DefaultRemoteLoggingConstraintsProvider.swift b/...es/AWSCloudWatchLoggingPlugin/Configuration/DefaultRemoteLoggingConstraintsProvider.swift
@@ -8,7 +8,7 @@
 import Foundation
 import Amplify
 import AWSPluginsCore
-import AWSPluginsSDKCore
+import InternalAmplifyCredentials
 import AWSClientRuntime
 import ClientRuntime
 

diff --git a/...yPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService.swift b/...yPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService.swift
@@ -12,7 +12,7 @@ import AWSTextract
 import AWSComprehend
 import AWSPolly
 import AWSPluginsCore
-@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore
+@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
 import Foundation
 import ClientRuntime
 import AWSClientRuntime

diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift
@@ -10,7 +10,7 @@ import AWSS3
 import Amplify
 import AWSPluginsCore
 import ClientRuntime
-@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore
+@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials
 
 /// - Tag: AWSS3StorageService
 class AWSS3StorageService: AWSS3StorageServiceBehavior, StorageServiceProxy {