feat: Add default trait support (#1696)

* Don't add x-amz-content-sha256 header before request is handed off to CRT signer. * Enable protocol tests that use defaults tag again. * swiftlint --------- Co-authored-by: Sichan Yoo <[email protected]>
awslabs · Sep 6, 2024 · aacff71 · aacff71
1 parent 4ce6d05
commit aacff71
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 16 deletions.
diff --git a/...Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/Sha256TreeHashMiddleware.swift b/...Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/Sha256TreeHashMiddleware.swift
@@ -24,14 +24,8 @@ public struct Sha256TreeHashMiddleware<OperationStackInput, OperationStackOutput
         context: Context
     ) async throws {
         switch request.body {
-        case .data(let data):
-            guard let data = data else {
-                return
-            }
-            if !request.headers.exists(name: X_AMZ_CONTENT_SHA256_HEADER_NAME) {
-                let sha256 = try data.computeSHA256().encodeToHexString()
-                builder.withHeader(name: X_AMZ_CONTENT_SHA256_HEADER_NAME, value: sha256)
-            }
+        case .data:
+            break
         case .stream(let stream):
             let streamBytes: Data?
             let currentPosition = stream.position

diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/UserAgent/BusinessMetrics.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/UserAgent/BusinessMetrics.swift
@@ -51,7 +51,7 @@ public extension Context {
         get { attributes.get(key: businessMetricsKey) ?? [:] }
         set(newPair) {
             var combined = businessMetrics
-            combined.merge(newPair) { (current, new) in new }
+            combined.merge(newPair) { (_, new) in new }
             attributes.set(key: businessMetricsKey, value: combined)
         }
     }
@@ -82,7 +82,7 @@ public let businessMetricsKey = AttributeKey<Dictionary<String, String>>(name: "
     "SIGV4A_SIGNING"            : "S"           : Y
     "RESOLVED_ACCOUNT_ID"       : "T"           :
  */
-fileprivate func setFlagsIntoContext(
+private func setFlagsIntoContext(
     config: UserAgentValuesFromConfig,
     context: Context
 ) {

diff --git a/...software/amazon/smithy/aws/swift/codegen/protocols/awsjson/AWSJSON1_0ProtocolGenerator.kt b/...software/amazon/smithy/aws/swift/codegen/protocols/awsjson/AWSJSON1_0ProtocolGenerator.kt
@@ -23,7 +23,6 @@ class AWSJSON1_0ProtocolGenerator : AWSHTTPBindingProtocolGenerator(AWSJSONCusto
         "SDKAppliedContentEncoding_awsJson1_0",
         "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsJson1_0",
     )
-    override val tagsToIgnore = setOf("defaults")
     override fun getProtocolHttpBindingResolver(ctx: ProtocolGenerator.GenerationContext, defaultContentType: String):
         HttpBindingResolver = AWSJSONHttpBindingResolver(ctx, defaultContentType)
 

diff --git a/...software/amazon/smithy/aws/swift/codegen/protocols/awsjson/AWSJSON1_1ProtocolGenerator.kt b/...software/amazon/smithy/aws/swift/codegen/protocols/awsjson/AWSJSON1_1ProtocolGenerator.kt
@@ -23,7 +23,6 @@ class AWSJSON1_1ProtocolGenerator : AWSHTTPBindingProtocolGenerator(AWSJSONCusto
         "SDKAppliedContentEncoding_awsJson1_1",
         "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsJson1_1",
     )
-    override val tagsToIgnore = setOf("defaults")
     override fun getProtocolHttpBindingResolver(ctx: ProtocolGenerator.GenerationContext, defaultContentType: String):
         HttpBindingResolver = AWSJSONHttpBindingResolver(ctx, defaultContentType)
 

diff --git a/.../software/amazon/smithy/aws/swift/codegen/protocols/awsquery/AWSQueryProtocolGenerator.kt b/.../software/amazon/smithy/aws/swift/codegen/protocols/awsquery/AWSQueryProtocolGenerator.kt
@@ -27,7 +27,6 @@ open class AWSQueryProtocolGenerator : AWSHTTPBindingProtocolGenerator(AWSQueryC
         "SDKAppliedContentEncoding_awsQuery",
         "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsQuery",
     )
-    override val tagsToIgnore = setOf("defaults")
 
     override fun addProtocolSpecificMiddleware(ctx: ProtocolGenerator.GenerationContext, operation: OperationShape) {
         super.addProtocolSpecificMiddleware(ctx, operation)

diff --git a/.../software/amazon/smithy/aws/swift/codegen/protocols/ec2query/EC2QueryProtocolGenerator.kt b/.../software/amazon/smithy/aws/swift/codegen/protocols/ec2query/EC2QueryProtocolGenerator.kt
@@ -27,7 +27,6 @@ class EC2QueryProtocolGenerator : AWSHTTPBindingProtocolGenerator(EC2QueryCustom
         "SDKAppliedContentEncoding_ec2Query",
         "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_ec2Query"
     )
-    override val tagsToIgnore = setOf("defaults")
 
     override fun addProtocolSpecificMiddleware(ctx: ProtocolGenerator.GenerationContext, operation: OperationShape) {
         super.addProtocolSpecificMiddleware(ctx, operation)

diff --git a/...tware/amazon/smithy/aws/swift/codegen/protocols/restjson/AWSRestJson1ProtocolGenerator.kt b/...tware/amazon/smithy/aws/swift/codegen/protocols/restjson/AWSRestJson1ProtocolGenerator.kt
@@ -14,6 +14,7 @@ class AWSRestJson1ProtocolGenerator : AWSHTTPBindingProtocolGenerator(RestJSONCu
     override val testsToIgnore = setOf(
         "SDKAppliedContentEncoding_restJson1",
         "SDKAppendedGzipAfterProvidedEncoding_restJson1",
+        // This test is disabled until Smithy v1.51.0 with the fix for the test gets released.
+        "RestJsonClientIgnoresDefaultValuesIfMemberValuesArePresentInResponse"
     )
-    override val tagsToIgnore = setOf("defaults")
 }
diff --git a/...in/software/amazon/smithy/aws/swift/codegen/protocols/restxml/RestXMLProtocolGenerator.kt b/...in/software/amazon/smithy/aws/swift/codegen/protocols/restxml/RestXMLProtocolGenerator.kt
@@ -27,7 +27,6 @@ class RestXMLProtocolGenerator : AWSHTTPBindingProtocolGenerator(RestXMLCustomiz
         "S3PreservesEmbeddedDotSegmentInUriLabel", // moved to s3-tests.smithy
         "S3PreservesLeadingDotSegmentInUriLabel", // moved to s3-tests.smithy
     )
-    override val tagsToIgnore = setOf("defaults")
 
     override fun generateDeserializers(ctx: ProtocolGenerator.GenerationContext) {
         super.generateDeserializers(ctx)