Revert "fix: Crash when using an invalid method in open api (#2001)" (#…

…2021) This reverts commit d57b132.
aws · May 13, 2021 · 54e2a16 · 54e2a16
1 parent d57b9ca
commit 54e2a16
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 100 deletions.
diff --git a/samtranslator/swagger/swagger.py b/samtranslator/swagger/swagger.py
@@ -531,19 +531,6 @@ def set_path_default_authorizer(
             if add_default_auth_to_preflight or normalized_method_name != "options":
                 normalized_method_name = self._normalize_method_name(method_name)
                 # It is possible that the method could have two definitions in a Fn::If block.
-
-                # check for valid methods
-                if normalized_method_name.upper() not in self._ALL_HTTP_METHODS:
-                    raise InvalidDocumentException(
-                        [
-                            InvalidTemplateException(
-                                "Path '{}' contains method '{}' which is not a supported method {}".format(
-                                    path, method_name, self._ALL_HTTP_METHODS
-                                )
-                            )
-                        ]
-                    )
-
                 for method_definition in self.get_method_contents(self.get_path(path)[normalized_method_name]):
 
                     # If no integration given, then we don't need to process this definition (could be AWS::NoValue)

diff --git a/tests/swagger/test_swagger.py b/tests/swagger/test_swagger.py
@@ -1468,39 +1468,3 @@ def test_should_include_none_if_default_is_overwritte(self):
 
         self.editor.add_auth_to_method("/cognito", "get", auth, self.api)
         self.assertEqual([{"NONE": []}], self.editor.swagger["paths"]["/cognito"]["get"]["security"])
-
-
-class TestSwaggerEditor_set_path_default_authorizer(TestCase):
-    def setUp(self):
-        self.api = api = {
-            "Auth": {
-                "Authorizers": {"MyOtherCognitoAuth": {}, "MyCognitoAuth": {}},
-                "DefaultAuthorizer": "MyCognitoAuth",
-            }
-        }
-        self.editor = SwaggerEditor(
-            {
-                "swagger": "2.0",
-                "paths": {
-                    "/cognito": {
-                        "nonMethod": {
-                            "x-amazon-apigateway-integration": {
-                                "httpMethod": "POST",
-                                "type": "aws_proxy",
-                                "uri": {
-                                    "Fn::Sub": "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyFn.Arn}/invocations"
-                                },
-                            },
-                            "security": [],
-                            "responses": {},
-                        }
-                    }
-                },
-            }
-        )
-
-    def test_should_fail_when_path_methods_are_invalid(self):
-        with self.assertRaises(InvalidDocumentException):
-            self.editor.set_path_default_authorizer(
-                "/cognito", "MyCognitoAuth", {"MyOtherCognitoAuth": {}, "MyCognitoAuth": {}}
-            )
diff --git a/tests/translator/input/error_api_with_invalid_path_object.yaml b/tests/translator/input/error_api_with_invalid_path_object.yaml
diff --git a/tests/translator/input/error_invalid_method_definition.yaml b/tests/translator/input/error_invalid_method_definition.yaml
@@ -42,7 +42,7 @@ Resources:
                 description: Application domain
                 type: string
                 required: true
-            options:
+            tags:
               - InvalidMethodDefinition
             get:
               x-amazon-apigateway-integration:

diff --git a/tests/translator/output/error_api_with_invalid_path_object.json b/tests/translator/output/error_api_with_invalid_path_object.json
diff --git a/tests/translator/test_translator.py b/tests/translator/test_translator.py
@@ -498,6 +498,7 @@ def test_transform_success(self, testcase, partition_with_region):
             ],  # Run all the above tests against each of the list of partitions to test against
         )
     )
+    @pytest.mark.slow
     @patch(
         "samtranslator.plugins.application.serverless_app_plugin.ServerlessAppPlugin._sar_service_call",
         mock_sar_service_call,