Skip to content

Commit b01c455

Browse files
authored
Merge branch 'develop' into develop
2 parents 79e8680 + 72f339a commit b01c455

14 files changed

+28
-24
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- "3.10"
2626
- "3.11"
2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
- uses: actions/setup-python@v6
3030
with:
3131
python-version: ${{ matrix.python }}

.github/workflows/check_compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout the PR
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- uses: actions/setup-python@v6
1717
with:
@@ -29,7 +29,7 @@ jobs:
2929
cp bin/public_interface.py "${{ runner.temp }}"/public_interface.py
3030
3131
- name: Checkout the base
32-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3333
with:
3434
ref: "${{ github.base_ref }}"
3535

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v5
43+
uses: actions/checkout@v6
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL

.github/workflows/schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write
1616

1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
- uses: actions/setup-python@v6
2020
with:
2121
python-version: "3.10"

samtranslator/model/sam_resources.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,11 @@ def _construct_role(
822822
else IAMRolePolicies.lambda_assume_role_policy()
823823
)
824824

825-
managed_policy_arns = [ArnGenerator.generate_aws_managed_policy_arn("service-role/AWSLambdaBasicExecutionRole")]
825+
managed_policy_arns = (
826+
[ArnGenerator.generate_aws_managed_policy_arn("service-role/AWSLambdaBasicDurableExecutionRolePolicy")]
827+
if self.DurableConfig
828+
else [ArnGenerator.generate_aws_managed_policy_arn("service-role/AWSLambdaBasicExecutionRole")]
829+
)
826830

827831
tracing = intrinsics_resolver.resolve_parameter_refs(self.Tracing)
828832

tests/translator/output/aws-cn/function_with_durable_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Version": "2012-10-17"
4747
},
4848
"ManagedPolicyArns": [
49-
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
49+
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
5050
],
5151
"Tags": [
5252
{

tests/translator/output/aws-cn/function_with_durable_config_globals.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Version": "2012-10-17"
4747
},
4848
"ManagedPolicyArns": [
49-
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
49+
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
5050
],
5151
"Tags": [
5252
{
@@ -103,7 +103,7 @@
103103
"Version": "2012-10-17"
104104
},
105105
"ManagedPolicyArns": [
106-
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
106+
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
107107
],
108108
"Tags": [
109109
{
@@ -160,7 +160,7 @@
160160
"Version": "2012-10-17"
161161
},
162162
"ManagedPolicyArns": [
163-
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
163+
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
164164
],
165165
"Tags": [
166166
{

tests/translator/output/aws-cn/globals_for_function.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"Version": "2012-10-17"
117117
},
118118
"ManagedPolicyArns": [
119-
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
119+
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy",
120120
"arn:aws-cn:iam::aws:policy/AWSXRayDaemonWriteAccess",
121121
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
122122
],
@@ -254,7 +254,7 @@
254254
"Version": "2012-10-17"
255255
},
256256
"ManagedPolicyArns": [
257-
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
257+
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy",
258258
"arn:aws-cn:iam::aws:policy/AWSXRayDaemonWriteAccess",
259259
"arn:aws-cn:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
260260
],

tests/translator/output/aws-us-gov/function_with_durable_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Version": "2012-10-17"
4747
},
4848
"ManagedPolicyArns": [
49-
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
49+
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
5050
],
5151
"Tags": [
5252
{

tests/translator/output/aws-us-gov/function_with_durable_config_globals.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Version": "2012-10-17"
4747
},
4848
"ManagedPolicyArns": [
49-
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
49+
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
5050
],
5151
"Tags": [
5252
{
@@ -103,7 +103,7 @@
103103
"Version": "2012-10-17"
104104
},
105105
"ManagedPolicyArns": [
106-
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
106+
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
107107
],
108108
"Tags": [
109109
{
@@ -160,7 +160,7 @@
160160
"Version": "2012-10-17"
161161
},
162162
"ManagedPolicyArns": [
163-
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
163+
"arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicDurableExecutionRolePolicy"
164164
],
165165
"Tags": [
166166
{

0 commit comments

Comments
 (0)