chore: coroutine version bump to 1.6.0 and Duration stabilization (#514)

* refactor tests to use `runTest` from  `kotlinx-coroutines-test`
* Duration API stabilization

Co-authored-by: Aaron J Todd <todaaron@amazon.com>

Author: kggilmer

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

@@ -6,17 +6,18 @@
 description = "Support for AWS configuration"
 extra["moduleName"] = "aws.sdk.kotlin.runtime.config"
 
-val smithyKotlinVersion: String by project
+val coroutinesVersion: String by project
 val crtKotlinVersion: String by project
-
 val kotestVersion: String by project
+val smithyKotlinVersion: String by project
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
                 api(project(":aws-runtime:aws-core"))
                 api(project(":aws-runtime:aws-types"))
+
                 implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:http:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:utils:$smithyKotlinVersion")
@@ -26,16 +27,15 @@ kotlin {
                 // parsing common JSON credentials responses
                 implementation("aws.smithy.kotlin:serde-json:$smithyKotlinVersion")
 
-
                 // credential providers
                 implementation("aws.sdk.kotlin.crt:aws-crt-kotlin:$crtKotlinVersion")
                 implementation(project(":aws-runtime:crt-util"))
-
             }
         }
         commonTest {
             dependencies {
                 implementation(project(":aws-runtime:testing"))
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
                 implementation("aws.smithy.kotlin:http-test:$smithyKotlinVersion")
                 val kotlinxSerializationVersion: String by project
                 val mockkVersion: String by project

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

@@ -7,7 +7,6 @@ package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.sdk.kotlin.crt.auth.credentials.build
 import kotlin.time.Duration
-import kotlin.time.ExperimentalTime
 import aws.sdk.kotlin.crt.auth.credentials.CachedCredentialsProvider as CachedCredentialsProviderCrt
 
 /**
@@ -24,7 +23,6 @@ import aws.sdk.kotlin.crt.auth.credentials.CachedCredentialsProvider as CachedCr
  */
 public class CachedCredentialsProvider private constructor(builder: Builder) : CrtCredentialsProvider {
 
-    @OptIn(ExperimentalTime::class)
     override val crtProvider: CachedCredentialsProviderCrt = CachedCredentialsProviderCrt.build {
         refreshTimeInMilliseconds = builder.refreshTime.inWholeMilliseconds
 
@@ -39,7 +37,6 @@ public class CachedCredentialsProvider private constructor(builder: Builder) : C
         public fun build(block: Builder.() -> Unit): CachedCredentialsProvider = Builder().apply(block).build()
     }
 
-    @OptIn(ExperimentalTime::class)
     public class Builder {
         /**
          * The provider to cache credentials query results from

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

@@ -46,7 +46,7 @@ internal sealed class JsonCredentialsResponse {
     //     // fields controlling the STS role:
     //     "RoleArn": "...", // required
     //     "RoleSessionName": "...", // required
-    //     // and also: DurationSeconds, ExternalId, SerialNumber, TokenCode, Policy
+    //     // and also: Duration, ExternalId, SerialNumber, TokenCode, Policy
     //     ...
     //   }
 

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

@@ -7,6 +7,7 @@ package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.sdk.kotlin.crt.auth.credentials.build
 import aws.sdk.kotlin.runtime.crt.SdkDefaultIO
+import kotlin.time.Duration
 import aws.sdk.kotlin.crt.auth.credentials.StsAssumeRoleCredentialsProvider as StsAssumeRoleCredentialsProviderCrt
 
 /**
@@ -15,20 +16,20 @@ import aws.sdk.kotlin.crt.auth.credentials.StsAssumeRoleCredentialsProvider as S
  * @param credentialsProvider The underlying Credentials Provider to use for source credentials
  * @param roleArn The target role's ARN
  * @param sessionName The name to associate with the session
- * @param durationSeconds The number of seconds from authentication that the session is valid for
+ * @param duration Amount of time from authentication that the session is valid for
  */
 public class StsAssumeRoleCredentialsProvider public constructor(
     credentialsProvider: CredentialsProvider,
     roleArn: String,
     sessionName: String,
-    durationSeconds: Int? = null,
+    duration: Duration? = null,
 ) : CrtCredentialsProvider {
     override val crtProvider: StsAssumeRoleCredentialsProviderCrt = StsAssumeRoleCredentialsProviderCrt.build {
         clientBootstrap = SdkDefaultIO.ClientBootstrap
         tlsContext = SdkDefaultIO.TlsContext
         this.credentialsProvider = asCrt(credentialsProvider)
         this.roleArn = roleArn
         this.sessionName = sessionName
-        this.durationSeconds = durationSeconds
+        this.durationSeconds = duration?.inWholeSeconds?.toInt()
     }
 }

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/CachedValue.kt

@@ -10,7 +10,6 @@ import aws.smithy.kotlin.runtime.time.Instant
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlin.time.Duration
-import kotlin.time.ExperimentalTime
 
 /**
  * A value with an expiration
@@ -26,7 +25,6 @@ internal data class ExpiringValue<T> (val value: T, val expiresAt: Instant)
  * expire BEFORE the actual expiration.
  * @param clock The clock to use for system time
  */
-@OptIn(ExperimentalTime::class)
 internal class CachedValue<T> (
     private var value: ExpiringValue<T>? = null,
     private val bufferTime: Duration = Duration.ZERO,

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/ImdsClient.kt

@@ -32,7 +32,6 @@ import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
-import kotlin.time.ExperimentalTime
 
 /**
  * Maximum time allowed by default (6 hours)
@@ -61,7 +60,6 @@ public interface InstanceMetadataProvider : Closeable {
  * See [transitioning to IMDSv2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html#instance-metadata-transition-to-version-2)
  * for more information.
  */
-@OptIn(ExperimentalTime::class)
 public class ImdsClient private constructor(builder: Builder) : InstanceMetadataProvider {
     public constructor() : this(Builder())
 

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/TokenMiddleware.kt

@@ -18,7 +18,6 @@ import aws.smithy.kotlin.runtime.http.response.complete
 import aws.smithy.kotlin.runtime.time.Clock
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
-import kotlin.time.ExperimentalTime
 
 /**
  * Tokens are cached to remove the need to reload the token between subsequent requests. To ensure
@@ -30,7 +29,6 @@ internal const val TOKEN_REFRESH_BUFFER_SECONDS = 120
 internal const val X_AWS_EC2_METADATA_TOKEN_TTL_SECONDS = "x-aws-ec2-metadata-token-ttl-seconds"
 internal const val X_AWS_EC2_METADATA_TOKEN = "x-aws-ec2-metadata-token"
 
-@OptIn(ExperimentalTime::class)
 internal class TokenMiddleware(
     private val httpClient: SdkHttpClient,
     private val ttl: Duration = DEFAULT_TOKEN_TTL_SECONDS.seconds,

aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/EnvironmentCredentialsProviderTest.kt

@@ -6,17 +6,19 @@
 package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.sdk.kotlin.runtime.config.AwsSdkSetting
-import aws.sdk.kotlin.runtime.testing.runSuspendTest
 import io.kotest.matchers.string.shouldContain
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class EnvironmentCredentialsProviderTest {
     private fun provider(vararg vars: Pair<String, String>) = EnvironmentCredentialsProvider((vars.toMap())::get)
 
     @Test
-    fun `it should read from environment variables (incl session token)`() = runSuspendTest {
+    fun `it should read from environment variables (incl session token)`() = runTest {
         val provider = provider(
             AwsSdkSetting.AwsAccessKeyId.environmentVariable to "abc",
             AwsSdkSetting.AwsSecretAccessKey.environmentVariable to "def",
@@ -26,7 +28,7 @@ class EnvironmentCredentialsProviderTest {
     }
 
     @Test
-    fun `it should read from environment variables (excl session token)`() = runSuspendTest {
+    fun `it should read from environment variables (excl session token)`() = runTest {
         val provider = provider(
             AwsSdkSetting.AwsAccessKeyId.environmentVariable to "abc",
             AwsSdkSetting.AwsSecretAccessKey.environmentVariable to "def",
@@ -35,14 +37,14 @@ class EnvironmentCredentialsProviderTest {
     }
 
     @Test
-    fun `it should throw an exception on missing access key`(): Unit = runSuspendTest {
+    fun `it should throw an exception on missing access key`() = runTest {
         assertFailsWith<ProviderConfigurationException> {
             provider(AwsSdkSetting.AwsSecretAccessKey.environmentVariable to "def").getCredentials()
         }.message.shouldContain("Missing value for environment variable `AWS_ACCESS_KEY_ID`")
     }
 
     @Test
-    fun `it should throw an exception on missing secret key`(): Unit = runSuspendTest {
+    fun `it should throw an exception on missing secret key`() = runTest {
         assertFailsWith<ProviderConfigurationException> {
             provider(AwsSdkSetting.AwsAccessKeyId.environmentVariable to "abc").getCredentials()
         }.message.shouldContain("Missing value for environment variable `AWS_SECRET_ACCESS_KEY`")

aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProviderTest.kt

@@ -8,7 +8,6 @@ package aws.sdk.kotlin.runtime.auth.credentials
 import aws.sdk.kotlin.runtime.config.AwsSdkSetting
 import aws.sdk.kotlin.runtime.config.imds.*
 import aws.sdk.kotlin.runtime.testing.TestPlatformProvider
-import aws.sdk.kotlin.runtime.testing.runSuspendTest
 import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.HttpBody
 import aws.smithy.kotlin.runtime.http.HttpStatusCode
@@ -18,15 +17,18 @@ import aws.smithy.kotlin.runtime.httptest.buildTestConnection
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.ManualClock
 import io.kotest.matchers.string.shouldContain
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertIs
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class ImdsCredentialsProviderTest {
 
     @Test
-    fun testImdsDisabled(): Unit = runSuspendTest {
+    fun testImdsDisabled() = runTest {
         val platform = TestPlatformProvider(
             env = mapOf(AwsSdkSetting.AwsEc2MetadataDisabled.environmentVariable to "true")
         )
@@ -37,7 +39,7 @@ class ImdsCredentialsProviderTest {
     }
 
     @Test
-    fun testSuccess(): Unit = runSuspendTest {
+    fun testSuccess() = runTest {
         val connection = buildTestConnection {
             expect(
                 tokenRequest("http://169.254.169.254", DEFAULT_TOKEN_TTL_SECONDS),
@@ -84,7 +86,7 @@ class ImdsCredentialsProviderTest {
     }
 
     @Test
-    fun testSuccessProfileOverride(): Unit = runSuspendTest {
+    fun testSuccessProfileOverride() = runTest {
         val connection = buildTestConnection {
             expect(
                 tokenRequest("http://169.254.169.254", DEFAULT_TOKEN_TTL_SECONDS),
@@ -128,7 +130,7 @@ class ImdsCredentialsProviderTest {
     }
 
     @Test
-    fun testTokenFailure(): Unit = runSuspendTest {
+    fun testTokenFailure() = runTest {
         // when attempting to retrieve initial token, IMDS replied with 403, indicating IMDS is disabled or not allowed through permissions
         val connection = buildTestConnection {
             expect(
@@ -154,7 +156,7 @@ class ImdsCredentialsProviderTest {
     }
 
     @Test
-    fun testNoInstanceProfileConfigured(): Unit = runSuspendTest {
+    fun testNoInstanceProfileConfigured() = runTest {
 
         val connection = buildTestConnection {
             expect(

aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/JsonCredentialsDeserializerTest.kt

@@ -5,17 +5,19 @@
 
 package aws.sdk.kotlin.runtime.auth.credentials
 
-import aws.sdk.kotlin.runtime.testing.runSuspendTest
 import aws.smithy.kotlin.runtime.serde.json.JsonDeserializer
 import aws.smithy.kotlin.runtime.time.Instant
 import io.kotest.matchers.string.shouldContain
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class JsonCredentialsDeserializerTest {
     @Test
-    fun testSuccessResponse() = runSuspendTest {
+    fun testSuccessResponse() = runTest {
         val payload = """
         {
             "Code" : "Success",
@@ -40,7 +42,7 @@ class JsonCredentialsDeserializerTest {
     }
 
     @Test
-    fun testInvalidJson(): Unit = runSuspendTest {
+    fun testInvalidJson() = runTest {
         val payload = "404: not found"
         val deserializer = JsonDeserializer(payload.encodeToByteArray())
 
@@ -51,7 +53,7 @@ class JsonCredentialsDeserializerTest {
     }
 
     @Test
-    fun testSuccessResponseMissingCode() = runSuspendTest {
+    fun testSuccessResponseMissingCode() = runTest {
         val payload = """
         {
             "LastUpdated" : "2021-09-17T20:57:08Z",
@@ -75,7 +77,7 @@ class JsonCredentialsDeserializerTest {
     }
 
     @Test
-    fun testMissingAccessKeyId() = runSuspendTest {
+    fun testMissingAccessKeyId() = runTest {
         val payload = """
         {
             "LastUpdated" : "2021-09-17T20:57:08Z",
@@ -93,7 +95,7 @@ class JsonCredentialsDeserializerTest {
     }
 
     @Test
-    fun testMissingSecretAccessKey() = runSuspendTest {
+    fun testMissingSecretAccessKey() = runTest {
         val payload = """
         {
             "LastUpdated" : "2021-09-17T20:57:08Z",
@@ -111,7 +113,7 @@ class JsonCredentialsDeserializerTest {
     }
 
     @Test
-    fun testMissingSessionToken() = runSuspendTest {
+    fun testMissingSessionToken() = runTest {
         val payload = """
         {
             "LastUpdated" : "2021-09-17T20:57:08Z",
@@ -129,7 +131,7 @@ class JsonCredentialsDeserializerTest {
     }
 
     @Test
-    fun testErrorResponse() = runSuspendTest {
+    fun testErrorResponse() = runTest {
         val payload = """
         {
             "Code" : "AssumeRoleUnauthorizedAccess",