Skip to content

Commit 89e6214

Browse files
Merge branch 'release-v1.56.0'
2 parents 7009eec + 6e7ff4d commit 89e6214

File tree

1,117 files changed

+24860
-5667
lines changed

Some content is hidden

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

1,117 files changed

+24860
-5667
lines changed

.cfnlintrc.yaml

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
templates:
2+
- tests/translator/output/**/*.json
3+
ignore_templates:
4+
- tests/translator/output/**/error_*.json # Fail by design
5+
- tests/translator/output/**/api_cache.json
6+
- tests/translator/output/**/api_description.json
7+
- tests/translator/output/**/api_endpoint_configuration.json
8+
- tests/translator/output/**/api_endpoint_configuration_with_vpcendpoint.json
9+
- tests/translator/output/**/api_http_paths_with_if_condition.json
10+
- tests/translator/output/**/api_http_paths_with_if_condition_no_value_else_case.json
11+
- tests/translator/output/**/api_http_paths_with_if_condition_no_value_then_case.json
12+
- tests/translator/output/**/api_http_with_default_iam_authorizer.json
13+
- tests/translator/output/**/api_request_model.json
14+
- tests/translator/output/**/api_request_model_openapi_3.json
15+
- tests/translator/output/**/api_request_model_with_validator.json
16+
- tests/translator/output/**/api_request_model_with_validator_openapi_3.json
17+
- tests/translator/output/**/api_rest_paths_with_if_condition_openapi.json
18+
- tests/translator/output/**/api_rest_paths_with_if_condition_openapi_no_value_else_case.json
19+
- tests/translator/output/**/api_rest_paths_with_if_condition_openapi_no_value_then_case.json
20+
- tests/translator/output/**/api_rest_paths_with_if_condition_swagger.json
21+
- tests/translator/output/**/api_rest_paths_with_if_condition_swagger_no_value_else_case.json
22+
- tests/translator/output/**/api_rest_paths_with_if_condition_swagger_no_value_then_case.json
23+
- tests/translator/output/**/api_swagger_integration_with_ref_intrinsic_api_id.json
24+
- tests/translator/output/**/api_swagger_integration_with_string_api_id.json
25+
- tests/translator/output/**/api_with_access_log_setting.json
26+
- tests/translator/output/**/api_with_any_method_in_swagger.json
27+
- tests/translator/output/**/api_with_apikey_default_override.json
28+
- tests/translator/output/**/api_with_apikey_required.json
29+
- tests/translator/output/**/api_with_apikey_required_openapi_3.json
30+
- tests/translator/output/**/api_with_apikey_source.json
31+
- tests/translator/output/**/api_with_auth_all_maximum.json
32+
- tests/translator/output/**/api_with_auth_all_maximum_openapi_3.json
33+
- tests/translator/output/**/api_with_auth_all_minimum.json
34+
- tests/translator/output/**/api_with_auth_all_minimum_openapi.json
35+
- tests/translator/output/**/api_with_auth_and_conditions_all_max.json
36+
- tests/translator/output/**/api_with_auth_no_default.json
37+
- tests/translator/output/**/api_with_auth_with_default_scopes.json
38+
- tests/translator/output/**/api_with_auth_with_default_scopes_openapi.json
39+
- tests/translator/output/**/api_with_aws_account_blacklist.json
40+
- tests/translator/output/**/api_with_aws_account_whitelist.json
41+
- tests/translator/output/**/api_with_aws_iam_auth_overrides.json
42+
- tests/translator/output/**/api_with_basic_custom_domain.json
43+
- tests/translator/output/**/api_with_basic_custom_domain_http.json
44+
- tests/translator/output/**/api_with_basic_custom_domain_intrinsics.json
45+
- tests/translator/output/**/api_with_basic_custom_domain_intrinsics_http.json
46+
- tests/translator/output/**/api_with_binary_media_types.json
47+
- tests/translator/output/**/api_with_binary_media_types_definition_body.json
48+
- tests/translator/output/**/api_with_canary_setting.json
49+
- tests/translator/output/**/api_with_cors.json
50+
- tests/translator/output/**/api_with_cors_and_auth_no_preflight_auth.json
51+
- tests/translator/output/**/api_with_cors_and_auth_preflight_auth.json
52+
- tests/translator/output/**/api_with_cors_and_conditions_no_definitionbody.json
53+
- tests/translator/output/**/api_with_cors_and_only_credentials_false.json
54+
- tests/translator/output/**/api_with_cors_and_only_headers.json
55+
- tests/translator/output/**/api_with_cors_and_only_maxage.json
56+
- tests/translator/output/**/api_with_cors_and_only_methods.json
57+
- tests/translator/output/**/api_with_cors_and_only_origins.json
58+
- tests/translator/output/**/api_with_cors_no_definitionbody.json
59+
- tests/translator/output/**/api_with_cors_openapi_3.json
60+
- tests/translator/output/**/api_with_custom_base_path.json
61+
- tests/translator/output/**/api_with_custom_domain_route53.json
62+
- tests/translator/output/**/api_with_custom_domain_route53_hosted_zone_name.json
63+
- tests/translator/output/**/api_with_custom_domain_route53_hosted_zone_name_http.json
64+
- tests/translator/output/**/api_with_custom_domain_route53_http.json
65+
- tests/translator/output/**/api_with_custom_domain_route53_multiple_intrinsic_hostedzoneid.json
66+
- tests/translator/output/**/api_with_default_aws_iam_auth.json
67+
- tests/translator/output/**/api_with_default_aws_iam_auth_and_no_auth_route.json
68+
- tests/translator/output/**/api_with_disable_api_execute_endpoint.json
69+
- tests/translator/output/**/api_with_disable_api_execute_endpoint_openapi_3.json
70+
- tests/translator/output/**/api_with_fail_on_warnings.json
71+
- tests/translator/output/**/api_with_gateway_responses.json
72+
- tests/translator/output/**/api_with_gateway_responses_all.json
73+
- tests/translator/output/**/api_with_gateway_responses_all_openapi_3.json
74+
- tests/translator/output/**/api_with_gateway_responses_implicit.json
75+
- tests/translator/output/**/api_with_gateway_responses_minimal.json
76+
- tests/translator/output/**/api_with_gateway_responses_string_status_code.json
77+
- tests/translator/output/**/api_with_identity_intrinsic.json
78+
- tests/translator/output/**/api_with_if_conditional_with_resource_policy.json
79+
- tests/translator/output/**/api_with_incompatible_stage_name.json
80+
- tests/translator/output/**/api_with_ip_range_blacklist.json
81+
- tests/translator/output/**/api_with_ip_range_whitelist.json
82+
- tests/translator/output/**/api_with_method_aws_iam_auth.json
83+
- tests/translator/output/**/api_with_method_settings.json
84+
- tests/translator/output/**/api_with_minimum_compression_size.json
85+
- tests/translator/output/**/api_with_mode.json
86+
- tests/translator/output/**/api_with_open_api_version.json
87+
- tests/translator/output/**/api_with_open_api_version_2.json
88+
- tests/translator/output/**/api_with_openapi_definition_body_no_flag.json
89+
- tests/translator/output/**/api_with_path_parameters.json
90+
- tests/translator/output/**/api_with_resource_policy.json
91+
- tests/translator/output/**/api_with_resource_policy_global.json
92+
- tests/translator/output/**/api_with_resource_policy_global_implicit.json
93+
- tests/translator/output/**/api_with_resource_refs.json
94+
- tests/translator/output/**/api_with_security_definition_and_components.json
95+
- tests/translator/output/**/api_with_security_definition_and_no_components.json
96+
- tests/translator/output/**/api_with_security_definition_and_none_components.json
97+
- tests/translator/output/**/api_with_source_vpc_blacklist.json
98+
- tests/translator/output/**/api_with_source_vpc_whitelist.json
99+
- tests/translator/output/**/api_with_swagger_and_openapi_with_auth.json
100+
- tests/translator/output/**/api_with_swagger_authorizer_none.json
101+
- tests/translator/output/**/api_with_usageplans.json
102+
- tests/translator/output/**/api_with_usageplans_intrinsics.json
103+
- tests/translator/output/**/api_with_usageplans_shared_attributes_three.json
104+
- tests/translator/output/**/api_with_usageplans_shared_attributes_two.json
105+
- tests/translator/output/**/api_with_usageplans_shared_no_side_effect_1.json
106+
- tests/translator/output/**/api_with_usageplans_shared_no_side_effect_2.json
107+
- tests/translator/output/**/api_with_xray_tracing.json
108+
- tests/translator/output/**/application_with_intrinsics.json
109+
- tests/translator/output/**/basic_function_withimageuri.json
110+
- tests/translator/output/**/basic_layer.json
111+
- tests/translator/output/**/cloudwatch_logs_with_ref.json
112+
- tests/translator/output/**/cloudwatchevent_intrinsics.json
113+
- tests/translator/output/**/cloudwatchlog.json
114+
- tests/translator/output/**/congito_userpool_with_sms_configuration.json
115+
- tests/translator/output/**/connector_bucket_to_function.json
116+
- tests/translator/output/**/connector_dependson_replace.json
117+
- tests/translator/output/**/connector_esm_dependson.json
118+
- tests/translator/output/**/connector_function_to_sqs.json
119+
- tests/translator/output/**/connector_function_to_table.json
120+
- tests/translator/output/**/connector_hardcoded_lambda_arn.json
121+
- tests/translator/output/**/connector_hardcoded_props.json
122+
- tests/translator/output/**/connector_rule_to_eventbus.json
123+
- tests/translator/output/**/connector_rule_to_sfn.json
124+
- tests/translator/output/**/connector_rule_to_sns.json
125+
- tests/translator/output/**/connector_sfn_to_function.json
126+
- tests/translator/output/**/connector_sns_to_function.json
127+
- tests/translator/output/**/connector_table_to_function.json
128+
- tests/translator/output/**/depends_on.json
129+
- tests/translator/output/**/eventbridgerule_with_dlq.json
130+
- tests/translator/output/**/explicit_api.json
131+
- tests/translator/output/**/explicit_api_openapi_3.json
132+
- tests/translator/output/**/explicit_api_with_invalid_events_config.json
133+
- tests/translator/output/**/function_event_conditions.json
134+
- tests/translator/output/**/function_with_alias_and_code_sha256.json
135+
- tests/translator/output/**/function_with_alias_and_event_sources.json
136+
- tests/translator/output/**/function_with_alias_intrinsics.json
137+
- tests/translator/output/**/function_with_condition.json
138+
- tests/translator/output/**/function_with_conditional_managed_policy.json
139+
- tests/translator/output/**/function_with_conditional_managed_policy_and_ref_no_value.json
140+
- tests/translator/output/**/function_with_conditional_policy_template.json
141+
- tests/translator/output/**/function_with_conditional_policy_template_and_ref_no_value.json
142+
- tests/translator/output/**/function_with_custom_codedeploy_deployment_preference.json
143+
- tests/translator/output/**/function_with_deployment_no_service_role_with_passthrough.json
144+
- tests/translator/output/**/function_with_deployment_no_service_role_without_passthrough.json
145+
- tests/translator/output/**/function_with_deployment_preference.json
146+
- tests/translator/output/**/function_with_deployment_preference_condition_with_passthrough.json
147+
- tests/translator/output/**/function_with_deployment_preference_condition_without_passthrough.json
148+
- tests/translator/output/**/function_with_deployment_preference_from_parameters.json
149+
- tests/translator/output/**/function_with_deployment_preference_multiple_combinations_conditions_with_passthrough.json
150+
- tests/translator/output/**/function_with_deployment_preference_multiple_combinations_conditions_without_passthrough.json
151+
- tests/translator/output/**/function_with_deployment_preference_passthrough_condition_with_supported_intrinsics.json
152+
- tests/translator/output/**/function_with_disabled_traffic_hook.json
153+
- tests/translator/output/**/function_with_dlq.json
154+
- tests/translator/output/**/function_with_event_dest.json
155+
- tests/translator/output/**/function_with_event_dest_basic.json
156+
- tests/translator/output/**/function_with_event_dest_conditional.json
157+
- tests/translator/output/**/function_with_event_schedule_state.json
158+
- tests/translator/output/**/function_with_file_system_config.json
159+
- tests/translator/output/**/function_with_function_url_config_conditions.json
160+
- tests/translator/output/**/function_with_globals_role_path.json
161+
- tests/translator/output/**/function_with_intrinsic_architecture.json
162+
- tests/translator/output/**/function_with_kmskeyarn.json
163+
- tests/translator/output/**/function_with_many_layers.json
164+
- tests/translator/output/**/function_with_msk.json
165+
- tests/translator/output/**/function_with_request_parameters.json
166+
- tests/translator/output/**/function_with_resource_refs.json
167+
- tests/translator/output/**/function_with_role_and_role_path.json
168+
- tests/translator/output/**/function_with_role_path.json
169+
- tests/translator/output/**/global_handle_path_level_parameter.json
170+
- tests/translator/output/**/globals_for_api.json
171+
- tests/translator/output/**/http_api_custom_iam_auth.json
172+
- tests/translator/output/**/http_api_existing_openapi.json
173+
- tests/translator/output/**/http_api_existing_openapi_conditions.json
174+
- tests/translator/output/**/http_api_explicit_stage.json
175+
- tests/translator/output/**/http_api_global_iam_auth_enabled.json
176+
- tests/translator/output/**/http_api_lambda_auth.json
177+
- tests/translator/output/**/http_api_lambda_auth_full.json
178+
- tests/translator/output/**/http_api_local_iam_auth_enabled.json
179+
- tests/translator/output/**/http_api_multiple_authorizers.json
180+
- tests/translator/output/**/http_api_with_cors.json
181+
- tests/translator/output/**/implicit_and_explicit_api_with_conditions.json
182+
- tests/translator/output/**/implicit_api.json
183+
- tests/translator/output/**/implicit_api_deletion_policy_precedence.json
184+
- tests/translator/output/**/implicit_api_with_auth_and_conditions_max.json
185+
- tests/translator/output/**/implicit_api_with_many_conditions.json
186+
- tests/translator/output/**/implicit_api_with_serverless_rest_api_resource.json
187+
- tests/translator/output/**/implicit_http_api_with_many_conditions.json
188+
- tests/translator/output/**/intrinsic_functions.json
189+
- tests/translator/output/**/iot_rule.json
190+
- tests/translator/output/**/kinesis_intrinsics.json
191+
- tests/translator/output/**/layers_all_properties.json
192+
- tests/translator/output/**/layers_with_intrinsics.json
193+
- tests/translator/output/**/no_implicit_api_with_serverless_rest_api_resource.json
194+
- tests/translator/output/**/s3_create_remove.json
195+
- tests/translator/output/**/s3_intrinsics.json
196+
- tests/translator/output/**/schema_validation_1.json
197+
- tests/translator/output/**/self_managed_kafka_with_intrinsics.json
198+
- tests/translator/output/**/state_machine_with_api_authorizer.json
199+
- tests/translator/output/**/state_machine_with_api_authorizer_maximum.json
200+
- tests/translator/output/**/state_machine_with_condition.json
201+
- tests/translator/output/**/state_machine_with_condition_and_events.json
202+
- tests/translator/output/**/state_machine_with_eb_dlq_target_id.json
203+
- tests/translator/output/**/state_machine_with_event_schedule_state.json
204+
- tests/translator/output/**/state_machine_with_schedule.json
205+
- tests/translator/output/**/state_machine_with_schedule_dlq_retry_policy.json
206+
ignore_checks:
207+
- E2531 # Deprecated runtime; not relevant for transform tests
208+
- W2531 # EOL runtime; not relevant for transform tests
209+
- E3001 # Invalid or unsupported Type; common in transform tests since they focus on SAM resources
210+
include_checks:
211+
# Informational rules not enabled by default: https://github.com/aws-cloudformation/cfn-lint/blob/7219faeabe48063e68e1a3e63f0301c5b337d36e/README.md#info-rules
212+
- I3042 # Hardcoded ARN partition/account

