Skip to content

feat: unified SAM/CloudFormation schema #2793

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 27 commits into from
Jan 18, 2023
Merged

feat: unified SAM/CloudFormation schema #2793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
435a71f
feat: extend schema with CloudFormation schema
Jan 16, 2023
e30c57c
Add CFN resources
Jan 16, 2023
1d043c9
Add props
Jan 16, 2023
245a18f
Add types
Jan 16, 2023
65d05f0
Only extend Resources
Jan 16, 2023
58dd56f
Separate files
Jan 17, 2023
20ec731
Add back any_cfn_resource
Jan 17, 2023
e0e9b90
Check correct schema
Jan 17, 2023
497c6fe
Do not store CFN schema
Jan 17, 2023
d127d9a
Keep same name for now
Jan 17, 2023
a4464cf
Remove sam.schema.json
Jan 17, 2023
d15e6cf
Write both schemas from same source
Jan 17, 2023
97c2501
Simpler Makefile
Jan 17, 2023
28f6421
Fix black-check
Jan 17, 2023
6ff4ad8
More robust schema caching
Jan 17, 2023
df72f2f
Fix mypy
Jan 17, 2023
8e9cdd5
Refactor
Jan 17, 2023
4454ae4
Add tests
Jan 17, 2023
4efb5ea
make black
Jan 17, 2023
d41f1e6
Add other props from CFN schema
Jan 17, 2023
b2a1ede
Merge branch 'develop' into extend-schema
hoffa Jan 17, 2023
92a8e93
Better test
Jan 18, 2023
8ce5087
Remove unused test
Jan 18, 2023
3977507
Add help message
Jan 18, 2023
55bbf89
Make cfn-lint happy
Jan 18, 2023
33b51ea
Store CFN schema in repo
Jan 18, 2023
70950fc
Fix tests
Jan 18, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ venv.bak/
# Companion stack config
integration/config/file_to_s3_map_modified.json

.tmp_schema.json
.tmp
15 changes: 11 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ black:

black-check:
# Checking latest schema was generated (run `make schema` if this fails)
python samtranslator/schema/schema.py > .tmp_schema.json
diff -u samtranslator/schema/schema.json .tmp_schema.json
rm .tmp_schema.json
mkdir -p .tmp
python samtranslator/schema/schema.py --sam-schema .tmp/sam.schema.json --cfn-schema samtranslator/schema/cloudformation.schema.json --unified-schema .tmp/unified.schema.json
diff -u samtranslator/schema/schema.json .tmp/sam.schema.json
diff -u samtranslator/schema/unified.schema.json .tmp/unified.schema.json
black --check setup.py samtranslator/* tests/* integration/* bin/*.py
bin/json-format.py --check tests integration samtranslator/policy_templates_data
bin/yaml-format.py --check tests
Expand All @@ -44,15 +45,21 @@ lint:
prepare-companion-stack:
pytest -v --no-cov integration/setup -m setup

update-cfn-schema:
curl -o samtranslator/schema/cloudformation.schema.json https://raw.githubusercontent.com/awslabs/goformation/master/schema/cloudformation.schema.json

schema:
python samtranslator/schema/schema.py > samtranslator/schema/schema.json
python samtranslator/schema/schema.py --sam-schema samtranslator/schema/schema.json --cfn-schema samtranslator/schema/cloudformation.schema.json --unified-schema samtranslator/schema/unified.schema.json

# Command to run everytime you make changes to verify everything works
dev: test

# Verifications to run before sending a pull request
pr: black-check lint init dev

clean:
rm -r .tmp

define HELP_MESSAGE

Usage: $ make [TARGETS]
Expand Down
Loading