(feat) Cors Support by viksrivat · Pull Request #1242 · aws/aws-sam-cli

viksrivat · 2019-06-26T21:38:13Z

Issue #, if available:

Description of changes:
Adds Cors support to ApiGateway. This completes the #1009 pr

Checklist:

Write Design Document (Do I need to write a design document?)
Write unit tests
Write/update functional tests
Write/update integration tests
make pr passes
Write documentation

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

… feature/cors_support Add cors support using aws#1009 as a ref

samcli/commands/local/lib/sam_api_provider.py

samcli/local/apigw/local_apigw_service.py

tests/integration/local/start_api/test_start_api.py

jfuss · 2019-07-15T23:48:38Z

@viksrivat Can you handle the merge conflicts here? I will do a quick pass over once you do that.

ApiGateway::RestApi only supports within methods section. This requires parsing the requestParameters section of the ApiGateway resource. Since we currently don'd do this, the best functionality is to ignore cors in RestApi

samcli/commands/local/lib/sam_api_provider.py

samcli/local/apigw/local_apigw_service.py

…#1238)

jfuss

Some of this will need to be changed based on other prs you have in process. Once the stage pr is merged, you should rebase here and handle the comments. Overall, this looks good and would love to get this into a release soon, as this will be a great addition for customers.

samcli/commands/local/lib/sam_api_provider.py

samcli/local/apigw/local_apigw_service.py

)

…li into feature/cors_support

samcli/commands/local/lib/provider.py

jfuss · 2019-07-26T21:34:19Z

samcli/commands/local/lib/sam_api_provider.py

+        if cors_prop and isinstance(cors_prop, dict):
+            allow_methods = cors_prop.get("AllowMethods", ','.join(Route.ANY_HTTP_METHODS))
+
+            if allow_methods and "OPTIONS" not in allow_methods and "options" not in allow_methods:


You need to normalize allow_methods here, just comparing OPTIONS and options is not enough, unless SAM or API gateway only allow these two ways for the strings.

jfuss · 2019-07-26T21:48:22Z

samcli/local/apigw/local_apigw_service.py

        try:
            event = self._construct_event(request, self.port, self.api.binary_media_types, self.api.stage_name,
-                                          self.api.stage_variables)
+                                          self.api.stage_variables, cors_headers)


Is this right? Cors_headers always get added to the event?

Yes. I believe CORS needs to be added to every request.

samcli/local/apigw/local_apigw_service.py

sriram-mv · 2019-08-05T02:38:27Z

Is this branch ready to merge to candidate 20 branch? I see there are new commits added after the approval.

viksrivat · 2019-08-05T15:43:43Z

The only changes that I added were updating some of the integration tests for Travis CI to pass.

jfuss · 2019-08-07T21:29:23Z

Updated this to track and merge into develop.

jfuss · 2019-08-10T18:13:46Z

@viksrivat Can you fix the flake8 errors:
tests/unit/commands/local/lib/test_sam_api_provider.py:1065:9: E303 too many blank lines (2)

Running make pr locally and making sure it passes should cover unit and linting.

viksrivat added 8 commits June 26, 2019 09:32

Start adding cors

14c51e3

Merge branch 'develop' of https://github.com/awslabs/aws-sam-cli into…

64ba5d4

… feature/cors_support Add cors support using aws#1009 as a ref

Reorganize cors header

d376c4f

Update cors

7de2882

Add cors tests

3c58a95

Update tests to check make pr passes

0094f29

Fix headers so that it is returned with post/get requests

d2fba5f

Cleanup Tests and style

7d9f270

sriram-mv reviewed Jun 27, 2019

View reviewed changes

samcli/commands/local/lib/sam_api_provider.py Outdated Show resolved Hide resolved

samcli/local/apigw/local_apigw_service.py Outdated Show resolved Hide resolved

tests/integration/local/start_api/test_start_api.py Outdated Show resolved Hide resolved

Update code with style comments

087c152

sriram-mv approved these changes Jun 28, 2019

View reviewed changes

