From 9d2c0fee207d848ebb6213607549c95898f7bd7d Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Sun, 23 Jun 2024 12:57:55 +0900 Subject: [PATCH 1/9] add dead letter queue --- .../aws-cdk-lib/aws-events/lib/event-bus.ts | 13 +++++++++++++ .../aws-events/test/event-bus.test.ts | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/packages/aws-cdk-lib/aws-events/lib/event-bus.ts b/packages/aws-cdk-lib/aws-events/lib/event-bus.ts index 78f533c5a5536..6b4f88462b20f 100644 --- a/packages/aws-cdk-lib/aws-events/lib/event-bus.ts +++ b/packages/aws-cdk-lib/aws-events/lib/event-bus.ts @@ -2,6 +2,7 @@ import { Construct } from 'constructs'; import { Archive, BaseArchiveProps } from './archive'; import { CfnEventBus, CfnEventBusPolicy } from './events.generated'; import * as iam from '../../aws-iam'; +import * as sqs from '../../aws-sqs'; import { ArnFormat, IResource, Lazy, Names, Resource, Stack, Token } from '../../core'; /** @@ -78,6 +79,15 @@ export interface EventBusProps { * @default - no partner event source */ readonly eventSourceName?: string; + + /** + * Dead Letter Queue for the event bus + * + * @see https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-rule-event-delivery.html#eb-rule-dlq + * + * @default - no dead letter queue + */ + readonly deadLetterQueue?: sqs.IQueue; } /** @@ -320,6 +330,9 @@ export class EventBus extends EventBusBase { const eventBus = new CfnEventBus(this, 'Resource', { name: this.physicalName, eventSourceName, + deadLetterConfig: props?.deadLetterQueue ? { + arn: props.deadLetterQueue.queueArn, + } : undefined, }); this.eventBusArn = this.getResourceArnAttribute(eventBus.attrArn, { diff --git a/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts b/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts index da4a96a3763e3..b2777c8e6f7ab 100644 --- a/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts +++ b/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts @@ -4,6 +4,7 @@ import * as iam from '../../aws-iam'; import { Effect } from '../../aws-iam'; import { Aws, CfnResource, Stack, Arn, App, PhysicalName, CfnOutput } from '../../core'; import { EventBus } from '../lib'; +import * as sqs from 'aws-cdk-lib/aws-sqs'; describe('event bus', () => { test('default event bus', () => { @@ -625,4 +626,21 @@ describe('event bus', () => { actions: ['events:PutEvents'], }))).toThrow('Event Bus policy statements must have a sid'); }); + + test('set dead letter queue', () => { + const app = new App(); + const stack = new Stack(app, 'Stack'); + const dlq = new sqs.Queue(stack, 'DLQ'); + new EventBus(stack, 'Bus', { + deadLetterQueue: dlq, + }); + + Template.fromStack(stack).hasResourceProperties('AWS::Events::EventBus', { + DeadLetterConfig: { + Arn: { + 'Fn::GetAtt': ['DLQ581697C4', 'Arn'], + }, + }, + }); + }); }); From 4870c118d7c1cf274eb291a129cb26f5a6eaf1cd Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Sun, 23 Jun 2024 13:04:26 +0900 Subject: [PATCH 2/9] update integ test --- .../Stack.assets.json | 4 +- .../Stack.template.json | 13 +++ .../integ.eventbus.js.snapshot/manifest.json | 26 ++---- .../test/integ.eventbus.js.snapshot/tree.json | 82 +++++++++++++------ .../test/aws-events/test/integ.eventbus.ts | 8 +- 5 files changed, 85 insertions(+), 48 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json index 7e02c8ce09ced..53a42ca4976f3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "1ac02a396bc49bcce2ab3c276dd4e234efe7e86f9d1a06c9ae16c054f1764bf1": { + "ccb792a2f49b0857bd651c9417cbe5bc907d55cd7e9ebc88f0b0a39d864580c4": { "source": { "path": "Stack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "1ac02a396bc49bcce2ab3c276dd4e234efe7e86f9d1a06c9ae16c054f1764bf1.json", + "objectKey": "ccb792a2f49b0857bd651c9417cbe5bc907d55cd7e9ebc88f0b0a39d864580c4.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json index 0fc44e208d8ce..190a05c8f0162 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json @@ -1,8 +1,21 @@ { "Resources": { + "DLQ581697C4": { + "Type": "AWS::SQS::Queue", + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "BusEA82B648": { "Type": "AWS::Events::EventBus", "Properties": { + "DeadLetterConfig": { + "Arn": { + "Fn::GetAtt": [ + "DLQ581697C4", + "Arn" + ] + } + }, "Name": "StackBusAA0A1E4B" } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json index c943d4cd06dd7..48c72df454510 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1ac02a396bc49bcce2ab3c276dd4e234efe7e86f9d1a06c9ae16c054f1764bf1.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ccb792a2f49b0857bd651c9417cbe5bc907d55cd7e9ebc88f0b0a39d864580c4.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -34,6 +34,12 @@ "Stack.assets" ], "metadata": { + "/Stack/DLQ/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DLQ581697C4" + } + ], "/Stack/Bus/Resource": [ { "type": "aws:cdk:logicalId", @@ -63,24 +69,6 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } - ], - "BusStatement1B4D0336C": [ - { - "type": "aws:cdk:logicalId", - "data": "BusStatement1B4D0336C", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "BusStatement2B5FB314B": [ - { - "type": "aws:cdk:logicalId", - "data": "BusStatement2B5FB314B", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } ] }, "displayName": "Stack" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json index d1f3f70812aa6..9fa2842053434 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json @@ -8,6 +8,28 @@ "id": "Stack", "path": "Stack", "children": { + "DLQ": { + "id": "DLQ", + "path": "Stack/DLQ", + "children": { + "Resource": { + "id": "Resource", + "path": "Stack/DLQ/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::SQS::Queue", + "aws:cdk:cloudformation:props": {} + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, "Bus": { "id": "Bus", "path": "Stack/Bus", @@ -18,12 +40,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Events::EventBus", "aws:cdk:cloudformation:props": { + "deadLetterConfig": { + "arn": { + "Fn::GetAtt": [ + "DLQ581697C4", + "Arn" + ] + } + }, "name": "StackBusAA0A1E4B" } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_events.CfnEventBus", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "cdk-Statement1": { @@ -72,14 +102,14 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_events.CfnEventBusPolicy", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_events.EventBusPolicy", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "cdk-Statement2": { @@ -128,42 +158,42 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_events.CfnEventBusPolicy", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_events.EventBusPolicy", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_events.EventBus", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "BootstrapVersion": { "id": "BootstrapVersion", "path": "Stack/BootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "Stack/CheckBootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "IntegTest-EventBusStack": { @@ -190,22 +220,22 @@ "id": "BootstrapVersion", "path": "IntegTest-EventBusStack/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "IntegTest-EventBusStack/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, @@ -230,8 +260,8 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.App", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.ts index 08b54b635dd1b..be5aaf2cc9810 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.ts @@ -1,11 +1,17 @@ import * as iam from 'aws-cdk-lib/aws-iam'; +import * as sqs from 'aws-cdk-lib/aws-sqs'; import { App, Stack } from 'aws-cdk-lib'; import { IntegTest } from '@aws-cdk/integ-tests-alpha'; import { EventBus } from 'aws-cdk-lib/aws-events'; const app = new App(); const stack = new Stack(app, 'Stack'); -const bus = new EventBus(stack, 'Bus'); + +const dlq = new sqs.Queue(stack, 'DLQ'); + +const bus = new EventBus(stack, 'Bus', { + deadLetterQueue: dlq, +}); bus.addToResourcePolicy(new iam.PolicyStatement({ effect: iam.Effect.ALLOW, From 3bd833a61ec1ca603f09bc7eb0267eb4bb91cde3 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Sun, 23 Jun 2024 13:16:01 +0900 Subject: [PATCH 3/9] add readme --- packages/aws-cdk-lib/aws-events/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/aws-cdk-lib/aws-events/README.md b/packages/aws-cdk-lib/aws-events/README.md index 6becb63ddef5f..66fe39f9c1d75 100644 --- a/packages/aws-cdk-lib/aws-events/README.md +++ b/packages/aws-cdk-lib/aws-events/README.md @@ -233,6 +233,22 @@ bus.archive('MyArchive', { }); ``` +## Dead Letter Queue for EventBus + +It is possible to configure a Dead Letter Queue for an EventBus. This is useful when you want to capture events that could not be delivered to any of the targets. + +To configure a Dead Letter Queue for an EventBus, you can use the `deadLetterQueue` property of the `EventBus` construct. + +```ts +import * as sqs from 'aws-cdk-lib/aws-sqs'; + +const dlq = new sqs.Queue(this, 'DLQ'); + +const bus = new EventBus(this, 'Bus', { + deadLetterQueue: dlq, +}); +``` + ## Granting PutEvents to an existing EventBus To import an existing EventBus into your CDK application, use `EventBus.fromEventBusArn`, `EventBus.fromEventBusAttributes` From cf3f4a9a6065d775c33f718807127967716c42d1 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Sun, 23 Jun 2024 21:32:18 +0900 Subject: [PATCH 4/9] udpate readme --- packages/aws-cdk-lib/aws-events/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-events/README.md b/packages/aws-cdk-lib/aws-events/README.md index 66fe39f9c1d75..0e47cb57c436c 100644 --- a/packages/aws-cdk-lib/aws-events/README.md +++ b/packages/aws-cdk-lib/aws-events/README.md @@ -235,7 +235,7 @@ bus.archive('MyArchive', { ## Dead Letter Queue for EventBus -It is possible to configure a Dead Letter Queue for an EventBus. This is useful when you want to capture events that could not be delivered to any of the targets. +It is possible to configure a [Dead Letter Queue for an EventBus](https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-rule-event-delivery.html#eb-rule-dlq). This is useful when you want to capture events that could not be delivered to any of the targets. To configure a Dead Letter Queue for an EventBus, you can use the `deadLetterQueue` property of the `EventBus` construct. From 31ff8a0498d58270609338e1e7b9f902fcd7a681 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Mon, 24 Jun 2024 12:46:12 +0900 Subject: [PATCH 5/9] fix import order --- packages/aws-cdk-lib/aws-events/test/event-bus.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts b/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts index b2777c8e6f7ab..36ba07b3db830 100644 --- a/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts +++ b/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts @@ -2,9 +2,9 @@ import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from '../../assertions'; import * as iam from '../../aws-iam'; import { Effect } from '../../aws-iam'; +import * as sqs from '../../aws-sqs'; import { Aws, CfnResource, Stack, Arn, App, PhysicalName, CfnOutput } from '../../core'; import { EventBus } from '../lib'; -import * as sqs from 'aws-cdk-lib/aws-sqs'; describe('event bus', () => { test('default event bus', () => { From 97ba8e53a68bef7866406af867b8f89f99ed234d Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Mon, 24 Jun 2024 20:54:41 +0900 Subject: [PATCH 6/9] fix readme --- packages/aws-cdk-lib/aws-events/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-events/README.md b/packages/aws-cdk-lib/aws-events/README.md index 0e47cb57c436c..9552cc74ed4e2 100644 --- a/packages/aws-cdk-lib/aws-events/README.md +++ b/packages/aws-cdk-lib/aws-events/README.md @@ -244,7 +244,7 @@ import * as sqs from 'aws-cdk-lib/aws-sqs'; const dlq = new sqs.Queue(this, 'DLQ'); -const bus = new EventBus(this, 'Bus', { +const bus = new events.EventBus(this, 'Bus', { deadLetterQueue: dlq, }); ``` From deb5aee8bd7b323ae191b5dbcc171a57b1725fd9 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Sun, 30 Jun 2024 00:45:03 +0900 Subject: [PATCH 7/9] fix docs --- packages/aws-cdk-lib/aws-events/README.md | 2 +- packages/aws-cdk-lib/aws-events/lib/event-bus.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/aws-cdk-lib/aws-events/README.md b/packages/aws-cdk-lib/aws-events/README.md index 9552cc74ed4e2..61677e55b1554 100644 --- a/packages/aws-cdk-lib/aws-events/README.md +++ b/packages/aws-cdk-lib/aws-events/README.md @@ -233,7 +233,7 @@ bus.archive('MyArchive', { }); ``` -## Dead Letter Queue for EventBus +## Dead-Letter Queue for EventBus It is possible to configure a [Dead Letter Queue for an EventBus](https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-rule-event-delivery.html#eb-rule-dlq). This is useful when you want to capture events that could not be delivered to any of the targets. diff --git a/packages/aws-cdk-lib/aws-events/lib/event-bus.ts b/packages/aws-cdk-lib/aws-events/lib/event-bus.ts index 6b4f88462b20f..c32b0892a4f2c 100644 --- a/packages/aws-cdk-lib/aws-events/lib/event-bus.ts +++ b/packages/aws-cdk-lib/aws-events/lib/event-bus.ts @@ -81,11 +81,11 @@ export interface EventBusProps { readonly eventSourceName?: string; /** - * Dead Letter Queue for the event bus + * Dead-letter queue for the event bus * * @see https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-rule-event-delivery.html#eb-rule-dlq * - * @default - no dead letter queue + * @default - no dead-letter queue */ readonly deadLetterQueue?: sqs.IQueue; } From fbaa0931ee551a6a1e04593c2aadf19a907e5c06 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Tue, 6 Aug 2024 00:45:35 +0900 Subject: [PATCH 8/9] update snapshot --- .../test/integ.eventbus.js.snapshot/Stack.assets.json | 4 ++-- .../test/integ.eventbus.js.snapshot/Stack.template.json | 1 - .../test/integ.eventbus.js.snapshot/manifest.json | 2 +- .../aws-events/test/integ.eventbus.js.snapshot/tree.json | 9 --------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json index 53a42ca4976f3..541d9087e05d1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "ccb792a2f49b0857bd651c9417cbe5bc907d55cd7e9ebc88f0b0a39d864580c4": { + "4e0626c268009579b0fccd0ebbac5011ff565fe3cb7b8c9bcbd44ce93ee334f0": { "source": { "path": "Stack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ccb792a2f49b0857bd651c9417cbe5bc907d55cd7e9ebc88f0b0a39d864580c4.json", + "objectKey": "4e0626c268009579b0fccd0ebbac5011ff565fe3cb7b8c9bcbd44ce93ee334f0.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json index 5af76cde67ca6..92f501540d442 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json @@ -8,7 +8,6 @@ "BusEA82B648": { "Type": "AWS::Events::EventBus", "Properties": { - "Description": "myEventBus", "Name": "StackBusAA0A1E4B" } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json index 48c72df454510..a95eff75bd352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ccb792a2f49b0857bd651c9417cbe5bc907d55cd7e9ebc88f0b0a39d864580c4.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4e0626c268009579b0fccd0ebbac5011ff565fe3cb7b8c9bcbd44ce93ee334f0.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json index 05f7895c8c043..3c4e898bca960 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json @@ -40,15 +40,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Events::EventBus", "aws:cdk:cloudformation:props": { - "deadLetterConfig": { - "arn": { - "Fn::GetAtt": [ - "DLQ581697C4", - "Arn" - ] - } - }, - "description": "myEventBus", "name": "StackBusAA0A1E4B" } }, From fbf33c7ad6884b9b36fdab14cd79781b8ca30459 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Wed, 7 Aug 2024 06:43:14 +0900 Subject: [PATCH 9/9] update snapshots --- .../test/integ.eventbus.js.snapshot/Stack.assets.json | 4 ++-- .../test/integ.eventbus.js.snapshot/Stack.template.json | 9 +++++++++ .../test/integ.eventbus.js.snapshot/manifest.json | 2 +- .../aws-events/test/integ.eventbus.js.snapshot/tree.json | 9 +++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json index 541d9087e05d1..8283986c144e7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "4e0626c268009579b0fccd0ebbac5011ff565fe3cb7b8c9bcbd44ce93ee334f0": { + "4c3d1a4b2e322a4753eb4eaf49c45451cc6a8bd2662a6d2c740c369f3e55d10f": { "source": { "path": "Stack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "4e0626c268009579b0fccd0ebbac5011ff565fe3cb7b8c9bcbd44ce93ee334f0.json", + "objectKey": "4c3d1a4b2e322a4753eb4eaf49c45451cc6a8bd2662a6d2c740c369f3e55d10f.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json index 92f501540d442..0ca0b5065f5e4 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json @@ -8,6 +8,15 @@ "BusEA82B648": { "Type": "AWS::Events::EventBus", "Properties": { + "DeadLetterConfig": { + "Arn": { + "Fn::GetAtt": [ + "DLQ581697C4", + "Arn" + ] + } + }, + "Description": "myEventBus", "Name": "StackBusAA0A1E4B" } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json index a95eff75bd352..bf76759facbc8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4e0626c268009579b0fccd0ebbac5011ff565fe3cb7b8c9bcbd44ce93ee334f0.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c3d1a4b2e322a4753eb4eaf49c45451cc6a8bd2662a6d2c740c369f3e55d10f.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json index 3c4e898bca960..05f7895c8c043 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json @@ -40,6 +40,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Events::EventBus", "aws:cdk:cloudformation:props": { + "deadLetterConfig": { + "arn": { + "Fn::GetAtt": [ + "DLQ581697C4", + "Arn" + ] + } + }, + "description": "myEventBus", "name": "StackBusAA0A1E4B" } },