Skip to content

fix: make sure Name and Type exists as a property of PrimaryKey of SimpleTable #1054

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 1 commit into from
Jul 30, 2019
Merged

fix: make sure Name and Type exists as a property of PrimaryKey of SimpleTable #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions samtranslator/model/sam_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,11 @@ def _construct_dynamodb_table(self):
dynamodb_table = DynamoDBTable(self.logical_id, depends_on=self.depends_on, attributes=self.resource_attributes)

if self.PrimaryKey:
if 'Name' not in self.PrimaryKey or 'Type' not in self.PrimaryKey:
raise InvalidResourceException(
self.logical_id,
'\'PrimaryKey\' is missing required Property \'Name\' or \'Type\'.'
)
primary_key = {
'AttributeName': self.PrimaryKey['Name'],
'AttributeType': self._convert_attribute_type(self.PrimaryKey['Type'])
Expand Down
7 changes: 7 additions & 0 deletions tests/translator/input/error_table_primary_key_missing_name.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Resources:
Table:
Type: AWS::Serverless::SimpleTable
Properties:
PrimaryKey:
Id: id
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#884 (comment)

Type: String
6 changes: 6 additions & 0 deletions tests/translator/input/error_table_primary_key_missing_type.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Resources:
Table:
Type: AWS::Serverless::SimpleTable
Properties:
PrimaryKey:
Name: id
8 changes: 8 additions & 0 deletions tests/translator/output/error_table_primary_key_missing_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"errors": [
{
"errorMessage": "Resource with id [Table] is invalid. 'PrimaryKey' is missing required Property 'Name' or 'Type'."
}
],
"errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [Table] is invalid. 'PrimaryKey' is missing required Property 'Name' or 'Type'."
}
8 changes: 8 additions & 0 deletions tests/translator/output/error_table_primary_key_missing_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"errors": [
{
"errorMessage": "Resource with id [Table] is invalid. 'PrimaryKey' is missing required Property 'Name' or 'Type'."
}
],
"errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [Table] is invalid. 'PrimaryKey' is missing required Property 'Name' or 'Type'."
}
2 changes: 2 additions & 0 deletions tests/translator/test_translator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,8 @@ def _generate_new_deployment_hash(self, logical_id, dict_to_hash, rest_api_to_sw
'error_multiple_resource_errors',
'error_s3_not_in_template',
'error_table_invalid_attributetype',
'error_table_primary_key_missing_name',
'error_table_primary_key_missing_type',
'error_invalid_resource_parameters',
'error_reserved_sam_tag',
'existing_event_logical_id',
Expand Down