Merge pull request #2954 from usmangani1/LSTACK_AWSPROXY

Fix response_parameter being ignored in put_integration_response
getmoto · May 4, 2020 · 323877c · 323877c
2 parents 2c9409f + d6875c2
commit 323877c
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 5 deletions.
diff --git a/moto/apigateway/models.py b/moto/apigateway/models.py
@@ -56,8 +56,10 @@ def __init__(self, deployment_id, name, description=""):
 
 
 class IntegrationResponse(BaseModel, dict):
-    def __init__(self, status_code, selection_pattern=None):
-        self["responseTemplates"] = {"application/json": None}
+    def __init__(self, status_code, selection_pattern=None, response_templates=None):
+        if response_templates is None:
+            response_templates = {"application/json": None}
+        self["responseTemplates"] = response_templates
         self["statusCode"] = status_code
         if selection_pattern:
             self["selectionPattern"] = selection_pattern
@@ -72,8 +74,14 @@ def __init__(self, integration_type, uri, http_method, request_templates=None):
         self["requestTemplates"] = request_templates
         self["integrationResponses"] = {"200": IntegrationResponse(200)}
 
-    def create_integration_response(self, status_code, selection_pattern):
-        integration_response = IntegrationResponse(status_code, selection_pattern)
+    def create_integration_response(
+        self, status_code, selection_pattern, response_templates
+    ):
+        if response_templates == {}:
+            response_templates = None
+        integration_response = IntegrationResponse(
+            status_code, selection_pattern, response_templates
+        )
         self["integrationResponses"][status_code] = integration_response
         return integration_response
 
@@ -956,7 +964,7 @@ def create_integration_response(
             raise InvalidRequestInput()
         integration = self.get_integration(function_id, resource_id, method_type)
         integration_response = integration.create_integration_response(
-            status_code, selection_pattern
+            status_code, selection_pattern, response_templates
         )
         return integration_response
 

diff --git a/tests/test_apigateway/test_apigateway.py b/tests/test_apigateway/test_apigateway.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import json
 
 import boto3
 from freezegun import freeze_time
@@ -1230,6 +1231,65 @@ def test_put_integration_response_requires_responseTemplate():
     )
 
 
+@mock_apigateway
+def test_put_integration_response_with_response_template():
+    client = boto3.client("apigateway", region_name="us-west-2")
+    response = client.create_rest_api(name="my_api", description="this is my api")
+    api_id = response["id"]
+    resources = client.get_resources(restApiId=api_id)
+    root_id = [resource for resource in resources["items"] if resource["path"] == "/"][
+        0
+    ]["id"]
+
+    client.put_method(
+        restApiId=api_id, resourceId=root_id, httpMethod="GET", authorizationType="NONE"
+    )
+    client.put_method_response(
+        restApiId=api_id, resourceId=root_id, httpMethod="GET", statusCode="200"
+    )
+    client.put_integration(
+        restApiId=api_id,
+        resourceId=root_id,
+        httpMethod="GET",
+        type="HTTP",
+        uri="http://httpbin.org/robots.txt",
+        integrationHttpMethod="POST",
+    )
+
+    with assert_raises(ClientError) as ex:
+        client.put_integration_response(
+            restApiId=api_id, resourceId=root_id, httpMethod="GET", statusCode="200"
+        )
+
+    ex.exception.response["Error"]["Code"].should.equal("BadRequestException")
+    ex.exception.response["Error"]["Message"].should.equal("Invalid request input")
+
+    client.put_integration_response(
+        restApiId=api_id,
+        resourceId=root_id,
+        httpMethod="GET",
+        statusCode="200",
+        selectionPattern="foobar",
+        responseTemplates={"application/json": json.dumps({"data": "test"})},
+    )
+
+    response = client.get_integration_response(
+        restApiId=api_id, resourceId=root_id, httpMethod="GET", statusCode="200"
+    )
+
+    # this is hard to match against, so remove it
+    response["ResponseMetadata"].pop("HTTPHeaders", None)
+    response["ResponseMetadata"].pop("RetryAttempts", None)
+    response.should.equal(
+        {
+            "statusCode": "200",
+            "selectionPattern": "foobar",
+            "ResponseMetadata": {"HTTPStatusCode": 200},
+            "responseTemplates": {"application/json": json.dumps({"data": "test"})},
+        }
+    )
+
+
 @mock_apigateway
 def test_put_integration_validation():
     client = boto3.client("apigateway", region_name="us-west-2")