use new constructor

Author: xinsong-cui

runtime/auth/http-auth/api/http-auth.api

@@ -62,6 +62,8 @@ public abstract interface class aws/smithy/kotlin/runtime/http/auth/CloseableBea
 public final class aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider : aws/smithy/kotlin/runtime/http/auth/BearerTokenProvider {
 	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
 	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 

runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt

@@ -15,12 +15,20 @@ import aws.smithy.kotlin.runtime.util.PlatformProvider
  * A [BearerTokenProvider] that extracts the bearer token from JVM system properties or environment variables.
  */
 public class EnvironmentBearerTokenProvider(
-    private val key: String,
+    private val sysPropKey: String?,
+    private val envKey: String?,
     private val platform: PlatformProvider = PlatformProvider.System,
 ) : BearerTokenProvider {
+    @Deprecated("Use constructor with separate system property and environment variable keys")
+    public constructor(
+        key: String,
+        platform: PlatformProvider = PlatformProvider.System,
+    ) : this(null, key, platform)
+
     override suspend fun resolve(attributes: Attributes): BearerToken {
-        val bearerToken = platform.getProperty(key) ?: platform.getenv(key)
-            ?: error("$key environment variable is not set")
+        val bearerToken = sysPropKey?.let { platform.getProperty(it) }
+            ?: envKey?.let { platform.getenv(it) }
+            ?: error("environment variable is not set")
         return object : BearerToken {
             override val token: String = bearerToken
             override val attributes: Attributes = mutableAttributes().apply {

runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt

@@ -10,9 +10,10 @@ class EnvironmentBearerTokenProviderTest {
     @Test
     fun testResolveFromEnvVar() = runTest {
         val provider = EnvironmentBearerTokenProvider(
-            "TEST_TOKEN",
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
             TestPlatformProvider(
-                env = mutableMapOf("TEST_TOKEN" to "test-env-bearer-token"),
+                env = mutableMapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
             ),
         )
 
@@ -24,9 +25,10 @@ class EnvironmentBearerTokenProviderTest {
     @Test
     fun testResolveFromSysProps() = runTest {
         val provider = EnvironmentBearerTokenProvider(
-            "TEST_TOKEN",
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
             TestPlatformProvider(
-                props = mutableMapOf("TEST_TOKEN" to "test-sys-props-bearer-token"),
+                props = mutableMapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
             ),
         )
 
@@ -38,6 +40,7 @@ class EnvironmentBearerTokenProviderTest {
     @Test
     fun testResolveWithMissingToken() = runTest {
         val provider = EnvironmentBearerTokenProvider(
+            "MISSING_TEST_TOKEN",
             "MISSING_TEST_TOKEN",
             TestPlatformProvider(
                 env = mutableMapOf("TEST_TOKEN" to "test-env-bearer-token"),
@@ -48,6 +51,6 @@ class EnvironmentBearerTokenProviderTest {
         val exception = assertFailsWith<IllegalStateException> {
             provider.resolve()
         }
-        assertEquals("MISSING_TEST_TOKEN environment variable is not set", exception.message)
+        assertEquals("environment variable is not set", exception.message)
     }
 }