return CloudFormation 400 errors on stack creation (localstack#444)

whummer · web-flow · commit fa9ad251b869 · 2017-11-05T01:46:28.000-04:00
diff --git a/localstack/dashboard/infra.py b/localstack/dashboard/infra.py
@@ -306,7 +306,7 @@ def handle(domain):
                 details = json.loads(details)['DomainStatus']
                 arn = details['ARN']
                 es = ElasticSearch(arn)
-                es.endpoint = details['Endpoint']
+                es.endpoint = details.get('Endpoint', 'n/a')
                 result.append(es)
                 pool[arn] = es
         parallelize(handle, out['DomainNames'])
diff --git a/localstack/services/cloudformation/cloudformation_listener.py b/localstack/services/cloudformation/cloudformation_listener.py
@@ -176,11 +176,11 @@ def return_response(self, method, path, data, headers, response):
                     # fix an error in moto where it fails with 500 if the stack does not exist
                     return error_response('Stack resource does not exist', code=404)
             elif action == 'CreateStack' or action == 'UpdateStack':
+                if response.status_code >= 400 and response.status_code < 500:
+                    return response
                 # run the actual deployment
                 template = template_deployer.template_to_json(req_data.get('TemplateBody')[0])
                 template_deployer.deploy_template(template, req_data.get('StackName')[0])
-                if response.status_code >= 400:
-                    return make_response(action)
 
 
 # instantiate listener
