chore: update test expectations to match explicit API mode from smithy-kotlin (#657)

Author: ianbotsf

codegen/smithy-aws-kotlin-codegen/build.gradle.kts

@@ -82,6 +82,9 @@ tasks.test {
     testLogging {
         events("passed", "skipped", "failed")
         showStandardStreams = true
+        showStackTraces = true
+        showExceptions = true
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
     }
 }
 

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegration.kt

@@ -38,7 +38,7 @@ class AwsServiceConfigIntegration : KotlinIntegration {
 
             propertyType = ClientConfigPropertyType.Custom(render = { prop, writer ->
                 writer.write(
-                    "val #1L: #2T = builder.#1L?.borrow() ?: #3T()",
+                    "public val #1L: #2T = builder.#1L?.borrow() ?: #3T()",
                     prop.propertyName,
                     prop.symbol,
                     AwsRuntimeTypes.Config.Credentials.DefaultChainCredentialsProvider
@@ -55,9 +55,9 @@ class AwsServiceConfigIntegration : KotlinIntegration {
     private val overrideServiceCompanionObjectWriter = SectionWriter { writer, _ ->
         // override the service client companion object for how a client is constructed
         val serviceSymbol: Symbol = writer.getContextValue(ServiceGenerator.SectionServiceCompanionObject.ServiceSymbol)
-        writer.withBlock("companion object {", "}") {
+        writer.withBlock("public companion object {", "}") {
             withBlock(
-                "operator fun invoke(block: Config.Builder.() -> Unit): #L {",
+                "public operator fun invoke(block: Config.Builder.() -> Unit): #L {",
                 "}",
                 serviceSymbol.name
             ) {
@@ -66,15 +66,15 @@ class AwsServiceConfigIntegration : KotlinIntegration {
             }
 
             write("")
-            write("operator fun invoke(config: Config): ${serviceSymbol.name} = Default${serviceSymbol.name}(config)")
+            write("public operator fun invoke(config: Config): ${serviceSymbol.name} = Default${serviceSymbol.name}(config)")
 
             // generate a convenience init to resolve a client from the current environment
             write("")
             dokka {
                 write("Construct a [${serviceSymbol.name}] by resolving the configuration from the current environment.")
             }
             writer.withBlock(
-                "suspend fun fromEnvironment(block: (Config.Builder.() -> Unit)? = null): #T {",
+                "public suspend fun fromEnvironment(block: (Config.Builder.() -> Unit)? = null): #T {",
                 "}",
                 serviceSymbol
             ) {

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/core/AwsHttpProtocolClientGenerator.kt

@@ -32,9 +32,9 @@ open class AwsHttpProtocolClientGenerator(
 
     override fun render(writer: KotlinWriter) {
         writer.write("\n\n")
-        writer.write("const val ServiceId: String = #S", ctx.service.sdkId)
-        writer.write("const val ServiceApiVersion: String = #S", ctx.service.version)
-        writer.write("const val SdkVersion: String = #S", ctx.settings.pkg.version)
+        writer.write("public const val ServiceId: String = #S", ctx.service.sdkId)
+        writer.write("public const val ServiceApiVersion: String = #S", ctx.service.version)
+        writer.write("public const val SdkVersion: String = #S", ctx.settings.pkg.version)
         writer.write("\n\n")
         super.render(writer)
 

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegrationTest.kt

@@ -43,9 +43,9 @@ class AwsServiceConfigIntegrationTest {
         val contents = writer.toString()
 
         val expectedProps = """
-    val credentialsProvider: CredentialsProvider = builder.credentialsProvider?.borrow() ?: DefaultChainCredentialsProvider()
-    val endpointResolver: AwsEndpointResolver = builder.endpointResolver ?: DefaultEndpointResolver()
-    val region: String = requireNotNull(builder.region) { "region is a required configuration property" }
+    public val credentialsProvider: CredentialsProvider = builder.credentialsProvider?.borrow() ?: DefaultChainCredentialsProvider()
+    public val endpointResolver: AwsEndpointResolver = builder.endpointResolver ?: DefaultEndpointResolver()
+    public val region: String = requireNotNull(builder.region) { "region is a required configuration property" }
 """
         contents.shouldContainOnlyOnceWithDiff(expectedProps)
 
@@ -56,16 +56,16 @@ class AwsServiceConfigIntegrationTest {
          * NOTE: The caller is responsible for managing the lifetime of the provider when set. The SDK
          * client will not close it when the client is closed.
          */
-        var credentialsProvider: CredentialsProvider? = null
+        public var credentialsProvider: CredentialsProvider? = null
         /**
          * Determines the endpoint (hostname) to make requests to. When not provided a default
          * resolver is configured automatically. This is an advanced client option.
          */
-        var endpointResolver: AwsEndpointResolver? = null
+        public var endpointResolver: AwsEndpointResolver? = null
         /**
          * AWS region to make requests to
          */
-        var region: String? = null
+        public var region: String? = null
 """
         contents.shouldContainOnlyOnceWithDiff(expectedImpl)
     }

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/PresignerGeneratorTest.kt

@@ -232,7 +232,7 @@ class PresignerGeneratorTest {
              * This type can be used to presign requests in cases where an existing service client
              * instance is not available.
              */
-            class TestPresignConfig private constructor(builder: Builder): ServicePresignConfig {
+            public class TestPresignConfig private constructor(builder: Builder): ServicePresignConfig {
                 override val credentialsProvider: CredentialsProvider = requireNotNull(builder.credentialsProvider) { "credentialsProvider is a required configuration property" }
                 override val endpointProvider: SigningEndpointProvider = builder.endpointProvider ?: DefaultEndpointResolver().asSigningEndpointProvider()
                 override val normalizeUriPath: Boolean = true
@@ -241,27 +241,27 @@ class PresignerGeneratorTest {
                 override val signer: AwsSigner = builder.signer ?: DefaultAwsSigner
                 override val signingName: String = "example-signing-name"
                 override val useDoubleUriEncode: Boolean = true
-                companion object {
-                    inline operator fun invoke(block: Builder.() -> kotlin.Unit): ServicePresignConfig = Builder().apply(block).build()
+                public companion object {
+                    public inline operator fun invoke(block: Builder.() -> kotlin.Unit): ServicePresignConfig = Builder().apply(block).build()
                 }
             
-                class Builder {
+                public class Builder {
                     /**
                      * The AWS credentials provider to use for authenticating requests. If not provided a [aws.sdk.kotlin.runtime.auth.credentials.DefaultChainCredentialsProvider] instance will be used.
                      */
-                    var credentialsProvider: CredentialsProvider? = null
+                    public var credentialsProvider: CredentialsProvider? = null
                     /**
                      * Provides the endpoint (hostname) and signing context to make requests to. When not provided a default resolver is configured automatically. This is an advanced client option.
                      */
-                    var endpointProvider: SigningEndpointProvider? = null
+                    public var endpointProvider: SigningEndpointProvider? = null
                     /**
                      * AWS region to make requests for
                      */
-                    var region: String? = null
+                    public var region: String? = null
                     /**
                      * The implementation of AWS signer to use for signing requests
                      */
-                    var signer: AwsSigner? = null
+                    public var signer: AwsSigner? = null
             
                     @PublishedApi
                     internal fun build(): TestPresignConfig = TestPresignConfig(this)

gradle.properties

@@ -12,7 +12,7 @@ sdkVersion=0.17.1-SNAPSHOT
 smithyVersion=1.22.0
 smithyGradleVersion=0.5.3
 # smithy-kotlin codegen and runtime are versioned together
-smithyKotlinVersion=0.12.0
+smithyKotlinVersion=0.12.1-SNAPSHOT
 
 # kotlin
 kotlinVersion=1.7.0