From 41b2a51e11d87eac2d1ee2f2b5eb82cc18b35602 Mon Sep 17 00:00:00 2001 From: "Imtiaz Asad Bin, INI-DNA-DL" Date: Thu, 3 Oct 2024 19:31:05 +0200 Subject: [PATCH 1/6] feat(redshift-alpha): issue #31634: add support for RA3.large node type --- packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts | 5 +++++ packages/@aws-cdk/aws-redshift-alpha/test/cluster.test.ts | 4 ++-- packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts index a47841324456d..07a7dc7692afe 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts @@ -49,6 +49,11 @@ export enum NodeType { */ DC2_8XLARGE = 'dc2.8xlarge', + /** + * ra3.large + */ + RA3_LARGE = 'ra3.large', + /** * ra3.xlplus */ diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/cluster.test.ts b/packages/@aws-cdk/aws-redshift-alpha/test/cluster.test.ts index 0d4ee8ba951a2..cd10644e10c8c 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/test/cluster.test.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/test/cluster.test.ts @@ -671,7 +671,7 @@ describe('multi AZ cluster', () => { masterPassword: cdk.SecretValue.unsafePlainText('tooshort'), }, vpc, - nodeType: NodeType.RA3_XLPLUS, + nodeType: NodeType.RA3_LARGE, multiAz: true, }); @@ -684,7 +684,7 @@ describe('multi AZ cluster', () => { AutomatedSnapshotRetentionPeriod: 1, Encrypted: true, NumberOfNodes: 2, - NodeType: 'ra3.xlplus', + NodeType: 'ra3.large', DBName: 'default_db', PubliclyAccessible: false, ClusterSubnetGroupName: { Ref: 'RedshiftSubnetsDFE70E0A' }, diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md index 2de4a12515cb1..d4030cf1e93f5 100644 --- a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md +++ b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md @@ -141,7 +141,7 @@ The following json shows the current recommended set of flags, as `cdk init` wou "@aws-cdk/aws-s3:keepNotificationInImportedBucket": false, "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": true, "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": true, - "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true + "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true, "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true } } From a114c31b1e8e0d4111fd6eb215ebc6638740a4d0 Mon Sep 17 00:00:00 2001 From: "Imtiaz Asad Bin, INI-DNA-DL" Date: Fri, 4 Oct 2024 11:11:31 +0200 Subject: [PATCH 2/6] feat(redshift-alpha): issue #31634: added integration tests for redshift node type --- .../@aws-cdk/aws-redshift-alpha/README.md | 1 + .../test/integ.cluster-nodetype.ts | 35 + ...efaultTestDeployAssert1EF91947.assets.json | 19 + ...aultTestDeployAssert1EF91947.template.json | 36 + .../cdk.out | 1 + .../integ.json | 12 + .../manifest.json | 277 ++++++ .../redshift-ra3-large-integ.assets.json | 19 + .../redshift-ra3-large-integ.template.json | 536 ++++++++++ .../tree.json | 935 ++++++++++++++++++ 10 files changed, 1871 insertions(+) create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json diff --git a/packages/@aws-cdk/aws-redshift-alpha/README.md b/packages/@aws-cdk/aws-redshift-alpha/README.md index bd43d96f838f9..186b6621bbb75 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/README.md +++ b/packages/@aws-cdk/aws-redshift-alpha/README.md @@ -616,6 +616,7 @@ as it's a fast operation and typically completes in minutes. Elastic resize is o * dc2.8xlarge * ds2.xlarge * ds2.8xlarge + * ra3.large * ra3.xlplus * ra3.4xlarge * ra3.16xlarge diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts new file mode 100644 index 0000000000000..3c496b483a855 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts @@ -0,0 +1,35 @@ +import * as ec2 from 'aws-cdk-lib/aws-ec2'; +import { Stack, App, StackProps } from 'aws-cdk-lib'; +import * as integ from '@aws-cdk/integ-tests-alpha'; +import { Construct } from 'constructs'; +import * as redshift from '../lib'; + +class RedshiftRA3LargeTestStack extends Stack { + constructor(scope: Construct, id: string, props?: StackProps) { + super(scope, id, props); + + const vpc = new ec2.Vpc(this, 'VPC', { + restrictDefaultSecurityGroup: false + }); + + new redshift.Cluster(this, 'RA3LargeCluster', { + vpc: vpc, + vpcSubnets: { + subnetType: ec2.SubnetType.PUBLIC, + }, + masterUser: { + masterUsername: 'admin', + }, + nodeType: redshift.NodeType.RA3_LARGE, + numberOfNodes: 2, + }); + } +} + +const app = new App(); + +new integ.IntegTest(app, 'RA3LargeNodeIntegTest', { + testCases: [new RedshiftRA3LargeTestStack(app, 'redshift-ra3-large-integ')], +}); + +app.synth(); \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json new file mode 100644 index 0000000000000..872fc22389b0d --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json @@ -0,0 +1,19 @@ +{ + "version": "38.0.1", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.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-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out new file mode 100644 index 0000000000000..c6e612584e352 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json new file mode 100644 index 0000000000000..1bdca2edc87d9 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "38.0.1", + "testCases": { + "RA3LargeNodeIntegTest/DefaultTest": { + "stacks": [ + "redshift-ra3-large-integ" + ], + "assertionStack": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert", + "assertionStackName": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json new file mode 100644 index 0000000000000..077c59bbd73b9 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json @@ -0,0 +1,277 @@ +{ + "version": "38.0.1", + "artifacts": { + "redshift-ra3-large-integ.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "redshift-ra3-large-integ.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "redshift-ra3-large-integ": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "redshift-ra3-large-integ.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "notificationArns": [], + "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}/ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "redshift-ra3-large-integ.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "redshift-ra3-large-integ.assets" + ], + "metadata": { + "/redshift-ra3-large-integ/VPC/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCB9E5F0B4" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1SubnetB4246D30" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1RouteTableFEE4B781" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1RouteTableAssociation0B0896DC" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1DefaultRoute91CEF279" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1EIP6AD938E8" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1NATGatewayE0556630" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2Subnet74179F39" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2RouteTable6F1A15F1" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2RouteTableAssociation5A808732" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2DefaultRouteB7481BBA" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2EIP4947BC00" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2NATGateway3C070193" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1Subnet8BCA10E0" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1RouteTableBE8A6027" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1RouteTableAssociation347902D1" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1DefaultRouteAE1D6490" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2RouteTable0A19E10E" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2RouteTableAssociation0C73D413" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2DefaultRouteF4F5CFD2" + } + ], + "/redshift-ra3-large-integ/VPC/IGW": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCIGWB7E252D3" + } + ], + "/redshift-ra3-large-integ/VPC/VPCGW": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCVPCGW99B986DC" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Subnets/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSubnets3256497D" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSecurityGroupDEDD1AE1" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Secret/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSecret4A7DB934" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSecretAttachment853268E7" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterCA6C6D40" + } + ], + "/redshift-ra3-large-integ/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/redshift-ra3-large-integ/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "redshift-ra3-large-integ" + }, + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "notificationArns": [], + "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets" + ], + "metadata": { + "/RA3LargeNodeIntegTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/RA3LargeNodeIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json new file mode 100644 index 0000000000000..483e03805474e --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json @@ -0,0 +1,19 @@ +{ + "version": "38.0.1", + "files": { + "ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac": { + "source": { + "path": "redshift-ra3-large-integ.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac.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-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json new file mode 100644 index 0000000000000..10699d96f1523 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json @@ -0,0 +1,536 @@ +{ + "Resources": { + "VPCB9E5F0B4": { + "Type": "AWS::EC2::VPC", + "Properties": { + "CidrBlock": "10.0.0.0/16", + "EnableDnsHostnames": true, + "EnableDnsSupport": true, + "InstanceTenancy": "default", + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "VPCPublicSubnet1SubnetB4246D30": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.0.0/18", + "MapPublicIpOnLaunch": true, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Public" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet1RouteTableFEE4B781": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet1RouteTableAssociation0B0896DC": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + }, + "SubnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + } + } + }, + "VPCPublicSubnet1DefaultRoute91CEF279": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + } + }, + "DependsOn": [ + "VPCVPCGW99B986DC" + ] + }, + "VPCPublicSubnet1EIP6AD938E8": { + "Type": "AWS::EC2::EIP", + "Properties": { + "Domain": "vpc", + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + } + }, + "VPCPublicSubnet1NATGatewayE0556630": { + "Type": "AWS::EC2::NatGateway", + "Properties": { + "AllocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet1EIP6AD938E8", + "AllocationId" + ] + }, + "SubnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + }, + "DependsOn": [ + "VPCPublicSubnet1DefaultRoute91CEF279", + "VPCPublicSubnet1RouteTableAssociation0B0896DC" + ] + }, + "VPCPublicSubnet2Subnet74179F39": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.64.0/18", + "MapPublicIpOnLaunch": true, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Public" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet2RouteTable6F1A15F1": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet2RouteTableAssociation5A808732": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + }, + "SubnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + } + }, + "VPCPublicSubnet2DefaultRouteB7481BBA": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + } + }, + "DependsOn": [ + "VPCVPCGW99B986DC" + ] + }, + "VPCPublicSubnet2EIP4947BC00": { + "Type": "AWS::EC2::EIP", + "Properties": { + "Domain": "vpc", + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + } + }, + "VPCPublicSubnet2NATGateway3C070193": { + "Type": "AWS::EC2::NatGateway", + "Properties": { + "AllocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet2EIP4947BC00", + "AllocationId" + ] + }, + "SubnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + }, + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + }, + "DependsOn": [ + "VPCPublicSubnet2DefaultRouteB7481BBA", + "VPCPublicSubnet2RouteTableAssociation5A808732" + ] + }, + "VPCPrivateSubnet1Subnet8BCA10E0": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.128.0/18", + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Private" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Private" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet1RouteTableBE8A6027": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet1RouteTableAssociation347902D1": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + }, + "SubnetId": { + "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" + } + } + }, + "VPCPrivateSubnet1DefaultRouteAE1D6490": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "NatGatewayId": { + "Ref": "VPCPublicSubnet1NATGatewayE0556630" + }, + "RouteTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + } + } + }, + "VPCPrivateSubnet2SubnetCFCDAA7A": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.192.0/18", + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Private" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Private" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet2RouteTable0A19E10E": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet2RouteTableAssociation0C73D413": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + }, + "SubnetId": { + "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + } + }, + "VPCPrivateSubnet2DefaultRouteF4F5CFD2": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "NatGatewayId": { + "Ref": "VPCPublicSubnet2NATGateway3C070193" + }, + "RouteTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + } + } + }, + "VPCIGWB7E252D3": { + "Type": "AWS::EC2::InternetGateway", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "VPCVPCGW99B986DC": { + "Type": "AWS::EC2::VPCGatewayAttachment", + "Properties": { + "InternetGatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "RA3LargeClusterSubnets3256497D": { + "Type": "AWS::Redshift::ClusterSubnetGroup", + "Properties": { + "Description": "Subnets for RA3LargeCluster Redshift cluster", + "SubnetIds": [ + { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + ] + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + }, + "RA3LargeClusterSecurityGroupDEDD1AE1": { + "Type": "AWS::EC2::SecurityGroup", + "Properties": { + "GroupDescription": "Redshift security group", + "SecurityGroupEgress": [ + { + "CidrIp": "0.0.0.0/0", + "Description": "Allow all outbound traffic by default", + "IpProtocol": "-1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "RA3LargeClusterSecret4A7DB934": { + "Type": "AWS::SecretsManager::Secret", + "Properties": { + "GenerateSecretString": { + "ExcludeCharacters": "\"@/\\ '", + "GenerateStringKey": "password", + "PasswordLength": 30, + "SecretStringTemplate": "{\"username\":\"admin\"}" + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "RA3LargeClusterSecretAttachment853268E7": { + "Type": "AWS::SecretsManager::SecretTargetAttachment", + "Properties": { + "SecretId": { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + "TargetId": { + "Ref": "RA3LargeClusterCA6C6D40" + }, + "TargetType": "AWS::Redshift::Cluster" + } + }, + "RA3LargeClusterCA6C6D40": { + "Type": "AWS::Redshift::Cluster", + "Properties": { + "AllowVersionUpgrade": true, + "AutomatedSnapshotRetentionPeriod": 1, + "ClusterSubnetGroupName": { + "Ref": "RA3LargeClusterSubnets3256497D" + }, + "ClusterType": "multi-node", + "DBName": "default_db", + "Encrypted": true, + "MasterUserPassword": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:password::}}" + ] + ] + }, + "MasterUsername": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:username::}}" + ] + ] + }, + "NodeType": "ra3.large", + "NumberOfNodes": 2, + "PubliclyAccessible": false, + "VpcSecurityGroupIds": [ + { + "Fn::GetAtt": [ + "RA3LargeClusterSecurityGroupDEDD1AE1", + "GroupId" + ] + } + ] + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json new file mode 100644 index 0000000000000..a1b518727023c --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json @@ -0,0 +1,935 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "redshift-ra3-large-integ": { + "id": "redshift-ra3-large-integ", + "path": "redshift-ra3-large-integ", + "children": { + "VPC": { + "id": "VPC", + "path": "redshift-ra3-large-integ/VPC", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/VPC/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPC", + "aws:cdk:cloudformation:props": { + "cidrBlock": "10.0.0.0/16", + "enableDnsHostnames": true, + "enableDnsSupport": true, + "instanceTenancy": "default", + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", + "version": "0.0.0" + } + }, + "PublicSubnet1": { + "id": "PublicSubnet1", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.0.0/18", + "mapPublicIpOnLaunch": true, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Public" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + }, + "subnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "allocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet1EIP6AD938E8", + "AllocationId" + ] + }, + "subnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "PublicSubnet2": { + "id": "PublicSubnet2", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.64.0/18", + "mapPublicIpOnLaunch": true, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Public" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + }, + "subnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "allocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet2EIP4947BC00", + "AllocationId" + ] + }, + "subnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + }, + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "PrivateSubnet1": { + "id": "PrivateSubnet1", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.128.0/18", + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Private" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Private" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + }, + "subnetId": { + "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "VPCPublicSubnet1NATGatewayE0556630" + }, + "routeTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "PrivateSubnet2": { + "id": "PrivateSubnet2", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.192.0/18", + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Private" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Private" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + }, + "subnetId": { + "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "VPCPublicSubnet2NATGateway3C070193" + }, + "routeTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "IGW": { + "id": "IGW", + "path": "redshift-ra3-large-integ/VPC/IGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", + "version": "0.0.0" + } + }, + "VPCGW": { + "id": "VPCGW", + "path": "redshift-ra3-large-integ/VPC/VPCGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", + "aws:cdk:cloudformation:props": { + "internetGatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.Vpc", + "version": "0.0.0" + } + }, + "RA3LargeCluster": { + "id": "RA3LargeCluster", + "path": "redshift-ra3-large-integ/RA3LargeCluster", + "children": { + "Subnets": { + "id": "Subnets", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Subnets", + "children": { + "Default": { + "id": "Default", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Subnets/Default", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Redshift::ClusterSubnetGroup", + "aws:cdk:cloudformation:props": { + "description": "Subnets for RA3LargeCluster Redshift cluster", + "subnetIds": [ + { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_redshift.CfnClusterSubnetGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-redshift-alpha.ClusterSubnetGroup", + "version": "0.0.0" + } + }, + "SecurityGroup": { + "id": "SecurityGroup", + "path": "redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", + "aws:cdk:cloudformation:props": { + "groupDescription": "Redshift security group", + "securityGroupEgress": [ + { + "cidrIp": "0.0.0.0/0", + "description": "Allow all outbound traffic by default", + "ipProtocol": "-1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", + "version": "0.0.0" + } + }, + "Secret": { + "id": "Secret", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::SecretsManager::Secret", + "aws:cdk:cloudformation:props": { + "generateSecretString": { + "passwordLength": 30, + "secretStringTemplate": "{\"username\":\"admin\"}", + "generateStringKey": "password", + "excludeCharacters": "\"@/\\ '" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_secretsmanager.CfnSecret", + "version": "0.0.0" + } + }, + "Attachment": { + "id": "Attachment", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::SecretsManager::SecretTargetAttachment", + "aws:cdk:cloudformation:props": { + "secretId": { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + "targetId": { + "Ref": "RA3LargeClusterCA6C6D40" + }, + "targetType": "AWS::Redshift::Cluster" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_secretsmanager.CfnSecretTargetAttachment", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_secretsmanager.SecretTargetAttachment", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-redshift-alpha.DatabaseSecret", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Redshift::Cluster", + "aws:cdk:cloudformation:props": { + "allowVersionUpgrade": true, + "automatedSnapshotRetentionPeriod": 1, + "clusterSubnetGroupName": { + "Ref": "RA3LargeClusterSubnets3256497D" + }, + "clusterType": "multi-node", + "dbName": "default_db", + "encrypted": true, + "masterUsername": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:username::}}" + ] + ] + }, + "masterUserPassword": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:password::}}" + ] + ] + }, + "nodeType": "ra3.large", + "numberOfNodes": 2, + "publiclyAccessible": false, + "vpcSecurityGroupIds": [ + { + "Fn::GetAtt": [ + "RA3LargeClusterSecurityGroupDEDD1AE1", + "GroupId" + ] + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_redshift.CfnCluster", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-redshift-alpha.Cluster", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "redshift-ra3-large-integ/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "redshift-ra3-large-integ/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "RA3LargeNodeIntegTest": { + "id": "RA3LargeNodeIntegTest", + "path": "RA3LargeNodeIntegTest", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "RA3LargeNodeIntegTest/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "RA3LargeNodeIntegTest/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file From 9c311a3b651ba2fbab2e52df9d3e7d0ddf68293c Mon Sep 17 00:00:00 2001 From: "Imtiaz Asad Bin, INI-DNA-DL" Date: Fri, 4 Oct 2024 11:17:19 +0200 Subject: [PATCH 3/6] feat(redshift-alpha): issue #31634: merge conflict resolved --- packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md index d4030cf1e93f5..44de4cac4e2f2 100644 --- a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md +++ b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md @@ -142,7 +142,9 @@ The following json shows the current recommended set of flags, as `cdk init` wou "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": true, "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": true, "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true, - "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true + "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true, + "@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": true, + "@aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages": true } } ``` From 5399e65b7ff6fe07722246d9696a4fb668afad92 Mon Sep 17 00:00:00 2001 From: "Imtiaz Asad Bin, INI-DNA-DL" Date: Fri, 8 Nov 2024 19:47:12 +0100 Subject: [PATCH 4/6] feat(redshift-alpha): issue #31634: add support for RA3.large node type --- ...efaultTestDeployAssert1EF91947.assets.json | 19 + ...aultTestDeployAssert1EF91947.template.json | 36 + .../cdk.out | 1 + .../integ.json | 12 + .../manifest.json | 277 ++++++ .../redshift-ra3-large-integ.assets.json | 19 + .../redshift-ra3-large-integ.template.json | 536 ++++++++++ .../tree.json | 935 ++++++++++++++++++ .../test/integ.cluster-nodetype.ts | 2 +- tools/@aws-cdk/eslint-plugin/lib/index.d.ts | 6 - tools/@aws-cdk/eslint-plugin/lib/index.js | 10 - .../lib/private/import-cache.d.ts | 15 - .../eslint-plugin/lib/private/import-cache.js | 29 - .../lib/private/is-prod-file.d.ts | 4 - .../eslint-plugin/lib/private/is-prod-file.js | 15 - .../lib/rules/invalid-cfn-imports.d.ts | 2 - .../lib/rules/invalid-cfn-imports.js | 174 ---- .../lib/rules/no-core-construct.d.ts | 2 - .../lib/rules/no-core-construct.js | 151 --- .../lib/rules/no-invalid-path.d.ts | 2 - .../lib/rules/no-invalid-path.js | 79 -- .../lib/rules/no-literal-partition.d.ts | 7 - .../lib/rules/no-literal-partition.js | 38 - .../test/rules/fixtures.test.d.ts | 1 - .../eslint-plugin/test/rules/fixtures.test.js | 94 -- 25 files changed, 1836 insertions(+), 630 deletions(-) create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/cdk.out create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/integ.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/manifest.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.assets.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.template.json create mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/tree.json delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/index.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/index.js delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/private/import-cache.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/private/import-cache.js delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.js delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.js delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.js delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.js delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.js delete mode 100644 tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.d.ts delete mode 100644 tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.js diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json new file mode 100644 index 0000000000000..872fc22389b0d --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json @@ -0,0 +1,19 @@ +{ + "version": "38.0.1", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.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-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/cdk.out b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/cdk.out new file mode 100644 index 0000000000000..c6e612584e352 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/integ.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/integ.json new file mode 100644 index 0000000000000..1bdca2edc87d9 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "38.0.1", + "testCases": { + "RA3LargeNodeIntegTest/DefaultTest": { + "stacks": [ + "redshift-ra3-large-integ" + ], + "assertionStack": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert", + "assertionStackName": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/manifest.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/manifest.json new file mode 100644 index 0000000000000..077c59bbd73b9 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/manifest.json @@ -0,0 +1,277 @@ +{ + "version": "38.0.1", + "artifacts": { + "redshift-ra3-large-integ.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "redshift-ra3-large-integ.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "redshift-ra3-large-integ": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "redshift-ra3-large-integ.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "notificationArns": [], + "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}/ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "redshift-ra3-large-integ.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "redshift-ra3-large-integ.assets" + ], + "metadata": { + "/redshift-ra3-large-integ/VPC/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCB9E5F0B4" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1SubnetB4246D30" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1RouteTableFEE4B781" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1RouteTableAssociation0B0896DC" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1DefaultRoute91CEF279" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1EIP6AD938E8" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet1/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1NATGatewayE0556630" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2Subnet74179F39" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2RouteTable6F1A15F1" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2RouteTableAssociation5A808732" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2DefaultRouteB7481BBA" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2EIP4947BC00" + } + ], + "/redshift-ra3-large-integ/VPC/PublicSubnet2/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2NATGateway3C070193" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1Subnet8BCA10E0" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1RouteTableBE8A6027" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1RouteTableAssociation347902D1" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1DefaultRouteAE1D6490" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2RouteTable0A19E10E" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2RouteTableAssociation0C73D413" + } + ], + "/redshift-ra3-large-integ/VPC/PrivateSubnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2DefaultRouteF4F5CFD2" + } + ], + "/redshift-ra3-large-integ/VPC/IGW": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCIGWB7E252D3" + } + ], + "/redshift-ra3-large-integ/VPC/VPCGW": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCVPCGW99B986DC" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Subnets/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSubnets3256497D" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSecurityGroupDEDD1AE1" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Secret/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSecret4A7DB934" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterSecretAttachment853268E7" + } + ], + "/redshift-ra3-large-integ/RA3LargeCluster/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "RA3LargeClusterCA6C6D40" + } + ], + "/redshift-ra3-large-integ/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/redshift-ra3-large-integ/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "redshift-ra3-large-integ" + }, + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "notificationArns": [], + "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets" + ], + "metadata": { + "/RA3LargeNodeIntegTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/RA3LargeNodeIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.assets.json new file mode 100644 index 0000000000000..483e03805474e --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.assets.json @@ -0,0 +1,19 @@ +{ + "version": "38.0.1", + "files": { + "ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac": { + "source": { + "path": "redshift-ra3-large-integ.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac.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-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.template.json new file mode 100644 index 0000000000000..10699d96f1523 --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/redshift-ra3-large-integ.template.json @@ -0,0 +1,536 @@ +{ + "Resources": { + "VPCB9E5F0B4": { + "Type": "AWS::EC2::VPC", + "Properties": { + "CidrBlock": "10.0.0.0/16", + "EnableDnsHostnames": true, + "EnableDnsSupport": true, + "InstanceTenancy": "default", + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "VPCPublicSubnet1SubnetB4246D30": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.0.0/18", + "MapPublicIpOnLaunch": true, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Public" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet1RouteTableFEE4B781": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet1RouteTableAssociation0B0896DC": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + }, + "SubnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + } + } + }, + "VPCPublicSubnet1DefaultRoute91CEF279": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + } + }, + "DependsOn": [ + "VPCVPCGW99B986DC" + ] + }, + "VPCPublicSubnet1EIP6AD938E8": { + "Type": "AWS::EC2::EIP", + "Properties": { + "Domain": "vpc", + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + } + }, + "VPCPublicSubnet1NATGatewayE0556630": { + "Type": "AWS::EC2::NatGateway", + "Properties": { + "AllocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet1EIP6AD938E8", + "AllocationId" + ] + }, + "SubnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + }, + "DependsOn": [ + "VPCPublicSubnet1DefaultRoute91CEF279", + "VPCPublicSubnet1RouteTableAssociation0B0896DC" + ] + }, + "VPCPublicSubnet2Subnet74179F39": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.64.0/18", + "MapPublicIpOnLaunch": true, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Public" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet2RouteTable6F1A15F1": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPublicSubnet2RouteTableAssociation5A808732": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + }, + "SubnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + } + }, + "VPCPublicSubnet2DefaultRouteB7481BBA": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + } + }, + "DependsOn": [ + "VPCVPCGW99B986DC" + ] + }, + "VPCPublicSubnet2EIP4947BC00": { + "Type": "AWS::EC2::EIP", + "Properties": { + "Domain": "vpc", + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + } + }, + "VPCPublicSubnet2NATGateway3C070193": { + "Type": "AWS::EC2::NatGateway", + "Properties": { + "AllocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet2EIP4947BC00", + "AllocationId" + ] + }, + "SubnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + }, + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + }, + "DependsOn": [ + "VPCPublicSubnet2DefaultRouteB7481BBA", + "VPCPublicSubnet2RouteTableAssociation5A808732" + ] + }, + "VPCPrivateSubnet1Subnet8BCA10E0": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.128.0/18", + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Private" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Private" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet1RouteTableBE8A6027": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet1RouteTableAssociation347902D1": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + }, + "SubnetId": { + "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" + } + } + }, + "VPCPrivateSubnet1DefaultRouteAE1D6490": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "NatGatewayId": { + "Ref": "VPCPublicSubnet1NATGatewayE0556630" + }, + "RouteTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + } + } + }, + "VPCPrivateSubnet2SubnetCFCDAA7A": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.192.0/18", + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Private" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Private" + }, + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet2RouteTable0A19E10E": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "VPCPrivateSubnet2RouteTableAssociation0C73D413": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + }, + "SubnetId": { + "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + } + }, + "VPCPrivateSubnet2DefaultRouteF4F5CFD2": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "NatGatewayId": { + "Ref": "VPCPublicSubnet2NATGateway3C070193" + }, + "RouteTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + } + } + }, + "VPCIGWB7E252D3": { + "Type": "AWS::EC2::InternetGateway", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "VPCVPCGW99B986DC": { + "Type": "AWS::EC2::VPCGatewayAttachment", + "Properties": { + "InternetGatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "RA3LargeClusterSubnets3256497D": { + "Type": "AWS::Redshift::ClusterSubnetGroup", + "Properties": { + "Description": "Subnets for RA3LargeCluster Redshift cluster", + "SubnetIds": [ + { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + ] + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + }, + "RA3LargeClusterSecurityGroupDEDD1AE1": { + "Type": "AWS::EC2::SecurityGroup", + "Properties": { + "GroupDescription": "Redshift security group", + "SecurityGroupEgress": [ + { + "CidrIp": "0.0.0.0/0", + "Description": "Allow all outbound traffic by default", + "IpProtocol": "-1" + } + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "RA3LargeClusterSecret4A7DB934": { + "Type": "AWS::SecretsManager::Secret", + "Properties": { + "GenerateSecretString": { + "ExcludeCharacters": "\"@/\\ '", + "GenerateStringKey": "password", + "PasswordLength": 30, + "SecretStringTemplate": "{\"username\":\"admin\"}" + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "RA3LargeClusterSecretAttachment853268E7": { + "Type": "AWS::SecretsManager::SecretTargetAttachment", + "Properties": { + "SecretId": { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + "TargetId": { + "Ref": "RA3LargeClusterCA6C6D40" + }, + "TargetType": "AWS::Redshift::Cluster" + } + }, + "RA3LargeClusterCA6C6D40": { + "Type": "AWS::Redshift::Cluster", + "Properties": { + "AllowVersionUpgrade": true, + "AutomatedSnapshotRetentionPeriod": 1, + "ClusterSubnetGroupName": { + "Ref": "RA3LargeClusterSubnets3256497D" + }, + "ClusterType": "multi-node", + "DBName": "default_db", + "Encrypted": true, + "MasterUserPassword": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:password::}}" + ] + ] + }, + "MasterUsername": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:username::}}" + ] + ] + }, + "NodeType": "ra3.large", + "NumberOfNodes": 2, + "PubliclyAccessible": false, + "VpcSecurityGroupIds": [ + { + "Fn::GetAtt": [ + "RA3LargeClusterSecurityGroupDEDD1AE1", + "GroupId" + ] + } + ] + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/tree.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/tree.json new file mode 100644 index 0000000000000..b43de8eee7d1c --- /dev/null +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/tree.json @@ -0,0 +1,935 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "redshift-ra3-large-integ": { + "id": "redshift-ra3-large-integ", + "path": "redshift-ra3-large-integ", + "children": { + "VPC": { + "id": "VPC", + "path": "redshift-ra3-large-integ/VPC", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/VPC/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPC", + "aws:cdk:cloudformation:props": { + "cidrBlock": "10.0.0.0/16", + "enableDnsHostnames": true, + "enableDnsSupport": true, + "instanceTenancy": "default", + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", + "version": "0.0.0" + } + }, + "PublicSubnet1": { + "id": "PublicSubnet1", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.0.0/18", + "mapPublicIpOnLaunch": true, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Public" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + }, + "subnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "allocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet1EIP6AD938E8", + "AllocationId" + ] + }, + "subnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "PublicSubnet2": { + "id": "PublicSubnet2", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.64.0/18", + "mapPublicIpOnLaunch": true, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Public" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + }, + "subnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "allocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet2EIP4947BC00", + "AllocationId" + ] + }, + "subnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + }, + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "PrivateSubnet1": { + "id": "PrivateSubnet1", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.128.0/18", + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Private" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Private" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + }, + "subnetId": { + "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "VPCPublicSubnet1NATGatewayE0556630" + }, + "routeTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "PrivateSubnet2": { + "id": "PrivateSubnet2", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.192.0/18", + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Private" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Private" + }, + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + }, + "subnetId": { + "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "VPCPublicSubnet2NATGateway3C070193" + }, + "routeTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "IGW": { + "id": "IGW", + "path": "redshift-ra3-large-integ/VPC/IGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "redshift-ra3-large-integ/VPC" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", + "version": "0.0.0" + } + }, + "VPCGW": { + "id": "VPCGW", + "path": "redshift-ra3-large-integ/VPC/VPCGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", + "aws:cdk:cloudformation:props": { + "internetGatewayId": { + "Ref": "VPCIGWB7E252D3" + }, + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.Vpc", + "version": "0.0.0" + } + }, + "RA3LargeCluster": { + "id": "RA3LargeCluster", + "path": "redshift-ra3-large-integ/RA3LargeCluster", + "children": { + "Subnets": { + "id": "Subnets", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Subnets", + "children": { + "Default": { + "id": "Default", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Subnets/Default", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Redshift::ClusterSubnetGroup", + "aws:cdk:cloudformation:props": { + "description": "Subnets for RA3LargeCluster Redshift cluster", + "subnetIds": [ + { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + { + "Ref": "VPCPublicSubnet2Subnet74179F39" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_redshift.CfnClusterSubnetGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-redshift-alpha.ClusterSubnetGroup", + "version": "0.0.0" + } + }, + "SecurityGroup": { + "id": "SecurityGroup", + "path": "redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", + "aws:cdk:cloudformation:props": { + "groupDescription": "Redshift security group", + "securityGroupEgress": [ + { + "cidrIp": "0.0.0.0/0", + "description": "Allow all outbound traffic by default", + "ipProtocol": "-1" + } + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", + "version": "0.0.0" + } + }, + "Secret": { + "id": "Secret", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::SecretsManager::Secret", + "aws:cdk:cloudformation:props": { + "generateSecretString": { + "passwordLength": 30, + "secretStringTemplate": "{\"username\":\"admin\"}", + "generateStringKey": "password", + "excludeCharacters": "\"@/\\ '" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_secretsmanager.CfnSecret", + "version": "0.0.0" + } + }, + "Attachment": { + "id": "Attachment", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment", + "children": { + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::SecretsManager::SecretTargetAttachment", + "aws:cdk:cloudformation:props": { + "secretId": { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + "targetId": { + "Ref": "RA3LargeClusterCA6C6D40" + }, + "targetType": "AWS::Redshift::Cluster" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_secretsmanager.CfnSecretTargetAttachment", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_secretsmanager.SecretTargetAttachment", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-redshift-alpha.DatabaseSecret", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "redshift-ra3-large-integ/RA3LargeCluster/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Redshift::Cluster", + "aws:cdk:cloudformation:props": { + "allowVersionUpgrade": true, + "automatedSnapshotRetentionPeriod": 1, + "clusterSubnetGroupName": { + "Ref": "RA3LargeClusterSubnets3256497D" + }, + "clusterType": "multi-node", + "dbName": "default_db", + "encrypted": true, + "masterUsername": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:username::}}" + ] + ] + }, + "masterUserPassword": { + "Fn::Join": [ + "", + [ + "{{resolve:secretsmanager:", + { + "Ref": "RA3LargeClusterSecret4A7DB934" + }, + ":SecretString:password::}}" + ] + ] + }, + "nodeType": "ra3.large", + "numberOfNodes": 2, + "publiclyAccessible": false, + "vpcSecurityGroupIds": [ + { + "Fn::GetAtt": [ + "RA3LargeClusterSecurityGroupDEDD1AE1", + "GroupId" + ] + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_redshift.CfnCluster", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-redshift-alpha.Cluster", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "redshift-ra3-large-integ/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "redshift-ra3-large-integ/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "RA3LargeNodeIntegTest": { + "id": "RA3LargeNodeIntegTest", + "path": "RA3LargeNodeIntegTest", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "RA3LargeNodeIntegTest/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "RA3LargeNodeIntegTest/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.4.2" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.4.2" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts index 3c496b483a855..22d2e2f382f15 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts @@ -9,7 +9,7 @@ class RedshiftRA3LargeTestStack extends Stack { super(scope, id, props); const vpc = new ec2.Vpc(this, 'VPC', { - restrictDefaultSecurityGroup: false + restrictDefaultSecurityGroup: false, }); new redshift.Cluster(this, 'RA3LargeCluster', { diff --git a/tools/@aws-cdk/eslint-plugin/lib/index.d.ts b/tools/@aws-cdk/eslint-plugin/lib/index.d.ts deleted file mode 100644 index 69609e4327f17..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/index.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export declare const rules: { - 'no-core-construct': any; - 'invalid-cfn-imports': any; - 'no-literal-partition': any; - 'no-invalid-path': any; -}; diff --git a/tools/@aws-cdk/eslint-plugin/lib/index.js b/tools/@aws-cdk/eslint-plugin/lib/index.js deleted file mode 100644 index 76859c6db048f..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/index.js +++ /dev/null @@ -1,10 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.rules = void 0; -exports.rules = { - 'no-core-construct': require('./rules/no-core-construct'), - 'invalid-cfn-imports': require('./rules/invalid-cfn-imports'), - 'no-literal-partition': require('./rules/no-literal-partition'), - 'no-invalid-path': require('./rules/no-invalid-path'), -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLEtBQUssR0FBRztJQUNuQixtQkFBbUIsRUFBRSxPQUFPLENBQUMsMkJBQTJCLENBQUM7SUFDekQscUJBQXFCLEVBQUUsT0FBTyxDQUFDLDZCQUE2QixDQUFDO0lBQzdELHNCQUFzQixFQUFFLE9BQU8sQ0FBQyw4QkFBOEIsQ0FBQztJQUMvRCxpQkFBaUIsRUFBRSxPQUFPLENBQUMseUJBQXlCLENBQUM7Q0FDdEQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjb25zdCBydWxlcyA9IHtcbiAgJ25vLWNvcmUtY29uc3RydWN0JzogcmVxdWlyZSgnLi9ydWxlcy9uby1jb3JlLWNvbnN0cnVjdCcpLFxuICAnaW52YWxpZC1jZm4taW1wb3J0cyc6IHJlcXVpcmUoJy4vcnVsZXMvaW52YWxpZC1jZm4taW1wb3J0cycpLFxuICAnbm8tbGl0ZXJhbC1wYXJ0aXRpb24nOiByZXF1aXJlKCcuL3J1bGVzL25vLWxpdGVyYWwtcGFydGl0aW9uJyksXG4gICduby1pbnZhbGlkLXBhdGgnOiByZXF1aXJlKCcuL3J1bGVzL25vLWludmFsaWQtcGF0aCcpLFxufTtcbiJdfQ== \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/lib/private/import-cache.d.ts b/tools/@aws-cdk/eslint-plugin/lib/private/import-cache.d.ts deleted file mode 100644 index 7b184d8feb35d..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/private/import-cache.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export interface ImportCacheKey { - readonly fileName: string; - readonly typeName: string; -} -export type Node = any; -export interface ImportCacheRecord extends ImportCacheKey { - readonly importNode: Node; - readonly localName: string; -} -export declare class ImportCache { - private records; - record(record: ImportCacheRecord): void; - find(key: ImportCacheKey): ImportCacheRecord | undefined; - get imports(): ImportCacheRecord[]; -} diff --git a/tools/@aws-cdk/eslint-plugin/lib/private/import-cache.js b/tools/@aws-cdk/eslint-plugin/lib/private/import-cache.js deleted file mode 100644 index c3c2b59db8c8b..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/private/import-cache.js +++ /dev/null @@ -1,29 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ImportCache = void 0; -const crypto = require("crypto"); -class ImportCache { - constructor() { - this.records = {}; - } - record(record) { - const key = { - fileName: record.fileName, - typeName: record.typeName, - }; - this.records[hashed(key)] = record; - } - find(key) { - return this.records[hashed(key)]; - } - get imports() { - return Object.values(this.records); - } -} -exports.ImportCache = ImportCache; -function hashed(key) { - const hash = crypto.createHash('md5'); - hash.update(JSON.stringify(key)); - return hash.digest('hex'); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0LWNhY2hlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW1wb3J0LWNhY2hlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGlDQUFpQztBQWlCakMsTUFBYSxXQUFXO0lBQXhCO1FBQ1UsWUFBTyxHQUF5QyxFQUFFLENBQUM7SUFpQjdELENBQUM7SUFmUSxNQUFNLENBQUMsTUFBeUI7UUFDckMsTUFBTSxHQUFHLEdBQW1CO1lBQzFCLFFBQVEsRUFBRSxNQUFNLENBQUMsUUFBUTtZQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVE7U0FDMUIsQ0FBQztRQUNGLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsTUFBTSxDQUFDO0lBQ3JDLENBQUM7SUFFTSxJQUFJLENBQUMsR0FBbUI7UUFDN0IsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFRCxJQUFXLE9BQU87UUFDaEIsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNyQyxDQUFDO0NBQ0Y7QUFsQkQsa0NBa0JDO0FBRUQsU0FBUyxNQUFNLENBQUMsR0FBTztJQUNyQixNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3RDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ2pDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUM1QixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgY3J5cHRvIGZyb20gJ2NyeXB0byc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSW1wb3J0Q2FjaGVLZXkge1xuICByZWFkb25seSBmaWxlTmFtZTogc3RyaW5nO1xuICByZWFkb25seSB0eXBlTmFtZTogc3RyaW5nO1xufVxuXG4vLyBgbm9kZWAgaXMgYSB0eXBlIGZyb20gQHR5cGVzY3JpcHQtZXNsaW50L3R5cGVzY3JpcHQtZXN0cmVlLCBidXQgdXNpbmcgJ2FueScgZm9yIG5vd1xuLy8gc2luY2UgaXQncyBpbmNvbXBhdGlibGUgd2l0aCBlc2xpbnQuUnVsZSBuYW1lc3BhY2UuIFdhaXRpbmcgZm9yIGJldHRlciBjb21wYXRpYmlsaXR5IGluXG4vLyBodHRwczovL2dpdGh1Yi5jb20vdHlwZXNjcmlwdC1lc2xpbnQvdHlwZXNjcmlwdC1lc2xpbnQvdHJlZS8xNzY1YTE3OGU0NTZiMTUyYmQ0ODE5MmViNWRiN2U4NTQxZTJhZGYyL3BhY2thZ2VzL2V4cGVyaW1lbnRhbC11dGlscyNub3RlXG5leHBvcnQgdHlwZSBOb2RlID0gYW55O1xuXG5leHBvcnQgaW50ZXJmYWNlIEltcG9ydENhY2hlUmVjb3JkIGV4dGVuZHMgSW1wb3J0Q2FjaGVLZXkge1xuICByZWFkb25seSBpbXBvcnROb2RlOiBOb2RlO1xuICByZWFkb25seSBsb2NhbE5hbWU6IHN0cmluZ1xufVxuXG5leHBvcnQgY2xhc3MgSW1wb3J0Q2FjaGUge1xuICBwcml2YXRlIHJlY29yZHM6IHsgW2tleTogc3RyaW5nXTogSW1wb3J0Q2FjaGVSZWNvcmQgfSA9IHt9O1xuXG4gIHB1YmxpYyByZWNvcmQocmVjb3JkOiBJbXBvcnRDYWNoZVJlY29yZCk6IHZvaWQge1xuICAgIGNvbnN0IGtleTogSW1wb3J0Q2FjaGVLZXkgPSB7XG4gICAgICBmaWxlTmFtZTogcmVjb3JkLmZpbGVOYW1lLFxuICAgICAgdHlwZU5hbWU6IHJlY29yZC50eXBlTmFtZSxcbiAgICB9O1xuICAgIHRoaXMucmVjb3Jkc1toYXNoZWQoa2V5KV0gPSByZWNvcmQ7XG4gIH1cbiAgXG4gIHB1YmxpYyBmaW5kKGtleTogSW1wb3J0Q2FjaGVLZXkpOiBJbXBvcnRDYWNoZVJlY29yZCB8IHVuZGVmaW5lZCB7XG4gICAgcmV0dXJuIHRoaXMucmVjb3Jkc1toYXNoZWQoa2V5KV07XG4gIH1cblxuICBwdWJsaWMgZ2V0IGltcG9ydHMoKTogSW1wb3J0Q2FjaGVSZWNvcmRbXSB7XG4gICAgcmV0dXJuIE9iamVjdC52YWx1ZXModGhpcy5yZWNvcmRzKTtcbiAgfVxufVxuXG5mdW5jdGlvbiBoYXNoZWQoa2V5OiB7fSk6IHN0cmluZyB7XG4gIGNvbnN0IGhhc2ggPSBjcnlwdG8uY3JlYXRlSGFzaCgnbWQ1Jyk7XG4gIGhhc2gudXBkYXRlKEpTT04uc3RyaW5naWZ5KGtleSkpO1xuICByZXR1cm4gaGFzaC5kaWdlc3QoJ2hleCcpO1xufSJdfQ== \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.d.ts b/tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.d.ts deleted file mode 100644 index 14f030e856d62..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -/** - * We don't care about project test files (in a /test/ directory, excluding our fixtures) - */ -export declare function isProdFile(filename: string): boolean; diff --git a/tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.js b/tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.js deleted file mode 100644 index 17b98f801e224..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/private/is-prod-file.js +++ /dev/null @@ -1,15 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.isProdFile = void 0; -const path = require("path"); -/** - * We don't care about project test files (in a /test/ directory, excluding our fixtures) - */ -function isProdFile(filename) { - const isInTestFolder = new RegExp(/\/test\//).test(filename); - const isTestingPackage = new RegExp(/@aws-cdk-testing/).test(filename); - const isInOurTestFolder = path.resolve(filename).startsWith(path.resolve(__dirname, '..', '..', 'test')); - return (!isInTestFolder && !isTestingPackage) || isInOurTestFolder; -} -exports.isProdFile = isProdFile; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXMtcHJvZC1maWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaXMtcHJvZC1maWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE2QjtBQUU3Qjs7R0FFRztBQUNILFNBQWdCLFVBQVUsQ0FBQyxRQUFnQjtJQUN6QyxNQUFNLGNBQWMsR0FBRyxJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDN0QsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUV2RSxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUV6RyxPQUFPLENBQUMsQ0FBQyxjQUFjLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLGlCQUFpQixDQUFDO0FBQ3JFLENBQUM7QUFQRCxnQ0FPQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHBhdGggZnJvbSAncGF0aCc7XG5cbi8qKlxuICogV2UgZG9uJ3QgY2FyZSBhYm91dCBwcm9qZWN0IHRlc3QgZmlsZXMgKGluIGEgL3Rlc3QvIGRpcmVjdG9yeSwgZXhjbHVkaW5nIG91ciBmaXh0dXJlcylcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGlzUHJvZEZpbGUoZmlsZW5hbWU6IHN0cmluZykge1xuICBjb25zdCBpc0luVGVzdEZvbGRlciA9IG5ldyBSZWdFeHAoL1xcL3Rlc3RcXC8vKS50ZXN0KGZpbGVuYW1lKTtcbiAgY29uc3QgaXNUZXN0aW5nUGFja2FnZSA9IG5ldyBSZWdFeHAoL0Bhd3MtY2RrLXRlc3RpbmcvKS50ZXN0KGZpbGVuYW1lKTtcblxuICBjb25zdCBpc0luT3VyVGVzdEZvbGRlciA9IHBhdGgucmVzb2x2ZShmaWxlbmFtZSkuc3RhcnRzV2l0aChwYXRoLnJlc29sdmUoX19kaXJuYW1lLCAnLi4nLCAnLi4nLCAndGVzdCcpKTtcblxuICByZXR1cm4gKCFpc0luVGVzdEZvbGRlciAmJiAhaXNUZXN0aW5nUGFja2FnZSkgfHwgaXNJbk91clRlc3RGb2xkZXI7XG59XG4iXX0= \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.d.ts b/tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.d.ts deleted file mode 100644 index 8d0dfdcab1186..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import { Rule } from 'eslint'; -export declare function create(context: Rule.RuleContext): Rule.NodeListener; diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.js b/tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.js deleted file mode 100644 index a2d492ae0cfd7..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/invalid-cfn-imports.js +++ /dev/null @@ -1,174 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.create = void 0; -const fs = require("fs-extra"); -const path = require("path"); -let namespaceImports = {}; -function create(context) { - // The format of Cfn imports only matters for alpha packages, so that they can be - // formatted correctly when released separately for V2. The linter rule should only be - // applied if the file is in an alpha package, or it is a test file. - const filename = context.getFilename(); - if (!currentFileIsInAlphaPackage(filename) && !filename.match('test/rules/fixtures')) { - return {}; - } - return { - ImportDeclaration: node => { - const location = node.source.value; - // Store all of the 'import * as name from location' imports, so that we can check the location when - // we find name.CfnXXX references. - node.specifiers.forEach(e => { - if (e.type === 'ImportNamespaceSpecifier') { - namespaceImports[e.local.name] = location; - } - }); - if (location.endsWith('generated') || location === '@aws-cdk/core') { - // If importing directly from a generated file, this is fine. Also we know that aws-cdk/core is not experimental, so that is fine as well. - return; - } - const cfnImports = []; - const otherImports = []; - node.specifiers.forEach(e => { - if (e.type === 'ImportSpecifier') { - if (e.imported.name.startsWith('Cfn')) { - cfnImports.push(e); - } - else { - otherImports.push(e); - } - } - }); - if (cfnImports.length > 0 && otherImports.length > 0 && location.startsWith('.')) { - // import { CfnXXX, SomethingElse, AnotherThing } from './some/relative/path/not/ending/in/generated'; - context.report({ - message: 'To allow rewriting imports when generating v2 experimental packages, import of `' + cfnImports.map(e => e.imported.name).join(', ') + '` must be separate from import of `' + otherImports.map(e => e.imported.name).join(', ') + '`, and imported from its specific .generated location.', - node: node, - }); - } - else if (cfnImports.length > 0 && location.startsWith('.')) { - // import { CfnXXX } from './some/relative/path/not/ending/in/generated'; - context.report({ - message: 'To allow rewriting imports when generating v2 experimental packages, import of `' + cfnImports.map(e => e.imported.name).join(', ') + '` must be imported from its specific .generated location.', - node: node, - }); - } - else if (cfnImports.length > 0 && otherImports.length > 0 && checkIfImportedLocationIsAnAlphaPackage(location, context.getFilename())) { - // import { CfnXXX, SomethingElse, AnotherThing } from '@aws-cdk/another-alpha-package'; - context.report({ - message: 'To allow rewriting imports when generating v2 experimental packages, import of `' + cfnImports.map(e => e.imported.name).join(', ') + '` must be separate from import of `' + otherImports.map(e => e.imported.name).join(', ') + '`', - node: node, - }); - } - }, - // This captures using `xxx.CfnConstruct` as an identifier - Identifier: node => { - const typeAnnotation = node.typeAnnotation?.typeAnnotation; - const type = typeAnnotation?.typeName; - if (type?.type === 'TSQualifiedName') { - const result = checkLeftAndRightForCfn(type); - if (result) { - reportErrorIfImportedLocationIsNotValid(context, node, result.name, result.location); - } - } - if (node.name.startsWith('Cfn') && node.parent.type === 'MemberExpression' && node.parent.object.type === 'Identifier') { - // new xxx.CfnConstruct(); - reportErrorIfImportedLocationIsNotValid(context, node, node.name, node.parent.object.name); - } - }, - }; -} -exports.create = create; -function reportErrorIfImportedLocationIsNotValid(context, node, name, barrelImportName) { - const location = namespaceImports[barrelImportName]; - if (!location) { - // This scenario should not happen, but if it does, we don't want users to run into weird runtime errors from the linter. - return; - } - if (location.endsWith('generated') || location === '@aws-cdk/core') { - return; - } - if (location.startsWith('.')) { - // import * as name from './some/relative/path/not/ending/in/generated'; name.CfnConstruct(); - context.report({ - message: 'To allow rewriting imports when generating v2 experimental packages, `' + name + '` must be imported by name from its specific .generated location.', - node: node, - }); - } - else if (checkIfImportedLocationIsAnAlphaPackage(location, context.getFilename())) { - // import * as name from '@aws-cdk/another-alpha-package'; name.CfnConstruct(); - context.report({ - message: 'To allow rewriting imports when generating v2 experimental packages, `' + name + '` must be imported by name and separate from non-L1 imports, since it is being imported from an experimental package: ' + location, - node: node, - }); - } -} -function currentFileIsInAlphaPackage(filename) { - const filePathSplit = filename.split(path.sep); - const awsCdkNamespaceIndex = filePathSplit.findIndex(e => e.match('@aws-cdk')); - if (awsCdkNamespaceIndex !== -1) { - const packageDir = filePathSplit.slice(0, awsCdkNamespaceIndex + 2).join(path.sep); - return isAlphaPackage(packageDir); - } - return false; -} -function checkIfImportedLocationIsAnAlphaPackage(location, currentFilename) { - const rootDir = getCdkRootDir(currentFilename); - if (rootDir) { - const packageDir = rootDir + `/packages/${location}`; - return isAlphaPackage(packageDir); - } - return false; -} -function getCdkRootDir(filename) { - const filenameSplit = filename.split(path.sep); - // for test files - let rootDirIndex = filenameSplit.findIndex(e => e.match('tools')); - // for package files - if (rootDirIndex === -1) { - rootDirIndex = filenameSplit.findIndex(e => e.match('packages')); - } - if (rootDirIndex !== -1) { - return filenameSplit.slice(0, rootDirIndex).join(path.sep); - } - return undefined; -} -function isAlphaPackage(packageDir) { - if (packageDir.endsWith('aws-cdk-lib/core')) { - return false; // special case for core because it does not have a package.json - } - const pkg = JSON.parse(fs.readFileSync(path.join(packageDir, 'package.json'), { encoding: 'utf-8' })); - const separateModule = pkg['separate-module']; - if (separateModule !== undefined) { - return separateModule; - } - const maturity = pkg.maturity; - if (maturity !== 'experimental' && maturity !== 'developer-preview') { - return false; - } - // we're only interested in '@aws-cdk/' packages, - // and those that are JSII-enabled - return pkg.name.startsWith('@aws-cdk/') && !!pkg['jsii']; -} -function checkLeftAndRightForCfn(node) { - // Checking the left and right allows capturing the CfnConstruct name even if the TSQualifiedName references a subtype like: - // xxx.CfnConstruct.subtype - // xxx.CfnConstruct.subtype.anothersubtype - if (!node) { - return undefined; - } - if (node.name?.startsWith('Cfn')) { - if (node.name === node.parent.left.name) { - // This is the scenario for a reference to CfnConstruct.subtype - // In this case, it is not qualified with a barrel import, so we don't need to do anything. - return undefined; - } - return { - name: node.name, - location: node.parent.left.name, - }; - } - const right = checkLeftAndRightForCfn(node.right); - const left = checkLeftAndRightForCfn(node.left); - return right ?? left ?? undefined; -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"invalid-cfn-imports.js","sourceRoot":"","sources":["invalid-cfn-imports.ts"],"names":[],"mappings":"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","sourcesContent":["import { Rule } from 'eslint';\nimport { Identifier, ImportSpecifier } from 'estree';\nimport * as fs from 'fs-extra';\nimport * as path from 'path';\n\nlet namespaceImports: {\n  [key: string]: string\n} = {};\n\nexport function create(context: Rule.RuleContext): Rule.NodeListener {\n  // The format of Cfn imports only matters for alpha packages, so that they can be\n  // formatted correctly when released separately for V2. The linter rule should only be\n  // applied if the file is in an alpha package, or it is a test file.\n  const filename = context.getFilename();\n  if (!currentFileIsInAlphaPackage(filename) && !filename.match('test/rules/fixtures')) {\n    return {};\n  }\n\n  return {\n    ImportDeclaration: node => {\n      const location = node.source.value as string;\n      // Store all of the 'import * as name from location' imports, so that we can check the location when\n      // we find name.CfnXXX references.\n      node.specifiers.forEach(e => {\n        if (e.type === 'ImportNamespaceSpecifier') {\n          namespaceImports[e.local.name] = location;\n        }\n      });\n\n      if (location.endsWith('generated') || location === '@aws-cdk/core') {\n        // If importing directly from a generated file, this is fine. Also we know that aws-cdk/core is not experimental, so that is fine as well. \n        return;\n      }\n\n      const cfnImports: ImportSpecifier[] = [];\n      const otherImports: ImportSpecifier[] = [];\n      node.specifiers.forEach(e => {\n        if (e.type === 'ImportSpecifier') {\n          if (e.imported.name.startsWith('Cfn')) {\n            cfnImports.push(e);\n          } else {\n            otherImports.push(e);\n          }\n        }\n      });\n\n      if (cfnImports.length > 0 && otherImports.length > 0 && location.startsWith('.')) {\n        // import { CfnXXX, SomethingElse, AnotherThing } from './some/relative/path/not/ending/in/generated';\n        context.report({\n          message: 'To allow rewriting imports when generating v2 experimental packages, import of `' + cfnImports.map(e => e.imported.name).join(', ') + '` must be separate from import of `' + otherImports.map(e => e.imported.name).join(', ') + '`, and imported from its specific .generated location.',\n          node: node,\n        });\n      } else if (cfnImports.length > 0 && location.startsWith('.')) {\n        // import { CfnXXX } from './some/relative/path/not/ending/in/generated';\n        context.report({\n          message: 'To allow rewriting imports when generating v2 experimental packages, import of `' + cfnImports.map(e => e.imported.name).join(', ') + '` must be imported from its specific .generated location.',\n          node: node,\n        });\n      } else if (cfnImports.length > 0 && otherImports.length > 0 && checkIfImportedLocationIsAnAlphaPackage(location, context.getFilename())) {\n        // import { CfnXXX, SomethingElse, AnotherThing } from '@aws-cdk/another-alpha-package';\n        context.report({\n          message: 'To allow rewriting imports when generating v2 experimental packages, import of `' + cfnImports.map(e => e.imported.name).join(', ') + '` must be separate from import of `' + otherImports.map(e => e.imported.name).join(', ') + '`',\n          node: node,\n        });\n      }\n    },\n\n    // This captures using `xxx.CfnConstruct` as an identifier\n    Identifier: node => {\n      const typeAnnotation = (node as any).typeAnnotation?.typeAnnotation;\n      const type = typeAnnotation?.typeName;\n      if (type?.type === 'TSQualifiedName') {\n        const result = checkLeftAndRightForCfn(type);\n        if (result) {\n          reportErrorIfImportedLocationIsNotValid(context, node, result.name, result.location);\n        }\n      }\n      if (node.name.startsWith('Cfn') && node.parent.type === 'MemberExpression' && node.parent.object.type === 'Identifier') {\n        // new xxx.CfnConstruct();\n        reportErrorIfImportedLocationIsNotValid(context, node, node.name, node.parent.object.name);\n      }\n    },\n  };\n}\n\nfunction reportErrorIfImportedLocationIsNotValid(context: Rule.RuleContext, node: Identifier, name: string, barrelImportName: string) {\n  const location = namespaceImports[barrelImportName];\n  if (!location) {\n    // This scenario should not happen, but if it does, we don't want users to run into weird runtime errors from the linter.\n    return;\n  }\n  if (location.endsWith('generated') || location === '@aws-cdk/core') {\n    return;\n  }\n  if (location.startsWith('.')) {\n    // import * as name from './some/relative/path/not/ending/in/generated'; name.CfnConstruct();\n    context.report({\n      message: 'To allow rewriting imports when generating v2 experimental packages, `' + name + '` must be imported by name from its specific .generated location.',\n      node: node,\n    });\n  } else if (checkIfImportedLocationIsAnAlphaPackage(location, context.getFilename())) {\n    // import * as name from '@aws-cdk/another-alpha-package'; name.CfnConstruct();\n    context.report({\n      message: 'To allow rewriting imports when generating v2 experimental packages, `' + name + '` must be imported by name and separate from non-L1 imports, since it is being imported from an experimental package: ' + location,\n      node: node,\n    });\n  }\n}\n\nfunction currentFileIsInAlphaPackage(filename: string): boolean {\n  const filePathSplit = filename.split(path.sep);\n  const awsCdkNamespaceIndex = filePathSplit.findIndex(e => e.match('@aws-cdk'))\n  if (awsCdkNamespaceIndex !== -1) {\n    const packageDir = filePathSplit.slice(0, awsCdkNamespaceIndex + 2).join(path.sep);\n    return isAlphaPackage(packageDir);\n  }\n  return false;\n}\n\nfunction checkIfImportedLocationIsAnAlphaPackage(location: string, currentFilename: string): boolean {\n  const rootDir = getCdkRootDir(currentFilename);\n  if (rootDir) {\n    const packageDir = rootDir + `/packages/${location}`;\n    return isAlphaPackage(packageDir);\n  }\n  return false;\n}\n\nfunction getCdkRootDir(filename: string): string | undefined {\n  const filenameSplit = filename.split(path.sep);\n  // for test files\n  let rootDirIndex = filenameSplit.findIndex(e => e.match('tools'));\n\n  // for package files\n  if (rootDirIndex === -1) {\n    rootDirIndex = filenameSplit.findIndex(e => e.match('packages'));\n  }\n\n  if (rootDirIndex !== -1) {\n    return filenameSplit.slice(0, rootDirIndex).join(path.sep);\n  }\n  return undefined;\n}\n\nfunction isAlphaPackage(packageDir: string): boolean {\n  if (packageDir.endsWith('aws-cdk-lib/core')) {\n    return false; // special case for core because it does not have a package.json  \n  }\n\n  const pkg = JSON.parse(fs.readFileSync(path.join(packageDir, 'package.json'), { encoding: 'utf-8' }));\n\n  const separateModule = pkg['separate-module'];\n  if (separateModule !== undefined) {\n    return separateModule;\n  }\n\n  const maturity = pkg.maturity;\n  if (maturity !== 'experimental' && maturity !== 'developer-preview') {\n    return false;\n  }\n  // we're only interested in '@aws-cdk/' packages,\n  // and those that are JSII-enabled\n  return pkg.name.startsWith('@aws-cdk/') && !!pkg['jsii'];\n}\n\nfunction checkLeftAndRightForCfn(node: any): { name: string, location: string } | undefined {\n  // Checking the left and right allows capturing the CfnConstruct name even if the TSQualifiedName references a subtype like:\n  //    xxx.CfnConstruct.subtype\n  //    xxx.CfnConstruct.subtype.anothersubtype\n  if (!node) {\n    return undefined;\n  }\n  if (node.name?.startsWith('Cfn')) {\n    if (node.name === node.parent.left.name) {\n      // This is the scenario for a reference to CfnConstruct.subtype\n      // In this case, it is not qualified with a barrel import, so we don't need to do anything. \n      return undefined;\n    }\n    return {\n      name: node.name,\n      location: node.parent.left.name,\n    };\n  }\n\n  const right = checkLeftAndRightForCfn(node.right);\n  const left = checkLeftAndRightForCfn(node.left);\n\n  return right ?? left ?? undefined;\n}\n"]} \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.d.ts b/tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.d.ts deleted file mode 100644 index 8d0dfdcab1186..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import { Rule } from 'eslint'; -export declare function create(context: Rule.RuleContext): Rule.NodeListener; diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.js b/tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.js deleted file mode 100644 index 64925fb2223cc..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/no-core-construct.js +++ /dev/null @@ -1,151 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.create = void 0; -const import_cache_1 = require("../private/import-cache"); -let importCache; -let importsFixed; -const BANNED_TYPES = ['IConstruct', 'Construct']; -function create(context) { - return { - // `node` is a type from @typescript-eslint/typescript-estree, but using 'any' for now - // since it's incompatible with eslint.Rule namespace. Waiting for better compatibility in - // https://github.com/typescript-eslint/typescript-eslint/tree/1765a178e456b152bd48192eb5db7e8541e2adf2/packages/experimental-utils#note - // Meanwhile, use a debugger to explore the AST node. - Program(_node) { - if (!isTestFile(context.getFilename())) { - return; - } - importCache = new import_cache_1.ImportCache(); - importsFixed = false; - }, - ImportDeclaration(node) { - if (!isTestFile(context.getFilename())) { - return; - } - if (node.source.value === '@aws-cdk/core') { - node.specifiers.forEach((s) => { - if (s.type === 'ImportSpecifier' && BANNED_TYPES.includes(s.imported.name)) { - // named import - importCache.record({ - fileName: context.getFilename(), - typeName: s.imported.name, - importNode: node, - localName: s.local.name - }); - } - else if (s.type === 'ImportNamespaceSpecifier') { - // barrel import - BANNED_TYPES.forEach(typeName => { - importCache.record({ - fileName: context.getFilename(), - typeName, - importNode: node, - localName: `${s.local.name}.${typeName}` - }); - }); - } - }); - } - }, - Identifier(node) { - if (!isTestFile(context.getFilename())) { - return; - } - // Only apply rule to bindings (variables and function parameters) - const typeAnnotation = node.typeAnnotation?.typeAnnotation; - if (!typeAnnotation) { - return; - } - const type = typeAnnotation.typeName; - if (!type) { - return; - } - const message = 'Use Construct and IConstruct from the "constructs" module in variable declarations (not "@aws-cdk/core")'; - if (type.type === 'TSQualifiedName') { - // barrel import - const qualifier = type.left.name; - const typename = type.right.name; - const importNode = findImportNode(`${qualifier}.${typename}`); - if (!importNode) { - return; - } - context.report({ - node, - message, - fix: (fixer) => { - const fixes = []; - if (!importsFixed) { - fixes.push(fixer.insertTextAfter(importNode, "\nimport * as constructs from 'constructs';")); - importsFixed = true; - } - fixes.push(fixer.replaceTextRange(typeAnnotation.range, `constructs.${typename}`)); - return fixes; - } - }); - } - else if (type.type === 'Identifier') { - // named imports - const importNode = findImportNode(type.name); - if (!importNode) { - return; - } - context.report({ - node, - message, - fix: (fixer) => { - const fixes = []; - if (!importsFixed) { - const typesToImport = BANNED_TYPES.map(typeName => { - const val = importCache.find({ fileName: context.getFilename(), typeName }); - if (!val) { - return undefined; - } - if (typeName === val.localName) { - return typeName; - } - return `${typeName} as ${val.localName}`; - }).filter(x => x !== undefined); - fixes.push(fixer.insertTextAfter(importNode, `\nimport { ${typesToImport.join(', ')} } from 'constructs';`)); - const specifiers = importNode.specifiers; - if (specifiers.length === typesToImport.length) { - fixes.push(fixer.removeRange(importNode.range)); - } - else { - for (let i = 0; i < specifiers.length; i++) { - const s = specifiers[i]; - if (typesToImport.includes(s.imported.name)) { - if (i === specifiers.length - 1) { - fixes.push(fixer.removeRange([s.range[0] - 2, s.range[1]])); // include the leading comma - } - else { - fixes.push(fixer.removeRange([s.range[0], s.range[1] + 2])); // include the trailing comma - } - } - } - } - importsFixed = true; - } - return fixes; - } - }); - } - else { - return; - } - function findImportNode(locaName) { - return BANNED_TYPES.map(typeName => { - const val = importCache.find({ fileName: context.getFilename(), typeName }); - if (val && val.localName === locaName) { - return val.importNode; - } - return undefined; - }).find(x => x !== undefined); - } - }, - }; -} -exports.create = create; -function isTestFile(filename) { - return new RegExp(/\/test\//).test(filename); -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"no-core-construct.js","sourceRoot":"","sources":["no-core-construct.ts"],"names":[],"mappings":"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","sourcesContent":["import { Rule } from 'eslint';\nimport { ImportCache, Node } from '../private/import-cache';\n\nlet importCache: ImportCache;\nlet importsFixed: boolean;\n\nconst BANNED_TYPES = [ 'IConstruct', 'Construct' ];\n\nexport function create(context: Rule.RuleContext): Rule.NodeListener {\n  return {\n\n    // `node` is a type from @typescript-eslint/typescript-estree, but using 'any' for now\n    // since it's incompatible with eslint.Rule namespace. Waiting for better compatibility in\n    // https://github.com/typescript-eslint/typescript-eslint/tree/1765a178e456b152bd48192eb5db7e8541e2adf2/packages/experimental-utils#note\n    // Meanwhile, use a debugger to explore the AST node.\n\n    Program(_node: any) {\n      if (!isTestFile(context.getFilename())) {\n        return;\n      }\n      importCache = new ImportCache();\n      importsFixed = false;\n    },\n\n    ImportDeclaration(node: any) {\n      if (!isTestFile(context.getFilename())) {\n        return;\n      }\n      if (node.source.value === '@aws-cdk/core') {\n        node.specifiers.forEach((s: any) => {\n          if (s.type === 'ImportSpecifier' && BANNED_TYPES.includes(s.imported.name)) {\n            // named import\n            importCache.record({\n              fileName: context.getFilename(),\n              typeName: s.imported.name,\n              importNode: node,\n              localName: s.local.name\n            });\n          } else if (s.type === 'ImportNamespaceSpecifier') {\n            // barrel import\n            BANNED_TYPES.forEach(typeName => {\n              importCache.record({\n                fileName: context.getFilename(),\n                typeName,\n                importNode: node,\n                localName: `${s.local.name}.${typeName}`\n              });\n            });\n          }\n        });\n      }\n    },\n\n    Identifier(node: any) {\n      if (!isTestFile(context.getFilename())) {\n        return;\n      }\n      // Only apply rule to bindings (variables and function parameters)\n      const typeAnnotation = node.typeAnnotation?.typeAnnotation\n      if (!typeAnnotation) {\n        return;\n      }\n      const type = typeAnnotation.typeName;\n      if (!type) { return; }\n\n      const message = 'Use Construct and IConstruct from the \"constructs\" module in variable declarations (not \"@aws-cdk/core\")';\n\n      if (type.type === 'TSQualifiedName') {\n        // barrel import\n        const qualifier = type.left.name;\n        const typename = type.right.name;\n        const importNode = findImportNode(`${qualifier}.${typename}`);\n        if (!importNode) {\n          return;\n        }\n        context.report({\n          node,\n          message,\n          fix: (fixer: Rule.RuleFixer) => {\n            const fixes: Rule.Fix[] = [];\n            if (!importsFixed) {\n              fixes.push(fixer.insertTextAfter(importNode, \"\\nimport * as constructs from 'constructs';\"));\n              importsFixed = true;\n            }\n            fixes.push(fixer.replaceTextRange(typeAnnotation.range, `constructs.${typename}`));\n            return fixes;\n          }\n        });\n      } else if (type.type === 'Identifier') {\n        // named imports\n        const importNode = findImportNode(type.name);\n        if (!importNode) {\n          return;\n        }\n        context.report({\n          node,\n          message,\n          fix: (fixer: Rule.RuleFixer) => {\n            const fixes: Rule.Fix[] = [];\n            if (!importsFixed) {\n              const typesToImport = BANNED_TYPES.map(typeName => {\n                const val = importCache.find({ fileName: context.getFilename(), typeName });\n                if (!val) { return undefined; }\n                if (typeName === val.localName) { return typeName; }\n                return `${typeName} as ${val.localName}`;\n              }).filter(x => x !== undefined);\n              fixes.push(fixer.insertTextAfter(importNode, `\\nimport { ${typesToImport.join(', ')} } from 'constructs';`));\n\n              const specifiers = importNode.specifiers;\n              if (specifiers.length === typesToImport.length) {\n                fixes.push(fixer.removeRange(importNode.range));\n              } else {\n                for (let i = 0; i < specifiers.length; i++) {\n                  const s = specifiers[i];\n                  if (typesToImport.includes(s.imported.name)) {\n                    if (i === specifiers.length - 1) {\n                      fixes.push(fixer.removeRange([s.range[0] - 2, s.range[1]])); // include the leading comma\n                    } else {\n                      fixes.push(fixer.removeRange([s.range[0], s.range[1] + 2])); // include the trailing comma\n                    }\n                  }\n                }\n              }\n              importsFixed = true;\n            }\n            return fixes;\n          }\n        });\n      } else {\n        return;\n      }\n\n      function findImportNode(locaName: string): Node | undefined {\n        return BANNED_TYPES.map(typeName => {\n          const val = importCache.find({ fileName: context.getFilename(), typeName });\n          if (val && val.localName === locaName) {\n            return val.importNode;\n          }\n          return undefined;\n        }).find(x => x !== undefined);\n      }\n    },\n  }\n}\n\nfunction isTestFile(filename: string) {\n  return new RegExp(/\\/test\\//).test(filename);\n}"]} \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.d.ts b/tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.d.ts deleted file mode 100644 index 8d0dfdcab1186..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import { Rule } from 'eslint'; -export declare function create(context: Rule.RuleContext): Rule.NodeListener; diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.js b/tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.js deleted file mode 100644 index 2238857413b42..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/no-invalid-path.js +++ /dev/null @@ -1,79 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.create = void 0; -const path = require("path"); -const fs = require("fs"); -function isPathJoinFuncCall(node) { - return (node.callee?.property?.name === 'join' && - (node.parent?.expression?.callee?.object?.name === 'path' || - node.parent?.arguments?.some((a) => a.callee?.object?.name === 'path'))); -} -function noArgumentVariables(node) { - // Outside of the first argument, all arguments should be strings - const components = node.arguments.slice(1); - return components.every((a) => a.value !== undefined); -} -function hasSlashes(args) { - return args.some((a) => a.includes('/')); -} -function firstArgIsDirname(node) { - return node.arguments[0].name && node.arguments[0].name === '__dirname'; -} -function argumentList(node) { - // Already confirmed that first argument is '__dirname', so can safely remove it - const args = node.arguments.slice(1).map((a) => { return a.value; }); - return args; -} -function recreatePath(args) { - return `path.join(__dirname, '${args.join('\', \'')}')`; -} -function create(context) { - return { - CallExpression(node) { - if (isPathJoinFuncCall(node)) { - if (node.arguments.length === 0) { - // ERROR: this is 'path.join()' - context.report({ node, message: '\'path.join()\' is not a valid path. You must specify arguments into the function.' }); - return; - } - if (!noArgumentVariables(node)) { - // WARNING: unexpected non-string in the argument list. This happens if part of the argument list is a variable, i.e. `path.join(__dirname, myPath)`. - // We may be able to do something about this, but we currently are just going to let it pass. - return; - } - // We currently do not lint any path.join without '__dirname' as the first argument - if (!firstArgIsDirname(node)) { - return; - } - const args = argumentList(node); - if (hasSlashes(args)) { - // ERROR: This path looks like 'path.join(__dirname, 'a/b')' and should be changed to 'path.join(__dirname, 'a', 'b')' - context.report({ node, message: `${recreatePath(args)} is not a valid path. It has '/' in the arguments which is not allowed. Each directory should be its own separate argument.` }); - return; - } - const firstDownDir = args.findIndex((p) => p !== '..'); - // Confirm path does not have any unnecessary '..' paths - // This allows us to validate subsequent checks - if (firstDownDir > 0 && args.some((p, i) => p === '..' && i > firstDownDir)) { - // ERROR: This path oscillates between up and down commands - context.report({ node, message: `${recreatePath(args)} is not a valid path. It goes backwards and forwards and backwards again, and can be simplified.` }); - return; - } - // Exclude the case where there are no '..' at all in the path -- those are never invalid - const currentFile = context.getFilename(); - if (firstDownDir > 0) { - for (let i = 0; i < firstDownDir; i++) { - const pjFile = path.join(...[path.dirname(currentFile), ...args.slice(0, i), 'package.json']); - if (fs.existsSync(pjFile)) { - // ERROR: this path will end up going out of the package.json directory - context.report({ node, message: `${recreatePath(args)} is not a valid path. It goes beyond the parent library's package.json file so the file it points to will not be available after the library is packaged.` }); - return; - } - } - } - } - } - }; -} -exports.create = create; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"no-invalid-path.js","sourceRoot":"","sources":["no-invalid-path.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAC7B,yBAAyB;AAEzB,SAAS,kBAAkB,CAAC,IAAS;IACnC,OAAO,CACL,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,KAAK,MAAM;QACtC,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,KAAK,MAAM;YACzD,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,CAC7E,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAS;IACpC,iEAAiE;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,UAAU,CAAC,IAAc;IAChC,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAS;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;AAC1E,CAAC;AAED,SAAS,YAAY,CAAC,IAAS;IAC7B,gFAAgF;IAChF,MAAM,IAAI,GAAa,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACpF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,IAAc;IAClC,OAAO,yBAAyB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED,SAAgB,MAAM,CAAC,OAAyB;IAC9C,OAAO;QACL,cAAc,CAAC,IAAS;YACtB,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7B,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAChC,+BAA+B;oBAC/B,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,oFAAoF,EAAC,CAAC,CAAA;oBACtH,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC/B,qJAAqJ;oBACrJ,6FAA6F;oBAC7F,OAAO;gBACT,CAAC;gBAED,mFAAmF;gBACnF,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC7B,OAAO;gBACT,CAAC;gBAED,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;gBAEhC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;oBACrB,sHAAsH;oBACtH,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,6HAA6H,EAAC,CAAC,CAAC;oBACrL,OAAO;gBACT,CAAC;gBAED,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;gBAEvD,wDAAwD;gBACxD,+CAA+C;gBAC/C,IAAI,YAAY,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,YAAY,CAAC,EAAE,CAAC;oBAC5E,2DAA2D;oBAC3D,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,kGAAkG,EAAC,CAAC,CAAC;oBAC1J,OAAO;gBACT,CAAC;gBAED,yFAAyF;gBACzF,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;gBAC1C,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;oBACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC;wBACtC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;wBAC9F,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;4BAC1B,uEAAuE;4BACvE,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,2JAA2J,EAAC,CAAC,CAAC;4BACnN,OAAO;wBACT,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAtDD,wBAsDC","sourcesContent":["import { Rule } from 'eslint';\nimport * as path from 'path';\nimport * as fs from 'fs';\n\nfunction isPathJoinFuncCall(node: any): boolean {\n  return (\n    node.callee?.property?.name === 'join' &&\n    (node.parent?.expression?.callee?.object?.name === 'path' ||\n    node.parent?.arguments?.some((a: any) => a.callee?.object?.name === 'path'))\n  );\n}\n\nfunction noArgumentVariables(node: any): boolean {\n  // Outside of the first argument, all arguments should be strings\n  const components = node.arguments.slice(1);\n  return components.every((a: any) => a.value !== undefined);\n}\n\nfunction hasSlashes(args: string[]): boolean {\n  return args.some((a) => a.includes('/'));\n}\n\nfunction firstArgIsDirname(node: any): boolean {\n  return node.arguments[0].name && node.arguments[0].name === '__dirname';\n}\n\nfunction argumentList(node: any): string[] {\n  // Already confirmed that first argument is '__dirname', so can safely remove it\n  const args: string[] = node.arguments.slice(1).map((a: any) => { return a.value; });\n  return args;\n}\n\nfunction recreatePath(args: string[]): string {\n  return `path.join(__dirname, '${args.join('\\', \\'')}')`;\n}\n\nexport function create(context: Rule.RuleContext): Rule.NodeListener {\n  return {\n    CallExpression(node: any) {\n      if (isPathJoinFuncCall(node)) {\n        if (node.arguments.length === 0) {\n          // ERROR: this is 'path.join()'\n          context.report({ node, message: '\\'path.join()\\' is not a valid path. You must specify arguments into the function.'})\n          return;\n        }\n\n        if (!noArgumentVariables(node)) {\n          // WARNING: unexpected non-string in the argument list. This happens if part of the argument list is a variable, i.e. `path.join(__dirname, myPath)`.\n          // We may be able to do something about this, but we currently are just going to let it pass.\n          return;\n        }\n\n        // We currently do not lint any path.join without '__dirname' as the first argument\n        if (!firstArgIsDirname(node)) {\n          return;\n        }\n\n        const args = argumentList(node);\n\n        if (hasSlashes(args)) {\n          // ERROR: This path looks like 'path.join(__dirname, 'a/b')' and should be changed to 'path.join(__dirname, 'a', 'b')'\n          context.report({ node, message: `${recreatePath(args)} is not a valid path. It has '/' in the arguments which is not allowed. Each directory should be its own separate argument.`});\n          return;\n        }\n\n        const firstDownDir = args.findIndex((p) => p !== '..');\n\n        // Confirm path does not have any unnecessary '..' paths\n        // This allows us to validate subsequent checks\n        if (firstDownDir > 0 && args.some((p, i) => p === '..' && i > firstDownDir)) {\n          // ERROR: This path oscillates between up and down commands\n          context.report({ node, message: `${recreatePath(args)} is not a valid path. It goes backwards and forwards and backwards again, and can be simplified.`});\n          return;\n        }\n\n        // Exclude the case where there are no '..' at all in the path -- those are never invalid\n        const currentFile = context.getFilename();\n        if (firstDownDir > 0) {\n          for (let i = 0; i < firstDownDir; i++) {\n            const pjFile = path.join(...[path.dirname(currentFile), ...args.slice(0, i), 'package.json']);\n            if (fs.existsSync(pjFile)) {\n              // ERROR: this path will end up going out of the package.json directory\n              context.report({ node, message: `${recreatePath(args)} is not a valid path. It goes beyond the parent library's package.json file so the file it points to will not be available after the library is packaged.`});\n              return;\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"]} \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.d.ts b/tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.d.ts deleted file mode 100644 index 2ee220c795018..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Rule } from 'eslint'; -export declare const meta: { - messages: { - hardcodedArn: string; - }; -}; -export declare function create(context: Rule.RuleContext): Rule.NodeListener; diff --git a/tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.js b/tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.js deleted file mode 100644 index 6a020f23689d5..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/lib/rules/no-literal-partition.js +++ /dev/null @@ -1,38 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.create = exports.meta = void 0; -const is_prod_file_1 = require("../private/is-prod-file"); -exports.meta = { - messages: { - hardcodedArn: 'There are more partitions than just \'aws\'. Silence this message if you are sure this is safe, or switch to using \'Aws.PARTITION\'', - }, -}; -function create(context) { - return { - // `node` is a type from @typescript-eslint/typescript-estree, but using 'any' for now - // since it's incompatible with eslint.Rule namespace. Waiting for better compatibility in - // https://github.com/typescript-eslint/typescript-eslint/tree/1765a178e456b152bd48192eb5db7e8541e2adf2/packages/experimental-utils#note - // Meanwhile, use a debugger to explore the AST node. - Literal(node) { - if (!(0, is_prod_file_1.isProdFile)(context.getFilename())) { - return; - } - if (typeof node.value === 'string' && node.value.includes('arn:aws:')) { - context.report({ node, messageId: 'hardcodedArn' }); - } - }, - TemplateLiteral(node) { - if (!(0, is_prod_file_1.isProdFile)(context.getFilename())) { - return; - } - for (const quasi of node.quasis) { - const value = quasi.value.cooked; - if (typeof value === 'string' && value.includes('arn:aws:')) { - context.report({ node: quasi, messageId: 'hardcodedArn' }); - } - } - } - }; -} -exports.create = create; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm8tbGl0ZXJhbC1wYXJ0aXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJuby1saXRlcmFsLXBhcnRpdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwwREFBcUQ7QUFFeEMsUUFBQSxJQUFJLEdBQUc7SUFDbEIsUUFBUSxFQUFFO1FBQ1IsWUFBWSxFQUFFLHNJQUFzSTtLQUNySjtDQUNGLENBQUM7QUFFRixTQUFnQixNQUFNLENBQUMsT0FBeUI7SUFDOUMsT0FBTztRQUVMLHNGQUFzRjtRQUN0RiwwRkFBMEY7UUFDMUYsd0lBQXdJO1FBQ3hJLHFEQUFxRDtRQUVyRCxPQUFPLENBQUMsSUFBUztZQUNmLElBQUksQ0FBQyxJQUFBLHlCQUFVLEVBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQztnQkFDdkMsT0FBTztZQUNULENBQUM7WUFFRCxJQUFJLE9BQU8sSUFBSSxDQUFDLEtBQUssS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztnQkFDdEUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztZQUN0RCxDQUFDO1FBQ0gsQ0FBQztRQUVELGVBQWUsQ0FBQyxJQUFTO1lBQ3ZCLElBQUksQ0FBQyxJQUFBLHlCQUFVLEVBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQztnQkFDdkMsT0FBTztZQUNULENBQUM7WUFDRCxLQUFLLE1BQU0sS0FBSyxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDaEMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUM7Z0JBRWpDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztvQkFDNUQsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxDQUFDLENBQUM7Z0JBQzdELENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztLQUNGLENBQUE7QUFDSCxDQUFDO0FBL0JELHdCQStCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJ1bGUgfSBmcm9tICdlc2xpbnQnO1xuaW1wb3J0IHsgaXNQcm9kRmlsZSB9IGZyb20gJy4uL3ByaXZhdGUvaXMtcHJvZC1maWxlJztcblxuZXhwb3J0IGNvbnN0IG1ldGEgPSB7XG4gIG1lc3NhZ2VzOiB7XG4gICAgaGFyZGNvZGVkQXJuOiAnVGhlcmUgYXJlIG1vcmUgcGFydGl0aW9ucyB0aGFuIGp1c3QgXFwnYXdzXFwnLiBTaWxlbmNlIHRoaXMgbWVzc2FnZSBpZiB5b3UgYXJlIHN1cmUgdGhpcyBpcyBzYWZlLCBvciBzd2l0Y2ggdG8gdXNpbmcgXFwnQXdzLlBBUlRJVElPTlxcJycsXG4gIH0sXG59O1xuXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlKGNvbnRleHQ6IFJ1bGUuUnVsZUNvbnRleHQpOiBSdWxlLk5vZGVMaXN0ZW5lciB7XG4gIHJldHVybiB7XG5cbiAgICAvLyBgbm9kZWAgaXMgYSB0eXBlIGZyb20gQHR5cGVzY3JpcHQtZXNsaW50L3R5cGVzY3JpcHQtZXN0cmVlLCBidXQgdXNpbmcgJ2FueScgZm9yIG5vd1xuICAgIC8vIHNpbmNlIGl0J3MgaW5jb21wYXRpYmxlIHdpdGggZXNsaW50LlJ1bGUgbmFtZXNwYWNlLiBXYWl0aW5nIGZvciBiZXR0ZXIgY29tcGF0aWJpbGl0eSBpblxuICAgIC8vIGh0dHBzOi8vZ2l0aHViLmNvbS90eXBlc2NyaXB0LWVzbGludC90eXBlc2NyaXB0LWVzbGludC90cmVlLzE3NjVhMTc4ZTQ1NmIxNTJiZDQ4MTkyZWI1ZGI3ZTg1NDFlMmFkZjIvcGFja2FnZXMvZXhwZXJpbWVudGFsLXV0aWxzI25vdGVcbiAgICAvLyBNZWFud2hpbGUsIHVzZSBhIGRlYnVnZ2VyIHRvIGV4cGxvcmUgdGhlIEFTVCBub2RlLlxuXG4gICAgTGl0ZXJhbChub2RlOiBhbnkpIHtcbiAgICAgIGlmICghaXNQcm9kRmlsZShjb250ZXh0LmdldEZpbGVuYW1lKCkpKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgaWYgKHR5cGVvZiBub2RlLnZhbHVlID09PSAnc3RyaW5nJyAmJiBub2RlLnZhbHVlLmluY2x1ZGVzKCdhcm46YXdzOicpKSB7XG4gICAgICAgIGNvbnRleHQucmVwb3J0KHsgbm9kZSwgbWVzc2FnZUlkOiAnaGFyZGNvZGVkQXJuJyB9KTtcbiAgICAgIH1cbiAgICB9LFxuXG4gICAgVGVtcGxhdGVMaXRlcmFsKG5vZGU6IGFueSkge1xuICAgICAgaWYgKCFpc1Byb2RGaWxlKGNvbnRleHQuZ2V0RmlsZW5hbWUoKSkpIHtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuICAgICAgZm9yIChjb25zdCBxdWFzaSBvZiBub2RlLnF1YXNpcykge1xuICAgICAgICBjb25zdCB2YWx1ZSA9IHF1YXNpLnZhbHVlLmNvb2tlZDtcblxuICAgICAgICBpZiAodHlwZW9mIHZhbHVlID09PSAnc3RyaW5nJyAmJiB2YWx1ZS5pbmNsdWRlcygnYXJuOmF3czonKSkge1xuICAgICAgICAgIGNvbnRleHQucmVwb3J0KHsgbm9kZTogcXVhc2ksIG1lc3NhZ2VJZDogJ2hhcmRjb2RlZEFybicgfSk7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gIH1cbn1cbiJdfQ== \ No newline at end of file diff --git a/tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.d.ts b/tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.d.ts deleted file mode 100644 index cb0ff5c3b541f..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.js b/tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.js deleted file mode 100644 index 77d776d46f21b..0000000000000 --- a/tools/@aws-cdk/eslint-plugin/test/rules/fixtures.test.js +++ /dev/null @@ -1,94 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const eslint_1 = require("eslint"); -const fs = require("fs-extra"); -const path = require("path"); -let linter; -const outputRoot = path.join(process.cwd(), '.test-output'); -fs.mkdirpSync(outputRoot); -const fixturesRoot = path.join(__dirname, 'fixtures'); -fs.readdirSync(fixturesRoot).filter(f => fs.lstatSync(path.join(fixturesRoot, f)).isDirectory()).forEach(d => { - describe(d, () => { - const fixturesDir = path.join(fixturesRoot, d); - beforeAll(() => { - linter = new eslint_1.ESLint({ - baseConfig: { - parser: '@typescript-eslint/parser', - }, - overrideConfigFile: path.join(fixturesDir, 'eslintrc.js'), - rulePaths: [ - path.join(__dirname, '..', '..', 'lib', 'rules'), - ], - fix: true, - }); - }); - const outputDir = path.join(outputRoot, d); - fs.mkdirpSync(outputDir); - const fixtureFiles = fs.readdirSync(fixturesDir).filter(f => f.endsWith('.ts') && !f.endsWith('.expected.ts')); - fixtureFiles.forEach(f => { - it(f, async () => { - const originalFilePath = path.join(fixturesDir, f); - const expectedFixedFilePath = path.join(fixturesDir, `${path.basename(f, '.ts')}.expected.ts`); - const expectedErrorFilepath = path.join(fixturesDir, `${path.basename(f, '.ts')}.error.txt`); - const fix = fs.existsSync(expectedFixedFilePath); - const checkErrors = fs.existsSync(expectedErrorFilepath); - if (fix && checkErrors) { - fail(`Expected only a fixed file or an expected error message file. Both ${expectedFixedFilePath} and ${expectedErrorFilepath} are present.`); - } - else if (fix) { - const actualFile = await lintAndFix(originalFilePath, outputDir); - const actual = await fs.readFile(actualFile, { encoding: 'utf8' }); - const expected = await fs.readFile(expectedFixedFilePath, { encoding: 'utf8' }); - if (actual !== expected) { - fail(`Linted file did not match expectations.\n--------- Expected ----------\n${expected}\n---------- Actual ----------\n${actual}`); - } - return; - } - else if (checkErrors) { - const actualErrorMessages = await lint(originalFilePath); - const expectedErrorMessages = (await fs.readFile(expectedErrorFilepath, { encoding: 'utf8' })).split('\n'); - if (expectedErrorMessages.length !== actualErrorMessages?.length) { - fail(`Number of messages from linter did not match expectations. Linted file: ${originalFilePath}. Expected number of messages: ${expectedErrorMessages.length}. Actual number of messages: ${actualErrorMessages?.length}.`); - } - actualErrorMessages.forEach(actualMessage => { - if (!expectedErrorMessages.some(expectedMessage => actualMessage.message.includes(expectedMessage))) { - fail(`Error message not found in .error.txt file. Linted file: ${originalFilePath}. Actual message:\n${actualMessage.message}\nExpected messages:\n${expectedErrorMessages}`); - } - }); - return; - } - else { - fail(`Expected fixed file or expected error file not found.`); - } - }); - }); - }); -}); -async function lintAndFix(file, outputDir) { - const newPath = path.join(outputDir, path.basename(file)); - let result = await linter.lintFiles(file); - const hasFixes = result.find(r => typeof (r.output) === 'string') !== undefined; - if (hasFixes) { - await eslint_1.ESLint.outputFixes(result.map(r => { - r.filePath = newPath; - return r; - })); - } - else { - // If there are no fixes, copy the input file as output - await fs.copyFile(file, newPath); - } - return newPath; -} -async function lint(file) { - const result = await linter.lintFiles(file); - // If you only lint one file, then result.length will always be one. - if (result.length === 1) { - return result[0].messages; - } - return []; -} -function fail(x) { - throw new Error(x); -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fixtures.test.js","sourceRoot":"","sources":["fixtures.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { ESLint } from 'eslint';\nimport * as fs from 'fs-extra';\nimport * as path from 'path';\n\nlet linter: ESLint;\n\nconst outputRoot = path.join(process.cwd(), '.test-output');\nfs.mkdirpSync(outputRoot);\n\nconst fixturesRoot = path.join(__dirname, 'fixtures');\n\nfs.readdirSync(fixturesRoot).filter(f => fs.lstatSync(path.join(fixturesRoot, f)).isDirectory()).forEach(d => {\n  describe(d, () => {\n    const fixturesDir = path.join(fixturesRoot, d);\n\n    beforeAll(() => {\n      linter = new ESLint({\n        baseConfig: {\n          parser: '@typescript-eslint/parser',\n        },\n        overrideConfigFile: path.join(fixturesDir, 'eslintrc.js'),\n        rulePaths: [\n          path.join(__dirname, '..', '..', 'lib', 'rules'),\n        ],\n        fix: true,\n      });\n    });\n\n    const outputDir = path.join(outputRoot, d);\n    fs.mkdirpSync(outputDir);\n\n    const fixtureFiles = fs.readdirSync(fixturesDir).filter(f => f.endsWith('.ts') && !f.endsWith('.expected.ts'));\n\n    fixtureFiles.forEach(f => {\n      it(f, async () => {\n        const originalFilePath = path.join(fixturesDir, f);\n        const expectedFixedFilePath = path.join(fixturesDir, `${path.basename(f, '.ts')}.expected.ts`);\n        const expectedErrorFilepath = path.join(fixturesDir, `${path.basename(f, '.ts')}.error.txt`);\n        const fix = fs.existsSync(expectedFixedFilePath);\n        const checkErrors = fs.existsSync(expectedErrorFilepath);\n        if (fix && checkErrors) {\n          fail(`Expected only a fixed file or an expected error message file. Both ${expectedFixedFilePath} and ${expectedErrorFilepath} are present.`);\n        } else if (fix) {\n          const actualFile = await lintAndFix(originalFilePath, outputDir);\n          const actual = await fs.readFile(actualFile, { encoding: 'utf8' });\n          const expected = await fs.readFile(expectedFixedFilePath, { encoding: 'utf8' });\n          if (actual !== expected) {\n            fail(`Linted file did not match expectations.\\n--------- Expected ----------\\n${expected}\\n---------- Actual ----------\\n${actual}`);\n          }\n          return;\n        } else if (checkErrors) {\n          const actualErrorMessages = await lint(originalFilePath)\n          const expectedErrorMessages = (await fs.readFile(expectedErrorFilepath, { encoding: 'utf8' })).split('\\n');\n          if (expectedErrorMessages.length !== actualErrorMessages?.length) {\n            fail(`Number of messages from linter did not match expectations. Linted file: ${originalFilePath}. Expected number of messages: ${expectedErrorMessages.length}. Actual number of messages: ${actualErrorMessages?.length}.`);\n          }\n          actualErrorMessages.forEach(actualMessage => {\n            if(!expectedErrorMessages.some(expectedMessage => actualMessage.message.includes(expectedMessage))) {\n              fail(`Error message not found in .error.txt file. Linted file: ${originalFilePath}. Actual message:\\n${actualMessage.message}\\nExpected messages:\\n${expectedErrorMessages}`);\n            }\n          });\n          return;\n        } else {\n          fail(`Expected fixed file or expected error file not found.`);\n        }\n      });\n    });\n  });\n});\n\nasync function lintAndFix(file: string, outputDir: string) {\n  const newPath = path.join(outputDir, path.basename(file))\n  let result = await linter.lintFiles(file);\n  const hasFixes = result.find(r => typeof(r.output) === 'string') !== undefined;\n  if (hasFixes) {\n    await ESLint.outputFixes(result.map(r => {\n      r.filePath = newPath;\n      return r;\n    }));\n  } else {\n    // If there are no fixes, copy the input file as output\n    await fs.copyFile(file, newPath);\n  }\n  return newPath;\n}\n\nasync function lint(file: string) {\n  const result = await linter.lintFiles(file);\n  // If you only lint one file, then result.length will always be one.\n  if (result.length === 1) {\n    return result[0].messages;\n  }\n  return [];\n}\n\nfunction fail(x: string) {\n  throw new Error(x);\n}"]} \ No newline at end of file From d786bd2fa30dcd16bd64efbf16b7521c45b223fe Mon Sep 17 00:00:00 2001 From: Asad Bin Imtiaz <46749976+AsadBinImtiaz@users.noreply.github.com> Date: Fri, 29 Nov 2024 09:06:51 +0100 Subject: [PATCH 5/6] Update packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts Co-authored-by: Matsuda --- .../@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts index 22d2e2f382f15..4544d086bb5c1 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts @@ -31,5 +31,3 @@ const app = new App(); new integ.IntegTest(app, 'RA3LargeNodeIntegTest', { testCases: [new RedshiftRA3LargeTestStack(app, 'redshift-ra3-large-integ')], }); - -app.synth(); \ No newline at end of file From 5682bafeff620095ffd2bc1bf0a5a1aee4621e91 Mon Sep 17 00:00:00 2001 From: "Imtiaz Asad Bin, INI-DNA-DL" Date: Fri, 29 Nov 2024 09:36:41 +0100 Subject: [PATCH 6/6] feat(redshift-alpha): issue #31634: changes based on pr comments --- ...efaultTestDeployAssert1EF91947.assets.json | 19 - ...aultTestDeployAssert1EF91947.template.json | 36 - .../cdk.out | 1 - .../integ.json | 12 - .../manifest.json | 277 ------ .../redshift-ra3-large-integ.assets.json | 19 - .../redshift-ra3-large-integ.template.json | 536 ---------- .../tree.json | 935 ------------------ 8 files changed, 1835 deletions(-) delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json delete mode 100644 packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json deleted file mode 100644 index 872fc22389b0d..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "38.0.1", - "files": { - "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { - "source": { - "path": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json", - "packaging": "file" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.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-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json deleted file mode 100644 index ad9d0fb73d1dd..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "Parameters": { - "BootstrapVersion": { - "Type": "AWS::SSM::Parameter::Value", - "Default": "/cdk-bootstrap/hnb659fds/version", - "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" - } - }, - "Rules": { - "CheckBootstrapVersion": { - "Assertions": [ - { - "Assert": { - "Fn::Not": [ - { - "Fn::Contains": [ - [ - "1", - "2", - "3", - "4", - "5" - ], - { - "Ref": "BootstrapVersion" - } - ] - } - ] - }, - "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." - } - ] - } - } -} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out deleted file mode 100644 index c6e612584e352..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/cdk.out +++ /dev/null @@ -1 +0,0 @@ -{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json deleted file mode 100644 index 1bdca2edc87d9..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/integ.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": "38.0.1", - "testCases": { - "RA3LargeNodeIntegTest/DefaultTest": { - "stacks": [ - "redshift-ra3-large-integ" - ], - "assertionStack": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert", - "assertionStackName": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947" - } - } -} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json deleted file mode 100644 index 077c59bbd73b9..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/manifest.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "version": "38.0.1", - "artifacts": { - "redshift-ra3-large-integ.assets": { - "type": "cdk:asset-manifest", - "properties": { - "file": "redshift-ra3-large-integ.assets.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "redshift-ra3-large-integ": { - "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", - "properties": { - "templateFile": "redshift-ra3-large-integ.template.json", - "terminationProtection": false, - "validateOnSynth": false, - "notificationArns": [], - "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}/ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", - "additionalDependencies": [ - "redshift-ra3-large-integ.assets" - ], - "lookupRole": { - "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", - "requiresBootstrapStackVersion": 8, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "dependencies": [ - "redshift-ra3-large-integ.assets" - ], - "metadata": { - "/redshift-ra3-large-integ/VPC/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCB9E5F0B4" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet1/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1SubnetB4246D30" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1RouteTableFEE4B781" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1RouteTableAssociation0B0896DC" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet1/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1DefaultRoute91CEF279" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet1/EIP": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1EIP6AD938E8" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet1/NATGateway": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1NATGatewayE0556630" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet2/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2Subnet74179F39" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2RouteTable6F1A15F1" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2RouteTableAssociation5A808732" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet2/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2DefaultRouteB7481BBA" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet2/EIP": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2EIP4947BC00" - } - ], - "/redshift-ra3-large-integ/VPC/PublicSubnet2/NATGateway": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2NATGateway3C070193" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet1/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1Subnet8BCA10E0" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1RouteTableBE8A6027" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1RouteTableAssociation347902D1" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet1/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1DefaultRouteAE1D6490" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet2/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2SubnetCFCDAA7A" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2RouteTable0A19E10E" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2RouteTableAssociation0C73D413" - } - ], - "/redshift-ra3-large-integ/VPC/PrivateSubnet2/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2DefaultRouteF4F5CFD2" - } - ], - "/redshift-ra3-large-integ/VPC/IGW": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCIGWB7E252D3" - } - ], - "/redshift-ra3-large-integ/VPC/VPCGW": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCVPCGW99B986DC" - } - ], - "/redshift-ra3-large-integ/RA3LargeCluster/Subnets/Default": [ - { - "type": "aws:cdk:logicalId", - "data": "RA3LargeClusterSubnets3256497D" - } - ], - "/redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "RA3LargeClusterSecurityGroupDEDD1AE1" - } - ], - "/redshift-ra3-large-integ/RA3LargeCluster/Secret/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "RA3LargeClusterSecret4A7DB934" - } - ], - "/redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "RA3LargeClusterSecretAttachment853268E7" - } - ], - "/redshift-ra3-large-integ/RA3LargeCluster/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "RA3LargeClusterCA6C6D40" - } - ], - "/redshift-ra3-large-integ/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" - } - ], - "/redshift-ra3-large-integ/CheckBootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" - } - ] - }, - "displayName": "redshift-ra3-large-integ" - }, - "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets": { - "type": "cdk:asset-manifest", - "properties": { - "file": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947": { - "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", - "properties": { - "templateFile": "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json", - "terminationProtection": false, - "validateOnSynth": false, - "notificationArns": [], - "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", - "additionalDependencies": [ - "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets" - ], - "lookupRole": { - "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", - "requiresBootstrapStackVersion": 8, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "dependencies": [ - "RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets" - ], - "metadata": { - "/RA3LargeNodeIntegTest/DefaultTest/DeployAssert/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" - } - ], - "/RA3LargeNodeIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" - } - ] - }, - "displayName": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert" - }, - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - } - } -} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json deleted file mode 100644 index 483e03805474e..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.assets.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "38.0.1", - "files": { - "ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac": { - "source": { - "path": "redshift-ra3-large-integ.template.json", - "packaging": "file" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ac3ba08dcff1225c9f2f2ed2b165b8082ead5ca78d285898b4ad93a7f44eabac.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-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json deleted file mode 100644 index 10699d96f1523..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/redshift-ra3-large-integ.template.json +++ /dev/null @@ -1,536 +0,0 @@ -{ - "Resources": { - "VPCB9E5F0B4": { - "Type": "AWS::EC2::VPC", - "Properties": { - "CidrBlock": "10.0.0.0/16", - "EnableDnsHostnames": true, - "EnableDnsSupport": true, - "InstanceTenancy": "default", - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC" - } - ] - } - }, - "VPCPublicSubnet1SubnetB4246D30": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "AvailabilityZone": { - "Fn::Select": [ - 0, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.0.0/18", - "MapPublicIpOnLaunch": true, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Public" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Public" - }, - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPublicSubnet1RouteTableFEE4B781": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPublicSubnet1RouteTableAssociation0B0896DC": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - }, - "SubnetId": { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - } - } - }, - "VPCPublicSubnet1DefaultRoute91CEF279": { - "Type": "AWS::EC2::Route", - "Properties": { - "DestinationCidrBlock": "0.0.0.0/0", - "GatewayId": { - "Ref": "VPCIGWB7E252D3" - }, - "RouteTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - } - }, - "DependsOn": [ - "VPCVPCGW99B986DC" - ] - }, - "VPCPublicSubnet1EIP6AD938E8": { - "Type": "AWS::EC2::EIP", - "Properties": { - "Domain": "vpc", - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ] - } - }, - "VPCPublicSubnet1NATGatewayE0556630": { - "Type": "AWS::EC2::NatGateway", - "Properties": { - "AllocationId": { - "Fn::GetAtt": [ - "VPCPublicSubnet1EIP6AD938E8", - "AllocationId" - ] - }, - "SubnetId": { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - }, - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ] - }, - "DependsOn": [ - "VPCPublicSubnet1DefaultRoute91CEF279", - "VPCPublicSubnet1RouteTableAssociation0B0896DC" - ] - }, - "VPCPublicSubnet2Subnet74179F39": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "AvailabilityZone": { - "Fn::Select": [ - 1, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.64.0/18", - "MapPublicIpOnLaunch": true, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Public" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Public" - }, - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPublicSubnet2RouteTable6F1A15F1": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPublicSubnet2RouteTableAssociation5A808732": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - }, - "SubnetId": { - "Ref": "VPCPublicSubnet2Subnet74179F39" - } - } - }, - "VPCPublicSubnet2DefaultRouteB7481BBA": { - "Type": "AWS::EC2::Route", - "Properties": { - "DestinationCidrBlock": "0.0.0.0/0", - "GatewayId": { - "Ref": "VPCIGWB7E252D3" - }, - "RouteTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - } - }, - "DependsOn": [ - "VPCVPCGW99B986DC" - ] - }, - "VPCPublicSubnet2EIP4947BC00": { - "Type": "AWS::EC2::EIP", - "Properties": { - "Domain": "vpc", - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ] - } - }, - "VPCPublicSubnet2NATGateway3C070193": { - "Type": "AWS::EC2::NatGateway", - "Properties": { - "AllocationId": { - "Fn::GetAtt": [ - "VPCPublicSubnet2EIP4947BC00", - "AllocationId" - ] - }, - "SubnetId": { - "Ref": "VPCPublicSubnet2Subnet74179F39" - }, - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ] - }, - "DependsOn": [ - "VPCPublicSubnet2DefaultRouteB7481BBA", - "VPCPublicSubnet2RouteTableAssociation5A808732" - ] - }, - "VPCPrivateSubnet1Subnet8BCA10E0": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "AvailabilityZone": { - "Fn::Select": [ - 0, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.128.0/18", - "MapPublicIpOnLaunch": false, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Private" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Private" - }, - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPrivateSubnet1RouteTableBE8A6027": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPrivateSubnet1RouteTableAssociation347902D1": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" - }, - "SubnetId": { - "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" - } - } - }, - "VPCPrivateSubnet1DefaultRouteAE1D6490": { - "Type": "AWS::EC2::Route", - "Properties": { - "DestinationCidrBlock": "0.0.0.0/0", - "NatGatewayId": { - "Ref": "VPCPublicSubnet1NATGatewayE0556630" - }, - "RouteTableId": { - "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" - } - } - }, - "VPCPrivateSubnet2SubnetCFCDAA7A": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "AvailabilityZone": { - "Fn::Select": [ - 1, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.192.0/18", - "MapPublicIpOnLaunch": false, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Private" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Private" - }, - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPrivateSubnet2RouteTable0A19E10E": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "VPCPrivateSubnet2RouteTableAssociation0C73D413": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" - }, - "SubnetId": { - "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" - } - } - }, - "VPCPrivateSubnet2DefaultRouteF4F5CFD2": { - "Type": "AWS::EC2::Route", - "Properties": { - "DestinationCidrBlock": "0.0.0.0/0", - "NatGatewayId": { - "Ref": "VPCPublicSubnet2NATGateway3C070193" - }, - "RouteTableId": { - "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" - } - } - }, - "VPCIGWB7E252D3": { - "Type": "AWS::EC2::InternetGateway", - "Properties": { - "Tags": [ - { - "Key": "Name", - "Value": "redshift-ra3-large-integ/VPC" - } - ] - } - }, - "VPCVPCGW99B986DC": { - "Type": "AWS::EC2::VPCGatewayAttachment", - "Properties": { - "InternetGatewayId": { - "Ref": "VPCIGWB7E252D3" - }, - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "RA3LargeClusterSubnets3256497D": { - "Type": "AWS::Redshift::ClusterSubnetGroup", - "Properties": { - "Description": "Subnets for RA3LargeCluster Redshift cluster", - "SubnetIds": [ - { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - }, - { - "Ref": "VPCPublicSubnet2Subnet74179F39" - } - ] - }, - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain" - }, - "RA3LargeClusterSecurityGroupDEDD1AE1": { - "Type": "AWS::EC2::SecurityGroup", - "Properties": { - "GroupDescription": "Redshift security group", - "SecurityGroupEgress": [ - { - "CidrIp": "0.0.0.0/0", - "Description": "Allow all outbound traffic by default", - "IpProtocol": "-1" - } - ], - "VpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "RA3LargeClusterSecret4A7DB934": { - "Type": "AWS::SecretsManager::Secret", - "Properties": { - "GenerateSecretString": { - "ExcludeCharacters": "\"@/\\ '", - "GenerateStringKey": "password", - "PasswordLength": 30, - "SecretStringTemplate": "{\"username\":\"admin\"}" - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "RA3LargeClusterSecretAttachment853268E7": { - "Type": "AWS::SecretsManager::SecretTargetAttachment", - "Properties": { - "SecretId": { - "Ref": "RA3LargeClusterSecret4A7DB934" - }, - "TargetId": { - "Ref": "RA3LargeClusterCA6C6D40" - }, - "TargetType": "AWS::Redshift::Cluster" - } - }, - "RA3LargeClusterCA6C6D40": { - "Type": "AWS::Redshift::Cluster", - "Properties": { - "AllowVersionUpgrade": true, - "AutomatedSnapshotRetentionPeriod": 1, - "ClusterSubnetGroupName": { - "Ref": "RA3LargeClusterSubnets3256497D" - }, - "ClusterType": "multi-node", - "DBName": "default_db", - "Encrypted": true, - "MasterUserPassword": { - "Fn::Join": [ - "", - [ - "{{resolve:secretsmanager:", - { - "Ref": "RA3LargeClusterSecret4A7DB934" - }, - ":SecretString:password::}}" - ] - ] - }, - "MasterUsername": { - "Fn::Join": [ - "", - [ - "{{resolve:secretsmanager:", - { - "Ref": "RA3LargeClusterSecret4A7DB934" - }, - ":SecretString:username::}}" - ] - ] - }, - "NodeType": "ra3.large", - "NumberOfNodes": 2, - "PubliclyAccessible": false, - "VpcSecurityGroupIds": [ - { - "Fn::GetAtt": [ - "RA3LargeClusterSecurityGroupDEDD1AE1", - "GroupId" - ] - } - ] - }, - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain" - } - }, - "Parameters": { - "BootstrapVersion": { - "Type": "AWS::SSM::Parameter::Value", - "Default": "/cdk-bootstrap/hnb659fds/version", - "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" - } - }, - "Rules": { - "CheckBootstrapVersion": { - "Assertions": [ - { - "Assert": { - "Fn::Not": [ - { - "Fn::Contains": [ - [ - "1", - "2", - "3", - "4", - "5" - ], - { - "Ref": "BootstrapVersion" - } - ] - } - ] - }, - "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." - } - ] - } - } -} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json deleted file mode 100644 index a1b518727023c..0000000000000 --- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.ts.snapshot/tree.json +++ /dev/null @@ -1,935 +0,0 @@ -{ - "version": "tree-0.1", - "tree": { - "id": "App", - "path": "", - "children": { - "redshift-ra3-large-integ": { - "id": "redshift-ra3-large-integ", - "path": "redshift-ra3-large-integ", - "children": { - "VPC": { - "id": "VPC", - "path": "redshift-ra3-large-integ/VPC", - "children": { - "Resource": { - "id": "Resource", - "path": "redshift-ra3-large-integ/VPC/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::VPC", - "aws:cdk:cloudformation:props": { - "cidrBlock": "10.0.0.0/16", - "enableDnsHostnames": true, - "enableDnsSupport": true, - "instanceTenancy": "default", - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", - "version": "0.0.0" - } - }, - "PublicSubnet1": { - "id": "PublicSubnet1", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1", - "children": { - "Subnet": { - "id": "Subnet", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "availabilityZone": { - "Fn::Select": [ - 0, - { - "Fn::GetAZs": "" - } - ] - }, - "cidrBlock": "10.0.0.0/18", - "mapPublicIpOnLaunch": true, - "tags": [ - { - "key": "aws-cdk:subnet-name", - "value": "Public" - }, - { - "key": "aws-cdk:subnet-type", - "value": "Public" - }, - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/Acl", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/RouteTableAssociation", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - }, - "subnetId": { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "destinationCidrBlock": "0.0.0.0/0", - "gatewayId": { - "Ref": "VPCIGWB7E252D3" - }, - "routeTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "0.0.0" - } - }, - "EIP": { - "id": "EIP", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/EIP", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::EIP", - "aws:cdk:cloudformation:props": { - "domain": "vpc", - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", - "version": "0.0.0" - } - }, - "NATGateway": { - "id": "NATGateway", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet1/NATGateway", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", - "aws:cdk:cloudformation:props": { - "allocationId": { - "Fn::GetAtt": [ - "VPCPublicSubnet1EIP6AD938E8", - "AllocationId" - ] - }, - "subnetId": { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - }, - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", - "version": "0.0.0" - } - }, - "PublicSubnet2": { - "id": "PublicSubnet2", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2", - "children": { - "Subnet": { - "id": "Subnet", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "availabilityZone": { - "Fn::Select": [ - 1, - { - "Fn::GetAZs": "" - } - ] - }, - "cidrBlock": "10.0.64.0/18", - "mapPublicIpOnLaunch": true, - "tags": [ - { - "key": "aws-cdk:subnet-name", - "value": "Public" - }, - { - "key": "aws-cdk:subnet-type", - "value": "Public" - }, - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/Acl", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/RouteTableAssociation", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - }, - "subnetId": { - "Ref": "VPCPublicSubnet2Subnet74179F39" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "destinationCidrBlock": "0.0.0.0/0", - "gatewayId": { - "Ref": "VPCIGWB7E252D3" - }, - "routeTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "0.0.0" - } - }, - "EIP": { - "id": "EIP", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/EIP", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::EIP", - "aws:cdk:cloudformation:props": { - "domain": "vpc", - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", - "version": "0.0.0" - } - }, - "NATGateway": { - "id": "NATGateway", - "path": "redshift-ra3-large-integ/VPC/PublicSubnet2/NATGateway", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", - "aws:cdk:cloudformation:props": { - "allocationId": { - "Fn::GetAtt": [ - "VPCPublicSubnet2EIP4947BC00", - "AllocationId" - ] - }, - "subnetId": { - "Ref": "VPCPublicSubnet2Subnet74179F39" - }, - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PublicSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", - "version": "0.0.0" - } - }, - "PrivateSubnet1": { - "id": "PrivateSubnet1", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1", - "children": { - "Subnet": { - "id": "Subnet", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "availabilityZone": { - "Fn::Select": [ - 0, - { - "Fn::GetAZs": "" - } - ] - }, - "cidrBlock": "10.0.128.0/18", - "mapPublicIpOnLaunch": false, - "tags": [ - { - "key": "aws-cdk:subnet-name", - "value": "Private" - }, - { - "key": "aws-cdk:subnet-type", - "value": "Private" - }, - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/Acl", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PrivateSubnet1" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/RouteTableAssociation", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" - }, - "subnetId": { - "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet1/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "destinationCidrBlock": "0.0.0.0/0", - "natGatewayId": { - "Ref": "VPCPublicSubnet1NATGatewayE0556630" - }, - "routeTableId": { - "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", - "version": "0.0.0" - } - }, - "PrivateSubnet2": { - "id": "PrivateSubnet2", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2", - "children": { - "Subnet": { - "id": "Subnet", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "availabilityZone": { - "Fn::Select": [ - 1, - { - "Fn::GetAZs": "" - } - ] - }, - "cidrBlock": "10.0.192.0/18", - "mapPublicIpOnLaunch": false, - "tags": [ - { - "key": "aws-cdk:subnet-name", - "value": "Private" - }, - { - "key": "aws-cdk:subnet-type", - "value": "Private" - }, - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/Acl", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC/PrivateSubnet2" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/RouteTableAssociation", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" - }, - "subnetId": { - "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "redshift-ra3-large-integ/VPC/PrivateSubnet2/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "destinationCidrBlock": "0.0.0.0/0", - "natGatewayId": { - "Ref": "VPCPublicSubnet2NATGateway3C070193" - }, - "routeTableId": { - "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", - "version": "0.0.0" - } - }, - "IGW": { - "id": "IGW", - "path": "redshift-ra3-large-integ/VPC/IGW", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", - "aws:cdk:cloudformation:props": { - "tags": [ - { - "key": "Name", - "value": "redshift-ra3-large-integ/VPC" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", - "version": "0.0.0" - } - }, - "VPCGW": { - "id": "VPCGW", - "path": "redshift-ra3-large-integ/VPC/VPCGW", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", - "aws:cdk:cloudformation:props": { - "internetGatewayId": { - "Ref": "VPCIGWB7E252D3" - }, - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.Vpc", - "version": "0.0.0" - } - }, - "RA3LargeCluster": { - "id": "RA3LargeCluster", - "path": "redshift-ra3-large-integ/RA3LargeCluster", - "children": { - "Subnets": { - "id": "Subnets", - "path": "redshift-ra3-large-integ/RA3LargeCluster/Subnets", - "children": { - "Default": { - "id": "Default", - "path": "redshift-ra3-large-integ/RA3LargeCluster/Subnets/Default", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Redshift::ClusterSubnetGroup", - "aws:cdk:cloudformation:props": { - "description": "Subnets for RA3LargeCluster Redshift cluster", - "subnetIds": [ - { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - }, - { - "Ref": "VPCPublicSubnet2Subnet74179F39" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_redshift.CfnClusterSubnetGroup", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-redshift-alpha.ClusterSubnetGroup", - "version": "0.0.0" - } - }, - "SecurityGroup": { - "id": "SecurityGroup", - "path": "redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup", - "children": { - "Resource": { - "id": "Resource", - "path": "redshift-ra3-large-integ/RA3LargeCluster/SecurityGroup/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", - "aws:cdk:cloudformation:props": { - "groupDescription": "Redshift security group", - "securityGroupEgress": [ - { - "cidrIp": "0.0.0.0/0", - "description": "Allow all outbound traffic by default", - "ipProtocol": "-1" - } - ], - "vpcId": { - "Ref": "VPCB9E5F0B4" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", - "version": "0.0.0" - } - }, - "Secret": { - "id": "Secret", - "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret", - "children": { - "Resource": { - "id": "Resource", - "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::SecretsManager::Secret", - "aws:cdk:cloudformation:props": { - "generateSecretString": { - "passwordLength": 30, - "secretStringTemplate": "{\"username\":\"admin\"}", - "generateStringKey": "password", - "excludeCharacters": "\"@/\\ '" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_secretsmanager.CfnSecret", - "version": "0.0.0" - } - }, - "Attachment": { - "id": "Attachment", - "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment", - "children": { - "Resource": { - "id": "Resource", - "path": "redshift-ra3-large-integ/RA3LargeCluster/Secret/Attachment/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::SecretsManager::SecretTargetAttachment", - "aws:cdk:cloudformation:props": { - "secretId": { - "Ref": "RA3LargeClusterSecret4A7DB934" - }, - "targetId": { - "Ref": "RA3LargeClusterCA6C6D40" - }, - "targetType": "AWS::Redshift::Cluster" - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_secretsmanager.CfnSecretTargetAttachment", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_secretsmanager.SecretTargetAttachment", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-redshift-alpha.DatabaseSecret", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "redshift-ra3-large-integ/RA3LargeCluster/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Redshift::Cluster", - "aws:cdk:cloudformation:props": { - "allowVersionUpgrade": true, - "automatedSnapshotRetentionPeriod": 1, - "clusterSubnetGroupName": { - "Ref": "RA3LargeClusterSubnets3256497D" - }, - "clusterType": "multi-node", - "dbName": "default_db", - "encrypted": true, - "masterUsername": { - "Fn::Join": [ - "", - [ - "{{resolve:secretsmanager:", - { - "Ref": "RA3LargeClusterSecret4A7DB934" - }, - ":SecretString:username::}}" - ] - ] - }, - "masterUserPassword": { - "Fn::Join": [ - "", - [ - "{{resolve:secretsmanager:", - { - "Ref": "RA3LargeClusterSecret4A7DB934" - }, - ":SecretString:password::}}" - ] - ] - }, - "nodeType": "ra3.large", - "numberOfNodes": 2, - "publiclyAccessible": false, - "vpcSecurityGroupIds": [ - { - "Fn::GetAtt": [ - "RA3LargeClusterSecurityGroupDEDD1AE1", - "GroupId" - ] - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_redshift.CfnCluster", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-redshift-alpha.Cluster", - "version": "0.0.0" - } - }, - "BootstrapVersion": { - "id": "BootstrapVersion", - "path": "redshift-ra3-large-integ/BootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" - } - }, - "CheckBootstrapVersion": { - "id": "CheckBootstrapVersion", - "path": "redshift-ra3-large-integ/CheckBootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" - } - }, - "RA3LargeNodeIntegTest": { - "id": "RA3LargeNodeIntegTest", - "path": "RA3LargeNodeIntegTest", - "children": { - "DefaultTest": { - "id": "DefaultTest", - "path": "RA3LargeNodeIntegTest/DefaultTest", - "children": { - "Default": { - "id": "Default", - "path": "RA3LargeNodeIntegTest/DefaultTest/Default", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" - } - }, - "DeployAssert": { - "id": "DeployAssert", - "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert", - "children": { - "BootstrapVersion": { - "id": "BootstrapVersion", - "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert/BootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" - } - }, - "CheckBootstrapVersion": { - "id": "CheckBootstrapVersion", - "path": "RA3LargeNodeIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", - "version": "0.0.0" - } - }, - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.App", - "version": "0.0.0" - } - } -} \ No newline at end of file