From c777c6020babcbb4e792c40b2ac9f331e074a081 Mon Sep 17 00:00:00 2001 From: Joshua Weber Date: Wed, 27 Jul 2022 22:26:50 +0200 Subject: [PATCH 1/4] :bug: fix(events): archive construct does not have defaultChild set --- packages/@aws-cdk/aws-events/lib/archive.ts | 2 +- .../@aws-cdk/aws-events/test/archive.test.ts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-events/lib/archive.ts b/packages/@aws-cdk/aws-events/lib/archive.ts index b4710cc3c7fb8..5ea930ece0916 100644 --- a/packages/@aws-cdk/aws-events/lib/archive.ts +++ b/packages/@aws-cdk/aws-events/lib/archive.ts @@ -64,7 +64,7 @@ export class Archive extends Resource { constructor(scope: Construct, id: string, props: ArchiveProps) { super(scope, id, { physicalName: props.archiveName }); - let archive = new CfnArchive(this, 'Archive', { + let archive = new CfnArchive(this, 'Default', { sourceArn: props.sourceEventBus.eventBusArn, description: props.description, eventPattern: renderEventPattern(props.eventPattern), diff --git a/packages/@aws-cdk/aws-events/test/archive.test.ts b/packages/@aws-cdk/aws-events/test/archive.test.ts index 8119961738cf1..55feb8a258c98 100644 --- a/packages/@aws-cdk/aws-events/test/archive.test.ts +++ b/packages/@aws-cdk/aws-events/test/archive.test.ts @@ -77,4 +77,20 @@ describe('archive', () => { }, }); }); + + test('should have defined defaultChild', () => { + const stack = new Stack(); + + const eventBus = new EventBus(stack, 'Bus'); + + const archive = new Archive(stack, 'Archive', { + sourceEventBus: eventBus, + eventPattern: { + account: [stack.account], + }, + retention: Duration.days(10), + }); + + expect(archive.node.defaultChild).toBeDefined(); + }); }); From 4430a40145758c5fdce9807fc2fe61faa424c9af Mon Sep 17 00:00:00 2001 From: daschaa Date: Thu, 28 Jul 2022 15:44:00 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Removes=20id=20rena?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/@aws-cdk/aws-events/lib/archive.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-events/lib/archive.ts b/packages/@aws-cdk/aws-events/lib/archive.ts index 5ea930ece0916..95d1e72ac2e11 100644 --- a/packages/@aws-cdk/aws-events/lib/archive.ts +++ b/packages/@aws-cdk/aws-events/lib/archive.ts @@ -64,7 +64,7 @@ export class Archive extends Resource { constructor(scope: Construct, id: string, props: ArchiveProps) { super(scope, id, { physicalName: props.archiveName }); - let archive = new CfnArchive(this, 'Default', { + let archive = new CfnArchive(this, 'Archive', { sourceArn: props.sourceEventBus.eventBusArn, description: props.description, eventPattern: renderEventPattern(props.eventPattern), @@ -74,5 +74,6 @@ export class Archive extends Resource { this.archiveArn = archive.attrArn; this.archiveName = archive.attrArchiveName; + this.node.defaultChild = archive; } } From 3639dfa718e2c1513555a3a62c8c87dd2106fbaf Mon Sep 17 00:00:00 2001 From: daschaa Date: Mon, 1 Aug 2022 08:31:23 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Changes=20due=20to=20r?= =?UTF-8?q?eview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/@aws-cdk/aws-events/package.json | 1 + .../IntegStack.assets.json | 19 ++++ .../IntegStack.template.json | 29 ++++++ .../test/archive.integ.snapshot/cdk.out | 1 + .../test/archive.integ.snapshot/integ.json | 14 +++ .../test/archive.integ.snapshot/manifest.json | 43 +++++++++ .../test/archive.integ.snapshot/tree.json | 92 +++++++++++++++++++ .../@aws-cdk/aws-events/test/archive.test.ts | 2 +- .../@aws-cdk/aws-events/test/integ.archive.ts | 18 ++++ 9 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.assets.json create mode 100644 packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.template.json create mode 100644 packages/@aws-cdk/aws-events/test/archive.integ.snapshot/cdk.out create mode 100644 packages/@aws-cdk/aws-events/test/archive.integ.snapshot/integ.json create mode 100644 packages/@aws-cdk/aws-events/test/archive.integ.snapshot/manifest.json create mode 100644 packages/@aws-cdk/aws-events/test/archive.integ.snapshot/tree.json create mode 100644 packages/@aws-cdk/aws-events/test/integ.archive.ts diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json index daceb1f27e8fb..12438f13391b3 100644 --- a/packages/@aws-cdk/aws-events/package.json +++ b/packages/@aws-cdk/aws-events/package.json @@ -85,6 +85,7 @@ "@aws-cdk/assertions": "0.0.0", "@aws-cdk/cdk-build-tools": "0.0.0", "@aws-cdk/cfn2ts": "0.0.0", + "@aws-cdk/integ-runner": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^27.5.2", "jest": "^27.5.1" diff --git a/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.assets.json b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.assets.json new file mode 100644 index 0000000000000..b2decb971c4a3 --- /dev/null +++ b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.assets.json @@ -0,0 +1,19 @@ +{ + "version": "20.0.0", + "files": { + "c328ab321c3d5fd5f5a82abed4520136f53bd07785ecd2a382c66fc17090bb0d": { + "source": { + "path": "IntegStack.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "c328ab321c3d5fd5f5a82abed4520136f53bd07785ecd2a382c66fc17090bb0d.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.template.json b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.template.json new file mode 100644 index 0000000000000..3597ce864ba57 --- /dev/null +++ b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/IntegStack.template.json @@ -0,0 +1,29 @@ +{ + "Resources": { + "EventBridgeF6D0CF9D": { + "Type": "AWS::Events::EventBus", + "Properties": { + "Name": "IntegStackEventBridgeF828A2C9" + } + }, + "MyCustomArchive": { + "Type": "AWS::Events::Archive", + "Properties": { + "SourceArn": { + "Fn::GetAtt": [ + "EventBridgeF6D0CF9D", + "Arn" + ] + }, + "EventPattern": { + "account": [ + { + "Ref": "AWS::AccountId" + } + ] + }, + "RetentionDays": 0 + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/cdk.out new file mode 100644 index 0000000000000..588d7b269d34f --- /dev/null +++ b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"20.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/integ.json b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/integ.json new file mode 100644 index 0000000000000..61f733fb5e8db --- /dev/null +++ b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/integ.json @@ -0,0 +1,14 @@ +{ + "version": "20.0.0", + "testCases": { + "integ.archive": { + "stacks": [ + "IntegStack" + ], + "diffAssets": false, + "stackUpdateWorkflow": true + } + }, + "synthContext": {}, + "enableLookups": false +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/manifest.json new file mode 100644 index 0000000000000..7d8745565413e --- /dev/null +++ b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/manifest.json @@ -0,0 +1,43 @@ +{ + "version": "20.0.0", + "artifacts": { + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + }, + "IntegStack": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "IntegStack.template.json", + "validateOnSynth": false + }, + "metadata": { + "/IntegStack/EventBridge/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "EventBridgeF6D0CF9D" + } + ], + "/IntegStack/Archive/Archive": [ + { + "type": "aws:cdk:logicalId", + "data": "MyCustomArchive" + } + ], + "Archive4DBC1EC9": [ + { + "type": "aws:cdk:logicalId", + "data": "Archive4DBC1EC9", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ] + }, + "displayName": "IntegStack" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/tree.json b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/tree.json new file mode 100644 index 0000000000000..f4aa900c9ece9 --- /dev/null +++ b/packages/@aws-cdk/aws-events/test/archive.integ.snapshot/tree.json @@ -0,0 +1,92 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.58" + } + }, + "IntegStack": { + "id": "IntegStack", + "path": "IntegStack", + "children": { + "EventBridge": { + "id": "EventBridge", + "path": "IntegStack/EventBridge", + "children": { + "Resource": { + "id": "Resource", + "path": "IntegStack/EventBridge/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Events::EventBus", + "aws:cdk:cloudformation:props": { + "name": "IntegStackEventBridgeF828A2C9" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-events.CfnEventBus", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-events.EventBus", + "version": "0.0.0" + } + }, + "Archive": { + "id": "Archive", + "path": "IntegStack/Archive", + "children": { + "Archive": { + "id": "Archive", + "path": "IntegStack/Archive/Archive", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Events::Archive", + "aws:cdk:cloudformation:props": { + "sourceArn": { + "Fn::GetAtt": [ + "EventBridgeF6D0CF9D", + "Arn" + ] + }, + "eventPattern": { + "account": [ + { + "Ref": "AWS::AccountId" + } + ] + }, + "retentionDays": 0 + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-events.CfnArchive", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-events.Archive", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-events/test/archive.test.ts b/packages/@aws-cdk/aws-events/test/archive.test.ts index 55feb8a258c98..595a845af60c0 100644 --- a/packages/@aws-cdk/aws-events/test/archive.test.ts +++ b/packages/@aws-cdk/aws-events/test/archive.test.ts @@ -91,6 +91,6 @@ describe('archive', () => { retention: Duration.days(10), }); - expect(archive.node.defaultChild).toBeDefined(); + expect(archive.node.defaultChild).toBe(archive.node.findChild('Archive')); }); }); diff --git a/packages/@aws-cdk/aws-events/test/integ.archive.ts b/packages/@aws-cdk/aws-events/test/integ.archive.ts new file mode 100644 index 0000000000000..d149d6bd8467b --- /dev/null +++ b/packages/@aws-cdk/aws-events/test/integ.archive.ts @@ -0,0 +1,18 @@ +import { App, Stack } from '@aws-cdk/core'; +import { Archive, CfnArchive, EventBus } from '../lib'; + +const app = new App(); + +const stack = new Stack(app, 'IntegStack'); + +const eventBus = new EventBus(stack, 'EventBridge'); + +const archive = new Archive(stack, 'Archive', { + sourceEventBus: eventBus, + eventPattern: { + account: [stack.account], + }, +}); +(archive.node.defaultChild as CfnArchive).overrideLogicalId('MyCustomArchive'); + +app.synth(); \ No newline at end of file From c2c97ff10638d969d57e0b7bf1dc06a5d99992db Mon Sep 17 00:00:00 2001 From: Joshua Weber Date: Mon, 1 Aug 2022 19:10:48 +0200 Subject: [PATCH 4/4] :white_check_mark: Adds the IntegTest structure to the integration test --- packages/@aws-cdk/aws-events/package.json | 1 + packages/@aws-cdk/aws-events/test/integ.archive.ts | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json index 12438f13391b3..d1d4acefa688b 100644 --- a/packages/@aws-cdk/aws-events/package.json +++ b/packages/@aws-cdk/aws-events/package.json @@ -86,6 +86,7 @@ "@aws-cdk/cdk-build-tools": "0.0.0", "@aws-cdk/cfn2ts": "0.0.0", "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/integ-tests": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^27.5.2", "jest": "^27.5.1" diff --git a/packages/@aws-cdk/aws-events/test/integ.archive.ts b/packages/@aws-cdk/aws-events/test/integ.archive.ts index d149d6bd8467b..b9a47ba6fafe6 100644 --- a/packages/@aws-cdk/aws-events/test/integ.archive.ts +++ b/packages/@aws-cdk/aws-events/test/integ.archive.ts @@ -1,4 +1,5 @@ import { App, Stack } from '@aws-cdk/core'; +import { IntegTest } from '@aws-cdk/integ-tests'; import { Archive, CfnArchive, EventBus } from '../lib'; const app = new App(); @@ -15,4 +16,8 @@ const archive = new Archive(stack, 'Archive', { }); (archive.node.defaultChild as CfnArchive).overrideLogicalId('MyCustomArchive'); -app.synth(); \ No newline at end of file +new IntegTest(app, 'ArchiveTest', { + testCases: [stack], +}); + +app.synth();