Skip to content

Commit

Permalink
Add test to verify CORS mappings
Browse files Browse the repository at this point in the history 
It's probably worth refactoring this logic into
a separate class, especially when support is added to
configure exactly what CORS settings you want.
  • Loading branch information
@jamesls
jamesls committed Oct 10, 2016
1 parent 8b9e862 commit 26d1705
Show file tree
Hide file tree
Showing 2 changed files with 179 additions and 6 deletions.
1 change: 0 additions & 1 deletion chalice/deployer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@ def _add_options_preflight_request(self, node, http_methods):
responseTemplates={'application/json': ''},
responseParameters={
"method.response.header.Access-Control-Allow-Origin": "'*'",
# TODO: This should be all the allowed methods in their view.
"method.response.header.Access-Control-Allow-Methods": (
"'%s'" % allowed_methods),
"method.response.header.Access-Control-Allow-Headers": (
Expand Down
184 changes: 179 additions & 5 deletions tests/unit/test_deployer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from chalice.app import Chalice
from chalice.config import Config

from botocore.stub import Stubber
from botocore.stub import Stubber, ANY
import botocore.session


Expand Down Expand Up @@ -147,12 +147,12 @@ def test_validation_error_if_no_role_provided_when_manage_false(sample_app):
validate_configuration(config)


def add_expected_calls_to_map_error(error_cls, gateway_stub):
def add_expected_calls_to_map_error(error_cls, gateway_stub, http_method='POST'):
gateway_stub.add_response(
'put_method_response',
service_response={},
expected_params={
'httpMethod': 'POST',
'httpMethod': http_method,
'resourceId': 'parent-id',
'responseModels': {
'application/json': 'Empty',
Expand All @@ -165,7 +165,7 @@ def add_expected_calls_to_map_error(error_cls, gateway_stub):
'put_integration_response',
service_response={},
expected_params={
'httpMethod': 'POST',
'httpMethod': http_method,
'resourceId': 'parent-id',
'responseTemplates': {'application/json': ERROR_MAPPING},
'restApiId': 'rest-api-id',
Expand All @@ -175,7 +175,8 @@ def add_expected_calls_to_map_error(error_cls, gateway_stub):
)


def test_can_build_resource_routes_for_single_view(stubbed_api_gateway, stubbed_lambda):
def test_can_build_resource_routes_for_single_view(stubbed_api_gateway,
stubbed_lambda):
route_trie = {
'name': '',
'uri_path': '/',
Expand Down Expand Up @@ -265,6 +266,179 @@ def test_can_build_resource_routes_for_single_view(stubbed_api_gateway, stubbed_
g.build_resources(route_trie)


def test_cors_adds_required_headers(stubbed_api_gateway, stubbed_lambda):
cors_route_entry = RouteEntry(None, 'index_view', '/', ['PUT'],
cors=True,
content_types=['application/json'])
route_trie = {
'name': '',
'uri_path': '/',
'children': {},
'resource_id': 'parent-id',
'parent_resource_id': None,
'is_route': True,
'route_entry': cors_route_entry,
}
gateway_client, gateway_stub = stubbed_api_gateway
lambda_client, lambda_stub = stubbed_lambda
gateway_stub.add_response(
'put_method',
service_response={},
expected_params={
'resourceId': 'parent-id',
'authorizationType': 'NONE',
'restApiId': 'rest-api-id',
'httpMethod': 'PUT',
})
gateway_stub.add_response(
'put_integration',
service_response={},
expected_params={
'httpMethod': 'PUT',
'integrationHttpMethod': 'POST',
'passthroughBehavior': 'NEVER',
'requestTemplates': {
'application/json': FULL_PASSTHROUGH,
},
'resourceId': 'parent-id',
'restApiId': 'rest-api-id',
'type': 'AWS',
'uri': ('arn:aws:apigateway:us-west-2:lambda:path'
'/2015-03-31/functions/arn:aws:lambda:us-west'
'-2:123:function:name/invocations')
}
)
gateway_stub.add_response(
'put_method_response',
service_response={},
expected_params={
'httpMethod': 'PUT',
'resourceId': 'parent-id',
'responseModels': {
'application/json': 'Empty',
},
'restApiId': 'rest-api-id',
'statusCode': '200',
'responseParameters': {'method.response.header.Access-Control-Allow-Origin': False},
}
)
gateway_stub.add_response(
'put_integration_response',
service_response={},
expected_params={
'httpMethod': 'PUT',
'resourceId': 'parent-id',
'responseTemplates': {
'application/json': '',
},
'responseParameters': {'method.response.header.Access-Control-Allow-Origin': "'*'"},
'restApiId': 'rest-api-id',
'statusCode': '200',
}
)
for error_cls in ALL_ERRORS:
gateway_stub.add_response(
'put_method_response',
service_response={},
expected_params={
'httpMethod': ANY,
'resourceId': ANY,
'responseModels': ANY,
'restApiId': ANY,
'statusCode': str(error_cls.STATUS_CODE),
'responseParameters': {
'method.response.header.Access-Control-Allow-Origin': False},
}
)
gateway_stub.add_response(
'put_integration_response',
service_response={},
expected_params={
'httpMethod': ANY,
'resourceId': ANY,
'responseTemplates': ANY,
'restApiId': ANY,
'selectionPattern': '%s.*' % error_cls.__name__,
'statusCode': str(error_cls.STATUS_CODE),
'responseParameters': {
'method.response.header.Access-Control-Allow-Origin': "'*'",
}
}
)
gateway_stub.add_response(
'put_method', service_response={},
expected_params={
'restApiId': ANY,
'resourceId': ANY,
'httpMethod': 'OPTIONS',
'authorizationType': 'NONE',
}
)
gateway_stub.add_response(
'put_integration', service_response={},
expected_params={
'restApiId': ANY,
'resourceId': ANY,
'httpMethod': 'OPTIONS',
'type': 'MOCK',
'requestTemplates': {'application/json': '{"statusCode": 200}'}
}
)
gateway_stub.add_response(
'put_method_response', service_response={},
expected_params={
'restApiId': ANY,
'resourceId': ANY,
'httpMethod': 'OPTIONS',
'statusCode': '200',
'responseModels': ANY,
'responseParameters': {
'method.response.header.Access-Control-Allow-Origin': False,
'method.response.header.Access-Control-Allow-Methods': False,
'method.response.header.Access-Control-Allow-Headers': False,
}
}
)
gateway_stub.add_response(
'put_integration_response', service_response={},
expected_params={
'restApiId': ANY,
'resourceId': ANY,
'httpMethod': 'OPTIONS',
'statusCode': '200',
'responseTemplates': ANY,
'responseParameters': {
'method.response.header.Access-Control-Allow-Origin': "'*'",
'method.response.header.Access-Control-Allow-Methods': (
"'PUT,OPTIONS'"
),
'method.response.header.Access-Control-Allow-Headers': (
"'Content-Type,X-Amz-Date,Authorization,X-Api-Key"
",X-Amz-Security-Token'"
),
}
}
)
lambda_stub.add_response(
'add_permission',
service_response={},
expected_params={
'Action': 'lambda:InvokeFunction',
'FunctionName': 'name',
'Principal': 'apigateway.amazonaws.com',
'SourceArn': 'arn:aws:execute-api:us-west-2:123:rest-api-id/*',
'StatementId': 'random-id',
}
)
g = APIGatewayResourceCreator(
gateway_client, lambda_client,
'rest-api-id', 'arn:aws:lambda:us-west-2:123:function:name',
random_id_generator=lambda: "random-id")
gateway_stub.activate()
lambda_stub.activate()
g.build_resources(route_trie)


def test_can_deploy_apig_and_lambda(sample_app):
lambda_deploy = mock.Mock(spec=LambdaDeployer)
apig_deploy = mock.Mock(spec=APIGatewayDeployer)
Expand Down

0 comments on commit 26d1705

Please sign in to comment.