Fix composite checksums

Author: 0marperez

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/S3CompositeChecksumsInterceptor.kt

@@ -0,0 +1,27 @@
+package aws.sdk.kotlin.runtime.http.interceptors
+
+import aws.smithy.kotlin.runtime.client.config.HttpChecksumConfigOption
+import aws.smithy.kotlin.runtime.http.interceptors.FlexibleChecksumsResponseInterceptor
+
+/**
+ * S3 variant of the flexible checksum interceptor where composite checksums are not validated
+ */
+public class S3FlexibleChecksumResponseInterceptor(
+    responseValidationRequired: Boolean,
+    responseChecksumValidation: HttpChecksumConfigOption?,
+) : FlexibleChecksumsResponseInterceptor(
+    responseValidationRequired,
+    responseChecksumValidation,
+) {
+    override fun ignoreChecksum(checksum: String): Boolean =
+        checksum.isCompositeChecksum()
+}
+
+/**
+ * Verifies if a checksum is composite.
+ */
+private fun String.isCompositeChecksum(): Boolean {
+    // Ends with "-#" where "#" is a number
+    val regex = Regex("-(\\d)+$")
+    return regex.containsMatchIn(this)
+}

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/S3FlexibleChecksumResponseInterceptor.kt

@@ -30,6 +30,7 @@ dependencies {
     api(libs.smithy.protocol.test.traits)
     implementation(libs.smithy.aws.endpoints)
     implementation(libs.smithy.smoke.test.traits)
+    implementation(libs.smithy.kotlin.runtime.core)
 
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.junit.jupiter.params)

codegen/aws-sdk-codegen/build.gradle.kts

@@ -62,7 +62,7 @@ object AwsRuntimeTypes {
             val UnsupportedSigningAlgorithmInterceptor = symbol("UnsupportedSigningAlgorithmInterceptor")
             val BusinessMetricsInterceptor = symbol("BusinessMetricsInterceptor")
             val AwsBusinessMetric = symbol("AwsBusinessMetric")
-            val S3CompositeChecksumsInterceptor = symbol("S3CompositeChecksumsInterceptor")
+            val S3FlexibleChecksumResponseInterceptor = symbol("S3FlexibleChecksumResponseInterceptor")
         }
 
         object Retries {

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt

@@ -5,6 +5,7 @@
 package aws.sdk.kotlin.codegen
 
 import aws.sdk.kotlin.codegen.model.traits.Presignable
+import aws.smithy.kotlin.runtime.hashing.algorithmsSupportedForFlexibleChecksums
 import software.amazon.smithy.aws.traits.HttpChecksumTrait
 import software.amazon.smithy.aws.traits.auth.SigV4Trait
 import software.amazon.smithy.aws.traits.protocols.AwsQueryTrait
@@ -304,7 +305,7 @@ class PresignerGenerator : KotlinIntegration {
                                         coroutineContext,
                                         warn,
                                         "The requested checksum algorithm (\${checksumAlgorithmName}) is not supported for pre-signed URL checksums, sending request without checksum. " +
-                                            "Supported checksums for pre-signed URLs include the following: ",
+                                            "Supported checksums for pre-signed URLs: $algorithmsSupportedForFlexibleChecksums",
                                     )
                                 }
                             }

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/PresignerGenerator.kt

@@ -4,6 +4,8 @@
  */
 package aws.sdk.kotlin.codegen.customization.flexiblechecksums
 
+import aws.sdk.kotlin.codegen.AwsRuntimeTypes
+import aws.sdk.kotlin.codegen.customization.s3.isS3
 import software.amazon.smithy.aws.traits.HttpChecksumTrait
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.core.*
@@ -16,6 +18,7 @@ import software.amazon.smithy.kotlin.codegen.rendering.util.ConfigPropertyType
 import software.amazon.smithy.kotlin.codegen.utils.getOrNull
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.OperationShape
+import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.StructureShape
 
 /**
@@ -84,18 +87,22 @@ private val flexibleChecksumsResponseMiddleware = object : ProtocolMiddleware {
     }
 
     override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
-        val inputSymbol = ctx.symbolProvider.toSymbol(ctx.model.expectShape(op.inputShape))
         val httpChecksumTrait = op.getTrait<HttpChecksumTrait>()!!
         val requestValidationModeMember = ctx.model.expectShape<StructureShape>(op.input.get())
             .members()
             .first { it.memberName == httpChecksumTrait.requestValidationModeMember.get() }
         val requestValidationModeMemberName = ctx.symbolProvider.toMemberName(requestValidationModeMember)
 
-        writer.withBlock( // TODO: ADD DIFFERENT INTERCEPTORS DEPENDING ON IF THE SERVICE HAS COMPOSITE CHECKSUMS !
-            "op.interceptors.add(#T<#T>(",
+        val interceptor = if (ctx.model.expectShape<ServiceShape>(ctx.settings.service).isS3) {
+            AwsRuntimeTypes.Http.Interceptors.S3FlexibleChecksumResponseInterceptor
+        } else {
+            RuntimeTypes.HttpClient.Interceptors.FlexibleChecksumsResponseInterceptor
+        }
+
+        writer.withBlock(
+            "op.interceptors.add(#T(",
             "))",
-            RuntimeTypes.HttpClient.Interceptors.FlexibleChecksumsResponseInterceptor,
-            inputSymbol,
+            interceptor,
         ) {
             writer.write("input.#L?.value == \"ENABLED\",", requestValidationModeMemberName)
             writer.write("config.responseChecksumValidation,")

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/flexiblechecksums/FlexibleChecksumsResponse.kt

@@ -12,7 +12,6 @@ aws.sdk.kotlin.codegen.endpoints.AddAwsEndpointFunctions
 aws.sdk.kotlin.codegen.PresignerGenerator
 aws.sdk.kotlin.codegen.customization.flexiblechecksums.FlexibleChecksumsRequest
 aws.sdk.kotlin.codegen.customization.flexiblechecksums.FlexibleChecksumsResponse
-aws.sdk.kotlin.codegen.customization.flexiblechecksums.s3.S3CompositeChecksumsIntegration
 aws.sdk.kotlin.codegen.customization.AddAwsSpanAttributes
 aws.sdk.kotlin.codegen.customization.s3.S3OperationErrorHandler
 aws.sdk.kotlin.codegen.customization.s3.S3SigningConfig

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/flexiblechecksums/s3/S3CompositeChecksumsIntegration.kt

@@ -169,7 +169,6 @@ class S3ChecksumTest {
         val unsignedPutRequest = PutObjectRequest {
             bucket = testBucket
             key = testKey()
-            checksumCrc32 = "`"
         }
         val presignedPutRequest = client.presignPutObject(unsignedPutRequest, 60.seconds)
         val contents = "presign-test"

codegen/aws-sdk-codegen/src/main/resources/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration

@@ -4,12 +4,12 @@ use aws.protocols#restJson1
 use aws.api#service
 use aws.auth#sigv4
 
-@restJson1
+@{protocol-name}
 @sigv4(name: "event-stream-test")
 @service(sdkId: "EventStreamTest")
 service TestService { version: "123", operations: [TestStreamOp] }
 
-@http(method: "POST", uri: "/test-eventstream", code: 200)
+{op-traits}
 operation TestStreamOp {
     input: TestStreamInputOutput,
     output: TestStreamInputOutput,