kn/misc: enable various ignored tests

.github/workflows/artifact-size-metrics.yml

@@ -45,23 +45,25 @@ jobs:
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
-      - name: Configure JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 17
-          cache: 'gradle'
+
+      - name: Setup build
+        uses: .github/actions/setup-build
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+
       - name: Configure Gradle
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+
       - name: Generate Artifact Size Metrics
         run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
+
       - name: Analyze Artifact Size Metrics
         run: ./gradlew analyzeArtifactSizeMetrics
+
       - name: Show Results
         uses: actions/github-script@v7
         with:

runtime/auth/aws-signing-crt/api/aws-signing-crt.api

@@ -1,4 +1,4 @@
-public final class aws/smithy/kotlin/runtime/auth/awssigning/crt/CrtAwsSigner : aws/smithy/kotlin/runtime/auth/awssigning/AwsSigner {
+public final class aws/smithy/kotlin/runtime/auth/awssigning/crt/CrtAwsSigner : aws/sdk/kotlin/crt/WithCrt, aws/smithy/kotlin/runtime/auth/awssigning/AwsSigner {
 	public static final field INSTANCE Laws/smithy/kotlin/runtime/auth/awssigning/crt/CrtAwsSigner;
 	public fun sign (Laws/smithy/kotlin/runtime/http/request/HttpRequest;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun signChunk ([B[BLaws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

runtime/auth/aws-signing-crt/jvmAndNative/src/aws/smithy/kotlin/runtime/auth/awssigning/crt/CrtAwsSigner.kt

@@ -4,6 +4,7 @@
  */
 package aws.smithy.kotlin.runtime.auth.awssigning.crt
 
+import aws.sdk.kotlin.crt.WithCrt
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awssigning.*
 import aws.smithy.kotlin.runtime.crt.toSignableCrtRequest
@@ -24,7 +25,7 @@ import aws.sdk.kotlin.crt.http.Headers as CrtHeaders
 
 private const val S3_EXPRESS_HEADER_NAME = "X-Amz-S3session-Token"
 
-public object CrtAwsSigner : AwsSigner {
+public object CrtAwsSigner : AwsSigner, WithCrt() {
     override suspend fun sign(request: HttpRequest, config: AwsSigningConfig): AwsSigningResult<HttpRequest> {
         val isUnsigned = config.hashSpecification is HashSpecification.UnsignedPayload
         val isAwsChunked = request.headers.contains("Content-Encoding", "aws-chunked")

runtime/auth/aws-signing-default/api/aws-signing-default.api

@@ -5,7 +5,7 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSignerBui
 	public final fun setTelemetryProvider (Laws/smithy/kotlin/runtime/telemetry/TelemetryProvider;)V
 }
 
-public final class aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSignerKt {
+public final class aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSignerJVMKt {
 	public static final fun DefaultAwsSigner (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;
 	public static final fun getDefaultAwsSigner ()Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;
 }

runtime/auth/aws-signing-default/build.gradle.kts

@@ -25,5 +25,11 @@ kotlin {
         all {
             languageSettings.optIn("aws.smithy.kotlin.runtime.InternalApi")
         }
+
+        nativeMain {
+            dependencies {
+                implementation(project(":runtime:auth:aws-signing-crt"))
+            }
+        }
     }
 }

runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt

@@ -4,136 +4,5 @@
  */
 package aws.smithy.kotlin.runtime.auth.awssigning
 
-import aws.smithy.kotlin.runtime.ExperimentalApi
-import aws.smithy.kotlin.runtime.http.Headers
-import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.telemetry.TelemetryProvider
-import aws.smithy.kotlin.runtime.telemetry.logging.logger
-import aws.smithy.kotlin.runtime.time.TimestampFormat
-import kotlin.coroutines.coroutineContext
-
 /** The default implementation of [AwsSigner] */
-public val DefaultAwsSigner: AwsSigner = DefaultAwsSignerImpl()
-
-/** Creates a customized instance of [AwsSigner] */
-@Suppress("ktlint:standard:function-naming")
-public fun DefaultAwsSigner(block: DefaultAwsSignerBuilder.() -> Unit): AwsSigner =
-    DefaultAwsSignerBuilder().apply(block).build()
-
-/** A builder class for creating instances of [AwsSigner] using the default implementation */
-public class DefaultAwsSignerBuilder {
-    public var telemetryProvider: TelemetryProvider? = null
-
-    public fun build(): AwsSigner = DefaultAwsSignerImpl(
-        telemetryProvider = telemetryProvider,
-    )
-}
-
-private val AwsSigningAlgorithm.signatureCalculator
-    get() = when (this) {
-        AwsSigningAlgorithm.SIGV4 -> SignatureCalculator.SigV4
-        AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> SignatureCalculator.SigV4a
-    }
-
-@OptIn(ExperimentalApi::class)
-internal class DefaultAwsSignerImpl(
-    private val canonicalizer: Canonicalizer = Canonicalizer.Default,
-    private val requestMutator: RequestMutator = RequestMutator.Default,
-    private val telemetryProvider: TelemetryProvider? = null,
-) : AwsSigner {
-    override suspend fun sign(request: HttpRequest, config: AwsSigningConfig): AwsSigningResult<HttpRequest> {
-        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
-            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
-
-        val canonical = canonicalizer.canonicalRequest(request, config)
-        if (config.logRequest) {
-            logger.trace { "Canonical request:\n${canonical.requestString}" }
-        }
-
-        val signatureCalculator = config.algorithm.signatureCalculator
-
-        val stringToSign = signatureCalculator.stringToSign(canonical.requestString, config)
-        logger.trace { "String to sign:\n$stringToSign" }
-
-        val signingKey = signatureCalculator.signingKey(config)
-
-        val signature = signatureCalculator.calculate(signingKey, stringToSign)
-        logger.debug { "Calculated signature: $signature" }
-
-        val signedRequest = requestMutator.appendAuth(config, canonical, signature)
-
-        return AwsSigningResult(signedRequest, signature.encodeToByteArray())
-    }
-
-    override suspend fun signChunk(
-        chunkBody: ByteArray,
-        prevSignature: ByteArray,
-        config: AwsSigningConfig,
-    ): AwsSigningResult<Unit> {
-        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
-            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
-
-        val signatureCalculator = config.algorithm.signatureCalculator
-
-        val stringToSign = signatureCalculator.chunkStringToSign(chunkBody, prevSignature, config)
-        logger.trace { "Chunk string to sign:\n$stringToSign" }
-
-        val signingKey = signatureCalculator.signingKey(config)
-
-        val signature = signatureCalculator.calculate(signingKey, stringToSign)
-        logger.debug { "Calculated chunk signature: $signature" }
-
-        return AwsSigningResult(Unit, signature.encodeToByteArray())
-    }
-
-    override suspend fun signChunkTrailer(
-        trailingHeaders: Headers,
-        prevSignature: ByteArray,
-        config: AwsSigningConfig,
-    ): AwsSigningResult<Unit> {
-        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
-            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
-
-        val signatureCalculator = config.algorithm.signatureCalculator
-
-        // FIXME - can we share canonicalization code more than we are..., also this reduce is inefficient.
-        // canonicalize the headers
-        val trailingHeadersBytes = trailingHeaders.entries().sortedBy { e -> e.key.lowercase() }
-            .map { e ->
-                buildString {
-                    append(e.key.lowercase())
-                    append(":")
-                    append(e.value.joinToString(",") { v -> v.trim() })
-                    append("\n")
-                }.encodeToByteArray()
-            }.reduce { acc, bytes -> acc + bytes }
-
-        val stringToSign = signatureCalculator.chunkTrailerStringToSign(trailingHeadersBytes, prevSignature, config)
-        logger.trace { "Chunk trailer string to sign:\n$stringToSign" }
-
-        val signingKey = signatureCalculator.signingKey(config)
-
-        val signature = signatureCalculator.calculate(signingKey, stringToSign)
-        logger.debug { "Calculated chunk signature: $signature" }
-
-        return AwsSigningResult(Unit, signature.encodeToByteArray())
-    }
-}
-
-/**
- * Formats a credential scope consisting of a signing date, region (SigV4 only), service, and a signature type
- */
-internal val AwsSigningConfig.credentialScope: String
-    get() = run {
-        val signingDate = signingDate.format(TimestampFormat.ISO_8601_CONDENSED_DATE)
-        return when (algorithm) {
-            AwsSigningAlgorithm.SIGV4 -> "$signingDate/$region/$service/aws4_request"
-            AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> "$signingDate/$service/aws4_request"
-        }
-    }
-
-/**
- * Formats the value for a credential header/parameter
- */
-internal fun credentialValue(config: AwsSigningConfig): String =
-    "${config.credentials.accessKeyId}/${config.credentialScope}"
+public expect val DefaultAwsSigner: AwsSigner

runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/RequestMutator.kt

@@ -5,6 +5,7 @@
 package aws.smithy.kotlin.runtime.auth.awssigning
 
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.time.TimestampFormat
 
 /**
  * An object that can mutate requests to include signing attributes.
@@ -55,3 +56,21 @@ internal class DefaultRequestMutator : RequestMutator {
         return canonical.request.build()
     }
 }
+
+/**
+ * Formats a credential scope consisting of a signing date, region (SigV4 only), service, and a signature type
+ */
+internal val AwsSigningConfig.credentialScope: String
+    get() {
+        val signingDate = signingDate.format(TimestampFormat.ISO_8601_CONDENSED_DATE)
+        return when (algorithm) {
+            AwsSigningAlgorithm.SIGV4 -> "$signingDate/$region/$service/aws4_request"
+            AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> "$signingDate/$service/aws4_request"
+        }
+    }
+
+/**
+ * Formats the value for a credential header/parameter
+ */
+internal fun credentialValue(config: AwsSigningConfig): String =
+    "${config.credentials.accessKeyId}/${config.credentialScope}"

runtime/auth/aws-signing-default/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSignerJVM.kt

@@ -0,0 +1,120 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.ExperimentalApi
+import aws.smithy.kotlin.runtime.http.Headers
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.telemetry.TelemetryProvider
+import aws.smithy.kotlin.runtime.telemetry.logging.logger
+import kotlin.coroutines.coroutineContext
+
+/** The default implementation of [AwsSigner] */
+public actual val DefaultAwsSigner: AwsSigner = DefaultAwsSignerImpl()
+
+/** Creates a customized instance of [AwsSigner] */
+@Suppress("ktlint:standard:function-naming")
+public fun DefaultAwsSigner(block: DefaultAwsSignerBuilder.() -> Unit): AwsSigner =
+    DefaultAwsSignerBuilder().apply(block).build()
+
+/** A builder class for creating instances of [AwsSigner] using the default implementation */
+public class DefaultAwsSignerBuilder {
+    public var telemetryProvider: TelemetryProvider? = null
+
+    public fun build(): AwsSigner = DefaultAwsSignerImpl(
+        telemetryProvider = telemetryProvider,
+    )
+}
+
+private val AwsSigningAlgorithm.signatureCalculator
+    get() = when (this) {
+        AwsSigningAlgorithm.SIGV4 -> SignatureCalculator.SigV4
+        AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> SignatureCalculator.SigV4a
+    }
+
+@OptIn(ExperimentalApi::class)
+internal class DefaultAwsSignerImpl(
+    private val canonicalizer: Canonicalizer = Canonicalizer.Default,
+    private val requestMutator: RequestMutator = RequestMutator.Default,
+    private val telemetryProvider: TelemetryProvider? = null,
+) : AwsSigner {
+    override suspend fun sign(request: HttpRequest, config: AwsSigningConfig): AwsSigningResult<HttpRequest> {
+        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
+            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
+
+        val canonical = canonicalizer.canonicalRequest(request, config)
+        if (config.logRequest) {
+            logger.trace { "Canonical request:\n${canonical.requestString}" }
+        }
+
+        val signatureCalculator = config.algorithm.signatureCalculator
+
+        val stringToSign = signatureCalculator.stringToSign(canonical.requestString, config)
+        logger.trace { "String to sign:\n$stringToSign" }
+
+        val signingKey = signatureCalculator.signingKey(config)
+
+        val signature = signatureCalculator.calculate(signingKey, stringToSign)
+        logger.debug { "Calculated signature: $signature" }
+
+        val signedRequest = requestMutator.appendAuth(config, canonical, signature)
+
+        return AwsSigningResult(signedRequest, signature.encodeToByteArray())
+    }
+
+    override suspend fun signChunk(
+        chunkBody: ByteArray,
+        prevSignature: ByteArray,
+        config: AwsSigningConfig,
+    ): AwsSigningResult<Unit> {
+        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
+            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
+
+        val signatureCalculator = config.algorithm.signatureCalculator
+
+        val stringToSign = signatureCalculator.chunkStringToSign(chunkBody, prevSignature, config)
+        logger.trace { "Chunk string to sign:\n$stringToSign" }
+
+        val signingKey = signatureCalculator.signingKey(config)
+
+        val signature = signatureCalculator.calculate(signingKey, stringToSign)
+        logger.debug { "Calculated chunk signature: $signature" }
+
+        return AwsSigningResult(Unit, signature.encodeToByteArray())
+    }
+
+    override suspend fun signChunkTrailer(
+        trailingHeaders: Headers,
+        prevSignature: ByteArray,
+        config: AwsSigningConfig,
+    ): AwsSigningResult<Unit> {
+        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
+            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
+
+        val signatureCalculator = config.algorithm.signatureCalculator
+
+        // FIXME - can we share canonicalization code more than we are..., also this reduce is inefficient.
+        // canonicalize the headers
+        val trailingHeadersBytes = trailingHeaders.entries().sortedBy { e -> e.key.lowercase() }
+            .map { e ->
+                buildString {
+                    append(e.key.lowercase())
+                    append(":")
+                    append(e.value.joinToString(",") { v -> v.trim() })
+                    append("\n")
+                }.encodeToByteArray()
+            }.reduce { acc, bytes -> acc + bytes }
+
+        val stringToSign = signatureCalculator.chunkTrailerStringToSign(trailingHeadersBytes, prevSignature, config)
+        logger.trace { "Chunk trailer string to sign:\n$stringToSign" }
+
+        val signingKey = signatureCalculator.signingKey(config)
+
+        val signature = signatureCalculator.calculate(signingKey, stringToSign)
+        logger.debug { "Calculated chunk signature: $signature" }
+
+        return AwsSigningResult(Unit, signature.encodeToByteArray())
+    }
+}

runtime/auth/aws-signing-default/native/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSignerNative.kt

@@ -0,0 +1,10 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.auth.awssigning.crt.CrtAwsSigner
+
+/** The default implementation of [AwsSigner] */
+public actual val DefaultAwsSigner: AwsSigner = CrtAwsSigner

runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedByteReadChannelTestBase.kt

@@ -5,7 +5,6 @@
 
 package aws.smithy.kotlin.runtime.auth.awssigning.tests
 
-import aws.smithy.kotlin.runtime.IgnoreNative
 import aws.smithy.kotlin.runtime.auth.awssigning.*
 import aws.smithy.kotlin.runtime.auth.awssigning.internal.CHUNK_SIZE_BYTES
 import aws.smithy.kotlin.runtime.io.*
@@ -18,7 +17,6 @@ import kotlin.test.*
 import kotlin.time.Duration.Companion.milliseconds
 
 abstract class AwsChunkedByteReadChannelTestBase : AwsChunkedTestBase(AwsChunkedReaderFactory.Channel) {
-    @IgnoreNative // FIXME Re-enable after Kotlin/Native Implementation
     @Test
     fun testSlowProducerMultipleChunksPartialLast(): TestResult = runTest {
         val numChunks = 6