refactor: re-paper crt engine to smithy kotlin and incorporate into common test suite

Author: aajtodd

builder.json

@@ -21,6 +21,11 @@
     "test_steps": [
         "{gradlew} test allTests"
     ],
+    "upstream": [
+        {
+            "name": "aws-crt-kotlin"
+        }
+    ],
     "downstream": [
         { "name": "aws-sdk-kotlin" }    
     ]

gradle.properties

@@ -39,3 +39,6 @@ kotlinLoggingVersion=2.0.3
 
 # logging - JVM
 slf4jVersion=1.7.30
+
+# crt
+crtKotlinVersion=0.5.4-SNAPSHOT

runtime/crt-util/build.gradle.kts

@@ -17,34 +17,31 @@ buildscript {
 apply(plugin = "kotlinx-atomicfu")
 
 description = "Utilities for working with AWS CRT Kotlin"
-extra["displayName"] = "AWS :: SDK :: Kotlin :: CRT :: Util"
-extra["moduleName"] = "aws.sdk.kotlin.runtime.crt"
+extra["displayName"] = "Smithy :: Kotlin :: CRT :: Util"
+extra["moduleName"] = "aws.smithy.kotlin.runtime.crt"
 
 val atomicFuVersion: String by project
 val coroutinesVersion: String by project
 val crtKotlinVersion: String by project
-val smithyKotlinVersion: String by project
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":aws-runtime:aws-core"))
+                api(project(":runtime:runtime-core"))
                 api("aws.sdk.kotlin.crt:aws-crt-kotlin:$crtKotlinVersion")
-                api("aws.smithy.kotlin:http:$smithyKotlinVersion")
+                api(project(":runtime:protocol:http"))
                 implementation("org.jetbrains.kotlinx:atomicfu:$atomicFuVersion")
             }
         }
         commonTest {
             dependencies {
-                implementation(project(":aws-runtime:testing"))
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
             }
         }
 
         all {
             languageSettings.optIn("aws.smithy.kotlin.runtime.util.InternalApi")
-            languageSettings.optIn("aws.sdk.kotlin.runtime.InternalSdkApi")
         }
     }
 }

runtime/crt-util/common/src/aws/sdk/kotlin/runtime/crt/Http.kt renamed to runtime/crt-util/common/src/aws/smithy/kotlin/runtime/crt/Http.kt

@@ -3,22 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-package aws.sdk.kotlin.runtime.crt
+package aws.smithy.kotlin.runtime.crt
 
 import aws.sdk.kotlin.crt.http.HttpRequestBodyStream
-import aws.sdk.kotlin.runtime.InternalSdkApi
 import aws.smithy.kotlin.runtime.http.*
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.util.splitAsQueryParameters
+import aws.smithy.kotlin.runtime.util.InternalApi
 import kotlin.coroutines.coroutineContext
 import aws.sdk.kotlin.crt.http.Headers as HeadersCrt
 import aws.sdk.kotlin.crt.http.HttpRequest as HttpRequestCrt
 
 /**
  * Convert an [HttpRequestBuilder] into a CRT HttpRequest for the purpose of signing.
  */
