Skip to content

fix: Better Error Handling of Intrinsics #1896

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

Merged
merged 2 commits into from
Jan 25, 2021
Merged

fix: Better Error Handling of Intrinsics #1896

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
aadfb9f
Better Error Handling of Intrinsics
awood45 Jan 21, 2021
a9e5387
Add "NoValue" Test Case
awood45 Jan 25, 2021
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
11 changes: 10 additions & 1 deletion samtranslator/model/api/http_api_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from samtranslator.open_api.open_api import OpenApiEditor
from samtranslator.translator import logical_id_generator
from samtranslator.model.tags.resource_tagging import get_tag_list
from samtranslator.model.intrinsics import is_intrinsic
from samtranslator.model.intrinsics import is_intrinsic, is_intrinsic_no_value
from samtranslator.model.route53 import Route53RecordSetGroup

_CORS_WILDCARD = "*"
Expand Down Expand Up @@ -467,6 +467,15 @@ def _set_default_authorizer(self, open_api_editor, authorizers, default_authoriz
if not default_authorizer:
return

if is_intrinsic_no_value(default_authorizer):
return

if is_intrinsic(default_authorizer):
raise InvalidResourceException(
self.logical_id,
"Unable to set DefaultAuthorizer because intrinsic functions are not supported for this field.",
)

if not authorizers.get(default_authorizer):
raise InvalidResourceException(
self.logical_id,
Expand Down
13 changes: 13 additions & 0 deletions tests/model/api/test_http_api_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@ def test_auth_missing_default_auth(self):
with pytest.raises(InvalidResourceException):
HttpApiGenerator(**self.kwargs)._construct_http_api()

def test_auth_intrinsic_default_auth(self):
self.kwargs["auth"] = self.authorizers
self.kwargs["auth"]["DefaultAuthorizer"] = {"Ref": "SomeValue"}
self.kwargs["definition_body"] = OpenApiEditor.gen_skeleton()
with pytest.raises(InvalidResourceException):
HttpApiGenerator(**self.kwargs)._construct_http_api()

def test_auth_novalue_default_does_not_raise(self):
self.kwargs["auth"] = self.authorizers
self.kwargs["auth"]["DefaultAuthorizer"] = {"Ref": "AWS::NoValue"}
self.kwargs["definition_body"] = OpenApiEditor.gen_skeleton()
HttpApiGenerator(**self.kwargs)._construct_http_api()

def test_def_uri_invalid_dict(self):
self.kwargs["auth"] = None
self.kwargs["definition_body"] = None
Expand Down