Merge branch 'unit-tests-in-serverless'

cnanayakkara · Jan 27, 2019 · 9a50850 · 9a50850
2 parents ae9e4c1 + 826d4d0
commit 9a50850
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/api-gateway-errors.yml b/api-gateway-errors.yml
@@ -0,0 +1,19 @@
+Resources:
+  GatewayResponseDefault4XX:
+    Type: 'AWS::ApiGateway::GatewayResponse'
+    Properties:
+      ResponseParameters:
+         gatewayresponse.header.Access-Control-Allow-Origin: "'*'"
+         gatewayresponse.header.Access-Control-Allow-Headers: "'*'"
+      ResponseType: DEFAULT_4XX
+      RestApiId:
+        Ref: 'ApiGatewayRestApi'
+  GatewayResponseDefault5XX:
+    Type: 'AWS::ApiGateway::GatewayResponse'
+    Properties:
+      ResponseParameters:
+         gatewayresponse.header.Access-Control-Allow-Origin: "'*'"
+         gatewayresponse.header.Access-Control-Allow-Headers: "'*'"
+      ResponseType: DEFAULT_5XX
+      RestApiId:
+        Ref: 'ApiGatewayRestApi'
diff --git a/serverless.yml b/serverless.yml
@@ -115,6 +115,7 @@ functions:
           cors: true
           authorizer: aws_iam
 
+<<<<<<< HEAD
   billing:
     handler: billing.main
     events:
@@ -126,6 +127,8 @@ functions:
 
 # Create our resources with separate CloudFormation templates
 resources:
+  # API Gateway Errors
+  - ${file(resources/api-gateway-errors.yml)}
   # DynamoDB
   - ${file(resources/dynamodb-table.yml)}
   # S3