From 6305f707d28d11000fda0336fe628a3d4743f4ba Mon Sep 17 00:00:00 2001
From: Shane Dowling <shane@shanedowling.com>
Date: Thu, 18 Jun 2020 09:50:58 +0100
Subject: [PATCH] fix to capture yaml scanner error (#3077)

---
 moto/cloudformation/models.py                 |  4 +--
 .../test_cloudformation/test_stack_parsing.py | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/moto/cloudformation/models.py b/moto/cloudformation/models.py
index 8c14f55b8..23cdc0925 100644
--- a/moto/cloudformation/models.py
+++ b/moto/cloudformation/models.py
@@ -315,8 +315,8 @@ class FakeStack(BaseModel):
         yaml.add_multi_constructor("", yaml_tag_constructor)
         try:
             self.template_dict = yaml.load(self.template, Loader=yaml.Loader)
-        except yaml.parser.ParserError:
-            self.template_dict = json.loads(self.template, Loader=yaml.Loader)
+        except (yaml.parser.ParserError, yaml.scanner.ScannerError):
+            self.template_dict = json.loads(self.template)
 
     @property
     def stack_parameters(self):
diff --git a/tests/test_cloudformation/test_stack_parsing.py b/tests/test_cloudformation/test_stack_parsing.py
index 85df76592..116287162 100644
--- a/tests/test_cloudformation/test_stack_parsing.py
+++ b/tests/test_cloudformation/test_stack_parsing.py
@@ -38,6 +38,16 @@ name_type_template = {
     },
 }
 
+name_type_template_with_tabs_json = """
+\t{
+\t\t"AWSTemplateFormatVersion": "2010-09-09",
+\t\t"Description": "Create a multi-az, load balanced, Auto Scaled sample web site. The Auto Scaling trigger is based on the CPU utilization of the web servers. The AMI is chosen based on the region in which the stack is run. This example creates a web service running across all availability zones in a region. The instances are load balanced with a simple health check. The web site is available on port 80, however, the instances can be configured to listen on any port (8888 by default). **WARNING** This template creates one or more Amazon EC2 instances. You will be billed for the AWS resources used if you create a stack from this template.",
+\t\t"Resources": {
+\t\t\t"Queue": {"Type": "AWS::SQS::Queue", "Properties": {"VisibilityTimeout": 60}}
+\t\t}
+\t}
+"""
+
 output_dict = {
     "Outputs": {
         "Output1": {"Value": {"Ref": "Queue"}, "Description": "This is a description."}
@@ -186,6 +196,21 @@ def test_parse_stack_with_name_type_resource():
     queue.should.be.a(Queue)
 
 
+def test_parse_stack_with_tabbed_json_template():
+    stack = FakeStack(
+        stack_id="test_id",
+        name="test_stack",
+        template=name_type_template_with_tabs_json,
+        parameters={},
+        region_name="us-west-1",
+    )
+
+    stack.resource_map.should.have.length_of(1)
+    list(stack.resource_map.keys())[0].should.equal("Queue")
+    queue = list(stack.resource_map.values())[0]
+    queue.should.be.a(Queue)
+
+
 def test_parse_stack_with_yaml_template():
     stack = FakeStack(
         stack_id="test_id",