chore: Remove HttpInterceptor (#1734)

IntegrationTests/Services/AWSCognitoIdentityIntegrationTests/UnauthenticatedAPITests.swift

@@ -65,7 +65,9 @@ class UnauthenticatedAPITests: XCTestCase {
 }
 
 // Interceptor & interceptor provider for sanity-checking that request is indeed unauthenticated.
-class GetHeadersBeforeTransmit<InputType, OutputType>: HttpInterceptor {
+class GetHeadersBeforeTransmit<InputType, OutputType>: Interceptor {
+    typealias RequestType = HTTPRequest
+    typealias ResponseType = HTTPResponse
     func readBeforeTransmit(context: some AfterSerialization<InputType, RequestType>) async throws {
         // Assert that the request is unauthenticated.
         XCTAssertTrue(!context.getRequest().headers.exists(name: "Authorization"))

IntegrationTests/Services/AWSS3IntegrationTests/S3FlexibleChecksumsTests.swift

@@ -83,7 +83,10 @@ final class S3FlexibleChecksumsTests: S3XCTestCase {
     }
 
     // Streaming unsigned payload without checksum (chunked encoding)
-    class DisablePayloadSigning<InputType, OutputType>: HttpInterceptor {
+    class DisablePayloadSigning<InputType, OutputType>: Interceptor {
+        typealias RequestType = HTTPRequest
+        typealias ResponseType = HTTPResponse
+
         func modifyBeforeRetryLoop(context: some MutableRequest<InputType, RequestType>) async throws {
             context.getAttributes().set(key: SmithyHTTPAPIKeys.hasUnsignedPayloadTrait, value: true)
         }

IntegrationTests/XCTestPlans/AWSIntegrationTestsOnCI.xctestplan

@@ -4,6 +4,7 @@
       "id" : "FF4C1A8F-5D70-4A2A-BFDE-77467500C547",
       "name" : "Test Scheme Action",
       "options" : {
+
       }
     }
   ],
@@ -16,22 +17,22 @@
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSS3IntegrationTests",
-        "name" : "AWSS3IntegrationTests"
+        "identifier" : "AWSCognitoIdentityIntegrationTests",
+        "name" : "AWSCognitoIdentityIntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSCloudFrontKeyValueStoreIntegrationTests",
-        "name" : "AWSCloudFrontKeyValueStoreIntegrationTests"
+        "identifier" : "AWSSTSIntegrationTests",
+        "name" : "AWSSTSIntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSEC2IntegrationTests",
-        "name" : "AWSEC2IntegrationTests"
+        "identifier" : "AWSTranscribeStreamingIntegrationTests",
+        "name" : "AWSTranscribeStreamingIntegrationTests"
       }
     },
     {
@@ -44,50 +45,64 @@
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSEventBridgeIntegrationTests",
-        "name" : "AWSEventBridgeIntegrationTests"
+        "identifier" : "AWSGlacierIntegrationTests",
+        "name" : "AWSGlacierIntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSKinesisIntegrationTests",
-        "name" : "AWSKinesisIntegrationTests"
+        "identifier" : "AWSMediaConvertIntegrationTests",
+        "name" : "AWSMediaConvertIntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSMediaConvertIntegrationTests",
-        "name" : "AWSMediaConvertIntegrationTests"
+        "identifier" : "AWSCloudFrontKeyValueStoreIntegrationTests",
+        "name" : "AWSCloudFrontKeyValueStoreIntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSRoute53IntegrationTests",
-        "name" : "AWSRoute53IntegrationTests"
+        "identifier" : "AWSSQSIntegrationTests",
+        "name" : "AWSSQSIntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSSQSIntegrationTests",
-        "name" : "AWSSQSIntegrationTests"
+        "identifier" : "AWSEventBridgeIntegrationTests",
+        "name" : "AWSEventBridgeIntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSSTSIntegrationTests",
-        "name" : "AWSSTSIntegrationTests"
+        "identifier" : "AWSEC2IntegrationTests",
+        "name" : "AWSEC2IntegrationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:",
-        "identifier" : "AWSTranscribeStreamingIntegrationTests",
-        "name" : "AWSTranscribeStreamingIntegrationTests"
+        "identifier" : "AWSKinesisIntegrationTests",
+        "name" : "AWSKinesisIntegrationTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "AWSRoute53IntegrationTests",
+        "name" : "AWSRoute53IntegrationTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "AWSS3IntegrationTests",
+        "name" : "AWSS3IntegrationTests"
       }
     }
   ],

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/AWSS3ErrorWith200StatusXMLMiddleware.swift

@@ -27,9 +27,11 @@ public struct AWSS3ErrorWith200StatusXMLMiddleware<OperationStackInput, Operatio
     }
 }
 
