diff --git a/.github/workflows/build_test_invoke.yml b/.github/workflows/build_test_invoke.yml index 4354f313..6ce8d603 100644 --- a/.github/workflows/build_test_invoke.yml +++ b/.github/workflows/build_test_invoke.yml @@ -104,12 +104,12 @@ jobs: - version: '3.13' type: 'Invoke' file: 'tests/integration/build_invoke/python/test_python_3_13.py' - # - version: '3.14' - # type: 'Test' - # file: 'tests/integration/unit_test/test_unit_test_python3_14.py' - # - version: '3.14' - # type: 'Invoke' - # file: 'tests/integration/build_invoke/python/test_python_3_14.py' + - version: '3.14' + type: 'Test' + file: 'tests/integration/unit_test/test_unit_test_python3_14.py' + - version: '3.14' + type: 'Invoke' + file: 'tests/integration/build_invoke/python/test_python_3_14.py' env: PYTHON_VERSION_INSTALL: ${{ matrix.sam_cli_python || matrix.version }} runs-on: ubuntu-latest @@ -258,10 +258,9 @@ jobs: - version: '3.4' type: 'Test' file: 'tests/integration/unit_test/test_unit_test_ruby3_4.py' - # Uncomment after SAM CLI supports Ruby3.4 and the build image is available - # - version: '3.4' - # type: 'Invoke' - # file: 'tests/integration/build_invoke/ruby/test_ruby_3_4.py' + - version: '3.4' + type: 'Invoke' + file: 'tests/integration/build_invoke/ruby/test_ruby_3_4.py' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/nodejs22.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml b/nodejs22.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml index 8ceb8dfc..f4001b26 100644 --- a/nodejs22.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml +++ b/nodejs22.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml @@ -6,20 +6,6 @@ Description: > Sample SAM Template for {{ cookiecutter.project_name }} Resources: - # TODO: No longer necessary after https://github.com/aws/serverless-application-model/pull/3854 - DurableFunctionRole: - Type: AWS::IAM::Role - Properties: - AssumeRolePolicyDocument: - Version: '2012-10-17' - Statement: - - Effect: Allow - Principal: - Service: lambda.amazonaws.com - Action: sts:AssumeRole - ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy - HelloWorldFunction: Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction Properties: @@ -33,7 +19,6 @@ Resources: - {{arch}} {%- endfor %} {%- endif %} - Role: !GetAtt DurableFunctionRole.Arn AutoPublishAlias: Live DurableConfig: ExecutionTimeout: 900 @@ -64,6 +49,3 @@ Outputs: HelloWorldFunction: Description: "Hello World Lambda Function ARN" Value: !GetAtt HelloWorldFunction.Arn - HelloWorldFunctionIamRole: - Description: "IAM Role for Hello World function" - Value: !GetAtt DurableFunctionRole.Arn diff --git a/nodejs24.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml b/nodejs24.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml index d144e8c5..00424e47 100644 --- a/nodejs24.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml +++ b/nodejs24.x/hello-durable-ts/{{cookiecutter.project_name}}/template.yaml @@ -6,20 +6,6 @@ Description: > Sample SAM Template for {{ cookiecutter.project_name }} Resources: - # TODO: No longer necessary after https://github.com/aws/serverless-application-model/pull/3854 - DurableFunctionRole: - Type: AWS::IAM::Role - Properties: - AssumeRolePolicyDocument: - Version: '2012-10-17' - Statement: - - Effect: Allow - Principal: - Service: lambda.amazonaws.com - Action: sts:AssumeRole - ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy - HelloWorldFunction: Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction Properties: @@ -33,7 +19,6 @@ Resources: - {{arch}} {%- endfor %} {%- endif %} - Role: !GetAtt DurableFunctionRole.Arn AutoPublishAlias: Live DurableConfig: ExecutionTimeout: 900 @@ -64,6 +49,3 @@ Outputs: HelloWorldFunction: Description: "Hello World Lambda Function ARN" Value: !GetAtt HelloWorldFunction.Arn - HelloWorldFunctionIamRole: - Description: "IAM Role for Hello World function" - Value: !GetAtt DurableFunctionRole.Arn diff --git a/python3.13/hello-durable/{{cookiecutter.project_name}}/template.yaml b/python3.13/hello-durable/{{cookiecutter.project_name}}/template.yaml index edab15f4..78d72418 100644 --- a/python3.13/hello-durable/{{cookiecutter.project_name}}/template.yaml +++ b/python3.13/hello-durable/{{cookiecutter.project_name}}/template.yaml @@ -6,20 +6,6 @@ Description: > Sample SAM Template for {{ cookiecutter.project_name }} Resources: - # TODO: No longer necessary after https://github.com/aws/serverless-application-model/pull/3854 - DurableFunctionRole: - Type: AWS::IAM::Role - Properties: - AssumeRolePolicyDocument: - Version: '2012-10-17' - Statement: - - Effect: Allow - Principal: - Service: lambda.amazonaws.com - Action: sts:AssumeRole - ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy - HelloWorldFunction: Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction Properties: @@ -33,7 +19,6 @@ Resources: - {{arch}} {%- endfor %} {%- endif %} - Role: !GetAtt DurableFunctionRole.Arn AutoPublishAlias: Live DurableConfig: ExecutionTimeout: 900 @@ -55,6 +40,3 @@ Outputs: HelloWorldFunction: Description: "Hello World Lambda Function ARN" Value: !GetAtt HelloWorldFunction.Arn - HelloWorldFunctionIamRole: - Description: "IAM Role for Hello World function" - Value: !GetAtt DurableFunctionRole.Arn diff --git a/python3.14/hello-durable/{{cookiecutter.project_name}}/template.yaml b/python3.14/hello-durable/{{cookiecutter.project_name}}/template.yaml index 0071d5e7..29550391 100644 --- a/python3.14/hello-durable/{{cookiecutter.project_name}}/template.yaml +++ b/python3.14/hello-durable/{{cookiecutter.project_name}}/template.yaml @@ -6,20 +6,6 @@ Description: > Sample SAM Template for {{ cookiecutter.project_name }} Resources: - # TODO: No longer necessary after https://github.com/aws/serverless-application-model/pull/3854 - DurableFunctionRole: - Type: AWS::IAM::Role - Properties: - AssumeRolePolicyDocument: - Version: '2012-10-17' - Statement: - - Effect: Allow - Principal: - Service: lambda.amazonaws.com - Action: sts:AssumeRole - ManagedPolicyArns: - - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy - HelloWorldFunction: Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction Properties: @@ -33,7 +19,6 @@ Resources: - {{arch}} {%- endfor %} {%- endif %} - Role: !GetAtt DurableFunctionRole.Arn AutoPublishAlias: Live DurableConfig: ExecutionTimeout: 900 @@ -55,6 +40,3 @@ Outputs: HelloWorldFunction: Description: "Hello World Lambda Function ARN" Value: !GetAtt HelloWorldFunction.Arn - HelloWorldFunctionIamRole: - Description: "IAM Role for Hello World function" - Value: !GetAtt DurableFunctionRole.Arn diff --git a/tests/integration/unit_test/test_unit_test_python3_14.py b/tests/integration/unit_test/test_unit_test_python3_14.py index 35691438..6e2eca43 100644 --- a/tests/integration/unit_test/test_unit_test_python3_14.py +++ b/tests/integration/unit_test/test_unit_test_python3_14.py @@ -7,7 +7,7 @@ class UnitTest_python3_14_cookiecutter_aws_sam_hello_python(UnitTestBase.Python3 class UnitTest_python3_14_cookiecutter_aws_sam_hello_durable_python(UnitTestBase.Python314UnitTestBase): - directory = "python3.13/hello-durable" + directory = "python3.14/hello-durable" code_directories = ["hello_world"] test_dependencies = True