Decode response header data from Codable userInfo (#565)

* Rename HTTPBody to AWSHTTPBody * Add AWSResponse to Codable userInfo * Add decode functions for AWSResponse * ResponseContainer for decoding * Fix tests after userInfo changes * Remove DictionaryDecoder Now we pass the response via uesrInfo to the decoder and decode header, body and payload in the init(from) function, we can use the JSONDecoder for decoding responses. * Fix tests * Re-organise root element code * Fix after merge * Update Sources/SotoCore/Encoder/ResponseContainer.swift Co-authored-by: Tim Condon <[email protected]> --------- Co-authored-by: Tim Condon <[email protected]>
soto-project · Jul 18, 2023 · 15744ff · 15744ff
1 parent f3d3461
commit 15744ff
Show file tree

Hide file tree

Showing 18 changed files with 278 additions and 2,310 deletions.
diff --git a/Sources/SotoCore/AWSClient.swift b/Sources/SotoCore/AWSClient.swift
@@ -521,7 +521,7 @@ extension AWSClient {
         url: URL,
         httpMethod: HTTPMethod,
         headers: HTTPHeaders = HTTPHeaders(),
-        body: HTTPBody,
+        body: AWSHTTPBody,
         serviceConfig: AWSServiceConfig,
         logger: Logger = AWSClient.loggingDisabled
     ) async throws -> HTTPHeaders {

diff --git a/Sources/SotoCore/AWSService.swift b/Sources/SotoCore/AWSService.swift
@@ -98,7 +98,7 @@ extension AWSService {
         url: URL,
         httpMethod: HTTPMethod,
         headers: HTTPHeaders = HTTPHeaders(),
-        body: HTTPBody = .init(),
+        body: AWSHTTPBody = .init(),
         logger: Logger = AWSClient.loggingDisabled
     ) async throws -> HTTPHeaders {
         return try await self.client.signHeaders(url: url, httpMethod: httpMethod, headers: headers, body: body, serviceConfig: self.config, logger: logger)

diff --git a/Sources/SotoCore/Concurrency/AnyAsyncSequence.swift b/Sources/SotoCore/Concurrency/AnyAsyncSequence.swift
@@ -42,7 +42,7 @@ public struct AnyAsyncSequence<Element>: Sendable, AsyncSequence {
 
     @usableFromInline var makeAsyncIteratorCallback: @Sendable () -> AsyncIteratorNextCallback
 
-    @inlinable init<SequenceOfBytes>(
+    @inlinable public init<SequenceOfBytes>(
         _ asyncSequence: SequenceOfBytes
     ) where SequenceOfBytes: AsyncSequence & Sendable, SequenceOfBytes.Element == Element {
         self.makeAsyncIteratorCallback = {

diff --git a/Sources/SotoCore/Doc/AWSShape.swift b/Sources/SotoCore/Doc/AWSShape.swift
@@ -141,15 +141,15 @@ public extension AWSEncodableShape {
         guard value.base64count <= max else { throw Self.validationError("Length of \(parent).\(name) (\(value.base64count)) is greater than the maximum allowed value \(max).") }
     }
 
-    func validate(_ value: HTTPBody, name: String, parent: String, min: Int) throws {
+    func validate(_ value: AWSHTTPBody, name: String, parent: String, min: Int) throws {
         if let size = value.length {
             guard size >= min else {
                 throw Self.validationError("Length of \(parent).\(name) (\(size)) is less than minimum allowed value \(min).")
             }
         }
     }
 
-    func validate(_ value: HTTPBody, name: String, parent: String, max: Int) throws {
+    func validate(_ value: AWSHTTPBody, name: String, parent: String, max: Int) throws {
         if let size = value.length {
             guard size <= max else {
                 throw Self.validationError("Length of \(parent).\(name) (\(size)) is greater than the maximum allowed value \(max).")
@@ -205,12 +205,12 @@ public extension AWSEncodableShape {
         try validate(value, name: name, parent: parent, max: max)
     }
 
-    func validate(_ value: HTTPBody?, name: String, parent: String, min: Int) throws {
+    func validate(_ value: AWSHTTPBody?, name: String, parent: String, min: Int) throws {
         guard let value = value else { return }
         try validate(value, name: name, parent: parent, min: min)
     }
 
-    func validate(_ value: HTTPBody?, name: String, parent: String, max: Int) throws {
+    func validate(_ value: AWSHTTPBody?, name: String, parent: String, max: Int) throws {
         guard let value = value else { return }
         try validate(value, name: name, parent: parent, max: max)
     }