Merge branch 'kn-main' of github.com:smithy-lang/smithy-kotlin into kn-platform

Author: lauzadis

runtime/protocol/http-client/build.gradle.kts

@@ -27,6 +27,7 @@ kotlin {
         commonTest {
             dependencies {
                 implementation(libs.kotlinx.coroutines.test)
+                implementation(project(":runtime:runtime-core"))
                 implementation(project(":runtime:protocol:http-test"))
             }
         }

runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptorTest.kt

@@ -68,7 +68,7 @@ class HttpChecksumRequiredInterceptorTest {
         assertEquals(expected, call.request.headers["x-amz-checksum-crc32"])
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native Implementation
+    @IgnoreNative
     @Test
     fun itSetsHeaderForNonBytesContent() = runTest {
         val req = HttpRequestBuilder().apply {

runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/RequestCompressionInterceptorTest.kt

@@ -9,6 +9,7 @@ import aws.smithy.kotlin.runtime.IgnoreNative
 import aws.smithy.kotlin.runtime.collections.get
 import aws.smithy.kotlin.runtime.compression.CompressionAlgorithm
 import aws.smithy.kotlin.runtime.compression.Gzip
+import aws.smithy.kotlin.runtime.compression.decompressGzipBytes
 import aws.smithy.kotlin.runtime.http.*
 import aws.smithy.kotlin.runtime.http.operation.HttpOperationContext
 import aws.smithy.kotlin.runtime.http.operation.newTestOperation
@@ -23,8 +24,6 @@ import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
-internal expect fun decompressGzipBytes(bytes: ByteArray): ByteArray
-
 class RequestCompressionInterceptorTest {
 
     private val client = SdkHttpClient(TestEngine())

runtime/protocol/http-client/jvm/test/aws/smithy/kotlin/runtime/http/interceptors/RequestCompressionInterceptorTestJvm.kt

@@ -330,6 +330,10 @@ public final class aws/smithy/kotlin/runtime/compression/Gzip : aws/smithy/kotli
 	public fun getId ()Ljava/lang/String;
 }
 
+public final class aws/smithy/kotlin/runtime/compression/GzipTestUtilsJvmKt {
+	public static final fun decompressGzipBytes ([B)[B
+}
+
 public final class aws/smithy/kotlin/runtime/config/EnvironmentSetting {
 	public static final field Companion Laws/smithy/kotlin/runtime/config/EnvironmentSetting$Companion;
 	public fun <init> (Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
@@ -465,6 +469,8 @@ public final class aws/smithy/kotlin/runtime/content/ByteStreamJVMKt {
 }
 
 public final class aws/smithy/kotlin/runtime/content/ByteStreamKt {
+	public static final fun asByteStream (Ljava/lang/String;)Laws/smithy/kotlin/runtime/content/ByteStream;
+	public static final fun asByteStream ([B)Laws/smithy/kotlin/runtime/content/ByteStream;
 	public static final fun cancel (Laws/smithy/kotlin/runtime/content/ByteStream;)V
 	public static final fun decodeToString (Laws/smithy/kotlin/runtime/content/ByteStream;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun toByteArray (Laws/smithy/kotlin/runtime/content/ByteStream;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

runtime/protocol/http-client/native/test/aws/smithy/kotlin/runtime/http/interceptors/RequestCompressionInterceptorTestNative.kt

@@ -2,9 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-package aws.smithy.kotlin.runtime.io
+package aws.smithy.kotlin.runtime.compression
+
+import aws.smithy.kotlin.runtime.InternalApi
 
 /**
  * Decompresses a [ByteArray] compressed using the gzip format
  */
-internal expect fun decompressGzipBytes(bytes: ByteArray): ByteArray
+@InternalApi
+public expect fun decompressGzipBytes(bytes: ByteArray): ByteArray

runtime/runtime-core/api/runtime-core.api

@@ -7,7 +7,6 @@ package aws.smithy.kotlin.runtime.content
 import aws.smithy.kotlin.runtime.io.*
 import aws.smithy.kotlin.runtime.io.internal.SdkDispatchers
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.IO
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 
@@ -197,3 +196,13 @@ private fun SdkSource.toFlow(bufferSize: Long): Flow<ByteArray> = flow {
         emit(sink.readByteArray())
     }
 }
+
+/**
+ * Convert this [String] to a [ByteStream]
+ */
+public fun String.asByteStream(): ByteStream = ByteStream.fromString(this)
+
+/**
+ * Convert this [ByteArray] to a [ByteStream]
+ */
+public fun ByteArray.asByteStream(): ByteStream = ByteStream.fromBytes(this)

runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/io/GzipTestUtils.kt renamed to runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/compression/GzipTestUtils.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.compression
+
+import aws.smithy.kotlin.runtime.content.ByteStream
+import aws.smithy.kotlin.runtime.content.toByteArray
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertContentEquals
+
+class GzipTest {
+    @Test
+    fun testCompress() = runTest {
+        val payload = "Hello World".encodeToByteArray()
+        val byteStream = ByteStream.fromBytes(payload)
+
+        val compressed = Gzip()
+            .compress(byteStream)
+            .toByteArray()
+
+        val decompressedBytes = decompressGzipBytes(compressed)
+        assertContentEquals(payload, decompressedBytes)
+    }
+
+    @Test
+    fun testCompressEmptyByteArray() = runTest {
+        val payload = ByteArray(0)
+        val byteStream = ByteStream.fromBytes(payload)
+
+        val compressed = Gzip()
+            .compress(byteStream)
+            .toByteArray()
+
+        val decompressedBytes = decompressGzipBytes(compressed)
+
+        assertContentEquals(payload, decompressedBytes)
+    }
+}

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/content/ByteStream.kt

@@ -4,15 +4,14 @@
  */
 package aws.smithy.kotlin.runtime.io
 
-import aws.smithy.kotlin.runtime.IgnoreNative
+import aws.smithy.kotlin.runtime.compression.decompressGzipBytes
 import aws.smithy.kotlin.runtime.hashing.crc32
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 
 class GzipByteReadChannelTest {
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testReadAll() = runTest {
         val payload = "Hello World"
@@ -32,7 +31,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testReadToBuffer() = runTest {
         val payload = "Hello World".repeat(1600)
@@ -51,7 +49,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testReadRemaining() = runTest {
         val payload = "Hello World".repeat(1600)
@@ -71,7 +68,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testRead() = runTest {
         val payload = "Hello World"
@@ -92,7 +88,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testReadLargeBody() = runTest {
         val payload = "Hello World".repeat(1600)
@@ -113,7 +108,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testReadLargeLimit() = runTest {
         val payload = "Hello World"
@@ -134,7 +128,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testReadLargeBodyLargeLimit() = runTest {
         val payload = "Hello World".repeat(1600)
@@ -155,7 +148,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testIsClosedForRead() = runTest {
         val payload = "Hello World"
@@ -178,7 +170,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testIsClosedForReadLargeBody() = runTest {
         val payload = "Hello World".repeat(1600)
@@ -201,7 +192,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testIsClosedForReadLargeLimit() = runTest {
         val payload = "Hello World"
@@ -224,7 +214,6 @@ class GzipByteReadChannelTest {
         assertEquals(bytesHash, decompressedBytes.crc32())
     }
 
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
     @Test
     fun testIsClosedForReadLargeBodyLargeLimit() = runTest {
         val payload = "Hello World".repeat(1600)