feat(core): make AmplifyOutputsData and all nested types public

Amplify/Core/Configuration/AmplifyOutputsData.swift

@@ -14,13 +14,15 @@ import Foundation
 
 /// Represents Amplify's Gen2 configuration for all categories intended to be used in an application.
 ///
+/// Currently supports schema version `1` of the `amplify_outputs.json` format.
+///
 /// See: [Amplify.configure](x-source-tag://Amplify.configure)
 ///
 /// - Tag: AmplifyOutputs
 ///
-@_spi(InternalAmplifyConfiguration)
 public struct AmplifyOutputsData: Codable {
-    public let version: String
+    static let currentVersion = "1"
+    let version: String
     public let analytics: Analytics?
     public let auth: Auth?
     public let data: DataCategory?
@@ -29,7 +31,6 @@ public struct AmplifyOutputsData: Codable {
     public let storage: Storage?
     public let custom: CustomOutput?
 
-    @_spi(InternalAmplifyConfiguration)
     public struct Analytics: Codable {
         public let amazonPinpoint: AmazonPinpoint?
 
@@ -39,7 +40,6 @@ public struct AmplifyOutputsData: Codable {
         }
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public struct Auth: Codable {
         public let awsRegion: AWSRegion
         public let userPoolId: String
@@ -54,7 +54,6 @@ public struct AmplifyOutputsData: Codable {
         public let mfaConfiguration: String?
         public let mfaMethods: [String]?
 
-        @_spi(InternalAmplifyConfiguration)
         public struct PasswordPolicy: Codable {
             public let minLength: UInt
             public let requireNumbers: Bool
@@ -63,7 +62,6 @@ public struct AmplifyOutputsData: Codable {
             public let requireSymbols: Bool
         }
 
-        @_spi(InternalAmplifyConfiguration)
         public struct OAuth: Codable {
             public let identityProviders: [String]
             public let domain: String
@@ -73,19 +71,17 @@ public struct AmplifyOutputsData: Codable {
             public let responseType: String
         }
 
-        @_spi(InternalAmplifyConfiguration)
         public enum UsernameAttributes: String, Codable {
             case email
             case phoneNumber = "phone_number"
         }
 
-        @_spi(InternalAmplifyConfiguration)
         public enum UserVerificationType: String, Codable {
             case email
             case phoneNumber = "phone_number"
         }
 
-        init(
+        public init(
             awsRegion: AWSRegion,
             userPoolId: String,
             userPoolClientId: String,
@@ -115,7 +111,6 @@ public struct AmplifyOutputsData: Codable {
 
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public struct DataCategory: Codable {
         public let awsRegion: AWSRegion
         public let url: String
@@ -125,38 +120,32 @@ public struct AmplifyOutputsData: Codable {
         public let authorizationTypes: [AWSAppSyncAuthorizationType]
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public struct Geo: Codable {
         public let awsRegion: AWSRegion
         public let maps: Maps?
         public let searchIndices: SearchIndices?
         public let geofenceCollections: GeofenceCollections?
 
-        @_spi(InternalAmplifyConfiguration)
         public struct Maps: Codable {
             public let items: [String: AmazonLocationServiceConfig]
             public let `default`: String
 
-            @_spi(InternalAmplifyConfiguration)
             public struct AmazonLocationServiceConfig: Codable {
                 public let style: String
             }
         }
 
-        @_spi(InternalAmplifyConfiguration)
         public struct SearchIndices: Codable {
             public let items: [String]
             public let `default`: String
         }
 
-        @_spi(InternalAmplifyConfiguration)
         public struct GeofenceCollections: Codable {
             public let items: [String]
             public let `default`: String
         }
 
-        // Internal init used for testing
-        init(
+        public init(
             awsRegion: AWSRegion,
             maps: Maps? = nil,
             searchIndices: SearchIndices? = nil,
@@ -169,28 +158,30 @@ public struct AmplifyOutputsData: Codable {
         }
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public struct Notifications: Codable {
         public let awsRegion: String
         public let amazonPinpointAppId: String
         public let channels: [AmazonPinpointChannelType]
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public struct Storage: Codable {
         public let awsRegion: AWSRegion
         public let bucketName: String
         public let buckets: [Bucket]?
 
-        @_spi(InternalAmplifyConfiguration)
         public struct Bucket: Codable {
             public let name: String
             public let bucketName: String
             public let awsRegion: AWSRegion
+
+            public init(name: String, bucketName: String, awsRegion: AWSRegion) {
+                self.name = name
+                self.bucketName = bucketName
+                self.awsRegion = awsRegion
+            }
         }
 
-        // Internal init used for testing
-        init(
+        public init(
             awsRegion: AWSRegion,
             bucketName: String,
             buckets: [Bucket]? = nil
@@ -201,13 +192,10 @@ public struct AmplifyOutputsData: Codable {
         }
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public struct CustomOutput: Codable {}
 
-    @_spi(InternalAmplifyConfiguration)
     public typealias AWSRegion = String
 
-    @_spi(InternalAmplifyConfiguration)
     public enum AmazonCognitoStandardAttributes: String, Codable, CodingKeyRepresentable {
         case address
         case birthdate
@@ -229,7 +217,6 @@ public struct AmplifyOutputsData: Codable {
         case zoneinfo
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public enum AWSAppSyncAuthorizationType: String, Codable {
         case amazonCognitoUserPools = "AMAZON_COGNITO_USER_POOLS"
         case apiKey = "API_KEY"
@@ -238,7 +225,6 @@ public struct AmplifyOutputsData: Codable {
         case openIDConnect = "OPENID_CONNECT"
     }
 
-    @_spi(InternalAmplifyConfiguration)
     public enum AmazonPinpointChannelType: String, Codable {
         case inAppMessaging = "IN_APP_MESSAGING"
         case fcm = "FCM"
@@ -247,9 +233,7 @@ public struct AmplifyOutputsData: Codable {
         case sms = "SMS"
     }
 
-    // Internal init used for testing
-    init(
-        version: String = "",
+    public init(
         analytics: Analytics? = nil,
         auth: Auth? = nil,
         data: DataCategory? = nil,
@@ -258,7 +242,7 @@ public struct AmplifyOutputsData: Codable {
         storage: Storage? = nil,
         custom: CustomOutput? = nil
     ) {
-        self.version = version
+        self.version = AmplifyOutputsData.currentVersion
         self.analytics = analytics
         self.auth = auth
         self.data = data
@@ -276,13 +260,12 @@ public struct AmplifyOutputsData: Codable {
 public struct AmplifyOutputs: @unchecked Sendable {
 
     /// A closure that resolves the `AmplifyOutputsData` configuration
-    @_spi(InternalAmplifyConfiguration)
     public let resolveConfiguration: () throws -> AmplifyOutputsData
 
     /// Resolves configuration with `amplify_outputs.json` in the main bundle.
     public static let amplifyOutputs: AmplifyOutputs = .init {
-            try AmplifyOutputsData(bundle: Bundle.main, resource: "amplify_outputs")
-        }
+        try AmplifyOutputsData(bundle: Bundle.main, resource: "amplify_outputs")
+    }
 
     /// Resolves configuration with a data object, from the contents of an `amplify_outputs.json` file.
     public static func data(_ data: Data) -> AmplifyOutputs {
@@ -336,7 +319,6 @@ public extension Amplify {
     /// - Parameter configuration: The AmplifyOutputsData object
     ///
     /// - Tag: Amplify.configure
-    @_spi(InternalAmplifyConfiguration)
     static func configure(_ configuration: AmplifyOutputsData) throws {
         // Always configure logging first since Auth dependings on logging
         try configure(CategoryType.logging.category, using: configuration)

AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+Configure.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 import AwsCommonRuntimeKit
 import AWSPluginsCore
 import InternalAmplifyCredentials

AmplifyPlugins/API/Sources/AWSAPIPlugin/Configuration/AWSAPICategoryPluginConfiguration+EndpointConfig.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 import AWSPluginsCore
 import Foundation
 

AmplifyPlugins/API/Sources/AWSAPIPlugin/Configuration/AWSAPICategoryPluginConfiguration.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 import AWSPluginsCore
 import Foundation
 import InternalAmplifyCredentials

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

@@ -7,7 +7,7 @@
 
 import XCTest
 @testable import AWSAPIPlugin
-@_spi(InternalAmplifyConfiguration) @testable import Amplify
+@testable import Amplify
 #if os(watchOS)
 @testable import APIWatchApp
 #else

AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGen2GraphQLTests/AWSAPIPluginGen2GraphQLBaseTest.swift

@@ -8,7 +8,7 @@
 import AWSCognitoAuthPlugin
 import XCTest
 @testable import AWSAPIPlugin
-@_spi(InternalAmplifyConfiguration) @testable import Amplify
+@testable import Amplify
 @testable import APIHostApp
 @testable import AWSPluginsCore
 

AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginGen2GraphQLTests/TestConfigHelper.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-@_spi(InternalAmplifyConfiguration) @testable import Amplify
+@testable import Amplify
 
 class TestConfigHelper {
 

AmplifyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+ConfigureTests.swift

@@ -7,7 +7,7 @@
 
 import XCTest
 
-@_spi(InternalAmplifyConfiguration) @testable import Amplify
+@testable import Amplify
 @testable import AWSAPIPlugin
 
 class AWSAPICategoryPluginConfigureTests: AWSAPICategoryPluginTestBase {

AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/AWSPinpointAnalyticsPlugin+Configure.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 import AWSPluginsCore
 import Foundation
 @_spi(InternalAWSPinpoint) import InternalAWSPinpoint

AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Configuration/AWSPinpointAnalyticsPluginConfiguration.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-@_spi(InternalAmplifyConfiguration) @preconcurrency import Amplify
+@preconcurrency import Amplify
 import AWSClientRuntime
 import AWSPinpoint
 import AWSPinpoint

AmplifyPlugins/Analytics/Tests/AWSPinpointAnalyticsPluginUnitTests/AWSPinpointAnalyticsPluginConfigureTests.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable @_spi(InternalAmplifyConfiguration) import Amplify
+@testable import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSPinpointAnalyticsPlugin
 @_spi(InternalAWSPinpoint) @testable import InternalAWSPinpoint

AmplifyPlugins/Analytics/Tests/AWSPinpointAnalyticsPluginUnitTests/Configuration/AWSPinpointAnalyticsPluginAmplifyOutputsConfigurationTests.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable @_spi(InternalAmplifyConfiguration) import Amplify
+@testable import Amplify
 @testable import AWSPinpointAnalyticsPlugin
 @_spi(InternalAWSPinpoint) @testable import InternalAWSPinpoint
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 import AWSClientRuntime
 import AWSCognitoIdentity
 import AWSCognitoIdentityProvider

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin.swift

@@ -38,7 +38,6 @@ public final class AWSCognitoAuthPlugin: AWSCognitoAuthPluginBehavior {
     /// The user secure storage preferences for access group
     let secureStoragePreferences: AWSCognitoSecureStoragePreferences?
 
-    @_spi(InternalAmplifyConfiguration)
     public internal(set) var jsonConfiguration: JSONValue?
 
     /// The unique key of the plugin within the auth category.

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/UserPoolConfigurationData.swift

@@ -6,7 +6,7 @@
 //
 
 import ClientRuntime
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 import SmithyHTTPAPI
 
 struct UserPoolConfigurationData: Equatable {

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Helpers/ConfigurationHelper.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 
 struct ConfigurationHelper {
 

AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/ConfigurationTests/AWSCognitoAuthPluginAmplifyOutputsConfigTests.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@_spi(InternalAmplifyConfiguration) @testable import Amplify
+@testable import Amplify
 @testable import AWSCognitoAuthPlugin
 
 class AWSCognitoAuthPluginAmplifyOutputsConfigTests: XCTestCase {

AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/Support/ConfigurationHelperTests.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@_spi(InternalAmplifyConfiguration) @testable import Amplify
+@testable import Amplify
 @testable import AWSCognitoAuthPlugin
 
 final class ConfigurationHelperTests: XCTestCase {

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/AWSAuthBaseTest.swift

@@ -7,7 +7,7 @@
 
 import AWSCognitoAuthPlugin
 import XCTest
-@_spi(InternalAmplifyConfiguration) @testable import Amplify
+@testable import Amplify
 
 private let internalTestDomain = "@amplify-swift-gamma.awsapps.com"
 

AmplifyPlugins/Core/AWSPluginsCore/API/AWSAppSyncConfiguration.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-@_spi(InternalAmplifyConfiguration) import Amplify
+import Amplify
 
 
 /// Hold necessary AWS AppSync configuration values to interact with the AppSync API