viksrivat and others added 3 commits July 16, 2019 09:21

Merge branch 'develop' into feature/cors_support

21f7683

Run make pr and Fix merge errors

0f50751

Fix Merge Issue with ApiGateway RestApi

aa04f5e

ApiGateway::RestApi only supports within methods section. This requires parsing the requestParameters section of the ApiGateway resource. Since we currently don'd do this, the best functionality is to ignore cors in RestApi

jfuss suggested changes Jul 18, 2019

View reviewed changes

Cleanup Cors class in provider

24d16ed

Luitame mentioned this pull request Jul 21, 2019

Document dealing with CORS brefphp/bref#252

Open

feat(start-api): CloudFormation AWS::ApiGateway::RestApi support (aws…

49d16b4

…#1238)

jfuss suggested changes Jul 25, 2019

View reviewed changes

feat(start-api): CloudFormation AWS::ApiGateway::Stage Support (aws#1239

aeba546

)

viksrivat changed the base branch from develop to start-api/cfn July 26, 2019 18:03

viksrivat added 6 commits July 26, 2019 11:51

Merge to cfn branch and update with comments

f0d64c0

Update cors tests

fa5dad3

Update cors tests

5853a33

Merge branch 'feature/cors_support' of github.com:viksrivat/aws-sam-c…

d0c93e3

…li into feature/cors_support

update test

5b89f27

Update cors with comments

41da0eb

jfuss suggested changes Jul 26, 2019

View reviewed changes

Fix rebase error

161de22

viksrivat added 5 commits July 29, 2019 14:13

Update cors allow methods tests

e7ab5f2

Update cors integ test

107d2da

Update * Allow Methods

49ae556

Update * Allow Methods

b7292fe

Update start_api import

1b1fc73

jfuss approved these changes Jul 31, 2019

View reviewed changes

viksrivat added 3 commits July 31, 2019 08:42

Update tests to pass

6873f54

Update bad unit test

9ed5224

Trigger

9f820f9

jfuss force-pushed the start-api/cfn branch from aeba546 to 6e083a9 Compare August 7, 2019 16:58

jfuss approved these changes Aug 7, 2019

View reviewed changes

jfuss added the stage/accepted Accepted and will be fixed label Aug 7, 2019

jfuss changed the base branch from start-api/cfn to develop August 7, 2019 21:28

jfuss and others added 2 commits August 7, 2019 14:29

Merge branch 'develop' into feature/cors_support

66662f4

Merge branch 'develop' into feature/cors_support

7354760

viksrivat changed the base branch from develop to start-api/cfn August 9, 2019 17:06

viksrivat changed the base branch from start-api/cfn to develop August 9, 2019 17:06

viksrivat and others added 3 commits August 9, 2019 10:09

Update Style for cors pr

a355959

Merge branch 'develop' into feature/cors_support

6e0d664

Merge branch 'develop' into feature/cors_support

c7d4563

viksrivat and others added 2 commits August 11, 2019 17:26

Fix style for flake8

3718fcf

Merge branch 'develop' into feature/cors_support

4cdd407

jfuss merged commit ec19bfb into aws:develop Aug 12, 2019

viksrivat added a commit to viksrivat/aws-sam-cli that referenced this pull request Aug 14, 2019

feat(start-api): Cors Support (aws#1242)

824f3a7

This was referenced Oct 15, 2019

OPTIONS endpoint does not invoke lambda code #1434

Closed

fix: options endpoint does not invoke lambda (#1434) #1464

Closed

Conversation

viksrivat commented Jun 26, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jfuss commented Jul 15, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jfuss left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jfuss Jul 26, 2019

Choose a reason for hiding this comment

Uh oh!

jfuss Jul 26, 2019

Choose a reason for hiding this comment

Uh oh!

viksrivat Jul 29, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sriram-mv commented Aug 5, 2019

Uh oh!

viksrivat commented Aug 5, 2019

Uh oh!

jfuss commented Aug 7, 2019

Uh oh!

jfuss commented Aug 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants