Skip to content

chore: Enforce formatting for yaml/json and add Test Metadata #2617

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
Nov 18, 2022
Merged

chore: Enforce formatting for yaml/json and add Test Metadata #2617

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ integ-test:

black:
black setup.py samtranslator/* tests/* integration/* bin/*.py
bin/json-format.py --write tests
bin/json-format.py --write tests integration
bin/yaml-format.py --write tests
bin/yaml-format.py --write integration --add-test-metadata

black-check:
black --check setup.py samtranslator/* tests/* integration/* bin/*.py
bin/json-format.py --check tests
bin/json-format.py --check tests integration
bin/yaml-format.py --check tests
bin/yaml-format.py --check integration --add-test-metadata

lint:
# mypy performs type check
Expand Down
14 changes: 7 additions & 7 deletions integration/config/code_key_to_file_map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"codeuri": "code.zip",
"contenturi": "layer1.zip",
"definitionuri": "swagger1.json",
"templateurl": "template.yaml",
"binaryMediaCodeUri": "binary-media.zip",
"mtlsuri": "MTLSCert.pem"
}
"binaryMediaCodeUri": "binary-media.zip",
"codeuri": "code.zip",
"contenturi": "layer1.zip",
"definitionuri": "swagger1.json",
"mtlsuri": "MTLSCert.pem",
"templateurl": "template.yaml"
}
47 changes: 37 additions & 10 deletions integration/config/file_to_s3_map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,38 @@
{
"code.zip": {"type": "s3", "uri": ""},
"code2.zip": {"type": "s3", "uri": ""},
"layer1.zip": {"type": "s3", "uri": ""},
"swagger1.json": {"type": "s3", "uri": ""},
"swagger2.json": {"type": "s3", "uri": ""},
"binary-media.zip": {"type": "s3", "uri": ""},
"template.yaml": {"type": "http", "uri": ""},
"MTLSCert.pem": {"type": "s3", "uri": ""},
"MTLSCert-Updated.pem": {"type": "s3", "uri": ""}
}
"MTLSCert-Updated.pem": {
"type": "s3",
"uri": ""
},
"MTLSCert.pem": {
"type": "s3",
"uri": ""
},
"binary-media.zip": {
"type": "s3",
"uri": ""
},
"code.zip": {
"type": "s3",
"uri": ""
},
"code2.zip": {
"type": "s3",
"uri": ""
},
"layer1.zip": {
"type": "s3",
"uri": ""
},
"swagger1.json": {
"type": "s3",
"uri": ""
},
"swagger2.json": {
"type": "s3",
"uri": ""
},
"template.yaml": {
"type": "http",
"uri": ""
}
}
Loading