feat!: Renamed several HTTP-related types (#785)

Author: jbelkins

.swiftlint.yml

@@ -22,6 +22,7 @@ disabled_rules:
   - large_tuple
   - type_body_length
   - trailing_comma
+  - non_optional_string_data_conversion
 
 opt_in_rules:
   - empty_count

Sources/ClientRuntime/Endpoints/EndpointResolverMiddleware.swift

@@ -7,8 +7,8 @@
 
 import class Smithy.Context
 import struct SmithyHTTPAPI.Endpoint
-import class SmithyHTTPAPI.SdkHttpRequest
-import class SmithyHTTPAPI.SdkHttpRequestBuilder
+import class SmithyHTTPAPI.HTTPRequest
+import class SmithyHTTPAPI.HTTPRequestBuilder
 import struct SmithyHTTPAuthAPI.SelectedAuthScheme
 import enum SmithyHTTPAuthAPI.SigningAlgorithm
 import enum SmithyHTTPAuthAPI.SigningPropertyKeys
@@ -34,7 +34,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput, Params: Endpoints
 
     public func handle<H>(
         context: Smithy.Context,
-        input: SmithyHTTPAPI.SdkHttpRequestBuilder,
+        input: HTTPRequestBuilder,
         next: H
     ) async throws -> OperationOutput<OperationStackOutput>
         where H: Handler,
@@ -46,17 +46,17 @@ public struct EndpointResolverMiddleware<OperationStackOutput, Params: Endpoints
             try await apply(request: request, selectedAuthScheme: selectedAuthScheme, attributes: context)
         return try await next.handle(context: context, input: updatedRequest.toBuilder())
     }
