more fixes for inflight-features

Author: ianbotsf

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt

@@ -222,7 +222,7 @@ class ShapeValueGenerator(
                         val currSymbol = generator.symbolProvider.toSymbol(currShape)
                         val memberName = generator.symbolProvider.toMemberName(member)
                         val variantName = memberName.replaceFirstChar { c -> c.uppercaseChar() }
-                        writer.writeInline("${currSymbol.name}.$variantName(")
+                        writer.writeInline("#T.#L(", currSymbol, variantName)
                         generator.instantiateShapeInline(writer, memberShape, valueNode)
                         writer.writeInline(")")
                     }

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt

@@ -132,18 +132,19 @@ class SmokeTestsRunnerGenerator(
             }
             write("")
             withInlineBlock("try {", "} ") {
-                renderClient(testCase)
-                renderOperation(operation, testCase)
+                renderTestCase(operation, testCase)
             }
             withBlock("catch (exception: Exception) {", "}") {
                 renderCatchBlock(testCase)
             }
         }
     }
 
-    private fun renderClient(testCase: SmokeTestCase) {
-        writer.withInlineBlock("#T {", "}", service) {
+    private fun renderTestCase(operation: OperationShape, testCase: SmokeTestCase) {
+        writer.withBlock("#T {", "}", service) {
             renderClientConfig(testCase)
+            closeAndOpenBlock("}.#T { client ->", RuntimeTypes.Core.IO.use)
+            renderOperation(operation, testCase)
         }
     }
 
@@ -159,10 +160,8 @@ class SmokeTestsRunnerGenerator(
             return
         }
 
-        testCase.clientConfig!!.forEach { config ->
-            val name = config.key.value.toCamelCase()
-            val value = config.value.format()
-
+        testCase.clientConfig.forEach { (name, unformattedValue) ->
+            val value = unformattedValue.format()
             writer.declareSection(
                 SmokeTestSectionIds.ClientConfig,
                 mapOf(
@@ -172,24 +171,22 @@ class SmokeTestsRunnerGenerator(
                     EndpointParams to EndpointParametersGenerator.getSymbol(settings),
                 ),
             ) {
-                writer.writeInline("#L = #L", name, value)
+                writer.write("#L = #L", name, value)
             }
         }
     }
 
     private fun renderOperation(operation: OperationShape, testCase: SmokeTestCase) {
-        writer.withBlock(".#T { client ->", "}", RuntimeTypes.Core.IO.use) {
-            val inputParams = testCase.params.getOrNull()
+        val inputParams = testCase.params.getOrNull()
 
-            writeInline("client.#L", operation.defaultName())
+        writer.writeInline("client.#L", operation.defaultName())
 
-            if (inputParams == null) {
-                write("()")
-            } else {
-                withBlock("(", ")") {
-                    val inputShape = model.expectShape(operation.input.get())
-                    ShapeValueGenerator(model, symbolProvider).instantiateShapeInline(writer, inputShape, inputParams)
-                }
+        if (inputParams == null) {
+            writer.write("()")
+        } else {
+            writer.withBlock("(", ")") {
+                val inputShape = model.expectShape(operation.input.get())
+                ShapeValueGenerator(model, symbolProvider).instantiateShapeInline(writer, inputShape, inputParams)
             }
         }
     }
@@ -277,8 +274,12 @@ class SmokeTestsRunnerGenerator(
     /**
      * Get the client configuration required for a [SmokeTestCase]
      */
-    private val SmokeTestCase.clientConfig: MutableMap<StringNode, Node>?
-        get() = this.vendorParams.get().members
+    private val SmokeTestCase.clientConfig: Map<String, Node>
+        get() = vendorParams
+            .getOrNull()
+            ?.members
+            ?.mapKeys { (key, _) -> key.value }
+            .orEmpty()
 
     // Constants
     private val model = ctx.model

codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt

@@ -30,7 +30,8 @@ class SmokeTestsRunnerGeneratorTest {
                         }
                         vendorParamsShape: AwsVendorParams,
                         vendorParams: {
-                            region: "eu-central-1"
+                            region: "eu-central-1",
+                            uri: "https://foo.amazon.com"
                         }
                     }
                     {
@@ -109,6 +110,7 @@ class SmokeTestsRunnerGeneratorTest {
                         TestClient {
                             interceptors.add(SmokeTestsInterceptor())
                             region = "eu-central-1"
+                            uri = "https://foo.amazon.com"
                         }.use { client ->
                             client.testOperation(
                                 TestOperationRequest {
@@ -144,7 +146,6 @@ class SmokeTestsRunnerGeneratorTest {
                 
                     try {
                         TestClient {
-                
                         }.use { client ->
                             client.testOperation(
                                 TestOperationRequest {
@@ -181,7 +182,6 @@ class SmokeTestsRunnerGeneratorTest {
                     try {
                         TestClient {
                             interceptors.add(SmokeTestsInterceptor())
-                
                         }.use { client ->
                             client.testOperation(
                                 TestOperationRequest {