chore: Refactor internal clients (#952)

Author: jbelkins

Sources/SmithyIdentity/AWSCredentialIdentityResolvers/StaticAWSCredentialIdentityResolver.swift

@@ -5,11 +5,17 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+@_spi(ClientConfigDefaultIdentityResolver) import protocol SmithyIdentityAPI.ClientConfigDefaultIdentityResolver
 import struct Smithy.Attributes
 
 /// A credential identity resolver that provides a fixed set of credentials
 public struct StaticAWSCredentialIdentityResolver: AWSCredentialIdentityResolver {
-    private let credentials: AWSCredentialIdentity
+    fileprivate let credentials: AWSCredentialIdentity
+
+    @_spi(StaticAWSCredentialIdentityResolver)
+    public init() {
+        self.credentials = AWSCredentialIdentity(accessKey: "", secret: "")
+    }
 
     /// Creates a credential identity resolver for a fixed set of credentials
     ///
@@ -24,3 +30,11 @@ public struct StaticAWSCredentialIdentityResolver: AWSCredentialIdentityResolver
         return credentials
     }
 }
+
+@_spi(ClientConfigDefaultIdentityResolver)
+extension StaticAWSCredentialIdentityResolver: ClientConfigDefaultIdentityResolver {
+
+    public var isClientConfigDefault: Bool {
+        self.credentials.accessKey.isEmpty && self.credentials.secret.isEmpty
+    }
+}

Sources/SmithyIdentity/BearerTokenIdentityResolvers/StaticBearerTokenIdentityResolver.swift

