Use already existing KMP way of getting env vars

smithy-lang · Sep 25, 2024 · 4a10ec7 · 4a10ec7
1 parent c93d8a6
commit 4a10ec7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 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
@@ -116,7 +116,6 @@ object RuntimeTypes {
 
  object SmokeTests : RuntimeTypePackage(KotlinDependency.CORE, "smoketests") {
  val exitProcess = symbol("exitProcess")
- val getEnv = symbol("getEnv")
  }
 
  object Collections : RuntimeTypePackage(KotlinDependency.CORE, "collections") {
@@ -197,6 +196,7 @@ object RuntimeTypes {
  val truthiness = symbol("truthiness")
  val toNumber = symbol("toNumber")
  val type = symbol("type")
+ val PlatformProvider = symbol("PlatformProvider")
  }
 
  object Net : RuntimeTypePackage(KotlinDependency.CORE, "net") {

diff --git a/...n/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt b/...n/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
@@ -40,14 +40,14 @@ class SmokeTestsRunnerGenerator(
  writer.declareSection(SmokeTestsRunner) {
  write("private var exitCode = 0")
  write(
- "private val skipTags = #T(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()",
- RuntimeTypes.Core.SmokeTests.getEnv,
+ "private val skipTags = #T.System.getenv(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()",
+ RuntimeTypes.Core.Utils.PlatformProvider,
  SKIP_TAGS,
  ",",
  )
  write(
- "private val serviceFilter = #T(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()",
- RuntimeTypes.Core.SmokeTests.getEnv,
+ "private val serviceFilter = #T.System.getenv(#S)?.let { it.split(#S).map { it.trim() }.toSet() } ?: emptySet()",
+ RuntimeTypes.Core.Utils.PlatformProvider,
  SERVICE_FILTER,
  ",",
  )

diff --git a/...ftware/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt b/...ftware/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt
@@ -74,8 +74,8 @@ class SmokeTestsRunnerGeneratorTest {
  generatedCode.shouldContainOnlyOnceWithDiff(
  """
  private var exitCode = 0
- private val skipTags = getEnv("AWS_SMOKE_TEST_SKIP_TAGS")?.let { it.split(",").map { it.trim() }.toSet() } ?: emptySet()
- private val serviceFilter = getEnv("AWS_SMOKE_TEST_SERVICE_IDS")?.let { it.split(",").map { it.trim() }.toSet() }
+ private val skipTags = PlatformProvider.System.getenv("AWS_SMOKE_TEST_SKIP_TAGS")?.let { it.split(",").map { it.trim() }.toSet() } ?: emptySet()
+ private val serviceFilter = PlatformProvider.System.getenv("AWS_SMOKE_TEST_SERVICE_IDS")?.let { it.split(",").map { it.trim() }.toSet() }
  """.trimIndent(),
  )
  }

diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
@@ -2046,7 +2046,6 @@ public final class aws/smithy/kotlin/runtime/retries/policy/SuccessAcceptor : aw
 
 public final class aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsJVMKt {
  public static final fun exitProcess (I)Ljava/lang/Void;
- public static final fun getEnv (Ljava/lang/String;)Ljava/lang/String;
 }
 
 public final class aws/smithy/kotlin/runtime/text/Scanner {

diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt
@@ -1,4 +1,3 @@
 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,4 +3,3 @@ 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,4 +3,3 @@ 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")