Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Decode response header data from Codable userInfo #565

Merged
merged 10 commits into from
Jul 18, 2023
Merged

Decode response header data from Codable userInfo #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2caff83
Rename HTTPBody to AWSHTTPBody
adam-fowler Jul 10, 2023
c534d12
Add AWSResponse to Codable userInfo
adam-fowler Jun 26, 2023
1ce47ac
Add decode functions for AWSResponse
adam-fowler Jun 26, 2023
fb0cc52
ResponseContainer for decoding
adam-fowler Jun 27, 2023
39bce9f
Fix tests after userInfo changes
adam-fowler Jun 29, 2023
ccb3274
Remove DictionaryDecoder
adam-fowler Jun 29, 2023
c9c4ee5
Fix tests
adam-fowler Jun 29, 2023
b8e0d7c
Re-organise root element code
adam-fowler Jun 29, 2023
6c708e4
Fix after merge
adam-fowler Jul 14, 2023
7869961
Update Sources/SotoCore/Encoder/ResponseContainer.swift
adam-fowler Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/SotoCore/AWSClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SotoCore/AWSService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Sources/SotoCore/Concurrency/AnyAsyncSequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
8 changes: 4 additions & 4 deletions Sources/SotoCore/Doc/AWSShape.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).")
Expand Down Expand Up @@ -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)
}
Expand Down
Loading