Merge branch 'develop' into tmp/1724090200/main

DEVELOPMENT_GUIDE.md

@@ -59,10 +59,10 @@ We format our code using [Black](https://github.com/python/black) and verify the
 during PR checks. Black will be installed automatically with `make init`.
 
 After installing, you can run our formatting through our Makefile by `make format` or integrating Black directly in your favorite IDE (instructions
-can be found [here](https://black.readthedocs.io/en/stable/editor_integration.html))
+can be found [here](https://black.readthedocs.io/en/stable/integrations/editors.html))
 
 ##### (Workaround) Integrating Black directly in your favorite IDE
-Since black is installed in virtualenv, when you follow [this instruction](https://black.readthedocs.io/en/stable/editor_integration.html), `which black` might give you this
+Since black is installed in virtualenv, when you follow [this instruction](https://black.readthedocs.io/en/stable/integrations/editors.html), `which black` might give you this
 
 ```bash
 (sam38) $ where black

bin/add_transform_test.py

@@ -68,8 +68,13 @@ def get_input_file_path() -> Path:
 
 
 def copy_input_file_to_transform_test_dir(input_file_path: Path, transform_test_input_path: Path) -> None:
-    shutil.copyfile(input_file_path, transform_test_input_path)
-    print(f"Transform Test input file generated {transform_test_input_path}")
+    try:
+        shutil.copyfile(input_file_path, transform_test_input_path)
+        print(f"Transform Test input file generated {transform_test_input_path}")
+    except shutil.SameFileError:
+        print(f"Source and destination are the same file: {input_file_path}")
+    except Exception as e:
+        raise e
 
 
 def verify_input_template(input_file_path: Path) -> None:
@@ -99,7 +104,9 @@ def main() -> None:
     verify_input_template(input_file_path)
 
     transform_test_input_path = TRANSFORM_TEST_DIR / "input" / (file_basename + ".yaml")
-    copy_input_file_to_transform_test_dir(input_file_path, transform_test_input_path)
+    # check if the template is not already in the transform test input dir
+    if input_file_path != transform_test_input_path:
+        copy_input_file_to_transform_test_dir(input_file_path, transform_test_input_path)
 
     generate_transform_test_output_files(transform_test_input_path, file_basename)
 

integration/resources/templates/combination/all_policy_templates.yaml

@@ -8,7 +8,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
       Policies:
 
       - SQSPollerPolicy:
@@ -123,7 +123,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
       Policies:
 
       - SESEmailTemplateCrudPolicy: {}
@@ -187,7 +187,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
       Policies:
       - ElasticMapReduceModifyInstanceFleetPolicy:
           ClusterId: name

integration/resources/templates/combination/api_with_authorizers_invokefunction_set_none.yaml

@@ -12,7 +12,7 @@ Resources:
       InlineCode: |
         print("hello")
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       Events:
         API3:
           Type: Api

integration/resources/templates/combination/connector_function_to_location_place_index.yaml

@@ -9,7 +9,7 @@ Resources:
   TriggerFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: python3.8
+      Runtime: python3.11
       Handler: index.handler
       InlineCode: |
         import boto3

integration/resources/templates/combination/depends_on.yaml

@@ -12,7 +12,7 @@ Resources:
       Role:
         Fn::GetAtt: LambdaRole.Arn
       Handler: lambda_function.lambda_handler
-      Runtime: python3.8
+      Runtime: python3.11
       Timeout: 15
       CodeUri: ${codeuri}
 

integration/resources/templates/combination/function_with_custom_code_deploy.yaml

@@ -10,7 +10,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
 
       AutoPublishAlias: Live
 

integration/resources/templates/combination/function_with_deployment_basic.yaml

@@ -5,7 +5,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
 
       AutoPublishAlias: Live
 

integration/resources/templates/combination/function_with_deployment_default_role_managed_policy.yaml

@@ -4,7 +4,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       AutoPublishAlias: Live
       DeploymentPreference:
         Type: Canary10Percent5Minutes

integration/resources/templates/combination/function_with_deployment_globals.yaml

@@ -16,7 +16,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       AutoPublishAlias: Live
 
   DeploymentRole:

integration/resources/templates/combination/function_with_http_api.yaml

@@ -3,7 +3,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       InlineCode: |
         def handler(event, context):
             return {'body': 'Hello World!', 'statusCode': 200}

integration/resources/templates/combination/function_with_http_api_default_path.yaml

@@ -3,7 +3,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       InlineCode: |
         def handler(event, context):
             return {'body': 'Hello World!', 'statusCode': 200}

integration/resources/templates/combination/function_with_implicit_http_api.yaml

@@ -4,7 +4,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       InlineCode: |
         def handler(event, context):
             return {'body': 'Hello World!', 'statusCode': 200}

integration/resources/templates/combination/function_with_policy_templates.yaml

@@ -14,7 +14,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
       Policies:
       - SQSPollerPolicy:
           QueueName:

integration/resources/templates/combination/function_with_resource_refs.yaml

@@ -10,14 +10,14 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
       AutoPublishAlias: Live
 
   MyOtherFunction:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: ${codeuri}
-      Runtime: python3.8
+      Runtime: python3.11
       Handler: hello.handler
       Environment:
         Variables:

integration/resources/templates/combination/http_api_with_auth.yaml

@@ -3,7 +3,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       InlineCode: |
         def handler(event, context):
             return {'body': 'Hello World!', 'statusCode': 200}

integration/resources/templates/combination/http_api_with_auth_updated.yaml

@@ -3,7 +3,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       InlineCode: |
         def handler(event, context):
             return {'body': 'Hello World!', 'statusCode': 200}

integration/resources/templates/combination/http_api_with_fail_on_warnings_and_default_stage_name.yaml

@@ -16,7 +16,7 @@ Resources:
       InlineCode: |
         def handler(event, context):
           print("Hello, world!")
-      Runtime: python3.8
+      Runtime: python3.11
       Architectures:
       - x86_64
       Events:

integration/resources/templates/combination/state_machine_with_policy_templates.yaml

@@ -24,7 +24,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
 
   MyQueue:
     Type: AWS::SQS::Queue

integration/resources/templates/single/basic_api_with_mode.yaml

@@ -9,7 +9,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       AutoPublishAlias: live
       InlineCode: |
         import json

integration/resources/templates/single/basic_api_with_mode_update.yaml

@@ -9,7 +9,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
       AutoPublishAlias: live
       InlineCode: |
         def handler(event, context):

integration/resources/templates/single/function_with_deployment_preference_alarms_intrinsic_if.yaml

@@ -9,7 +9,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
       AutoPublishAlias: live
       DeploymentPreference:
         Type: Linear10PercentEvery3Minutes

integration/resources/templates/single/function_with_role_path.yaml

@@ -4,7 +4,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: hello.handler
-      Runtime: python3.8
+      Runtime: python3.11
       RolePath: /foo/bar/
 Metadata:
   SamTransformTest: true

integration/resources/templates/single/state_machine_with_api.yaml

@@ -14,7 +14,7 @@ Resources:
             print(event)
             return "do nothing"
       Handler: index.handler
-      Runtime: python3.8
+      Runtime: python3.11
   Post:
     Type: AWS::Serverless::StateMachine
     Properties:

samtranslator/internal/schema_source/aws_serverless_statemachine.py

@@ -174,6 +174,7 @@ class Properties(BaseModel):
     Type: Optional[PassThroughProp] = properties("Type")
     AutoPublishAlias: Optional[PassThroughProp]
     DeploymentPreference: Optional[PassThroughProp]
+    UseAliasAsEventTarget: Optional[bool]
 
 
 class Resource(ResourceAttributes):

samtranslator/model/sam_resources.py

@@ -1781,6 +1781,7 @@ class SamStateMachine(SamResourceMacro):
         "PermissionsBoundary": PropertyType(False, IS_STR),
         "AutoPublishAlias": PassThroughProperty(False),
         "DeploymentPreference": MutatedPassThroughProperty(False),
+        "UseAliasAsEventTarget": Property(False, IS_BOOL),
     }
 
     Definition: Optional[Dict[str, Any]]
@@ -1799,6 +1800,7 @@ class SamStateMachine(SamResourceMacro):
     PermissionsBoundary: Optional[Intrinsicable[str]]
     AutoPublishAlias: Optional[PassThrough]
     DeploymentPreference: Optional[PassThrough]
+    UseAliasAsEventTarget: Optional[bool]
 
     event_resolver = ResourceTypeResolver(
         samtranslator.model.stepfunctions.events,
@@ -1837,6 +1839,7 @@ def to_cloudformation(self, **kwargs):  # type: ignore[no-untyped-def]
             get_managed_policy_map=get_managed_policy_map,
             auto_publish_alias=self.AutoPublishAlias,
             deployment_preference=self.DeploymentPreference,
+            use_alias_as_event_target=self.UseAliasAsEventTarget,
         )
 
         generated_resources = state_machine_generator.to_cloudformation()

samtranslator/model/stepfunctions/generators.py

@@ -54,6 +54,7 @@ def __init__(  # type: ignore[no-untyped-def] # noqa: PLR0913
         get_managed_policy_map=None,
         auto_publish_alias=None,
         deployment_preference=None,
+        use_alias_as_event_target=None,
     ):
         """
         Constructs an State Machine Generator class that generates a State Machine resource
@@ -81,6 +82,7 @@ def __init__(  # type: ignore[no-untyped-def] # noqa: PLR0913
         :param passthrough_resource_attributes: Attributes such as `Condition` that are added to derived resources
         :param auto_publish_alias: Name of the state machine alias to automatically create and update
         :deployment_preference: Settings to enable gradual state machine deployments
+        :param use_alias_as_event_target: Whether to use the state machine alias as the event target
         """
         self.logical_id = logical_id
         self.depends_on = depends_on
@@ -110,6 +112,7 @@ def __init__(  # type: ignore[no-untyped-def] # noqa: PLR0913
         self.get_managed_policy_map = get_managed_policy_map
         self.auto_publish_alias = auto_publish_alias
         self.deployment_preference = deployment_preference
+        self.use_alias_as_event_target = use_alias_as_event_target
 
     @cw_timer(prefix="Generator", name="StateMachine")
     def to_cloudformation(self):  # type: ignore[no-untyped-def]
@@ -300,6 +303,8 @@ def _construct_alias(self, version: StepFunctionsStateMachineVersion) -> StepFun
         deployment_preference["StateMachineVersionArn"] = state_machine_version_arn
         state_machine_alias.DeploymentPreference = deployment_preference
 
+        self.state_machine_alias = state_machine_alias
+
         return state_machine_alias
 
     def _generate_managed_traffic_shifting_resources(
@@ -310,6 +315,10 @@ def _generate_managed_traffic_shifting_resources(
         :returns: a list containing the state machine's version and alias resources
         :rtype: list
         """
+        if not self.auto_publish_alias and self.use_alias_as_event_target:
+            raise InvalidResourceException(
+                self.logical_id, "'UseAliasAsEventTarget' requires 'AutoPublishAlias' property to be specified."
+            )
         if not self.auto_publish_alias and not self.deployment_preference:
             return []
         if not self.auto_publish_alias and self.deployment_preference:
@@ -341,7 +350,12 @@ def _generate_event_resources(self) -> List[Dict[str, Any]]:
                         kwargs[name] = resource
                 except (TypeError, AttributeError) as e:
                     raise InvalidEventException(logical_id, str(e)) from e
-                resources += eventsource.to_cloudformation(resource=self.state_machine, **kwargs)
+                target_resource = (
+                    (self.state_machine_alias or self.state_machine)
+                    if self.use_alias_as_event_target
+                    else self.state_machine
+                )
+                resources += eventsource.to_cloudformation(resource=target_resource, **kwargs)
 
         return resources