Move CBOR implementation to smithy-swift

awslabs · Jan 29, 2025 · 0a4e077 · 0a4e077
1 parent 9c5123c
commit 0a4e077
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 747 deletions.
diff --git a/...time/Sources/AWSClientRuntime/Middlewares/RpcV2CborValidateResponseHeaderMiddleware.swift b/...time/Sources/AWSClientRuntime/Middlewares/RpcV2CborValidateResponseHeaderMiddleware.swift
diff --git a/...Runtime/Sources/AWSClientRuntime/Protocols/RpcV2Cbor/RpcV2CborError+QueryCompatible.swift b/...Runtime/Sources/AWSClientRuntime/Protocols/RpcV2Cbor/RpcV2CborError+QueryCompatible.swift
@@ -0,0 +1,29 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+@_spi(SmithyReadWrite) import struct ClientRuntime.RpcV2CborError
+@_spi(SmithyReadWrite) import class SmithyCBOR.Reader
+import class SmithyHTTPAPI.HTTPResponse
+
+// support awsQueryCompatible trait
+extension RpcV2CborError {
+    @_spi(SmithyReadWrite)
+    public static func makeQueryCompatibleError(
+        httpResponse: HTTPResponse,
+        responseReader: Reader,
+        noErrorWrapping: Bool,
+        errorDetails: String?
+    ) throws -> RpcV2CborError {
+        let errorCode = try AwsQueryCompatibleErrorDetails.parse(errorDetails).code
+        return try RpcV2CborError(
+            httpResponse: httpResponse,
+            responseReader: responseReader,
+            noErrorWrapping: noErrorWrapping,
+            code: errorCode
+        )
+    }
+}
diff --git a/...s/Core/AWSClientRuntime/Sources/AWSClientRuntime/Protocols/RpcV2Cbor/RpcV2CborError.swift b/...s/Core/AWSClientRuntime/Sources/AWSClientRuntime/Protocols/RpcV2Cbor/RpcV2CborError.swift
diff --git a/...c/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPBindingProtocolGenerator.kt b/...c/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPBindingProtocolGenerator.kt
@@ -4,14 +4,15 @@
  */
 package software.amazon.smithy.aws.swift.codegen
 
-import software.amazon.smithy.aws.swift.codegen.middleware.OperationEndpointResolverMiddleware
+import software.amazon.smithy.swift.codegen.integration.middlewares.OperationEndpointResolverMiddleware
 import software.amazon.smithy.aws.swift.codegen.middleware.UserAgentMiddleware
 import software.amazon.smithy.aws.swift.codegen.swiftmodules.AWSClientRuntimeTypes
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.rulesengine.language.EndpointRuleSet
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait
 import software.amazon.smithy.rulesengine.traits.EndpointTestsTrait
+import software.amazon.smithy.swift.codegen.EndpointTestGenerator
 import software.amazon.smithy.swift.codegen.integration.HTTPBindingProtocolGenerator
 import software.amazon.smithy.swift.codegen.integration.HTTPProtocolCustomizable
 import software.amazon.smithy.swift.codegen.integration.HttpProtocolTestGenerator

diff --git a/...ws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AddProtocols.kt b/...ws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AddProtocols.kt
@@ -4,13 +4,15 @@
  */
 package software.amazon.smithy.aws.swift.codegen
 
+import software.amazon.smithy.aws.swift.codegen.middleware.UserAgentMiddleware
 import software.amazon.smithy.aws.swift.codegen.protocols.awsjson.AWSJSON1_0ProtocolGenerator
 import software.amazon.smithy.aws.swift.codegen.protocols.awsjson.AWSJSON1_1ProtocolGenerator
 import software.amazon.smithy.aws.swift.codegen.protocols.awsquery.AWSQueryProtocolGenerator
 import software.amazon.smithy.aws.swift.codegen.protocols.ec2query.EC2QueryProtocolGenerator
 import software.amazon.smithy.aws.swift.codegen.protocols.restjson.AWSRestJson1ProtocolGenerator
 import software.amazon.smithy.aws.swift.codegen.protocols.restxml.RestXMLProtocolGenerator
-import software.amazon.smithy.aws.swift.codegen.protocols.rpcv2cbor.RpcV2CborProtocolGenerator
+import software.amazon.smithy.aws.swift.codegen.protocols.rpcv2cbor.AWSRpcV2CborCustomizations
+import software.amazon.smithy.swift.codegen.protocols.rpcv2cbor.RpcV2CborProtocolGenerator
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
 import software.amazon.smithy.swift.codegen.integration.SwiftIntegration
 
@@ -33,6 +35,13 @@ class AddProtocols : SwiftIntegration {
         RestXMLProtocolGenerator(),
         AWSQueryProtocolGenerator(),
         EC2QueryProtocolGenerator(),
-        RpcV2CborProtocolGenerator()
+        RpcV2CborProtocolGenerator(
+            rpcCborCustomizations = AWSRpcV2CborCustomizations(),
+            userAgentMiddlewareFactory = { ctx ->
+                UserAgentMiddleware(
+                    ctx.settings
+                )
+            }
+        )
     )
 }
diff --git a/...codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/EndpointTestGenerator.kt b/...codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/EndpointTestGenerator.kt
diff --git a/...otlin/software/amazon/smithy/aws/swift/codegen/customization/AwsQueryModeCustomization.kt b/...otlin/software/amazon/smithy/aws/swift/codegen/customization/AwsQueryModeCustomization.kt
@@ -1,6 +1,6 @@
 package software.amazon.smithy.aws.swift.codegen.customization
 
-import software.amazon.smithy.aws.swift.codegen.middleware.MutateHeadersMiddleware
+import software.amazon.smithy.swift.codegen.integration.middlewares.MutateHeadersMiddleware
 import software.amazon.smithy.aws.traits.protocols.AwsQueryCompatibleTrait
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.OperationShape

diff --git a/...are/amazon/smithy/aws/swift/codegen/customization/apigateway/ApiGatewayAddAcceptHeader.kt b/...are/amazon/smithy/aws/swift/codegen/customization/apigateway/ApiGatewayAddAcceptHeader.kt
@@ -1,6 +1,6 @@
 package software.amazon.smithy.aws.swift.codegen.customization.apigateway
 
-import software.amazon.smithy.aws.swift.codegen.middleware.MutateHeadersMiddleware
+import software.amazon.smithy.swift.codegen.integration.middlewares.MutateHeadersMiddleware
 import software.amazon.smithy.aws.swift.codegen.sdkId
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.OperationShape