feat!: Closure-based reader-writer serde for JSON, FormURL

Sources/Core/AWSClientRuntime/Errors/UnknownAWSHTTPServiceError.swift

@@ -58,30 +58,31 @@ extension UnknownAWSHTTPServiceError {
     ///   - requestID2: The request ID2 associated with this error (ID2 used on S3 only.)  Defaults to `nil`.
     ///   - typeName: The non-namespaced name of the error type for this error, or `nil`.
     /// - Returns: An error that represents the response.
-    public static func makeError(
-        httpResponse: HttpResponse,
-        message: String?,
-        requestID: String?,
-        requestID2: String? = nil,
-        typeName: String?
-    ) async throws -> Error {
+    public static func makeError<Base: BaseError>(
+        baseError: Base
+    ) throws -> Error {
         let candidates: [UnknownAWSHTTPErrorCandidate.Type] = [
             InvalidAccessKeyId.self
         ]
-        if let Candidate = candidates.first(where: { $0.errorCode == typeName }) {
+        if let Candidate = candidates.first(where: { $0.errorCode == baseError.code }) {
             return Candidate.init(
-                httpResponse: httpResponse,
-                message: message,
-                requestID: requestID,
-                requestID2: requestID2
+                httpResponse: baseError.httpResponse,
+                message: baseError.message,
+                requestID: baseError.requestID,
+                requestID2: baseError.requestID2
             )
         }
         return UnknownAWSHTTPServiceError(
-            httpResponse: httpResponse,
-            message: message,
-            requestID: requestID,
-            requestID2: requestID2,
-            typeName: typeName
+            httpResponse: baseError.httpResponse,
+            message: baseError.message,
+            requestID: baseError.requestID,
+            requestID2: baseError.requestID2,
+            typeName: baseError.code
         )
     }
 }
+
+extension ClientRuntime.BaseError {
+
+    var requestID2: String? { nil }
+}

Sources/Core/AWSClientRuntime/Protocols/AWSJSON/AWSJSONError.swift

@@ -0,0 +1,35 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import protocol ClientRuntime.BaseError
+import enum ClientRuntime.BaseErrorDecodeError
+import class ClientRuntime.HttpResponse
+import class SmithyJSON.Reader
+
+public struct AWSJSONError: BaseError {
+    public let code: String
+    public let message: String?
+    public let requestID: String?
+    public var errorBodyReader: Reader { responseReader }
+
+    public let httpResponse: HttpResponse
+    private let responseReader: Reader
+
+    public init(httpResponse: HttpResponse, responseReader: Reader, noErrorWrapping: Bool) throws {
+        let code: String? = try httpResponse.headers.value(for: "X-Amzn-Errortype")
+                            ?? responseReader["code"].readIfPresent()
+                            ?? responseReader["__type"].readIfPresent()
+        let message: String? = try responseReader["Message"].readIfPresent()
+        let requestID: String? = try responseReader["RequestId"].readIfPresent()
+        guard let code else { throw BaseErrorDecodeError.missingRequiredData }
+        self.code = sanitizeErrorType(code)
+        self.message = message
+        self.requestID = requestID
+        self.httpResponse = httpResponse
+        self.responseReader = responseReader
+    }
+}

Sources/Core/AWSClientRuntime/Protocols/AWSQuery/AWSQueryError.swift

@@ -0,0 +1,37 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import protocol ClientRuntime.BaseError
+import enum ClientRuntime.BaseErrorDecodeError
+import class ClientRuntime.HttpResponse
+import class SmithyXML.Reader
+
+public struct AWSQueryError: BaseError {
+    public let code: String
+    public let message: String?
+    public let requestID: String?
+    public let httpResponse: HttpResponse
+    public let responseReader: Reader
+    public let errorBodyReader: Reader
+
+    public init(httpResponse: HttpResponse, responseReader: Reader, noErrorWrapping: Bool) throws {
+        self.errorBodyReader = noErrorWrapping ? responseReader : responseReader["Error"]
+        let code: String? = try errorBodyReader["Code"].readIfPresent()
+        let message: String? = try errorBodyReader["Message"].readIfPresent()
+        let requestID: String? = try responseReader["RequestId"].readIfPresent()
+        guard let code else { throw BaseErrorDecodeError.missingRequiredData }
+        self.code = code
+        self.message = message
+        self.requestID = requestID
+        self.httpResponse = httpResponse
+        self.responseReader = responseReader
+    }
+}
+
+public enum AWSQueryDecodeError: Error {
+    case missingRequiredData
+}

Sources/Core/AWSClientRuntime/Protocols/Ec2Query/EC2QueryError.swift

@@ -0,0 +1,35 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import protocol ClientRuntime.BaseError
+import enum ClientRuntime.BaseErrorDecodeError
+import class ClientRuntime.HttpResponse
+import class SmithyXML.Reader
+
+public struct EC2QueryError: BaseError {
+    public let code: String
+    public let message: String?
+    public let requestID: String?
+    public let errorBodyReader: Reader
+
+    public let httpResponse: HttpResponse
+    public let responseReader: Reader
+
+    public init(httpResponse: HttpResponse, responseReader: Reader, noErrorWrapping: Bool) throws {
+        self.httpResponse = httpResponse
+        self.responseReader = responseReader
+        self.errorBodyReader = responseReader["Errors"]["Error"]
+        let code: String? = try errorBodyReader["Code"].readIfPresent()
+        guard let code else { throw BaseErrorDecodeError.missingRequiredData }
+        let message: String? = try errorBodyReader["Message"].readIfPresent()
+        let requestID: String? = try responseReader["RequestId"].readIfPresent()
+                                 ?? responseReader["RequestID"].readIfPresent()
+        self.code = code
+        self.message = message
+        self.requestID = requestID
+    }
+}