-    public typealias MInput = SmithyHTTPAPI.SdkHttpRequestBuilder
+    public typealias MInput = HTTPRequestBuilder
     public typealias MOutput = OperationOutput<OperationStackOutput>
 }
 
 extension EndpointResolverMiddleware: ApplyEndpoint {
 
     public func apply(
-        request: SdkHttpRequest,
+        request: HTTPRequest,
         selectedAuthScheme: SelectedAuthScheme?,
         attributes: Smithy.Context
-    ) async throws -> SdkHttpRequest {
+    ) async throws -> HTTPRequest {
         let builder = request.toBuilder()
 
         let endpoint = try endpointResolverBlock(endpointParams)

Sources/ClientRuntime/Interceptor/HttpInterceptor.swift

@@ -6,8 +6,8 @@
 //
 
 import class Smithy.Context
-import class SmithyHTTPAPI.SdkHttpRequest
-import class SmithyHTTPAPI.HttpResponse
+import class SmithyHTTPAPI.HTTPRequest
+import class SmithyHTTPAPI.HTTPResponse
 
 public protocol HttpInterceptor<InputType, OutputType>: Interceptor
-where RequestType == SdkHttpRequest, ResponseType == HttpResponse {}
+where RequestType == HTTPRequest, ResponseType == HTTPResponse {}

Sources/ClientRuntime/Middleware/NoopHandler.swift

@@ -6,16 +6,16 @@
 //
 
 import class Smithy.Context
-import class SmithyHTTPAPI.SdkHttpRequest
-import class SmithyHTTPAPI.HttpResponse
+import class SmithyHTTPAPI.HTTPRequest
+import class SmithyHTTPAPI.HTTPResponse
 
 public struct NoopHandler<OperationStackOutput>: Handler {
     public init() {}
 
     public func handle(
         context: Smithy.Context,
-        input: SdkHttpRequest
+        input: HTTPRequest
     ) async throws -> OperationOutput<OperationStackOutput> {
-        return OperationOutput<OperationStackOutput>(httpResponse: HttpResponse())
+        return OperationOutput<OperationStackOutput>(httpResponse: HTTPResponse())
     }
 }

Sources/ClientRuntime/Middleware/OperationStack.swift

@@ -7,8 +7,8 @@
 
 import class Smithy.Context
 import enum Smithy.ClientError
-import class SmithyHTTPAPI.SdkHttpRequest
-import class SmithyHTTPAPI.SdkHttpRequestBuilder
+import class SmithyHTTPAPI.HTTPRequest
+import class SmithyHTTPAPI.HTTPRequestBuilder
 
 public struct OperationStack<OperationStackInput, OperationStackOutput> {
 
@@ -33,7 +33,7 @@ public struct OperationStack<OperationStackInput, OperationStackOutput> {
     public func handleMiddleware<H: Handler>(context: Smithy.Context,
                                              input: OperationStackInput,
                                              next: H) async throws -> OperationStackOutput
-    where H.Input == SdkHttpRequest,
+    where H.Input == HTTPRequest,
           H.Output == OperationOutput<OperationStackOutput> {
 
               let deserialize = compose(next: DeserializeStepHandler(handler: next), with: deserializeStep)
@@ -58,10 +58,10 @@ public struct OperationStack<OperationStackInput, OperationStackOutput> {
         input: OperationStackInput,
         output: OperationStackOutput,
         next: H
-    ) async throws -> SdkHttpRequestBuilder? where
-    H.Input == SdkHttpRequest,
+    ) async throws -> HTTPRequestBuilder? where
+    H.Input == HTTPRequest,
     H.Output == OperationOutput<OperationStackOutput> {
-        var builder: SdkHttpRequestBuilder?
+        var builder: HTTPRequestBuilder?
         self.finalizeStep.intercept(
             position: .after,
             middleware: PresignerShim<OperationStackOutput>(handler: { buildInMiddleware in

Sources/ClientRuntime/Middleware/PresignerShimHandler.swift

@@ -6,10 +6,10 @@
 //
 
 import class Smithy.Context
-import class SmithyHTTPAPI.SdkHttpRequestBuilder
-import class SmithyHTTPAPI.HttpResponse
+import class SmithyHTTPAPI.HTTPRequestBuilder
+import class SmithyHTTPAPI.HTTPResponse
 
-typealias PresignerShimHandler = (SdkHttpRequestBuilder) -> Void
+typealias PresignerShimHandler = (HTTPRequestBuilder) -> Void
 
 struct PresignerShim<OperationStackOutput>: Middleware {
     public let id: String = "PresignerShim"
@@ -22,18 +22,18 @@ struct PresignerShim<OperationStackOutput>: Middleware {
         self.output = output
     }
 
-    public typealias MInput = SdkHttpRequestBuilder
+    public typealias MInput = HTTPRequestBuilder
     public typealias MOutput = OperationOutput<OperationStackOutput>
     public typealias Context = Smithy.Context
 
     public func handle<H>(context: Smithy.Context,
-                          input: SdkHttpRequestBuilder,
+                          input: HTTPRequestBuilder,
                           next: H) async throws -> OperationOutput<OperationStackOutput>
     where H: Handler,
           Self.MInput == H.Input,
           Self.MOutput == H.Output {
               handler(input)
-              let httpResponse = HttpResponse(body: .noStream, statusCode: .ok)
+              let httpResponse = HTTPResponse(body: .noStream, statusCode: .ok)
               return .init(httpResponse: httpResponse, output: output)
           }
 }

Sources/ClientRuntime/Middleware/RetryMiddleware.swift

@@ -15,13 +15,13 @@ import struct Foundation.UUID
 import protocol SmithyRetriesAPI.RetryStrategy
 import protocol SmithyRetriesAPI.RetryErrorInfoProvider
 import struct SmithyRetriesAPI.RetryStrategyOptions
-import SmithyHTTPAPI
+import class SmithyHTTPAPI.HTTPRequestBuilder
 
 public struct RetryMiddleware<Strategy: RetryStrategy,
                               ErrorInfoProvider: RetryErrorInfoProvider,
                               OperationStackOutput>: Middleware {
 
-    public typealias MInput = SdkHttpRequestBuilder
+    public typealias MInput = HTTPRequestBuilder
     public typealias MOutput = OperationOutput<OperationStackOutput>
 
     public var id: String { "Retry" }
@@ -37,7 +37,7 @@ public struct RetryMiddleware<Strategy: RetryStrategy,
         self.maxRetries = options.maxRetriesBase
     }
 
-    public func handle<H>(context: Context, input: SdkHttpRequestBuilder, next: H) async throws ->
+    public func handle<H>(context: Context, input: HTTPRequestBuilder, next: H) async throws ->
         OperationOutput<OperationStackOutput>
         where H: Handler, MInput == H.Input, MOutput == H.Output {
 

Sources/ClientRuntime/Middleware/Steps/BuildStep.swift

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0.
 
 import class Smithy.Context
-import class SmithyHTTPAPI.SdkHttpRequestBuilder
+import class SmithyHTTPAPI.HTTPRequestBuilder
 
 /// Adds additional metadata to the serialized transport message,
 /// (e.g. HTTP's Content-Length header, or body checksum). Decorations and
@@ -11,16 +11,16 @@ import class SmithyHTTPAPI.SdkHttpRequestBuilder
 /// Takes Request, and returns result or error.
 ///
 /// Receives result or error from Finalize step.
-public typealias BuildStep<OperationStackOutput> = MiddlewareStep<SdkHttpRequestBuilder,
+public typealias BuildStep<OperationStackOutput> = MiddlewareStep<HTTPRequestBuilder,
                                                                   OperationOutput<OperationStackOutput>>
 
 public let BuildStepId = "Build"
 
 public struct BuildStepHandler<OperationStackOutput, H: Handler>: Handler
-    where H.Input == SdkHttpRequestBuilder,
+    where H.Input == HTTPRequestBuilder,
           H.Output == OperationOutput<OperationStackOutput> {
 
-    public typealias Input = SdkHttpRequestBuilder
+    public typealias Input = HTTPRequestBuilder
 
     public typealias Output = OperationOutput<OperationStackOutput>
 

Sources/ClientRuntime/Middleware/Steps/DeserializeStep.swift

@@ -6,8 +6,8 @@
 //
 
 import class Smithy.Context
-import class SmithyHTTPAPI.SdkHttpRequest
-import class SmithyHTTPAPI.HttpResponse
+import class SmithyHTTPAPI.HTTPRequest
+import class SmithyHTTPAPI.HTTPResponse
 
 /// Reacts to the handler's response returned by the recipient of the request
 /// message. Deserializes the response into a structured type or error above
@@ -18,16 +18,16 @@ import class SmithyHTTPAPI.HttpResponse
 /// Takes Request, and returns result or error.
 ///
 /// Receives raw response, or error from underlying handler.
-public typealias DeserializeStep<OperationStackOutput> = MiddlewareStep<SdkHttpRequest,
+public typealias DeserializeStep<OperationStackOutput> = MiddlewareStep<HTTPRequest,
                                                                         OperationOutput<OperationStackOutput>>
 
 public let DeserializeStepId = "Deserialize"
 
 public struct DeserializeStepHandler<OperationStackOutput, H: Handler>: Handler
-    where H.Input == SdkHttpRequest,
+    where H.Input == HTTPRequest,
           H.Output == OperationOutput<OperationStackOutput> {
 
-    public typealias Input = SdkHttpRequest
+    public typealias Input = HTTPRequest
 
     public typealias Output = OperationOutput<OperationStackOutput>
 
@@ -43,10 +43,10 @@ public struct DeserializeStepHandler<OperationStackOutput, H: Handler>: Handler
 }
 
 public struct OperationOutput<Output> {
-    public var httpResponse: HttpResponse
+    public var httpResponse: HTTPResponse
     public var output: Output?
 
-    public init(httpResponse: HttpResponse, output: Output? = nil) {
+    public init(httpResponse: HTTPResponse, output: Output? = nil) {
         self.httpResponse = httpResponse
         self.output = output
     }

Sources/ClientRuntime/Middleware/Steps/FinalizeStep.swift

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0.
 
 import class Smithy.Context
-import class SmithyHTTPAPI.SdkHttpRequest
-import class SmithyHTTPAPI.SdkHttpRequestBuilder
-import class SmithyHTTPAPI.HttpResponse
+import class SmithyHTTPAPI.HTTPRequest
+import class SmithyHTTPAPI.HTTPRequestBuilder
+import class SmithyHTTPAPI.HTTPResponse
 
 // Performs final preparations needed before sending the message. The
 // message should already be complete by this stage, and is only alternated
@@ -14,16 +14,16 @@ import class SmithyHTTPAPI.HttpResponse
 // Takes Request, and returns result or error.
 //
 // Receives result or error from Deserialize step.
-public typealias FinalizeStep<OperationStackOutput> = MiddlewareStep<SdkHttpRequestBuilder,
+public typealias FinalizeStep<OperationStackOutput> = MiddlewareStep<HTTPRequestBuilder,
                                                                      OperationOutput<OperationStackOutput>>
 
 public let FinalizeStepId = "Finalize"
 
 public struct FinalizeStepHandler<OperationStackOutput, H: Handler>: Handler
-    where H.Input == SdkHttpRequest,
+    where H.Input == HTTPRequest,
           H.Output == OperationOutput<OperationStackOutput> {
 
-    public typealias Input = SdkHttpRequestBuilder
+    public typealias Input = HTTPRequestBuilder
 
     public typealias Output = OperationOutput<OperationStackOutput>