Update codegen test & fix optional chaining.

awslabs · Nov 19, 2024 · eabc32e · eabc32e
1 parent b9b7f18
commit eabc32e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.../aws/swift/codegen/customization/flexiblechecksums/FlexibleChecksumsRequestIntegration.kt b/.../aws/swift/codegen/customization/flexiblechecksums/FlexibleChecksumsRequestIntegration.kt
@@ -68,13 +68,15 @@ private object FlexibleChecksumRequestMiddleware : MiddlewareRenderable {
         val inputShapeName = MiddlewareShapeUtils.inputSymbol(ctx.symbolProvider, ctx.model, op).name
         val outputShapeName = MiddlewareShapeUtils.outputSymbol(ctx.symbolProvider, ctx.model, op).name
         val httpChecksumTrait = op.getTrait(HttpChecksumTrait::class.java).orElse(null)
-        val algorithmMemberName = httpChecksumTrait?.requestAlgorithmMember?.get()?.lowercaseFirstLetter()?.let {
+        val algorithmMemberName = httpChecksumTrait?.requestAlgorithmMember?.getOrNull()?.lowercaseFirstLetter()?.let {
             "input.$it?.rawValue"
         } ?: "nil"
         val requestChecksumIsRequired = httpChecksumTrait?.isRequestChecksumRequired
-        val algoHeaderName = ctx.model.expectShape(op.inputShape).getMember(algorithmMemberName)?.getOrNull()?.getTrait<HttpHeaderTrait>()?.value?.let {
-            "\"$it\""
-        } ?: "nil"
+        val algoHeaderName = if (httpChecksumTrait?.requestAlgorithmMember?.getOrNull() != null) {
+            ctx.model.expectShape(op.inputShape).getMember(httpChecksumTrait.requestAlgorithmMember.get())?.getOrNull()?.getTrait<HttpHeaderTrait>()?.value?.let {
+                "\"$it\""
+            } ?: "nil"
+        } else { "nil" }
 
         writer.write(
             "\$N<\$L, \$L>(requestChecksumRequired: \$L, checksumAlgorithm: \$L, checksumAlgoHeaderName: \$L)",

diff --git a/...oftware/amazon/smithy/aws/swift/codegen/customizations/FlexibleChecksumMiddlewareTests.kt b/...oftware/amazon/smithy/aws/swift/codegen/customizations/FlexibleChecksumMiddlewareTests.kt
@@ -16,7 +16,7 @@ class FlexibleChecksumMiddlewareTests {
         val contents = TestUtils.getFileContents(context.manifest, "Sources/Example/ChecksumTestsClient.swift")
         contents.shouldSyntacticSanityCheck()
         val expectedContents = """
-        builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsRequestMiddleware<SomeOperationInput, SomeOperationOutput>(requestChecksumRequired: true, checksumAlgorithm: input.checksumAlgorithm?.rawValue))
+        builder.interceptors.add(AWSClientRuntime.FlexibleChecksumsRequestMiddleware<SomeOperationInput, SomeOperationOutput>(requestChecksumRequired: true, checksumAlgorithm: input.checksumAlgorithm?.rawValue, checksumAlgoHeaderName: "x-amz-request-algorithm"))
 """
         contents.shouldContainOnlyOnce(expectedContents)
     }