misc: merge from main

Author: aws-sdk-kotlin-ci

aws-crt-kotlin/build.gradle.kts

@@ -224,10 +224,9 @@ private val KotlinNativeTarget.isBuildableOnHost: Boolean
         }
     }
 
-private fun findMingwHome(): String =
-    System.getenv("MINGW_PREFIX")?.takeUnless { it.isBlank() }
-        ?: typedProp("mingw.prefix")
-        ?: throw IllegalStateException(
-            "Cannot determine MinGW prefix location. Please verify MinGW is installed correctly " +
-                "and that either the `MINGW_PREFIX` environment variable or the `mingw.prefix` Gradle property is set.",
-        )
+private fun findMingwHome(): String = System.getenv("MINGW_PREFIX")?.takeUnless { it.isBlank() }
+    ?: typedProp("mingw.prefix")
+    ?: throw IllegalStateException(
+        "Cannot determine MinGW prefix location. Please verify MinGW is installed correctly " +
+            "and that either the `MINGW_PREFIX` environment variable or the `mingw.prefix` Gradle property is set.",
+    )

aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions.kt

@@ -53,8 +53,7 @@ public class HttpClientConnectionManagerOptions internal constructor(
         public const val DEFAULT_INITIAL_WINDOW_SIZE: Int = 16 * 1024
         public const val DEFAULT_MAX_CONNECTIONS: Int = 2
 
-        public fun build(block: HttpClientConnectionManagerOptionsBuilder.() -> Unit): HttpClientConnectionManagerOptions =
-            HttpClientConnectionManagerOptionsBuilder().apply(block).build()
+        public fun build(block: HttpClientConnectionManagerOptionsBuilder.() -> Unit): HttpClientConnectionManagerOptions = HttpClientConnectionManagerOptionsBuilder().apply(block).build()
     }
 }
 

aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpStreamResponseHandler.kt