-@InternalSdkApi
+@InternalApi
 public suspend fun HttpRequestBuilder.toSignableCrtRequest(unsignedPayload: Boolean = false): HttpRequestCrt {
     // Streams that implement HttpBody.Streaming and are not replayable are not signable without consuming the stream
     // and would need to go through chunked signing or unsigned payload
@@ -49,7 +49,7 @@ private suspend fun signableBodyStream(body: HttpBody): HttpRequestBodyStream? =
 /**
  * Convert an [HttpRequest] into a CRT HttpRequest for the purposes of signing
  */
-@InternalSdkApi
+@InternalApi
 public suspend fun HttpRequest.toSignableCrtRequest(): HttpRequestCrt =
     HttpRequestCrt(
         method = method.name,
@@ -70,7 +70,7 @@ private class HttpHeadersCrt(val headers: HeadersBuilder) : HeadersCrt {
 /**
  * Update a request builder from a CRT HTTP request (primary use is updating a request builder after signing)
  */
-@InternalSdkApi
+@InternalApi
 public fun HttpRequestBuilder.update(crtRequest: HttpRequestCrt) {
     crtRequest.headers.entries().forEach { entry ->
         headers.appendMissing(entry.key, entry.value)
@@ -94,7 +94,7 @@ public fun HttpRequestBuilder.update(crtRequest: HttpRequestCrt) {
  * Get just the query parameters (if any)
  * @return the query parameters from the path or null if there weren't any
  */
-@InternalSdkApi
+@InternalApi
 public fun HttpRequestCrt.queryParameters(): QueryParameters? {
     val idx = encodedPath.indexOf("?")
     if (idx < 0 || idx + 1 > encodedPath.length) return null
@@ -108,14 +108,14 @@ public fun HttpRequestCrt.queryParameters(): QueryParameters? {
  * Get just the encoded path sans any query or fragment
  * @return the URI path segment from the encoded path
  */
-@InternalSdkApi
+@InternalApi
 public fun HttpRequestCrt.path(): String {
     val idx = encodedPath.indexOf("?")
     return if (idx > 0) encodedPath.substring(0, idx) else encodedPath
 }
 
 // Convert CRT header type to SDK header type
-@InternalSdkApi
+@InternalApi
 public fun aws.sdk.kotlin.crt.http.Headers.toSdkHeaders(): Headers {
     val headersBuilder = HeadersBuilder()
 
@@ -127,7 +127,7 @@ public fun aws.sdk.kotlin.crt.http.Headers.toSdkHeaders(): Headers {
 }
 
 // Convert SDK header type to CRT header type
-@InternalSdkApi
+@InternalApi
 public fun Headers.toCrtHeaders(): aws.sdk.kotlin.crt.http.Headers {
     val headersBuilder = aws.sdk.kotlin.crt.http.HeadersBuilder()
 

runtime/crt-util/common/src/aws/sdk/kotlin/runtime/crt/ReadChannelBodyStream.kt renamed to runtime/crt-util/common/src/aws/smithy/kotlin/runtime/crt/ReadChannelBodyStream.kt

@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-package aws.sdk.kotlin.runtime.crt
+package aws.smithy.kotlin.runtime.crt
 
 import aws.sdk.kotlin.crt.http.HttpRequestBodyStream
 import aws.sdk.kotlin.crt.io.MutableBuffer
-import aws.sdk.kotlin.runtime.InternalSdkApi
 import aws.smithy.kotlin.runtime.io.SdkByteBuffer
 import aws.smithy.kotlin.runtime.io.SdkByteReadChannel
 import aws.smithy.kotlin.runtime.io.readAvailable
+import aws.smithy.kotlin.runtime.util.InternalApi
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
@@ -24,7 +24,7 @@ internal expect fun transferRequestBody(outgoing: SdkByteBuffer, dest: MutableBu
 /**
  * Implement's [HttpRequestBodyStream] which proxies an SDK request body channel [SdkByteReadChannel]
  */
-@InternalSdkApi
+@InternalApi
 public class ReadChannelBodyStream(
     // the request body channel
     private val bodyChan: SdkByteReadChannel,
@@ -49,9 +49,8 @@ public class ReadChannelBodyStream(
     // and handle these concerns.
     override fun resetPosition(): Boolean = true
 
-    override fun sendRequestBody(buffer: MutableBuffer): Boolean {
-        return doSendRequestBody(buffer).also { if (it) producerJob.complete() }
-    }
+    override fun sendRequestBody(buffer: MutableBuffer): Boolean =
+        doSendRequestBody(buffer).also { if (it) producerJob.complete() }
 
     @OptIn(ExperimentalCoroutinesApi::class)
     private fun doSendRequestBody(buffer: MutableBuffer): Boolean {

runtime/crt-util/common/src/aws/sdk/kotlin/runtime/crt/SdkDefaultIO.kt renamed to runtime/crt-util/common/src/aws/smithy/kotlin/runtime/crt/SdkDefaultIO.kt

@@ -3,18 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-package aws.sdk.kotlin.runtime.crt
+package aws.smithy.kotlin.runtime.crt
 
 import aws.sdk.kotlin.crt.io.*
-import aws.sdk.kotlin.runtime.InternalSdkApi
+import aws.smithy.kotlin.runtime.util.InternalApi
 
 // FIXME - this should default to number of processors
 private const val DEFAULT_EVENT_LOOP_THREAD_COUNT: Int = 1
 
 /**
  * Default (CRT) IO used by the SDK when not configured manually/directly
  */
-@InternalSdkApi
+@InternalApi
 public object SdkDefaultIO {
     /**
      * The default event loop group to run IO on

runtime/crt-util/common/test/aws/sdk/kotlin/runtime/crt/HttpTest.kt renamed to runtime/crt-util/common/test/aws/smithy/kotlin/runtime/crt/HttpTest.kt

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-package aws.sdk.kotlin.runtime.crt
+package aws.smithy.kotlin.runtime.crt
 
 import aws.smithy.kotlin.runtime.http.HttpMethod
 import aws.smithy.kotlin.runtime.http.Protocol

runtime/crt-util/common/test/aws/sdk/kotlin/runtime/crt/ReadChannelBodyStreamTest.kt renamed to runtime/crt-util/common/test/aws/smithy/kotlin/runtime/crt/ReadChannelBodyStreamTest.kt

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-package aws.sdk.kotlin.runtime.crt
+package aws.smithy.kotlin.runtime.crt
 
 import aws.sdk.kotlin.crt.io.MutableBuffer
 import aws.smithy.kotlin.runtime.io.SdkByteChannel

runtime/crt-util/jvm/src/aws/sdk/kotlin/runtime/crt/RequestUtilsJVM.kt renamed to runtime/crt-util/jvm/src/aws/smithy/kotlin/runtime/crt/RequestUtilsJVM.kt

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-package aws.sdk.kotlin.runtime.crt
+package aws.smithy.kotlin.runtime.crt
 
 import aws.sdk.kotlin.crt.io.MutableBuffer
 import aws.smithy.kotlin.runtime.io.SdkByteBuffer

runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts

@@ -17,37 +17,35 @@ apply(plugin = "kotlinx-atomicfu")
 
 description = "HTTP client engine backed by CRT"
 extra["displayName"] = "AWS :: SDK :: Kotlin :: HTTP"
-extra["moduleName"] = "aws.sdk.kotlin.runtime.http.engine.crt"
+extra["moduleName"] = "aws.smithy.kotlin.runtime.http.engine.crt"
 
-val smithyKotlinVersion: String by project
 val coroutinesVersion: String by project
 val atomicFuVersion: String by project
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":aws-runtime:aws-core"))
-                api("aws.smithy.kotlin:http:$smithyKotlinVersion")
-                implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
-                implementation(project(":aws-runtime:crt-util"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
+                api(project(":runtime:runtime-core"))
+                api(project(":runtime:protocol:http"))
+                implementation(project(":runtime:logging"))
+                implementation(project(":runtime:crt-util"))
 
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
                 implementation("org.jetbrains.kotlinx:atomicfu:$atomicFuVersion")
             }
         }
 
         commonTest {
             dependencies {
-                implementation(project(":aws-runtime:testing"))
+                implementation(project(":runtime:testing"))
+                implementation(project(":runtime:protocol:http-test"))
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
-                implementation("aws.smithy.kotlin:http-test:$smithyKotlinVersion")
             }
         }
 
         all {
             languageSettings.optIn("aws.smithy.kotlin.runtime.util.InternalApi")
-            languageSettings.optIn("aws.sdk.kotlin.runtime.InternalSdkApi")
         }
     }
 }