refactor: track upstream runtime changes (#827)

Author: aajtodd

.changes/5b2586c6-7776-477c-abff-ea9f8b12e2c9.json

@@ -0,0 +1,5 @@
+{
+    "id": "5b2586c6-7776-477c-abff-ea9f8b12e2c9",
+    "type": "misc",
+    "description": "Refactor: track upstream module refactoring"
+}

aws-runtime/aws-config/build.gradle.kts

@@ -36,10 +36,8 @@ kotlin {
             dependencies {
                 api(project(":aws-runtime:aws-core"))
                 implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
-                implementation("aws.smithy.kotlin:hashing:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:http:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:tracing-core:$smithyKotlinVersion")
-                implementation("aws.smithy.kotlin:utils:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:http-client-engine-default:$smithyKotlinVersion")
                 implementation(project(":aws-runtime:aws-http"))
 
@@ -79,7 +77,7 @@ kotlin {
         }
 
         all {
-            languageSettings.optIn("aws.smithy.kotlin.runtime.util.InternalApi")
+            languageSettings.optIn("aws.smithy.kotlin.runtime.InternalApi")
             languageSettings.optIn("aws.sdk.kotlin.runtime.InternalSdkApi")
         }
     }

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/DefaultChainCredentialsProvider.kt

@@ -13,7 +13,6 @@ import aws.smithy.kotlin.runtime.http.engine.DefaultHttpEngine
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
 import aws.smithy.kotlin.runtime.io.Closeable
 import aws.smithy.kotlin.runtime.io.closeIfCloseable
-import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 
 /**
@@ -41,7 +40,7 @@ import aws.smithy.kotlin.runtime.util.PlatformProvider
  */
 public class DefaultChainCredentialsProvider constructor(
     private val profileName: String? = null,
-    private val platformProvider: PlatformProvider = Platform,
+    private val platformProvider: PlatformProvider = PlatformProvider.System,
     httpClientEngine: HttpClientEngine? = null,
     region: String? = null,
 ) : CloseableCredentialsProvider {

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EcsCredentialsProvider.kt

@@ -28,8 +28,8 @@ import aws.smithy.kotlin.runtime.retries.policy.RetryErrorType
 import aws.smithy.kotlin.runtime.retries.policy.RetryPolicy
 import aws.smithy.kotlin.runtime.serde.json.JsonDeserializer
 import aws.smithy.kotlin.runtime.time.TimestampFormat
-import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformEnvironProvider
+import aws.smithy.kotlin.runtime.util.PlatformProvider
 import kotlin.coroutines.coroutineContext
 
 /**
@@ -60,7 +60,7 @@ public class EcsCredentialsProvider internal constructor(
     httpClientEngine: HttpClientEngine? = null,
 ) : CloseableCredentialsProvider {
 
-    public constructor() : this(Platform)
+    public constructor() : this(PlatformProvider.System)
 
     private val manageEngine = httpClientEngine == null
     private val httpClientEngine = httpClientEngine ?: DefaultHttpEngine()

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EnvironmentCredentialsProvider.kt

@@ -10,7 +10,7 @@ import aws.smithy.kotlin.runtime.auth.awscredentials.CloseableCredentialsProvide
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.tracing.trace
-import aws.smithy.kotlin.runtime.util.Platform
+import aws.smithy.kotlin.runtime.util.PlatformProvider
 import kotlin.coroutines.coroutineContext
 
 private const val PROVIDER_NAME = "Environment"
@@ -24,7 +24,7 @@ private val SESSION_TOKEN = AwsSdkSetting.AwsSessionToken.environmentVariable
  */
 public class EnvironmentCredentialsProvider
 public constructor(private val getEnv: (String) -> String?) : CloseableCredentialsProvider {
-    public constructor() : this(Platform::getenv)
+    public constructor() : this(PlatformProvider.System::getenv)
 
     private fun requireEnv(variable: String): String =
         getEnv(variable) ?: throw ProviderConfigurationException("Missing value for environment variable `$variable`")

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProvider.kt

@@ -19,8 +19,8 @@ import aws.smithy.kotlin.runtime.time.Clock
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.tracing.info
 import aws.smithy.kotlin.runtime.tracing.warn
-import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformEnvironProvider
+import aws.smithy.kotlin.runtime.util.PlatformProvider
 import aws.smithy.kotlin.runtime.util.asyncLazy
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -51,7 +51,7 @@ internal expect class SdkIOException : Exception // FIXME move this to the prope
 public class ImdsCredentialsProvider(
     private val profileOverride: String? = null,
     private val client: Lazy<InstanceMetadataProvider> = lazy { ImdsClient() },
-    private val platformProvider: PlatformEnvironProvider = Platform,
+    private val platformProvider: PlatformEnvironProvider = PlatformProvider.System,
     private val clock: Clock = Clock.System,
 ) : CloseableCredentialsProvider {
     private var previousCredentials: Credentials? = null

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProcessCredentialsProvider.kt

@@ -6,7 +6,6 @@ import aws.smithy.kotlin.runtime.logging.Logger
 import aws.smithy.kotlin.runtime.serde.json.JsonDeserializer
 import aws.smithy.kotlin.runtime.time.Clock
 import aws.smithy.kotlin.runtime.time.Instant
-import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 
 internal expect suspend fun executeCommand(
@@ -38,7 +37,7 @@ private const val PROVIDER_NAME = "Process"
  */
 public class ProcessCredentialsProvider(
     private val credentialProcess: String,
-    private val platformProvider: PlatformProvider = Platform,
+    private val platformProvider: PlatformProvider = PlatformProvider.System,
     private val maxOutputLengthBytes: Long = 64 * 1024,
     private val timeoutMillis: Long = 60_000,
 ) : CredentialsProvider {

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProvider.kt

@@ -21,7 +21,6 @@ import aws.smithy.kotlin.runtime.http.operation.getLogger
 import aws.smithy.kotlin.runtime.io.Closeable
 import aws.smithy.kotlin.runtime.time.TimestampFormat
 import aws.smithy.kotlin.runtime.util.LazyAsyncValue
-import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 import aws.smithy.kotlin.runtime.util.asyncLazy
 import kotlin.coroutines.coroutineContext
@@ -77,7 +76,7 @@ import kotlin.coroutines.coroutineContext
 public class ProfileCredentialsProvider(
     private val profileName: String? = null,
     private val region: String? = null,
-    private val platformProvider: PlatformProvider = Platform,
+    private val platformProvider: PlatformProvider = PlatformProvider.System,
     private val httpClientEngine: HttpClientEngine? = null,
 ) : CloseableCredentialsProvider {
     private val namedProviders = mapOf(

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/SsoCredentialsProvider.kt

@@ -88,7 +88,7 @@ public class SsoCredentialsProvider public constructor(
     /**
      * The platform provider
      */
-    private val platformProvider: PlatformProvider = Platform,
+    private val platformProvider: PlatformProvider = PlatformProvider.System,
 
     /**
      * The source of time for the provider

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsAssumeRoleCredentialsProvider.kt

@@ -18,8 +18,8 @@ import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.TimestampFormat
 import aws.smithy.kotlin.runtime.time.epochMilliseconds
 import aws.smithy.kotlin.runtime.tracing.*
-import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformEnvironProvider
+import aws.smithy.kotlin.runtime.util.PlatformProvider
 import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
@@ -106,5 +106,5 @@ public class StsAssumeRoleCredentialsProvider(
 }
 
 // role session name must be provided to assume a role, when the user doesn't provide one we choose a name for them
-internal fun defaultSessionName(platformEnvironProvider: PlatformEnvironProvider = Platform): String =
+internal fun defaultSessionName(platformEnvironProvider: PlatformEnvironProvider = PlatformProvider.System): String =
     AwsSdkSetting.AwsRoleSessionName.resolve(platformEnvironProvider) ?: "aws-sdk-kotlin-${Instant.now().epochMilliseconds}"