.coveragerc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
[run]
22
branch = True
3+
omit =
4+
# Schema tested by `make check-black`
5+
samtranslator/schema/*
36
[report]
47
exclude_lines =
58
pragma: no cover

.github/ISSUE_TEMPLATE/bug_report.md

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

88
---
99

10-
<!-- Make sure we don't have an existing Issue that reports the bug you are seeing (both open and closed).
11-
If you do find an existing Issue, re-open or add a comment to that Issue instead of creating a new one. -->
10+
<!-- Make sure we don't have an existing issue that reports the bug you are encountering (both open and closed).
11+
If you do find an existing issue, re-open or add a comment to that issue instead of creating a new one.
12+
Add the --debug flag to any SAM CLI commands you are running. -->
1213

13-
### Description:
14+
### Description
1415
<!-- Briefly describe the bug you are facing.-->
1516

1617

18+
### Steps to reproduce
19+
<!-- Provide detailed steps to reproduce the bug. Include relevant parts of the SAM template. -->
1720

18-
### Steps to reproduce:
19-
<!-- Provide detailed steps to replicate the bug, including steps from third party tools (CDK, etc.) -->
2021

22+
### Observed result
23+
<!-- Describe what you observed. -->
2124

2225

23-
### Observed result:
24-
<!-- Please provide command output with `--debug` flag set.-->
26+
### Expected result
27+
<!-- Describe what you expected. -->
2528

2629

27-
28-
### Expected result:
29-
<!-- Describe what you expected.-->
30-
31-
32-
33-
### Additional environment details (Ex: Windows, Mac, Amazon Linux etc)
30+
### Additional environment details
3431

3532
1. OS:
36-
2. If using SAM CLI, `sam --version`:
33+
2. If using the [SAM CLI](https://github.com/aws/aws-sam-cli), `sam --version`:
3734
3. AWS region:
38-
39-
`Add --debug flag to any SAM CLI commands you are running`

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/other.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
name: Other
33
about: Choose if your issue doesn't apply to the other templates
44
title: ''
5-
labels: ['stage/needs-triage']
5+
labels: stage/needs-triage
66
assignees: ''
77

8-
---
8+
---
9+
10+

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,14 @@
77
### Checklist
88

99
- [ ] Adheres to the [development guidelines](https://github.com/aws/serverless-application-model/blob/develop/DEVELOPMENT_GUIDE.md#development-guidelines)
10-
- [ ] Add/update [unit tests](https://github.com/aws/serverless-application-model/blob/develop/DEVELOPMENT_GUIDE.md#unit-testing-with-multiple-python-versions) using:
11-
- [ ] Correct values
12-
- [ ] Bad/wrong values (None, empty, wrong type, length, etc.)
13-
- [ ] [Intrinsic Functions](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html)
10+
- [ ] Add/update [transform tests](https://github.com/aws/serverless-application-model/blob/develop/DEVELOPMENT_GUIDE.md#unit-testing-with-multiple-python-versions)
11+
- [ ] Using correct values
12+
- [ ] Using wrong values
1413
- [ ] Add/update [integration tests](https://github.com/aws/serverless-application-model/blob/develop/INTEGRATION_TESTS.md)
15-
- [ ] Update documentation
16-
- [ ] 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?
2014

2115
### Examples?
2216

23-
Please reach out in the comments, if you want to add an example. Examples will be
24-
added to `sam init` through https://github.com/awslabs/aws-sam-cli-app-templates/
17+
Please reach out in the comments if you want to add an example. Examples will be
18+
added to `sam init` through [aws/aws-sam-cli-app-templates](https://github.com/aws/aws-sam-cli-app-templates).
2519

2620
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/workflows/README.md

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

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
push:
55
branches:
66
- develop
7+
- "feat-*"
78
pull_request:
8-
branches:
9-
- develop
9+
workflow_dispatch:
1010

1111
jobs:
1212
build:

0 commit comments

Comments
 (0)