diff --git a/packages/@aws-cdk/aws-iot/package.json b/packages/@aws-cdk/aws-iot/package.json index 985ea75c3e20d..09e07ec40d9bd 100644 --- a/packages/@aws-cdk/aws-iot/package.json +++ b/packages/@aws-cdk/aws-iot/package.json @@ -83,6 +83,7 @@ "@aws-cdk/assertions": "0.0.0", "@aws-cdk/cdk-build-tools": "0.0.0", "@aws-cdk/integ-runner": "0.0.0", + "@aws-cdk/integ-tests": "0.0.0", "@aws-cdk/cfn2ts": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^27.5.2", diff --git a/packages/@aws-cdk/aws-iot/test/integ.topic-rule.ts b/packages/@aws-cdk/aws-iot/test/integ.topic-rule.ts index c5a602141bda6..06df404f8c93e 100644 --- a/packages/@aws-cdk/aws-iot/test/integ.topic-rule.ts +++ b/packages/@aws-cdk/aws-iot/test/integ.topic-rule.ts @@ -1,9 +1,7 @@ -/// !cdk-integ pragma:ignore-assets import * as cdk from '@aws-cdk/core'; +import * as integ from '@aws-cdk/integ-tests'; import * as iot from '../lib'; -const app = new cdk.App(); - class TestStack extends cdk.Stack { constructor(scope: cdk.App, id: string, props?: cdk.StackProps) { super(scope, id, props); @@ -23,5 +21,10 @@ class TestStack extends cdk.Stack { } } -new TestStack(app, 'test-stack'); +const app = new cdk.App(); +const testCase = new TestStack(app, 'topic-rule-test-stack'); +new integ.IntegTest(app, 'TopicRule', { + testCases: [testCase], +}); + app.synth(); diff --git a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/TopicRuleDefaultTestDeployAssert86D4DD8C.template.json b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/TopicRuleDefaultTestDeployAssert86D4DD8C.template.json new file mode 100644 index 0000000000000..9e26dfeeb6e64 --- /dev/null +++ b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/TopicRuleDefaultTestDeployAssert86D4DD8C.template.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/cdk.out index 90bef2e09ad39..588d7b269d34f 100644 --- a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"20.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/integ.json b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/integ.json index 191adf9a94ffe..fbd4e6d7be0ba 100644 --- a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/integ.json +++ b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/integ.json @@ -1,14 +1,11 @@ { "version": "20.0.0", "testCases": { - "integ.topic-rule": { + "TopicRule/DefaultTest": { "stacks": [ - "test-stack" + "topic-rule-test-stack" ], - "diffAssets": false, - "stackUpdateWorkflow": true + "assertionStack": "TopicRule/DefaultTest/DeployAssert" } - }, - "synthContext": {}, - "enableLookups": false + } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/manifest.json index 442d0b446c090..9b3475876e317 100644 --- a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "20.0.0", "artifacts": { "Tree": { "type": "cdk:tree", @@ -7,22 +7,31 @@ "file": "tree.json" } }, - "test-stack": { + "topic-rule-test-stack": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "test-stack.template.json", + "templateFile": "topic-rule-test-stack.template.json", "validateOnSynth": false }, "metadata": { - "/test-stack/TopicRule/Resource": [ + "/topic-rule-test-stack/TopicRule/Resource": [ { "type": "aws:cdk:logicalId", "data": "TopicRule40A4EA44" } ] }, - "displayName": "test-stack" + "displayName": "topic-rule-test-stack" + }, + "TopicRuleDefaultTestDeployAssert86D4DD8C": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "TopicRuleDefaultTestDeployAssert86D4DD8C.template.json", + "validateOnSynth": false + }, + "displayName": "TopicRule/DefaultTest/DeployAssert" } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/test-stack.assets.json b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/test-stack.assets.json deleted file mode 100644 index d94156c2f4cc9..0000000000000 --- a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/test-stack.assets.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "17.0.0", - "files": { - "d50090fbe5678c31ed21caae07c16cfd4767778ce303e452ca29c31ece195f32": { - "source": { - "path": "test-stack.template.json", - "packaging": "file" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d50090fbe5678c31ed21caae07c16cfd4767778ce303e452ca29c31ece195f32.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-iot/test/topic-rule.integ.snapshot/test-stack.template.json b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/topic-rule-test-stack.template.json similarity index 100% rename from packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/test-stack.template.json rename to packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/topic-rule-test-stack.template.json diff --git a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/tree.json b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/tree.json index f5829e7ea2abf..a974dc54045bb 100644 --- a/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/tree.json +++ b/packages/@aws-cdk/aws-iot/test/topic-rule.integ.snapshot/tree.json @@ -9,20 +9,20 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.0.9" + "version": "10.1.85" } }, - "test-stack": { - "id": "test-stack", - "path": "test-stack", + "topic-rule-test-stack": { + "id": "topic-rule-test-stack", + "path": "topic-rule-test-stack", "children": { "TopicRule": { "id": "TopicRule", - "path": "test-stack/TopicRule", + "path": "topic-rule-test-stack/TopicRule", "children": { "Resource": { "id": "Resource", - "path": "test-stack/TopicRule/Resource", + "path": "topic-rule-test-stack/TopicRule/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IoT::TopicRule", "aws:cdk:cloudformation:props": { @@ -55,6 +55,42 @@ "fqn": "@aws-cdk/core.Stack", "version": "0.0.0" } + }, + "TopicRule": { + "id": "TopicRule", + "path": "TopicRule", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "TopicRule/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "TopicRule/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.85" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "TopicRule/DefaultTest/DeployAssert", + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTest", + "version": "0.0.0" + } } }, "constructInfo": {