Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gordonmleigh wants to merge 2 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33810a8
fix: options endpoint does not invoke lambda (#1434)
Oct 15, 2019
e150ab3
wip: add unit test
Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samcli/local/apigw/local_apigw_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def _request_handler(self, **kwargs):
cors_headers = Cors.cors_to_headers(self.api.cors)

method, _ = self.get_request_methods_endpoints(request)
if method == "OPTIONS":
if method == "OPTIONS" and method not in route.methods:
headers = Headers(cors_headers)
return self.service_response("", headers, 200)

Expand Down
24 changes: 24 additions & 0 deletions tests/unit/local/apigw/test_local_apigw_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,30 @@ def test_request_must_invoke_lambda(self, request_mock):
self.assertEqual(result, make_response_mock)
self.lambda_runner.invoke.assert_called_with(ANY, ANY, stdout=ANY, stderr=self.stderr)

@patch.object(LocalApigwService, "get_request_methods_endpoints")
def test_options_request_must_invoke_lambda(self, request_mock):
make_response_mock = Mock()

self.service.service_response = make_response_mock
self.service._get_current_route = MagicMock()
self.service._get_current_route.return_value.methods = ["OPTIONS"]
self.service._construct_event = Mock()

parse_output_mock = Mock()
parse_output_mock.return_value = ("status_code", Headers({"headers": "headers"}), "body")
self.service._parse_lambda_output = parse_output_mock

service_response_mock = Mock()
service_response_mock.return_value = make_response_mock
self.service.service_response = service_response_mock

request_mock.return_value = ("OPTIONS", "test")

result = self.service._request_handler()

self.assertEqual(result, make_response_mock)
self.lambda_runner.invoke.assert_called_with(ANY, ANY, stdout=ANY, stderr=self.stderr)

@patch.object(LocalApigwService, "get_request_methods_endpoints")
@patch("samcli.local.apigw.local_apigw_service.LambdaOutputParser")
def test_request_handler_returns_process_stdout_when_making_response(self, lambda_output_parser_mock, request_mock):
Expand Down