@@ -62,8 +62,7 @@ public interface HttpStreamResponseHandler {
      * @return The number of bytes to move the sliding window by. Repeatedly returning zero will eventually cause the
      * sliding window to fill up and data to stop flowing until the user slides the window back open.
      */
-    public fun onResponseBody(stream: HttpStream, bodyBytesIn: Buffer): Int =
-        /* Optional Callback, ignore incoming response body by default unless user wants to capture it. */
+    public fun onResponseBody(stream: HttpStream, bodyBytesIn: Buffer): Int = /* Optional Callback, ignore incoming response body by default unless user wants to capture it. */
         // FIXME - do we want to follow this pattern or just have a single way of incrementing the
         // window size through `Stream.incrementWindow()`?
         bodyBytesIn.len

aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContext.kt

@@ -19,5 +19,4 @@ public expect class TlsContext(options: TlsContextOptions? = null) : Closeable {
 /**
  * Build and configure a TLS context in the given [block]
  */
-public fun TlsContext.Companion.build(block: TlsContextOptionsBuilder.() -> Unit): TlsContext =
-    TlsContextOptionsBuilder().apply(block).build().let { TlsContext(it) }
+public fun TlsContext.Companion.build(block: TlsContextOptionsBuilder.() -> Unit): TlsContext = TlsContextOptionsBuilder().apply(block).build().let { TlsContext(it) }

aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContextOptions.kt

@@ -27,8 +27,7 @@ public class TlsContextOptions internal constructor(builder: TlsContextOptionsBu
 
     public companion object {
 
-        public fun build(block: TlsContextOptionsBuilder.() -> Unit): TlsContextOptions =
-            TlsContextOptionsBuilder().apply(block).build()
+        public fun build(block: TlsContextOptionsBuilder.() -> Unit): TlsContextOptions = TlsContextOptionsBuilder().apply(block).build()
 
         /**
          * Helper which creates a default set of TLS options for the current platform

aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/util/CaseInsensitiveMap.kt

@@ -12,8 +12,7 @@ private class CaseInsensitiveString(val s: String) {
     override fun toString(): String = s
 }
 
-private fun String.toInsensitive(): CaseInsensitiveString =
-    CaseInsensitiveString(this)
+private fun String.toInsensitive(): CaseInsensitiveString = CaseInsensitiveString(this)
 
 /**
  * Map of case-insensitive [String] to [Value]

aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/util/Digest.kt

@@ -20,8 +20,7 @@ public expect object Digest {
  * Get a hex string representation of [buffer]
  */
 @OptIn(ExperimentalUnsignedTypes::class)
-public fun Digest.hex(buffer: ByteArray): String =
-    buffer.asUByteArray().joinToString("") { it.toString(16).padStart(2, '0') }
+public fun Digest.hex(buffer: ByteArray): String = buffer.asUByteArray().joinToString("") { it.toString(16).padStart(2, '0') }
 
 /**
  * Get a hex string representation of this byte array

aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/http/HttpClientConnectionTest.kt

@@ -71,8 +71,8 @@ class HttpClientConnectionTest : CrtTest() {
         // bad ssl
         // assertConnect("https://rsa2048.badssl.com/")
         assertConnect("http://http.badssl.com/")
-        assertConnectFails("https://expired.badssl.com/", "TLS (SSL) negotiation failed")
-        assertConnectFails("https://self-signed.badssl.com/", "TLS (SSL) negotiation failed")
+        assertConnectFails("https://expired.badssl.com/", setOf("TLS (SSL) negotiation failed", "tls certificate is malformed or not correctly formatted"))
+        assertConnectFails("https://self-signed.badssl.com/", setOf("TLS (SSL) negotiation failed", "tls certificate is malformed or not correctly formatted"))
     }
 
     /**
@@ -88,11 +88,14 @@ class HttpClientConnectionTest : CrtTest() {
     }
 
     /**
-     * Assert that an attempt to connect to the given [url] fails with the given [exceptionMessage]
+     * Assert that an attempt to connect to the given [url] fails with any of the given [exceptionMessages]
      */
-    private suspend fun assertConnectFails(url: String, exceptionMessage: String) {
+    private suspend fun assertConnectFails(url: String, exceptionMessages: Set<String>) {
         val ex = assertFails { connectAllCiphers(url) }
-        assertTrue(ex.message!!.contains(exceptionMessage))
+        assertTrue(
+            exceptionMessages.any { ex.message!!.contains(it) },
+            "Exception message \"${ex.message}\" did not contain any of the expected ${exceptionMessages.joinToString(prefix = "\"", postfix = "\"")}",
+        )
     }
 
     /**

aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CRT.kt

@@ -36,8 +36,11 @@ public actual object CRT {
                 val logLevel = Log.LogLevel.valueOf(config.logLevel.name)
                 when (config.logDestination) {
                     LogDestination.None -> return@runBlocking
+
                     LogDestination.Stdout -> Log.initLoggingToStdout(logLevel)
+
                     LogDestination.Stderr -> Log.initLoggingToStderr(logLevel)
+
                     LogDestination.File -> {
                         val logfile = config.logFile
                         requireNotNull(logfile) { "log filename must be specified when LogDestination.File is specified" }

aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderJVM.kt

@@ -38,30 +38,27 @@ internal actual constructor(
 }
 
 // Convert the SDK version of CredentialsProvider type to the CRT version
-internal fun adapt(credentialsProvider: CredentialsProvider?): CredentialsProviderJni? =
-    if (credentialsProvider == null) {
-        null
-    } else {
-        toCrtCredentialsProvider(credentialsProvider)
-    }
-
-private fun toCrtCredentialsProvider(sdkCredentialsProvider: CredentialsProvider): CredentialsProviderJni =
-    object : CredentialsProviderJni() {
+internal fun adapt(credentialsProvider: CredentialsProvider?): CredentialsProviderJni? = if (credentialsProvider == null) {
+    null
+} else {
+    toCrtCredentialsProvider(credentialsProvider)
+}
 
-        override fun getCredentials(): CompletableFuture<CredentialsJni> = runBlocking {
-            val deferred = async(start = CoroutineStart.UNDISPATCHED) {
-                toCrtCredentials(sdkCredentialsProvider.getCredentials())
-            }
+private fun toCrtCredentialsProvider(sdkCredentialsProvider: CredentialsProvider): CredentialsProviderJni = object : CredentialsProviderJni() {
 
-            deferred.asCompletableFuture()
+    override fun getCredentials(): CompletableFuture<CredentialsJni> = runBlocking {
+        val deferred = async(start = CoroutineStart.UNDISPATCHED) {
+            toCrtCredentials(sdkCredentialsProvider.getCredentials())
         }
+
+        deferred.asCompletableFuture()
     }
+}
 
-private fun toCrtCredentials(sdkCredentials: Credentials): CredentialsJni =
-    object : CredentialsJni() {
-        override fun getAccessKeyId(): ByteArray = sdkCredentials.accessKeyId.encodeToByteArray()
+private fun toCrtCredentials(sdkCredentials: Credentials): CredentialsJni = object : CredentialsJni() {
+    override fun getAccessKeyId(): ByteArray = sdkCredentials.accessKeyId.encodeToByteArray()
 
-        override fun getSecretAccessKey(): ByteArray = sdkCredentials.secretAccessKey.encodeToByteArray()
+    override fun getSecretAccessKey(): ByteArray = sdkCredentials.secretAccessKey.encodeToByteArray()
 
-        override fun getSessionToken(): ByteArray = sdkCredentials.sessionToken?.encodeToByteArray() ?: ByteArray(0)
-    }
+    override fun getSessionToken(): ByteArray = sdkCredentials.sessionToken?.encodeToByteArray() ?: ByteArray(0)
+}