Skip to content

Commit 496d3ab

Browse files
authored
Merge pull request #2412 from aws/release-v1.46.0
Release 1.46.0 (to main)
2 parents e38e0dc + aab2d11 commit 496d3ab

File tree

165 files changed

+13904
-899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+13904
-899
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
name: Bug report
33
about: Create an issue to report a bug for the SAM Translator
4-
title: ''
5-
labels: ''
4+
title: "Bug: TITLE"
5+
labels: ['type/bug', 'stage/needs-triage']
66
assignees: ''
77

88
---

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
name: Feature request
33
about: Suggest an idea/feature/enhancement for the SAM Translator
4-
title: ''
5-
labels: ''
4+
title: "Feature request: TITLE"
5+
labels: ['type/feature', 'stage/needs-triage']
66
assignees: ''
77

88
---

.github/ISSUE_TEMPLATE/other.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
name: Other
3+
about: Choose if your issue doesn't apply to the other templates
4+
title: ''
5+
labels: ['stage/needs-triage']
6+
assignees: ''
7+
8+
---

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
- [ ] `make pr` passes
1515
- [ ] Update documentation
1616
- [ ] Verify transformed template deploys and application functions as expected
17+
- [ ] Do these changes include any template validations?
18+
- [ ] Did the newly validated properties support intrinsics prior to adding the validations? (If unsure, please review [Intrinsic Functions](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html) before proceeding).
19+
- [ ] Does the pull request ensure that intrinsics remain functional with the new validations?
1720

1821
*Examples?*
1922

.github/workflows/pr-labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
issue_number: context.issue.number,
2727
owner: context.repo.owner,
2828
repo: context.repo.repo,
29-
labels: ['pr/external']
29+
labels: ['pr/external', 'stage/needs-triage']
3030
})
3131
}

DEVELOPMENT_GUIDE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ Running Tests
114114

115115
### Unit testing with one Python version
116116

117-
If you're trying to do a quick run, it's ok to use the current python version. Run `make pr`.
117+
If you're trying to do a quick run, it's ok to use the current python version.
118+
Run `make test` or `make test-fast`. Once all tests pass make sure to run
119+
`make pr` before sending out your PR.
118120

119121
### Unit testing with multiple Python versions
120122

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
target:
22
$(info ${HELP_MESSAGE})
33
@exit 0
4-
4+
55
init:
66
pip install -e '.[dev]'
77

88
test:
99
pytest --cov samtranslator --cov-report term-missing --cov-fail-under 95 -n auto tests/*
1010

11+
test-fast:
12+
pytest -x --cov samtranslator --cov-report term-missing --cov-fail-under 95 -n auto tests/*
13+
1114
test-cov-report:
1215
pytest --cov samtranslator --cov-report term-missing --cov-report html --cov-fail-under 95 tests/*
1316

bin/sam-translate.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
from samtranslator.translator.transform import transform
3838
from samtranslator.yaml_helper import yaml_parse
3939
from samtranslator.model.exceptions import InvalidDocumentException
40-
from samtranslator.feature_toggle.feature_toggle import FeatureToggleLocalConfigProvider, FeatureToggle
4140

4241
LOG = logging.getLogger(__name__)
4342
cli_options = docopt(__doc__)
@@ -98,16 +97,8 @@ def transform_template(input_file_path, output_file_path):
9897
sam_template = yaml_parse(f)
9998

10099
try:
101-
feature_toggle = FeatureToggle(
102-
FeatureToggleLocalConfigProvider(
103-
os.path.join(my_path, "..", "tests", "feature_toggle", "input", "feature_toggle_config.json")
104-
),
105-
stage=None,
106-
account_id=None,
107-
region=None,
108-
)
109-
cloud_formation_template = transform(sam_template, {}, ManagedPolicyLoader(iam_client), feature_toggle)
110-
cloud_formation_template_prettified = json.dumps(cloud_formation_template, indent=2)
100+
cloud_formation_template = transform(sam_template, {}, ManagedPolicyLoader(iam_client))
101+
cloud_formation_template_prettified = json.dumps(cloud_formation_template, indent=1)
111102

112103
with open(output_file_path, "w") as f:
113104
f.write(cloud_formation_template_prettified)

0 commit comments

Comments
 (0)