Move some functions to common KMP code

smithy-lang · Sep 24, 2024 · bd0072c · bd0072c
1 parent 1055f1b
commit bd0072c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/...kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/...kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -115,7 +115,8 @@ object RuntimeTypes {
         }
 
         object SmokeTests : RuntimeTypePackage(KotlinDependency.CORE, "smoketests") {
-            val ExitProcess = symbol("exitProcess")
+            val exitProcess = symbol("exitProcess")
+            val getEnv = symbol("getEnv")
         }
 
         object Collections : RuntimeTypePackage(KotlinDependency.CORE, "collections") {
@@ -174,6 +175,7 @@ object RuntimeTypes {
             val Closeable = symbol("Closeable")
             val SdkManagedGroup = symbol("SdkManagedGroup")
             val addIfManaged = symbol("addIfManaged", isExtension = true)
+            val use = symbol("use")
         }
 
         object Text : RuntimeTypePackage(KotlinDependency.CORE, "text") {

diff --git a/...n/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt b/...n/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
@@ -39,13 +39,23 @@ class SmokeTestsRunnerGenerator(
     internal fun render() {
         writer.declareSection(SmokeTestsRunner) {
             write("private var exitCode = 0")
-            write("private val skipTags = System.getenv(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()", SKIP_TAGS, ",")
-            write("private val serviceFilter = System.getenv(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()", SERVICE_FILTER, ",")
+            write(
+                "private val skipTags = #T(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()",
+                RuntimeTypes.Core.SmokeTests.getEnv,
+                SKIP_TAGS,
+                ",",
+            )
+            write(
+                "private val serviceFilter = #T(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()",
+                RuntimeTypes.Core.SmokeTests.getEnv,
+                SERVICE_FILTER,
+                ",",
+            )
             declareSection(SmokeTestAdditionalEnvVars)
             write("")
             withBlock("public suspend fun main() {", "}") {
                 renderFunctionCalls()
-                write("#T(exitCode)", RuntimeTypes.Core.SmokeTests.ExitProcess)
+                write("#T(exitCode)", RuntimeTypes.Core.SmokeTests.exitProcess)
             }
             write("")
             renderFunctions()
@@ -120,7 +130,7 @@ class SmokeTestsRunnerGenerator(
     private fun renderOperation(operation: OperationShape, testCase: SmokeTestCase) {
         val operationSymbol = symbolProvider.toSymbol(model.getShape(operation.input.get()).get())
 
-        writer.withBlock(".use { client ->", "}") {
+        writer.withBlock(".#T { client ->", "}", RuntimeTypes.Core.IO.use) {
             withBlock("client.#L(", ")", operation.defaultName()) {
                 withBlock("#L {", "}", operationSymbol) {
                     testCase.params.get().members.forEach { member ->

diff --git a/.../smoketests/SmokeTestsRuntimeFunctions.kt → ...runtime/smoketests/SmokeTestsFunctions.kt b/.../smoketests/SmokeTestsRuntimeFunctions.kt → ...runtime/smoketests/SmokeTestsFunctions.kt
@@ -1,3 +1,4 @@
 package aws.smithy.kotlin.runtime.smoketests
 
 public expect fun exitProcess(status: Int): Nothing
+public expect fun getEnv(name: String): String?
diff --git a/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsJVM.kt b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsJVM.kt
@@ -3,3 +3,4 @@ package aws.smithy.kotlin.runtime.smoketests
 import kotlin.system.exitProcess
 
 public actual fun exitProcess(status: Int): Nothing = exitProcess(status)
+public actual fun getEnv(name: String): String? = System.getenv(name)
diff --git a/...runtime-core/native/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsNative.kt b/...runtime-core/native/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsNative.kt
@@ -3,3 +3,4 @@ package aws.smithy.kotlin.runtime.smoketests
 import kotlin.system.exitProcess
 
 public actual fun exitProcess(status: Int): Nothing = exitProcess(status)
+public actual fun getEnv(name: String): String? = TODO("Not yet implemented")