PR feedback #2

Author: 0marperez

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt

@@ -117,6 +117,7 @@ object RuntimeTypes {
         object SmokeTests : RuntimeTypePackage(KotlinDependency.CORE, "smoketests") {
             val exitProcess = symbol("exitProcess")
             val printExceptionStackTrace = symbol("printExceptionStackTrace")
+            val SmokeTestsException = symbol("SmokeTestsException")
         }
 
         object Collections : RuntimeTypePackage(KotlinDependency.CORE, "collections") {

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

@@ -10,10 +10,10 @@ import software.amazon.smithy.kotlin.codegen.model.isStringEnumShape
 import software.amazon.smithy.kotlin.codegen.rendering.endpoints.EndpointParametersGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.endpoints.EndpointProviderGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.stringToNumber
-import software.amazon.smithy.kotlin.codegen.rendering.smoketests.ClientConfig.EndpointParams
-import software.amazon.smithy.kotlin.codegen.rendering.smoketests.ClientConfig.EndpointProvider
-import software.amazon.smithy.kotlin.codegen.rendering.smoketests.ClientConfig.Name
-import software.amazon.smithy.kotlin.codegen.rendering.smoketests.ClientConfig.Value
+import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SmokeTestSectionIds.ClientConfig.EndpointParams
+import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SmokeTestSectionIds.ClientConfig.EndpointProvider
+import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SmokeTestSectionIds.ClientConfig.Name
+import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SmokeTestSectionIds.ClientConfig.Value
 import software.amazon.smithy.kotlin.codegen.rendering.util.format
 import software.amazon.smithy.kotlin.codegen.utils.dq
 import software.amazon.smithy.kotlin.codegen.utils.toCamelCase
@@ -26,16 +26,18 @@ import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
 import kotlin.jvm.optionals.getOrNull
 
 // Section IDs
-object AdditionalEnvironmentVariables : SectionId
-object DefaultClientConfig : SectionId
-object HttpEngineOverride : SectionId
-object ServiceFilter : SectionId
-object SkipTags : SectionId
-object ClientConfig : SectionId {
-    val Name: SectionKey<String> = SectionKey("aws.smithy.kotlin#SmokeTestClientConfigName")
-    val Value: SectionKey<String> = SectionKey("aws.smithy.kotlin#SmokeTestClientConfigValue")
-    val EndpointProvider: SectionKey<Symbol> = SectionKey("aws.smithy.kotlin#SmokeTestEndpointProvider")
-    val EndpointParams: SectionKey<Symbol> = SectionKey("aws.smithy.kotlin#SmokeTestClientEndpointParams")
+object SmokeTestSectionIds {
+    object AdditionalEnvironmentVariables : SectionId
+    object DefaultClientConfig : SectionId
+    object HttpEngineOverride : SectionId
+    object ServiceFilter : SectionId
+    object SkipTags : SectionId
+    object ClientConfig : SectionId {
+        val Name: SectionKey<String> = SectionKey("aws.smithy.kotlin#SmokeTestClientConfigName")
+        val Value: SectionKey<String> = SectionKey("aws.smithy.kotlin#SmokeTestClientConfigValue")
+        val EndpointProvider: SectionKey<Symbol> = SectionKey("aws.smithy.kotlin#SmokeTestEndpointProvider")
+        val EndpointParams: SectionKey<Symbol> = SectionKey("aws.smithy.kotlin#SmokeTestClientEndpointParams")
+    }
 }
 
 /**
@@ -61,7 +63,7 @@ class SmokeTestsRunnerGenerator(
     internal fun render() {
         writer.write("private var exitCode = 0")
         renderEnvironmentVariables()
-        writer.declareSection(AdditionalEnvironmentVariables)
+        writer.declareSection(SmokeTestSectionIds.AdditionalEnvironmentVariables)
         writer.write("")
         writer.withBlock("public suspend fun main() {", "}") {
             renderFunctionCalls()
@@ -77,7 +79,7 @@ class SmokeTestsRunnerGenerator(
             "private val skipTags = #T.System.getenv(",
             RuntimeTypes.Core.Utils.PlatformProvider,
         )
-        writer.declareSection(SkipTags) {
+        writer.declareSection(SmokeTestSectionIds.SkipTags) {
             writer.writeInline("#S", SKIP_TAGS)
         }
         writer.write(
@@ -90,7 +92,7 @@ class SmokeTestsRunnerGenerator(
             "private val serviceFilter = #T.System.getenv(",
             RuntimeTypes.Core.Utils.PlatformProvider,
         )
-        writer.declareSection(ServiceFilter) {
+        writer.declareSection(SmokeTestSectionIds.ServiceFilter) {
             writer.writeInline("#S", SERVICE_FILTER)
         }
         writer.write(
@@ -152,10 +154,10 @@ class SmokeTestsRunnerGenerator(
             writer.write("interceptors.add(#T())", RuntimeTypes.HttpClient.Interceptors.SmokeTestsInterceptor)
         }
 
-        writer.declareSection(HttpEngineOverride)
+        writer.declareSection(SmokeTestSectionIds.HttpEngineOverride)
 
         if (!testCase.hasClientConfig) {
-            writer.declareSection(DefaultClientConfig)
+            writer.declareSection(SmokeTestSectionIds.DefaultClientConfig)
             return
         }
 
@@ -164,7 +166,7 @@ class SmokeTestsRunnerGenerator(
             val value = config.value.format()
 
             writer.declareSection(
-                ClientConfig,
+                SmokeTestSectionIds.ClientConfig,
                 mapOf(
                     Name to name,
                     Value to value,

runtime/runtime-core/api/runtime-core.api

@@ -2046,6 +2046,10 @@ public final class aws/smithy/kotlin/runtime/retries/policy/SuccessAcceptor : aw
 	public final fun getSuccess ()Z
 }
 
+public final class aws/smithy/kotlin/runtime/smoketests/SmokeTestsException : java/lang/Exception {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public final class aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsJVMKt {
 	public static final fun exitProcess (I)Ljava/lang/Void;
 }

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt

@@ -17,3 +17,5 @@ public expect fun exitProcess(status: Int): Nothing
  */
 public fun printExceptionStackTrace(exception: Exception): Unit =
     println(exception.stackTraceToString().split("\n").joinToString("\n") { "#$it" })
+
+public class SmokeTestsException(message: String) : Exception(message)