-extension AWSS3ErrorWith200StatusXMLMiddleware: HttpInterceptor {
+extension AWSS3ErrorWith200StatusXMLMiddleware: Interceptor {
     public typealias InputType = OperationStackInput
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeDeserialization(
         context: some MutableResponse<Self.InputType, Self.RequestType, Self.ResponseType>

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/AmzSdkInvocationIdMiddleware.swift

@@ -26,9 +26,11 @@ public struct AmzSdkInvocationIdMiddleware<InputType, OperationStackOutput> {
     }
 }
 
-extension AmzSdkInvocationIdMiddleware: HttpInterceptor {
+extension AmzSdkInvocationIdMiddleware: Interceptor {
     public typealias InputType = InputType
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeRetryLoop(context: some MutableRequest<InputType, HTTPRequest>) async throws {
         let builder = context.getRequest().toBuilder()

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/AmzSdkRequestMiddleware.swift

@@ -53,9 +53,11 @@ public class AmzSdkRequestMiddleware<InputType, OperationStackOutput> {
 
 }
 
-extension AmzSdkRequestMiddleware: HttpInterceptor {
+extension AmzSdkRequestMiddleware: Interceptor {
     public typealias InputType = InputType
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeSigning(context: some MutableRequest<InputType, HTTPRequest>) async throws {
         let builder = context.getRequest().toBuilder()

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsRequestMiddleware.swift

@@ -92,9 +92,11 @@ public struct FlexibleChecksumsRequestMiddleware<OperationStackInput, OperationS
     }
 }
 
-extension FlexibleChecksumsRequestMiddleware: HttpInterceptor {
+extension FlexibleChecksumsRequestMiddleware: Interceptor {
     public typealias InputType = OperationStackInput
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = SmithyHTTPAPI.HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeRetryLoop(context: some MutableRequest<InputType, RequestType>) async throws {
         let builder = context.getRequest().toBuilder()

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift

@@ -92,9 +92,11 @@ public struct FlexibleChecksumsResponseMiddleware<OperationStackInput, Operation
     }
 }
 
-extension FlexibleChecksumsResponseMiddleware: HttpInterceptor {
+extension FlexibleChecksumsResponseMiddleware: Interceptor {
     public typealias InputType = OperationStackInput
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeRetryLoop(context: some MutableRequest<InputType, RequestType>) async throws {
         context.getAttributes().set(key: AttributeKey<String>(name: "ChecksumHeaderValidated"), value: nil)

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/Route53TrimHostedZoneMiddleware.swift

@@ -7,6 +7,7 @@
 
 import class Smithy.Context
 import ClientRuntime
+import SmithyHTTPAPI
 
 public struct Route53TrimHostedZoneMiddleware<Input, Output> {
     public let id: Swift.String = "Route53TrimHostedZoneMiddleware"
@@ -29,9 +30,11 @@ public struct Route53TrimHostedZoneMiddleware<Input, Output> {
     }
 }
 
-extension Route53TrimHostedZoneMiddleware: HttpInterceptor {
+extension Route53TrimHostedZoneMiddleware: Interceptor {
     public typealias InputType = Input
     public typealias OutputType = Output
+    public typealias RequestType = HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeSerialization(context: some MutableInput<Self.InputType>) async throws {
         context.updateInput(updated: getUpdatedInput(input: context.getInput()))

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/Sha256TreeHashMiddleware.swift

@@ -92,9 +92,11 @@ public struct Sha256TreeHashMiddleware<OperationStackInput, OperationStackOutput
     }
 }
 
-extension Sha256TreeHashMiddleware: HttpInterceptor {
+extension Sha256TreeHashMiddleware: Interceptor {
     public typealias InputType = OperationStackInput
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = SmithyHTTPAPI.HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeSigning(context: some MutableRequest<Self.InputType, Self.RequestType>) async throws {
         let request = context.getRequest()

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/UserAgentMiddleware.swift

@@ -30,9 +30,11 @@ public struct UserAgentMiddleware<OperationStackInput, OperationStackOutput> {
     }
 }
 
-extension UserAgentMiddleware: HttpInterceptor {
+extension UserAgentMiddleware: Interceptor {
     public typealias InputType = OperationStackInput
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeTransmit(context: some MutableRequest<Self.InputType, HTTPRequest>) async throws {
         let awsUserAgentString = AWSUserAgentMetadata.fromConfigAndContext(

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/XAmzTargetMiddleware.swift

@@ -19,9 +19,11 @@ public struct XAmzTargetMiddleware<OperationStackInput, OperationStackOutput> {
     }
 }
 
-extension XAmzTargetMiddleware: HttpInterceptor {
+extension XAmzTargetMiddleware: Interceptor {
     public typealias InputType = OperationStackInput
     public typealias OutputType = OperationStackOutput
+    public typealias RequestType = HTTPRequest
+    public typealias ResponseType = HTTPResponse
 
     public func modifyBeforeRetryLoop(context: some MutableRequest<Self.InputType, Self.RequestType>) async throws {
         let builder = context.getRequest().toBuilder()

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/middleware/handlers/PredictInputEndpointURLHostMiddlewareHandler.kt

@@ -6,6 +6,7 @@ import software.amazon.smithy.swift.codegen.SwiftWriter
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
 import software.amazon.smithy.swift.codegen.swiftmodules.ClientRuntimeTypes
 import software.amazon.smithy.swift.codegen.swiftmodules.FoundationTypes
+import software.amazon.smithy.swift.codegen.swiftmodules.SmithyHTTPAPITypes
 
 class PredictInputEndpointURLHostMiddlewareHandler(
     private val writer: SwiftWriter,
@@ -26,10 +27,12 @@ class PredictInputEndpointURLHostMiddlewareHandler(
             "extension \$L: \$N {",
             "}",
             typeName,
-            ClientRuntimeTypes.Middleware.HttpInterceptor,
+            ClientRuntimeTypes.Middleware.Interceptor,
         ) {
             writer.write("public typealias InputType = PredictInput")
             writer.write("public typealias OutputType = PredictOutput")
+            writer.write("public typealias RequestType = \$N", SmithyHTTPAPITypes.HTTPRequest)
+            writer.write("public typealias ResponseType = \$N", SmithyHTTPAPITypes.HTTPResponse)
             writer.write("")
             writer.openBlock(
                 "public func modifyBeforeSerialization(context: some \$N<InputType>) async throws {",