chore: pass httpbindingresolver to protocol codegen tests for http method (#379)

Author: wooj2

Packages/SmithyTestUtil/Sources/RequestTestUtil/HttpRequestTestBase.swift

@@ -35,6 +35,7 @@ open class HttpRequestTestBase: XCTestCase {
                                          host: String,
                                          resolvedHost: String?) -> ExpectedSdkHttpRequest {
         let builder = ExpectedSdkHttpRequestBuilder()
+        builder.withMethod(method)
 
         if let deconflictedHost = deconflictHost(host: host, resolvedHost: resolvedHost) {
             builder.withHost(deconflictedHost)
@@ -217,7 +218,7 @@ open class HttpRequestTestBase: XCTestCase {
 
         XCTAssertEqual(expected.endpoint.path, actual.endpoint.path)
         XCTAssertEqual(expected.endpoint.host, actual.endpoint.host)
-
+        XCTAssertEqual(expected.method, actual.method)
         assertForbiddenQueryItems(expected.forbiddenQueryItems, actual.queryItems)
 
         assertRequiredQueryItems(expected.requiredQueryItems, actual.queryItems)

Packages/SmithyTestUtil/Tests/RequestTestUtilTests/HttpRequestTestBaseTests.swift

@@ -191,6 +191,7 @@ class HttpRequestTestBaseTests: HttpRequestTestBase {
         var operationStack = OperationStack<SayHelloInput, MockOutput, MockMiddlewareError>(id: "SayHelloInputRequest")
         operationStack.initializeStep.intercept(position: .before, middleware: SayHelloInputURLHostMiddleware(host: HttpRequestTestBaseTests.host))
         operationStack.buildStep.intercept(position: .after, id: "RequestTestEndpointResolver") { (context, input, next) -> Swift.Result<ClientRuntime.OperationOutput<MockOutput>, ClientRuntime.SdkError<MockMiddlewareError>> in
+            input.withMethod(context.getMethod())
             let host = "\(context.getHostPrefix() ?? "")\(context.getHost() ?? "")"
             input.withHost(host)
             return next.handle(context: context, input: input)
@@ -248,7 +249,10 @@ class HttpRequestTestBaseTests: HttpRequestTestBase {
             return .success(output)
            })
 
-        let context = HttpContextBuilder().withEncoder(value: JSONEncoder()).build()
+        let context = HttpContextBuilder()
+            .withEncoder(value: JSONEncoder())
+            .withMethod(value: .post)
+            .build()
         _ = operationStack.handleMiddleware(context: context, input: input, next: MockHandler { (_, _) in
             XCTFail("Deserialize was mocked out, this should fail")
             let httpResponse = HttpResponse(body: .none, statusCode: .badRequest)

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolTestGenerator.kt

@@ -35,6 +35,7 @@ class HttpProtocolTestGenerator(
     private val errorTestBuilder: HttpProtocolUnitTestErrorGenerator.Builder,
     private val httpProtocolCustomizable: HttpProtocolCustomizable,
     private val operationMiddleware: OperationMiddleware,
+    private val httpBindingResolver: HttpBindingResolver,
     private val serdeContext: HttpProtocolUnitTestGenerator.SerdeContext,
     private val imports: List<String> = listOf(),
     // list of test IDs to ignore/skip
@@ -116,6 +117,7 @@ class HttpProtocolTestGenerator(
                     .testCases(requestTestCases)
                     .httpProtocolCustomizable(httpProtocolCustomizable)
                     .operationMiddleware(operationMiddleware)
+                    .httpBindingResolver(httpBindingResolver)
                     .serdeContext(serdeContext)
                     .build()
                     .renderTestClass(testClassName)
@@ -150,6 +152,7 @@ class HttpProtocolTestGenerator(
                     .testCases(responseTestCases)
                     .httpProtocolCustomizable(httpProtocolCustomizable)
                     .operationMiddleware(operationMiddleware)
+                    .httpBindingResolver(httpBindingResolver)
                     .serdeContext(serdeContext)
                     .build()
                     .renderTestClass(testClassName)
@@ -192,6 +195,7 @@ class HttpProtocolTestGenerator(
                         .testCases(testCases)
                         .httpProtocolCustomizable(httpProtocolCustomizable)
                         .operationMiddleware(operationMiddleware)
+                        .httpBindingResolver(httpBindingResolver)
                         .serdeContext(serdeContext)
                         .build()
                         .renderTestClass(testClassName)

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolUnitTestGenerator.kt

@@ -27,6 +27,7 @@ protected constructor(builder: Builder<T>) {
     protected val writer: SwiftWriter = builder.writer!!
     protected val httpProtocolCustomizable = builder.httpProtocolCustomizable!!
     protected val operationMiddleware = builder.operationMiddleware!!
+    protected val httpBindingResolver = builder.httpBindingResolver!!
     protected val serdeContext = builder.serdeContext!!
     protected val serviceName: String = builder.serviceName!!
     abstract val baseTestClassName: String
@@ -78,6 +79,7 @@ protected constructor(builder: Builder<T>) {
         var serviceName: String? = null
         var httpProtocolCustomizable: HttpProtocolCustomizable? = null
         var operationMiddleware: OperationMiddleware? = null
+        var httpBindingResolver: HttpBindingResolver? = null
         var serdeContext: SerdeContext? = null
 
         fun symbolProvider(provider: SymbolProvider): Builder<T> = apply { this.symbolProvider = provider }
@@ -88,6 +90,7 @@ protected constructor(builder: Builder<T>) {
         fun serviceName(serviceName: String): Builder<T> = apply { this.serviceName = serviceName }
         fun httpProtocolCustomizable(httpProtocolCustomizable: HttpProtocolCustomizable): Builder<T> = apply { this.httpProtocolCustomizable = httpProtocolCustomizable }
         fun operationMiddleware(operationMiddleware: OperationMiddleware): Builder<T> = apply { this.operationMiddleware = operationMiddleware }
+        fun httpBindingResolver(httpBindingResolver: HttpBindingResolver): Builder<T> = apply { this.httpBindingResolver = httpBindingResolver }
         fun serdeContext(serdeContext: SerdeContext): Builder<T> = apply { this.serdeContext = serdeContext }
         abstract fun build(): HttpProtocolUnitTestGenerator<T>
     }

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolUnitTestRequestGenerator.kt

@@ -5,6 +5,7 @@
 package software.amazon.smithy.swift.codegen.integration
 
 import software.amazon.smithy.codegen.core.Symbol
+import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.Shape
 import software.amazon.smithy.model.shapes.ShapeType
 import software.amazon.smithy.model.traits.HttpHeaderTrait
@@ -88,8 +89,10 @@ open class HttpProtocolUnitTestRequestGenerator protected constructor(builder: B
             writer.write("let context = HttpContextBuilder()")
             val idempotentMember = inputShape.members().firstOrNull() { it.hasTrait(IdempotencyTokenTrait::class.java) }
             val hasIdempotencyTokenTrait = idempotentMember != null
+            val httpMethod = resolveHttpMethod(operation)
             writer.swiftFunctionParameterIndent {
                 writer.write("  .withEncoder(value: encoder)")
+                writer.write("  .withMethod(value: .$httpMethod)")
                 if (hasIdempotencyTokenTrait) {
                     writer.write("  .withIdempotencyTokenGenerator(value: QueryIdempotencyTestTokenGenerator())")
                 }
@@ -116,6 +119,11 @@ open class HttpProtocolUnitTestRequestGenerator protected constructor(builder: B
         }
     }
 
+    private fun resolveHttpMethod(op: OperationShape): String {
+        val httpTrait = httpBindingResolver.httpTrait(op)
+        return httpTrait.method.toLowerCase()
+    }
+
     private fun renderMockDeserializeMiddleware(
         test: HttpRequestTestCase,
         operationStack: String,

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/middlewares/RequestTestEndpointResolverMiddleware.kt

@@ -25,6 +25,7 @@ class RequestTestEndpointResolverMiddleware(private val model: Model, private va
             ClientRuntimeTypes.Middleware.OperationOutput,
             ClientRuntimeTypes.Core.SdkError
         ) {
+            writer.write("input.withMethod(context.getMethod())")
             writer.write("input.withPath(context.getPath())")
             writer.write("let host = \"\\(context.getHostPrefix() ?? \"\")\\(context.getHost() ?? \"\")\"")
             writer.write("input.withHost(host)")