@@ -5,11 +5,17 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+@_spi(ClientConfigDefaultIdentityResolver) import protocol SmithyIdentityAPI.ClientConfigDefaultIdentityResolver
 import struct Smithy.Attributes
 
 /// The token identity resolver that returns a static token identity given to it at initialization.
 public struct StaticBearerTokenIdentityResolver: BearerTokenIdentityResolver {
-    private let token: BearerTokenIdentity
+    fileprivate let token: BearerTokenIdentity
+
+    @_spi(StaticBearerTokenIdentityResolver)
+    public init() {
+        self.token = BearerTokenIdentity(token: "")
+    }
 
     public init(token: BearerTokenIdentity) {
         self.token = token
@@ -19,3 +25,11 @@ public struct StaticBearerTokenIdentityResolver: BearerTokenIdentityResolver {
         return token
     }
 }
+
+@_spi(ClientConfigDefaultIdentityResolver)
+extension StaticBearerTokenIdentityResolver: ClientConfigDefaultIdentityResolver {
+
+    public var isClientConfigDefault: Bool {
+        token.token.isEmpty
+    }
+}

Sources/SmithyIdentityAPI/ClientConfigDefaultIdentityResolver.swift

@@ -0,0 +1,17 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+/// A protocol on identity resolver used to signify that this resolver is a default resolver created because the client config was not passed a custom resolver at creation.
+///
+/// Resolvers that do not implement this protocol should be presumed to not be a client config default.
+
+@_spi(ClientConfigDefaultIdentityResolver)
+public protocol ClientConfigDefaultIdentityResolver: IdentityResolver {
+
+    /// Indicates whether this identity resolver was provided as a client config default.
+    var isClientConfigDefault: Bool { get }
+}

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/AuthSchemeResolverGenerator.kt

@@ -132,7 +132,7 @@ class AuthSchemeResolverGenerator(
         // Model-based auth scheme resolver should be private internal impl detail if service uses rules-based resolver.
         val accessModifier = if (usesRulesBasedResolver) "private" else "public"
         val resolvedAccessModifier =
-            if (accessModifier == "public" && ctx.settings.visibility == "internal") {
+            if (accessModifier == "public" && ctx.settings.internalClient) {
                 ctx.settings.visibility
             } else {
                 accessModifier

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftDependency.kt

@@ -52,19 +52,8 @@ class SwiftDependency(
                 "",
                 DistributionMethod.GIT,
             )
-        val CRT =
-            SwiftDependency(
-                "AwsCommonRuntimeKit",
-                null,
-                "0.52.1",
-                "https://github.com/awslabs/aws-crt-swift",
-                "",
-                "aws-crt-swift",
-                DistributionMethod.GIT,
-            )
         val CLIENT_RUNTIME = smithySwiftDependency("ClientRuntime")
         val SMITHY = smithySwiftDependency("Smithy")
-        val SMITHY_IDENTITY_API = smithySwiftDependency("SmithyIdentityAPI")
         val SMITHY_IDENTITY = smithySwiftDependency("SmithyIdentity")
         val SMITHY_RETRIES_API = smithySwiftDependency("SmithyRetriesAPI")
         val SMITHY_RETRIES = smithySwiftDependency("SmithyRetries")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftSettings.kt

@@ -37,6 +37,7 @@ private const val SWIFT_VERSION = "swiftVersion"
 private const val MERGE_MODELS = "mergeModels"
 private const val COPYRIGHT_NOTICE = "copyrightNotice"
 private const val VISIBILITY = "visibility"
+private const val INTERNAL_CLIENT = "internalClient"
 private const val FOR_PROTOCOL_TESTS = "forProtocolTests"
 
 // Prioritized list of protocols supported for code generation
@@ -64,6 +65,7 @@ class SwiftSettings(
     val mergeModels: Boolean,
     val copyrightNotice: String,
     val visibility: String,
+    val internalClient: Boolean,
     val forProtocolTests: Boolean,
 ) {
     companion object {
@@ -120,6 +122,7 @@ class SwiftSettings(
                     "// Code generated by smithy-swift-codegen. DO NOT EDIT!\n\n",
                 )
             val visibility = config.getStringMemberOrDefault(VISIBILITY, "public")
+            val internalClient = config.getBooleanMemberOrDefault(INTERNAL_CLIENT, false)
             val forProtocolTests = config.getBooleanMemberOrDefault(FOR_PROTOCOL_TESTS, false)
 
             return SwiftSettings(
@@ -135,6 +138,7 @@ class SwiftSettings(
                 mergeModels,
                 copyrightNotice,
                 visibility,
+                internalClient,
                 forProtocolTests,
             )
         }

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/lang/AccessModifier.kt

@@ -15,6 +15,7 @@ enum class AccessModifier {
     PublicPrivateSet,
     Internal,
     Private,
+    Package,
     None,
     ;
 
@@ -27,6 +28,7 @@ enum class AccessModifier {
             PublicPrivateSet -> "public private(set)"
             Internal -> "internal"
             Private -> "private"
+            Package -> "package"
             None -> ""
         }
 

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/lang/ReservedWords.kt

@@ -83,6 +83,7 @@ val reservedWords =
         "operator",
         "optional",
         "override",
+        "package",
         "postfix",
         "prefix",
         "private",

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftmodules/ClientRuntimeTypes.kt

@@ -108,12 +108,12 @@ private fun runtimeSymbol(
     name: String,
     declaration: SwiftDeclaration?,
     additionalImports: List<Symbol> = emptyList(),
-    spiName: List<String> = emptyList(),
+    spiNames: List<String> = emptyList(),
 ): Symbol =
     SwiftSymbol.make(
         name,
         declaration,
         SwiftDependency.CLIENT_RUNTIME.takeIf { additionalImports.isEmpty() },
         additionalImports,
-        spiName,
+        spiNames,
     )

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftmodules/SmithyIdentityTypes.kt

@@ -5,21 +5,25 @@ import software.amazon.smithy.swift.codegen.SwiftDeclaration
 import software.amazon.smithy.swift.codegen.SwiftDependency
 
 object SmithyIdentityTypes {
-    val AWSCredentialIdentityResolver = runtimeSymbol("AWSCredentialIdentityResolver", SwiftDeclaration.PROTOCOL)
+    val AWSCredentialIdentityResolver =
+        runtimeSymbol("AWSCredentialIdentityResolver", SwiftDeclaration.PROTOCOL, listOf("AWSCredentialIdentityResolver"))
     val BearerTokenIdentityResolver = runtimeSymbol("BearerTokenIdentityResolver", SwiftDeclaration.PROTOCOL)
     val BearerTokenIdentity = runtimeSymbol("BearerTokenIdentity", SwiftDeclaration.STRUCT)
-    val StaticBearerTokenIdentityResolver = runtimeSymbol("StaticBearerTokenIdentityResolver", SwiftDeclaration.STRUCT)
-    val StaticAWSCredentialIdentityResolver = runtimeSymbol("StaticAWSCredentialIdentityResolver", SwiftDeclaration.STRUCT)
+    val StaticAWSCredentialIdentityResolver =
+        runtimeSymbol("StaticAWSCredentialIdentityResolver", SwiftDeclaration.STRUCT, listOf("StaticAWSCredentialIdentityResolver"))
+    val StaticBearerTokenIdentityResolver =
+        runtimeSymbol("StaticBearerTokenIdentityResolver", SwiftDeclaration.STRUCT, listOf("StaticBearerTokenIdentityResolver"))
 }
 
 private fun runtimeSymbol(
     name: String,
     declaration: SwiftDeclaration? = null,
+    spiNames: List<String> = listOf(),
 ): Symbol =
     SwiftSymbol.make(
         name,
         declaration,
         SwiftDependency.SMITHY_IDENTITY,
         emptyList(),
-        emptyList(),
+        spiNames,
     )