add constructor

Author: xinsong-cui

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

@@ -62,8 +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 <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;Z)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ZILkotlin/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

@@ -14,21 +14,28 @@ import aws.smithy.kotlin.runtime.util.PlatformProvider
 /**
  * A [BearerTokenProvider] that extracts the bearer token from JVM system properties or environment variables.
  */
-public class EnvironmentBearerTokenProvider(
+public class EnvironmentBearerTokenProvider private constructor(
     private val sysPropKey: String?,
-    private val envKey: String?,
+    private val envKey: String,
     private val platform: PlatformProvider = PlatformProvider.System,
 ) : BearerTokenProvider {
-    @Deprecated("Use constructor with separate system property and environment variable keys")
+    @Deprecated("This constructor does not support a parameter for a system property key and will be removed in version 1.6.x")
     public constructor(
-        key: String,
+        envKey: String,
         platform: PlatformProvider = PlatformProvider.System,
-    ) : this(null, key, platform)
+    ) : this(null, envKey, platform)
+
+    public constructor(
+        sysPropKey: String,
+        envKey: String,
+        platform: PlatformProvider = PlatformProvider.System,
+        @Suppress("UNUSED_PARAMETER") dummy: Boolean = true,
+    ) : this(sysPropKey as String?, envKey, platform)
 
     override suspend fun resolve(attributes: Attributes): BearerToken {
-        val bearerToken = sysPropKey?.let { platform.getProperty(it) }
-            ?: envKey?.let { platform.getenv(it) }
-            ?: error("neither system property $sysPropKey nor environment variable $envKey is set")
+        val bearerToken = sysPropKey?.let(platform::getProperty) ?: platform.getenv(envKey)
+        if (bearerToken.isNullOrBlank()) throw IllegalStateException("""Missing values for system property "$sysPropKey" and environment variable "$envKey"""")
+
         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

@@ -13,7 +13,7 @@ class EnvironmentBearerTokenProviderTest {
             "TEST_SYS_PROPS_TOKEN",
             "TEST_ENV_TOKEN",
             TestPlatformProvider(
-                env = mutableMapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
             ),
         )
 
@@ -28,7 +28,7 @@ class EnvironmentBearerTokenProviderTest {
             "TEST_SYS_PROPS_TOKEN",
             "TEST_ENV_TOKEN",
             TestPlatformProvider(
-                props = mutableMapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
             ),
         )
 
@@ -43,8 +43,8 @@ class EnvironmentBearerTokenProviderTest {
             "TEST_SYS_PROPS_TOKEN",
             "TEST_ENV_TOKEN",
             TestPlatformProvider(
-                props = mutableMapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
-                env = mutableMapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
             ),
         )
 
@@ -59,8 +59,8 @@ class EnvironmentBearerTokenProviderTest {
             "MISSING_TEST_TOKEN",
             "MISSING_TEST_TOKEN",
             TestPlatformProvider(
-                env = mutableMapOf("TEST_TOKEN" to "test-env-bearer-token"),
-                props = mutableMapOf("TEST_TOKEN" to "test-sys-props-bearer-token"),
+                env = mapOf("TEST_TOKEN" to "test-env-bearer-token"),
+                props = mapOf("TEST_TOKEN" to "test-sys-props-bearer-token"),
             ),
         )