Merge pull request #3167 from aws/release-v1.67.0

Release 1.67.0 (to main)

Author: hoffa

integration/helpers/deployer/exceptions/exceptions.py

@@ -38,6 +38,16 @@ def __init__(self, stack_name, msg):
         super().__init__(message=message_fmt.format(stack_name=self.stack_name, msg=msg))
 
 
+class TerminationProtectionUpdateFailedError(UserException):
+    def __init__(self, stack_name, msg):
+        self.stack_name = stack_name
+        self.msg = msg
+
+        message_fmt = "Failed to update termination protection of the stack: {stack_name}, {msg}"
+
+        super().__init__(message=message_fmt.format(stack_name=self.stack_name, msg=msg))
+
+
 class DeployStackOutPutFailedError(UserException):
     def __init__(self, stack_name, msg):
         self.stack_name = stack_name

integration/helpers/stack.py

@@ -3,7 +3,7 @@
 import botocore
 
 from integration.helpers.deployer.deployer import Deployer
-from integration.helpers.deployer.exceptions.exceptions import ThrottlingError
+from integration.helpers.deployer.exceptions.exceptions import TerminationProtectionUpdateFailedError, ThrottlingError
 from integration.helpers.deployer.utils.retry import retry_with_exponential_backoff_and_jitter
 from integration.helpers.resource import generate_suffix
 from integration.helpers.template import transform_template
@@ -54,6 +54,7 @@ def _deploy_stack(self, output_file_path, update, parameters=None):
                 self.deployer.wait_for_execute(self.stack_name, "UPDATE" if update else "CREATE")
 
         self._get_stack_description()
+        self._udpate_termination_protection()
         self.stack_resources = self.cfn_client.list_stack_resources(StackName=self.stack_name)
 
     @retry_with_exponential_backoff_and_jitter(ThrottlingError, 5, 360)
@@ -65,6 +66,12 @@ def _get_stack_description(self):
                 raise ThrottlingError(stack_name=self.stack_name, msg=str(ex))
             raise
 
+    def _udpate_termination_protection(self, enable=True):
+        try:
+            self.cfn_client.update_termination_protection(EnableTerminationProtection=enable, StackName=self.stack_name)
+        except botocore.exceptions.ClientError as ex:
+            raise TerminationProtectionUpdateFailedError(stack_name=self.stack_name, msg=str(ex))
+
     @staticmethod
     def _generate_output_file_path(file_path, output_dir):
         # add a folder name before file name to avoid possible collisions between

requirements/dev.txt

@@ -29,3 +29,7 @@ mypy~=1.1.0
 boto3-stubs[appconfig,serverlessrepo]>=1.19.5,==1.*
 types-PyYAML~=6.0
 types-jsonschema~=3.2
+
+# Check package version (backport importlib.metadata for python 3.7)
+# https://docs.python.org/3/library/importlib.metadata.html
+importlib_metadata; python_version < '3.8'

samtranslator/__init__.py

@@ -1 +1 @@
-__version__ = "1.66.0"
+__version__ = "1.67.0"

samtranslator/internal/data/aws_managed_policies.json

@@ -466,6 +466,7 @@ class ScheduleV2EventProperties(BaseModel):
     ScheduleExpressionTimezone: Optional[PassThroughProp] = schedulev2eventproperties("ScheduleExpressionTimezone")
     StartDate: Optional[PassThroughProp] = schedulev2eventproperties("StartDate")
     State: Optional[PassThroughProp] = schedulev2eventproperties("State")
+    OmitName: Optional[bool]  # TODO: add doc
 
 
 class ScheduleV2Event(BaseModel):

samtranslator/internal/schema_source/aws_serverless_function.py

@@ -72,6 +72,7 @@ class ScheduleV2EventProperties(BaseModel):
     ScheduleExpressionTimezone: Optional[PassThroughProp] = scheduleeventv2properties("ScheduleExpressionTimezone")
     StartDate: Optional[PassThroughProp] = scheduleeventv2properties("StartDate")
     State: Optional[PassThroughProp] = scheduleeventv2properties("State")
+    OmitName: Optional[bool]  # TODO: add doc
 
 
 class ScheduleV2Event(BaseModel):

samtranslator/internal/schema_source/aws_serverless_statemachine.py

@@ -30,15 +30,15 @@ def validate_dlq_config(source_logical_id, dead_letter_config):  # type: ignore[
         is_type_defined = "Type" in dead_letter_config
         if is_arn_defined and is_type_defined:
             raise InvalidEventException(
-                source_logical_id, "You can either define 'Arn' or 'Type' property of DeadLetterConfig"
+                source_logical_id, "You can either define 'Arn' or 'Type' property of DeadLetterConfig."
             )
         if is_type_defined and dead_letter_config.get("Type") not in supported_types:
             raise InvalidEventException(
                 source_logical_id,
-                "The only valid value for 'Type' property of DeadLetterConfig is 'SQS'",
+                "The only valid value for 'Type' property of DeadLetterConfig is 'SQS'.",
             )
         if not is_arn_defined and not is_type_defined:
-            raise InvalidEventException(source_logical_id, "No 'Arn' or 'Type' property provided for DeadLetterConfig")
+            raise InvalidEventException(source_logical_id, "No 'Arn' or 'Type' property provided for DeadLetterConfig.")
 
     @staticmethod
     def get_dlq_queue_arn_and_resources(cw_event_source, source_arn, attributes):  # type: ignore[no-untyped-def]

samtranslator/internal/schema_source/sam-docs.json

@@ -971,7 +971,7 @@ def _get_merged_definitions(
         - otherwise include key-value pairs from both definitions
         """
         merged_definition_body = source_definition_body.copy()
-        source_body_paths = merged_definition_body.get("paths", {})
+        source_body_paths = merged_definition_body.get("paths") or {}
 
         try:
             path_method_body = dict_deep_get(source_body_paths, [self.Path, self.Method]) or {}