Clean up

Author: 0marperez

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

@@ -5,19 +5,10 @@
 package aws.sdk.kotlin.codegen
 
 import aws.sdk.kotlin.codegen.model.traits.Presignable
-import software.amazon.smithy.aws.traits.HttpChecksumTrait
 import software.amazon.smithy.aws.traits.auth.SigV4Trait
 import software.amazon.smithy.aws.traits.protocols.AwsQueryTrait
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.core.*
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.Core.Hashing.isSupportedForFlexibleChecksums
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.Core.Hashing.toHashFunctionOrThrow
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.Core.Text.Encoding.encodeBase64String
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.Http.HttpBody
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.Http.readAll
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.KotlinCoroutines.coroutineContext
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.KotlinxCoroutines.runBlocking
-import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes.Observability.TelemetryApi.warn
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.integration.SectionId
 import software.amazon.smithy.kotlin.codegen.integration.SectionKey
@@ -28,7 +19,6 @@ import software.amazon.smithy.kotlin.codegen.rendering.endpoints.EndpointResolve
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.HttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.HttpBindingResolver
 import software.amazon.smithy.kotlin.codegen.rendering.serde.serializerName
-import software.amazon.smithy.kotlin.codegen.utils.getOrNull
 import software.amazon.smithy.model.knowledge.TopDownIndex
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
@@ -157,7 +147,6 @@ class PresignerGenerator : KotlinIntegration {
                 requestSymbol,
                 serializerSymbol,
                 contextMap,
-                op,
             )
         }
     }
@@ -202,7 +191,6 @@ class PresignerGenerator : KotlinIntegration {
         requestSymbol: Symbol,
         serializerSymbol: Symbol,
         contextMap: Map<SectionKey<*>, Any>,
-        op: OperationShape,
     ) = writer.apply {
         dokka {
             write("Presign a [#T] using the configuration of this [#T].", requestSymbol, serviceSymbol)
@@ -275,44 +263,6 @@ class PresignerGenerator : KotlinIntegration {
                 )
             }
 
-            checksumAlgorithmMember(op, ctx)?.let { checksumAlgorithmMember ->
-                withBlock("input.#L?.value?.let { checksumAlgorithmName ->", "}", checksumAlgorithmMember) {
-                    withBlock("when (unsignedRequest.body) {", "}") {
-                        withBlock("is #1T.Bytes, is #1T.Empty -> {", "}", HttpBody) {
-                            write("val checksumAlgorithm = checksumAlgorithmName.#T()", toHashFunctionOrThrow)
-                            withInlineBlock(
-                                "if (checksumAlgorithm.#T) {",
-                                "}",
-                                isSupportedForFlexibleChecksums,
-                            ) {
-                                withBlock("#T {", "}", runBlocking) {
-                                    withBlock("checksumAlgorithm.update(", ")") {
-                                        write("unsignedRequest.body.#T() ?: byteArrayOf()", readAll)
-                                    }
-                                }
-                                write(
-                                    "checksum = #S.lowercase() to checksumAlgorithm.digest().#T()",
-                                    "x-amz-checksum-\${checksumAlgorithmName}",
-                                    encodeBase64String,
-                                )
-                            }
-                            withBlock(" else {", "}") {
-                                withBlock("#T {", "}", runBlocking) {
-                                    write("class Presigner")
-                                    write(
-                                        "#T.#T<Presigner> { #S }",
-                                        coroutineContext,
-                                        warn,
-                                        "The requested checksum algorithm (\${checksumAlgorithmName}) is not supported for pre-signed URL checksums, sending request without checksum.",
-                                    )
-                                }
-                            }
-                        }
-                        write("else -> throw IllegalStateException(#S)", "HTTP body type unsupported for pre-signed URL checksums.")
-                    }
-                }
-            }
-
             declareSection(SigningConfigCustomizationSection)
 
             write("configBlock()")
@@ -335,24 +285,4 @@ class PresignerGenerator : KotlinIntegration {
      * > "my-object/example/photo.user". This is an incorrect path for that object.
      */
     private fun normalizeUriPath(service: ServiceShape) = service.sdkId != "S3"
-
-    /**
-     * Gets the checksum algorithm member if configured on a request, otherwise null
-     */
-    private fun checksumAlgorithmMember(
-        operationShape: OperationShape,
-        ctx: CodegenContext,
-    ): String? {
-        operationShape.getTrait<HttpChecksumTrait>()?.let { httpChecksumTrait ->
-            httpChecksumTrait.requestAlgorithmMember.getOrNull()?.let { requestAlgorithmMember ->
-                val memberShape = ctx.model
-                    .expectShape<StructureShape>(operationShape.input.get())
-                    .members()
-                    .first { it.memberName == requestAlgorithmMember }
-
-                return ctx.symbolProvider.toMemberName(memberShape)
-            }
-        }
-        return null
-    }
 }

services/s3/e2eTest/src/S3ChecksumTest.kt

@@ -16,7 +16,6 @@ import org.junit.jupiter.api.*
 import java.io.File
 import java.io.FileInputStream
 import java.util.*
-import kotlin.test.Ignore
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -166,28 +165,28 @@ class S3ChecksumTest {
 
     @Test
     fun testPresignedUrlNoDefault() = runBlocking {
+        val contents = "presign-test"
+
         val unsignedPutRequest = PutObjectRequest {
             bucket = testBucket
             key = testKey()
         }
         val presignedPutRequest = client.presignPutObject(unsignedPutRequest, 60.seconds)
-        val contents = "presign-test"
 
         assertFalse(presignedPutRequest.url.toString().contains("x-amz-checksum-crc32"))
         assertTrue(responseCodeFromPut(presignedPutRequest, contents) in 200..299)
     }
 
-    // FIXME: Sending checksum via query params should work
     @Test
-    @Ignore
-    fun testPresignedUrlContainsChecksum() = runBlocking {
+    fun testPresignedUrlChecksumValue() = runBlocking {
+        val contents = "presign-test"
+
         val unsignedPutRequest = PutObjectRequest {
             bucket = testBucket
             key = testKey()
-            checksumAlgorithm = ChecksumAlgorithm.Crc32
+            checksumCrc32 = "dBBx+Q=="
         }
         val presignedPutRequest = client.presignPutObject(unsignedPutRequest, 60.seconds)
-        val contents = "presign-test"
 
         assertTrue(presignedPutRequest.url.toString().contains("x-amz-checksum-crc32"))
         assertTrue(responseCodeFromPut(presignedPutRequest, contents) in 200..299)

tests/codegen/checksums/src/commonTest/kotlin/aws/sdk/kotlin/tests/codegen/checksums/utils/ChecksumTestUtils.kt

@@ -114,11 +114,9 @@ internal fun runChecksumTest(
     // Test type
     requestChecksumRequired: Boolean = true,
 ): Unit = runBlocking {
-    val interceptorsList = listOfNotNull(headerReader, headerSetter, businessMetricsReader)
-
     TestClient {
         httpClient = TestEngine()
-        interceptors = interceptorsList.toMutableList()
+        interceptors = listOfNotNull(headerReader, headerSetter, businessMetricsReader).toMutableList()
         requestChecksumCalculation = requestChecksumCalculationValue ?: requestChecksumCalculation
         responseChecksumValidation = responseChecksumValidationValue ?: responseChecksumValidation
         httpClient = TestEngine(