Skip to content

Commit 8e30da4

Browse files
authored
Merge branch 'main' into fix/502-ecs-payload-s3-pointer
2 parents 1ad937d + f765219 commit 8e30da4

8 files changed

Lines changed: 19 additions & 0 deletions

File tree

cdk/bootstrap/bootstrap-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,7 @@ Resources:
930930
- route53resolver:UpdateFirewallDomains
931931
- route53resolver:AssociateFirewallRuleGroup
932932
- route53resolver:DisassociateFirewallRuleGroup
933+
- route53resolver:UpdateFirewallRuleGroupAssociation
933934
- route53resolver:GetFirewallRuleGroupAssociation
934935
- route53resolver:ListFirewallRuleGroupAssociations
935936
- route53resolver:UpdateFirewallConfig
@@ -1191,6 +1192,7 @@ Resources:
11911192
- cloudwatch:TagResource
11921193
- cloudwatch:UntagResource
11931194
- logs:CreateDelivery
1195+
- logs:UpdateDeliveryConfiguration
11941196
- logs:DescribeDeliveries
11951197
- logs:GetDelivery
11961198
- logs:GetDeliveryDestination

cdk/bootstrap/policies/infrastructure.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
"route53resolver:UpdateFirewallDomains",
154154
"route53resolver:AssociateFirewallRuleGroup",
155155
"route53resolver:DisassociateFirewallRuleGroup",
156+
"route53resolver:UpdateFirewallRuleGroupAssociation",
156157
"route53resolver:GetFirewallRuleGroupAssociation",
157158
"route53resolver:ListFirewallRuleGroupAssociations",
158159
"route53resolver:UpdateFirewallConfig",

cdk/bootstrap/policies/observability.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"cloudwatch:TagResource",
4545
"cloudwatch:UntagResource",
4646
"logs:CreateDelivery",
47+
"logs:UpdateDeliveryConfiguration",
4748
"logs:DescribeDeliveries",
4849
"logs:GetDelivery",
4950
"logs:GetDeliveryDestination",

cdk/src/bootstrap/policies/infrastructure.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ export function infrastructurePolicy(): iam.PolicyDocument {
190190
'route53resolver:UpdateFirewallDomains',
191191
'route53resolver:AssociateFirewallRuleGroup',
192192
'route53resolver:DisassociateFirewallRuleGroup',
193+
'route53resolver:UpdateFirewallRuleGroupAssociation',
193194
'route53resolver:GetFirewallRuleGroupAssociation',
194195
'route53resolver:ListFirewallRuleGroupAssociations',
195196
'route53resolver:UpdateFirewallConfig',

cdk/src/bootstrap/policies/observability.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ export function observabilityPolicy(): iam.PolicyDocument {
7979
'cloudwatch:TagResource',
8080
'cloudwatch:UntagResource',
8181
'logs:CreateDelivery',
82+
'logs:UpdateDeliveryConfiguration',
8283
'logs:DescribeDeliveries',
8384
'logs:GetDelivery',
8485
'logs:GetDeliveryDestination',

cdk/test/handlers/shared/context-hydration.test.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,15 @@ global.fetch = mockFetch as unknown as typeof fetch;
7575
beforeEach(() => {
7676
jest.clearAllMocks();
7777
clearTokenCache();
78+
// hydrateContext falls back to process.env.MEMORY_ID when no memoryId option
79+
// is passed (context-hydration.ts:990). If MEMORY_ID leaks into the jest
80+
// process env (set by another test file, or the deploy env when the suite
81+
// runs in-container), the "memoryId not provided" tests would spuriously call
82+
// loadMemoryContext and fail — an order/environment-dependent flake that
83+
// forced the fork's build-gate to be bypassed with `git push --no-verify`.
84+
// Pin a clean "no ambient memory" baseline; tests that want memory pass the
85+
// memoryId option explicitly.
86+
delete process.env.MEMORY_ID;
7887
});
7988

8089
// ---------------------------------------------------------------------------

docs/design/DEPLOYMENT_ROLES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ CloudFormation stack operations, IAM roles/policies, VPC networking, and Route 5
238238
"route53resolver:UpdateFirewallDomains",
239239
"route53resolver:AssociateFirewallRuleGroup",
240240
"route53resolver:DisassociateFirewallRuleGroup",
241+
"route53resolver:UpdateFirewallRuleGroupAssociation",
241242
"route53resolver:GetFirewallRuleGroupAssociation",
242243
"route53resolver:ListFirewallRuleGroupAssociations",
243244
"route53resolver:UpdateFirewallConfig",
@@ -557,6 +558,7 @@ Bedrock Guardrails, CloudWatch Logs/Dashboards/Alarms, X-Ray, S3 (CDK assets), K
557558
"cloudwatch:TagResource",
558559
"cloudwatch:UntagResource",
559560
"logs:CreateDelivery",
561+
"logs:UpdateDeliveryConfiguration",
560562
"logs:DescribeDeliveries",
561563
"logs:GetDelivery",
562564
"logs:GetDeliveryDestination",

docs/src/content/docs/architecture/Deployment-roles.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ CloudFormation stack operations, IAM roles/policies, VPC networking, and Route 5
242242
"route53resolver:UpdateFirewallDomains",
243243
"route53resolver:AssociateFirewallRuleGroup",
244244
"route53resolver:DisassociateFirewallRuleGroup",
245+
"route53resolver:UpdateFirewallRuleGroupAssociation",
245246
"route53resolver:GetFirewallRuleGroupAssociation",
246247
"route53resolver:ListFirewallRuleGroupAssociations",
247248
"route53resolver:UpdateFirewallConfig",
@@ -561,6 +562,7 @@ Bedrock Guardrails, CloudWatch Logs/Dashboards/Alarms, X-Ray, S3 (CDK assets), K
561562
"cloudwatch:TagResource",
562563
"cloudwatch:UntagResource",
563564
"logs:CreateDelivery",
565+
"logs:UpdateDeliveryConfiguration",
564566
"logs:DescribeDeliveries",
565567
"logs:GetDelivery",
566568
"logs:GetDeliveryDestination",

0 commit comments

Comments
 (0)