From b82f1097456466d690b1e5830d0048180b538dfa Mon Sep 17 00:00:00 2001 From: Ahmed Kamel Date: Wed, 7 Sep 2022 22:40:23 +0100 Subject: [PATCH] Revert "collect cluster tests into a single file using integ.IntegTest test cases" This reverts commit 7e9858c44ba916f7becbdcfeb1d79db41cfc3530. --- ...efaultTestDeployAssert6A1BBA9D.assets.json | 0 ...aultTestDeployAssert6A1BBA9D.template.json | 0 .../aws-cdk-neptune-integ.assets.json} | 6 +- .../aws-cdk-neptune-integ.template.json} | 52 +- .../test/cluster-ev12.integ.snapshot/cdk.out | 1 + .../cluster-ev12.integ.snapshot/integ.json | 12 + .../cluster-ev12.integ.snapshot/manifest.json | 285 +++++ .../cluster-ev12.integ.snapshot/tree.json | 953 ++++++++++++++ ...json => aws-cdk-neptune-integ.assets.json} | 6 +- ...on => aws-cdk-neptune-integ.template.json} | 52 +- .../test/cluster.integ.snapshot/integ.json | 13 +- .../test/cluster.integ.snapshot/manifest.json | 364 ++---- .../test/cluster.integ.snapshot/tree.json | 1110 ++--------------- .../aws-neptune/test/integ.cluster-ev12.ts | 51 + .../aws-neptune/test/integ.cluster.ts | 70 +- 15 files changed, 1553 insertions(+), 1422 deletions(-) rename packages/@aws-cdk/aws-neptune/test/{cluster.integ.snapshot => cluster-ev12.integ.snapshot}/ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json (100%) rename packages/@aws-cdk/aws-neptune/test/{cluster.integ.snapshot => cluster-ev12.integ.snapshot}/ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json (100%) rename packages/@aws-cdk/aws-neptune/test/{cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.assets.json => cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.assets.json} (64%) rename packages/@aws-cdk/aws-neptune/test/{cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.template.json => cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.template.json} (91%) create mode 100644 packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/cdk.out create mode 100644 packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/integ.json create mode 100644 packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/manifest.json create mode 100644 packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/tree.json rename packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/{aws-cdk-neptune-cluster-default-ev-integ.assets.json => aws-cdk-neptune-integ.assets.json} (64%) rename packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/{aws-cdk-neptune-cluster-default-ev-integ.template.json => aws-cdk-neptune-integ.template.json} (91%) create mode 100644 packages/@aws-cdk/aws-neptune/test/integ.cluster-ev12.ts diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json similarity index 100% rename from packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json rename to packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json similarity index 100% rename from packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json rename to packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.assets.json b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.assets.json similarity index 64% rename from packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.assets.json rename to packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.assets.json index e1ef003357a25..3ca21b0b70510 100644 --- a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.assets.json +++ b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.assets.json @@ -1,15 +1,15 @@ { "version": "21.0.0", "files": { - "dded623372950e5bd703e747a26d979ddaa1c00f23cbb8594cf34de135f03c16": { + "06bc77521a70e494cf9fb7d601f5111e19745b0ecde4b6ac42b311f1a19f8328": { "source": { - "path": "aws-cdk-neptune-cluster-12-ev-integ.template.json", + "path": "aws-cdk-neptune-integ.template.json", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "dded623372950e5bd703e747a26d979ddaa1c00f23cbb8594cf34de135f03c16.json", + "objectKey": "06bc77521a70e494cf9fb7d601f5111e19745b0ecde4b6ac42b311f1a19f8328.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.template.json b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.template.json similarity index 91% rename from packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.template.json rename to packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.template.json index 2fcc029d7ffc4..43aa778486b0b 100644 --- a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-12-ev-integ.template.json +++ b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/aws-cdk-neptune-integ.template.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC" + "Value": "aws-cdk-neptune-integ/VPC" } ] } @@ -42,7 +42,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -94,7 +94,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -114,7 +114,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] }, @@ -150,7 +150,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -164,7 +164,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -202,7 +202,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -222,7 +222,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] }, @@ -258,7 +258,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" } ] } @@ -272,7 +272,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" } ] } @@ -327,7 +327,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" } ] } @@ -341,7 +341,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" } ] } @@ -375,7 +375,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-12-ev-integ/VPC" + "Value": "aws-cdk-neptune-integ/VPC" } ] } @@ -391,17 +391,6 @@ } } }, - "ParamsA8366201": { - "Type": "AWS::Neptune::DBClusterParameterGroup", - "Properties": { - "Description": "A nice parameter group", - "Family": "neptune1.2", - "Parameters": { - "neptune_enable_audit_log": "1", - "neptune_query_timeout": "100000" - } - } - }, "DbSecurity381C2C15": { "Type": "AWS::KMS::Key", "Properties": { @@ -437,6 +426,17 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, + "ParamsA8366201": { + "Type": "AWS::Neptune::DBClusterParameterGroup", + "Properties": { + "Description": "A nice parameter group", + "Family": "neptune1.2", + "Parameters": { + "neptune_enable_audit_log": "1", + "neptune_query_timeout": "100000" + } + } + }, "DatabaseSubnets3C9252C9": { "Type": "AWS::Neptune::DBSubnetGroup", "Properties": { @@ -526,7 +526,7 @@ "Type": "AWS::Neptune::DBInstance", "Properties": { "DBInstanceClass": "db.r5.large", - "AutoMinorVersionUpgrade": false, + "AutoMinorVersionUpgrade": true, "DBClusterIdentifier": { "Ref": "DatabaseB269D8BB" } diff --git a/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/cdk.out new file mode 100644 index 0000000000000..8ecc185e9dbee --- /dev/null +++ b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"21.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/integ.json b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/integ.json new file mode 100644 index 0000000000000..e2061d5ea4e11 --- /dev/null +++ b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "21.0.0", + "testCases": { + "ClusterTest/DefaultTest": { + "stacks": [ + "aws-cdk-neptune-integ" + ], + "assertionStack": "ClusterTest/DefaultTest/DeployAssert", + "assertionStackName": "ClusterTestDefaultTestDeployAssert6A1BBA9D" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/manifest.json new file mode 100644 index 0000000000000..5f4e106168dcc --- /dev/null +++ b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/manifest.json @@ -0,0 +1,285 @@ +{ + "version": "21.0.0", + "artifacts": { + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + }, + "aws-cdk-neptune-integ.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "aws-cdk-neptune-integ.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "aws-cdk-neptune-integ": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "aws-cdk-neptune-integ.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/06bc77521a70e494cf9fb7d601f5111e19745b0ecde4b6ac42b311f1a19f8328.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "aws-cdk-neptune-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": [ + "aws-cdk-neptune-integ.assets" + ], + "metadata": { + "/aws-cdk-neptune-integ/VPC/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCB9E5F0B4" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1SubnetB4246D30" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1RouteTableFEE4B781" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1RouteTableAssociation0B0896DC" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1DefaultRoute91CEF279" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1EIP6AD938E8" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet1NATGatewayE0556630" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2Subnet74179F39" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2RouteTable6F1A15F1" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2RouteTableAssociation5A808732" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2DefaultRouteB7481BBA" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2EIP4947BC00" + } + ], + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPublicSubnet2NATGateway3C070193" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1Subnet8BCA10E0" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1RouteTableBE8A6027" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1RouteTableAssociation347902D1" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet1DefaultRouteAE1D6490" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2RouteTable0A19E10E" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2RouteTableAssociation0C73D413" + } + ], + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCPrivateSubnet2DefaultRouteF4F5CFD2" + } + ], + "/aws-cdk-neptune-integ/VPC/IGW": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCIGWB7E252D3" + } + ], + "/aws-cdk-neptune-integ/VPC/VPCGW": [ + { + "type": "aws:cdk:logicalId", + "data": "VPCVPCGW99B986DC" + } + ], + "/aws-cdk-neptune-integ/DbSecurity/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DbSecurity381C2C15" + } + ], + "/aws-cdk-neptune-integ/Params/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ParamsA8366201" + } + ], + "/aws-cdk-neptune-integ/Database/Subnets/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DatabaseSubnets3C9252C9" + } + ], + "/aws-cdk-neptune-integ/Database/SecurityGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DatabaseSecurityGroup5C91FDCB" + } + ], + "/aws-cdk-neptune-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}": [ + { + "type": "aws:cdk:logicalId", + "data": "DatabaseSecurityGroupfrom00000IndirectPortF24F2E03" + } + ], + "/aws-cdk-neptune-integ/Database/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DatabaseB269D8BB" + } + ], + "/aws-cdk-neptune-integ/Database/Instance1": [ + { + "type": "aws:cdk:logicalId", + "data": "DatabaseInstance1844F58FD" + } + ], + "/aws-cdk-neptune-integ/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/aws-cdk-neptune-integ/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "aws-cdk-neptune-integ" + }, + "ClusterTestDefaultTestDeployAssert6A1BBA9D.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "ClusterTestDefaultTestDeployAssert6A1BBA9D": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "ClusterTestDefaultTestDeployAssert6A1BBA9D.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": [ + "ClusterTestDefaultTestDeployAssert6A1BBA9D.assets" + ], + "metadata": { + "/ClusterTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/ClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "ClusterTest/DefaultTest/DeployAssert" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/tree.json b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/tree.json new file mode 100644 index 0000000000000..6e3578029b3f3 --- /dev/null +++ b/packages/@aws-cdk/aws-neptune/test/cluster-ev12.integ.snapshot/tree.json @@ -0,0 +1,953 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.92" + } + }, + "aws-cdk-neptune-integ": { + "id": "aws-cdk-neptune-integ", + "path": "aws-cdk-neptune-integ", + "children": { + "VPC": { + "id": "VPC", + "path": "aws-cdk-neptune-integ/VPC", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-neptune-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": "aws-cdk-neptune-integ/VPC" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnVPC", + "version": "0.0.0" + } + }, + "PublicSubnet1": { + "id": "PublicSubnet1", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "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": "aws-cdk-neptune-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/Acl", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "aws-cdk-neptune-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/aws-ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" + }, + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "VPCIGWB7E252D3" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "subnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, + "allocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet1EIP6AD938E8", + "AllocationId" + ] + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "PublicSubnet2": { + "id": "PublicSubnet2", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "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": "aws-cdk-neptune-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/Acl", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "aws-cdk-neptune-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/aws-ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" + }, + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "VPCIGWB7E252D3" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "subnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + }, + "allocationId": { + "Fn::GetAtt": [ + "VPCPublicSubnet2EIP4947BC00", + "AllocationId" + ] + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "PrivateSubnet1": { + "id": "PrivateSubnet1", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "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": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/Acl", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "aws-cdk-neptune-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/aws-ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" + }, + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "VPCPublicSubnet1NATGatewayE0556630" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "PrivateSubnet2": { + "id": "PrivateSubnet2", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "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": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/Acl", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "aws-cdk-neptune-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/aws-ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" + }, + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "VPCPublicSubnet2NATGateway3C070193" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "IGW": { + "id": "IGW", + "path": "aws-cdk-neptune-integ/VPC/IGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "aws-cdk-neptune-integ/VPC" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnInternetGateway", + "version": "0.0.0" + } + }, + "VPCGW": { + "id": "VPCGW", + "path": "aws-cdk-neptune-integ/VPC/VPCGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "VPCB9E5F0B4" + }, + "internetGatewayId": { + "Ref": "VPCIGWB7E252D3" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnVPCGatewayAttachment", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.Vpc", + "version": "0.0.0" + } + }, + "DbSecurity": { + "id": "DbSecurity", + "path": "aws-cdk-neptune-integ/DbSecurity", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-neptune-integ/DbSecurity/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::KMS::Key", + "aws:cdk:cloudformation:props": { + "keyPolicy": { + "Statement": [ + { + "Action": "kms:*", + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": "*" + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-kms.CfnKey", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-kms.Key", + "version": "0.0.0" + } + }, + "Params": { + "id": "Params", + "path": "aws-cdk-neptune-integ/Params", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-neptune-integ/Params/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Neptune::DBClusterParameterGroup", + "aws:cdk:cloudformation:props": { + "description": "A nice parameter group", + "family": "neptune1.2", + "parameters": { + "neptune_enable_audit_log": "1", + "neptune_query_timeout": "100000" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.CfnDBClusterParameterGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.ClusterParameterGroup", + "version": "0.0.0" + } + }, + "Database": { + "id": "Database", + "path": "aws-cdk-neptune-integ/Database", + "children": { + "Subnets": { + "id": "Subnets", + "path": "aws-cdk-neptune-integ/Database/Subnets", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-neptune-integ/Database/Subnets/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Neptune::DBSubnetGroup", + "aws:cdk:cloudformation:props": { + "dbSubnetGroupDescription": "Subnets for Database database", + "subnetIds": [ + { + "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" + }, + { + "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.CfnDBSubnetGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.SubnetGroup", + "version": "0.0.0" + } + }, + "SecurityGroup": { + "id": "SecurityGroup", + "path": "aws-cdk-neptune-integ/Database/SecurityGroup", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-neptune-integ/Database/SecurityGroup/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", + "aws:cdk:cloudformation:props": { + "groupDescription": "Neptune 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/aws-ec2.CfnSecurityGroup", + "version": "0.0.0" + } + }, + "from 0.0.0.0_0:{IndirectPort}": { + "id": "from 0.0.0.0_0:{IndirectPort}", + "path": "aws-cdk-neptune-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", + "aws:cdk:cloudformation:props": { + "ipProtocol": "tcp", + "cidrIp": "0.0.0.0/0", + "description": "Open to the world", + "fromPort": { + "Fn::GetAtt": [ + "DatabaseB269D8BB", + "Port" + ] + }, + "groupId": { + "Fn::GetAtt": [ + "DatabaseSecurityGroup5C91FDCB", + "GroupId" + ] + }, + "toPort": { + "Fn::GetAtt": [ + "DatabaseB269D8BB", + "Port" + ] + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.CfnSecurityGroupIngress", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-ec2.SecurityGroup", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-neptune-integ/Database/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Neptune::DBCluster", + "aws:cdk:cloudformation:props": { + "dbClusterParameterGroupName": { + "Ref": "ParamsA8366201" + }, + "dbSubnetGroupName": { + "Ref": "DatabaseSubnets3C9252C9" + }, + "engineVersion": "1.2.0.0", + "kmsKeyId": { + "Fn::GetAtt": [ + "DbSecurity381C2C15", + "Arn" + ] + }, + "storageEncrypted": true, + "vpcSecurityGroupIds": [ + { + "Fn::GetAtt": [ + "DatabaseSecurityGroup5C91FDCB", + "GroupId" + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.CfnDBCluster", + "version": "0.0.0" + } + }, + "Instance1": { + "id": "Instance1", + "path": "aws-cdk-neptune-integ/Database/Instance1", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Neptune::DBInstance", + "aws:cdk:cloudformation:props": { + "dbInstanceClass": "db.r5.large", + "autoMinorVersionUpgrade": true, + "dbClusterIdentifier": { + "Ref": "DatabaseB269D8BB" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.CfnDBInstance", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.DatabaseCluster", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "ClusterTest": { + "id": "ClusterTest", + "path": "ClusterTest", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "ClusterTest/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "ClusterTest/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.92" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "ClusterTest/DefaultTest/DeployAssert", + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTest", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-default-ev-integ.assets.json b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-integ.assets.json similarity index 64% rename from packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-default-ev-integ.assets.json rename to packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-integ.assets.json index e511991b5a7b7..406c273a3a088 100644 --- a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-default-ev-integ.assets.json +++ b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-integ.assets.json @@ -1,15 +1,15 @@ { "version": "21.0.0", "files": { - "aa6bb473c0214e3703478ea3a9d8257e9bb42aeed885ece97d284b90cf0f061e": { + "315715ffe6004c7bd7c9874629785c10fd8f65a20d6995ea8eb20188dfb82b7d": { "source": { - "path": "aws-cdk-neptune-cluster-default-ev-integ.template.json", + "path": "aws-cdk-neptune-integ.template.json", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "aa6bb473c0214e3703478ea3a9d8257e9bb42aeed885ece97d284b90cf0f061e.json", + "objectKey": "315715ffe6004c7bd7c9874629785c10fd8f65a20d6995ea8eb20188dfb82b7d.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-default-ev-integ.template.json b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-integ.template.json similarity index 91% rename from packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-default-ev-integ.template.json rename to packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-integ.template.json index e6a0934c87444..67f5870712c2a 100644 --- a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-cluster-default-ev-integ.template.json +++ b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/aws-cdk-neptune-integ.template.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC" + "Value": "aws-cdk-neptune-integ/VPC" } ] } @@ -42,7 +42,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -94,7 +94,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -114,7 +114,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] }, @@ -150,7 +150,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -164,7 +164,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -202,7 +202,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -222,7 +222,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] }, @@ -258,7 +258,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" } ] } @@ -272,7 +272,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" } ] } @@ -327,7 +327,7 @@ }, { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" } ] } @@ -341,7 +341,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2" + "Value": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" } ] } @@ -375,7 +375,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-cdk-neptune-cluster-default-ev-integ/VPC" + "Value": "aws-cdk-neptune-integ/VPC" } ] } @@ -391,17 +391,6 @@ } } }, - "ParamsA8366201": { - "Type": "AWS::Neptune::DBClusterParameterGroup", - "Properties": { - "Description": "A nice parameter group", - "Family": "neptune1", - "Parameters": { - "neptune_enable_audit_log": "1", - "neptune_query_timeout": "100000" - } - } - }, "DbSecurity381C2C15": { "Type": "AWS::KMS::Key", "Properties": { @@ -437,6 +426,17 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, + "ParamsA8366201": { + "Type": "AWS::Neptune::DBClusterParameterGroup", + "Properties": { + "Description": "A nice parameter group", + "Family": "neptune1", + "Parameters": { + "neptune_enable_audit_log": "1", + "neptune_query_timeout": "100000" + } + } + }, "DatabaseSubnets3C9252C9": { "Type": "AWS::Neptune::DBSubnetGroup", "Properties": { @@ -525,7 +525,7 @@ "Type": "AWS::Neptune::DBInstance", "Properties": { "DBInstanceClass": "db.r5.large", - "AutoMinorVersionUpgrade": false, + "AutoMinorVersionUpgrade": true, "DBClusterIdentifier": { "Ref": "DatabaseB269D8BB" } diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/integ.json b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/integ.json index 9784681f19474..7f298dac51aa6 100644 --- a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/integ.json +++ b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/integ.json @@ -1,13 +1,14 @@ { "version": "21.0.0", "testCases": { - "ClusterTest/DefaultTest": { + "integ.cluster": { "stacks": [ - "aws-cdk-neptune-cluster-default-ev-integ", - "aws-cdk-neptune-cluster-12-ev-integ" + "aws-cdk-neptune-integ" ], - "assertionStack": "ClusterTest/DefaultTest/DeployAssert", - "assertionStackName": "ClusterTestDefaultTestDeployAssert6A1BBA9D" + "diffAssets": false, + "stackUpdateWorkflow": true } - } + }, + "synthContext": {}, + "enableLookups": false } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/manifest.json index 9615b46477cbf..c9e9d7159e499 100644 --- a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/manifest.json @@ -7,27 +7,27 @@ "file": "tree.json" } }, - "aws-cdk-neptune-cluster-default-ev-integ.assets": { + "aws-cdk-neptune-integ.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "aws-cdk-neptune-cluster-default-ev-integ.assets.json", + "file": "aws-cdk-neptune-integ.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "aws-cdk-neptune-cluster-default-ev-integ": { + "aws-cdk-neptune-integ": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "aws-cdk-neptune-cluster-default-ev-integ.template.json", + "templateFile": "aws-cdk-neptune-integ.template.json", "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/aa6bb473c0214e3703478ea3a9d8257e9bb42aeed885ece97d284b90cf0f061e.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/315715ffe6004c7bd7c9874629785c10fd8f65a20d6995ea8eb20188dfb82b7d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "aws-cdk-neptune-cluster-default-ev-integ.assets" + "aws-cdk-neptune-integ.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -36,477 +36,257 @@ } }, "dependencies": [ - "aws-cdk-neptune-cluster-default-ev-integ.assets" + "aws-cdk-neptune-integ.assets" ], "metadata": { - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/Resource": [ + "/aws-cdk-neptune-integ/VPC/Resource": [ { "type": "aws:cdk:logicalId", "data": "VPCB9E5F0B4" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/Subnet": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet1SubnetB4246D30" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/RouteTable": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet1RouteTableFEE4B781" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/RouteTableAssociation": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet1RouteTableAssociation0B0896DC" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/DefaultRoute": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet1DefaultRoute91CEF279" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/EIP": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/EIP": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet1EIP6AD938E8" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/NATGateway": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet1/NATGateway": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet1NATGatewayE0556630" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/Subnet": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet2Subnet74179F39" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/RouteTable": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet2RouteTable6F1A15F1" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/RouteTableAssociation": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet2RouteTableAssociation5A808732" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/DefaultRoute": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet2DefaultRouteB7481BBA" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/EIP": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/EIP": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet2EIP4947BC00" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/NATGateway": [ + "/aws-cdk-neptune-integ/VPC/PublicSubnet2/NATGateway": [ { "type": "aws:cdk:logicalId", "data": "VPCPublicSubnet2NATGateway3C070193" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/Subnet": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet1Subnet8BCA10E0" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/RouteTable": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet1RouteTableBE8A6027" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/RouteTableAssociation": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet1RouteTableAssociation347902D1" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/DefaultRoute": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet1/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet1DefaultRouteAE1D6490" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/Subnet": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet2SubnetCFCDAA7A" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/RouteTable": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet2RouteTable0A19E10E" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/RouteTableAssociation": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet2RouteTableAssociation0C73D413" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/DefaultRoute": [ + "/aws-cdk-neptune-integ/VPC/PrivateSubnet2/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "VPCPrivateSubnet2DefaultRouteF4F5CFD2" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/IGW": [ + "/aws-cdk-neptune-integ/VPC/IGW": [ { "type": "aws:cdk:logicalId", "data": "VPCIGWB7E252D3" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/VPC/VPCGW": [ + "/aws-cdk-neptune-integ/VPC/VPCGW": [ { "type": "aws:cdk:logicalId", "data": "VPCVPCGW99B986DC" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/Params/Resource": [ + "/aws-cdk-neptune-integ/DbSecurity/Resource": [ { "type": "aws:cdk:logicalId", - "data": "ParamsA8366201" + "data": "DbSecurity381C2C15" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/DbSecurity/Resource": [ + "/aws-cdk-neptune-integ/Params/Resource": [ { "type": "aws:cdk:logicalId", - "data": "DbSecurity381C2C15" + "data": "ParamsA8366201" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/Database/Subnets/Resource": [ + "/aws-cdk-neptune-integ/Database/Subnets/Resource": [ { "type": "aws:cdk:logicalId", "data": "DatabaseSubnets3C9252C9" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/Database/SecurityGroup/Resource": [ + "/aws-cdk-neptune-integ/Database/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", "data": "DatabaseSecurityGroup5C91FDCB" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}": [ + "/aws-cdk-neptune-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}": [ { "type": "aws:cdk:logicalId", "data": "DatabaseSecurityGroupfrom00000IndirectPortF24F2E03" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/Database/Resource": [ + "/aws-cdk-neptune-integ/Database/Resource": [ { "type": "aws:cdk:logicalId", "data": "DatabaseB269D8BB" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/Database/Instance1": [ + "/aws-cdk-neptune-integ/Database/Instance1": [ { "type": "aws:cdk:logicalId", "data": "DatabaseInstance1844F58FD" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/BootstrapVersion": [ + "/aws-cdk-neptune-integ/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/aws-cdk-neptune-cluster-default-ev-integ/CheckBootstrapVersion": [ + "/aws-cdk-neptune-integ/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } - ] - }, - "displayName": "aws-cdk-neptune-cluster-default-ev-integ" - }, - "aws-cdk-neptune-cluster-12-ev-integ.assets": { - "type": "cdk:asset-manifest", - "properties": { - "file": "aws-cdk-neptune-cluster-12-ev-integ.assets.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "aws-cdk-neptune-cluster-12-ev-integ": { - "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", - "properties": { - "templateFile": "aws-cdk-neptune-cluster-12-ev-integ.template.json", - "validateOnSynth": false, - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", - "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dded623372950e5bd703e747a26d979ddaa1c00f23cbb8594cf34de135f03c16.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", - "additionalDependencies": [ - "aws-cdk-neptune-cluster-12-ev-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": [ - "aws-cdk-neptune-cluster-12-ev-integ.assets" - ], - "metadata": { - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCB9E5F0B4" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1SubnetB4246D30" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1RouteTableFEE4B781" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1RouteTableAssociation0B0896DC" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1DefaultRoute91CEF279" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/EIP": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1EIP6AD938E8" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/NATGateway": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet1NATGatewayE0556630" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2Subnet74179F39" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2RouteTable6F1A15F1" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2RouteTableAssociation5A808732" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2DefaultRouteB7481BBA" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/EIP": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2EIP4947BC00" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/NATGateway": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPublicSubnet2NATGateway3C070193" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1Subnet8BCA10E0" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1RouteTableBE8A6027" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1RouteTableAssociation347902D1" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet1DefaultRouteAE1D6490" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/Subnet": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2SubnetCFCDAA7A" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/RouteTable": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2RouteTable0A19E10E" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/RouteTableAssociation": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2RouteTableAssociation0C73D413" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/DefaultRoute": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCPrivateSubnet2DefaultRouteF4F5CFD2" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/IGW": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCIGWB7E252D3" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/VPC/VPCGW": [ - { - "type": "aws:cdk:logicalId", - "data": "VPCVPCGW99B986DC" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/Params/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ParamsA8366201" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/DbSecurity/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "DbSecurity381C2C15" - } ], - "/aws-cdk-neptune-cluster-12-ev-integ/Database/Subnets/Resource": [ + "Params1200F93288": [ { "type": "aws:cdk:logicalId", - "data": "DatabaseSubnets3C9252C9" + "data": "Params1200F93288", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/aws-cdk-neptune-cluster-12-ev-integ/Database/SecurityGroup/Resource": [ + "Database12Subnets4179194B": [ { "type": "aws:cdk:logicalId", - "data": "DatabaseSecurityGroup5C91FDCB" + "data": "Database12Subnets4179194B", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/aws-cdk-neptune-cluster-12-ev-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}": [ + "Database12SecurityGroup4F4302E8": [ { "type": "aws:cdk:logicalId", - "data": "DatabaseSecurityGroupfrom00000IndirectPortF24F2E03" + "data": "Database12SecurityGroup4F4302E8", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/aws-cdk-neptune-cluster-12-ev-integ/Database/Resource": [ + "Database12SecurityGroupfrom00000IndirectPort3A40EE2B": [ { "type": "aws:cdk:logicalId", - "data": "DatabaseB269D8BB" + "data": "Database12SecurityGroupfrom00000IndirectPort3A40EE2B", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/aws-cdk-neptune-cluster-12-ev-integ/Database/Instance1": [ + "Database12D6A36FB9": [ { "type": "aws:cdk:logicalId", - "data": "DatabaseInstance1844F58FD" - } - ], - "/aws-cdk-neptune-cluster-12-ev-integ/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" + "data": "Database12D6A36FB9", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/aws-cdk-neptune-cluster-12-ev-integ/CheckBootstrapVersion": [ + "Database12Instance10D9E6224": [ { "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" - } - ] - }, - "displayName": "aws-cdk-neptune-cluster-12-ev-integ" - }, - "ClusterTestDefaultTestDeployAssert6A1BBA9D.assets": { - "type": "cdk:asset-manifest", - "properties": { - "file": "ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "ClusterTestDefaultTestDeployAssert6A1BBA9D": { - "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", - "properties": { - "templateFile": "ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json", - "validateOnSynth": false, - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", - "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", - "additionalDependencies": [ - "ClusterTestDefaultTestDeployAssert6A1BBA9D.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": [ - "ClusterTestDefaultTestDeployAssert6A1BBA9D.assets" - ], - "metadata": { - "/ClusterTest/DefaultTest/DeployAssert/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" - } - ], - "/ClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" + "data": "Database12Instance10D9E6224", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ] }, - "displayName": "ClusterTest/DefaultTest/DeployAssert" + "displayName": "aws-cdk-neptune-integ" } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/tree.json b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/tree.json index 928016a4c5660..0d2da0fe35492 100644 --- a/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/tree.json +++ b/packages/@aws-cdk/aws-neptune/test/cluster.integ.snapshot/tree.json @@ -12,17 +12,17 @@ "version": "10.1.92" } }, - "aws-cdk-neptune-cluster-default-ev-integ": { - "id": "aws-cdk-neptune-cluster-default-ev-integ", - "path": "aws-cdk-neptune-cluster-default-ev-integ", + "aws-cdk-neptune-integ": { + "id": "aws-cdk-neptune-integ", + "path": "aws-cdk-neptune-integ", "children": { "VPC": { "id": "VPC", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC", + "path": "aws-cdk-neptune-integ/VPC", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/Resource", + "path": "aws-cdk-neptune-integ/VPC/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPC", "aws:cdk:cloudformation:props": { @@ -33,7 +33,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC" + "value": "aws-cdk-neptune-integ/VPC" } ] } @@ -45,11 +45,11 @@ }, "PublicSubnet1": { "id": "PublicSubnet1", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1", "children": { "Subnet": { "id": "Subnet", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/Subnet", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -77,7 +77,7 @@ }, { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -89,7 +89,7 @@ }, "Acl": { "id": "Acl", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/Acl", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/Acl", "constructInfo": { "fqn": "@aws-cdk/core.Resource", "version": "0.0.0" @@ -97,7 +97,7 @@ }, "RouteTable": { "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { @@ -107,7 +107,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -119,7 +119,7 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/RouteTableAssociation", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -138,7 +138,7 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -158,7 +158,7 @@ }, "EIP": { "id": "EIP", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/EIP", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/EIP", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::EIP", "aws:cdk:cloudformation:props": { @@ -166,7 +166,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -178,7 +178,7 @@ }, "NATGateway": { "id": "NATGateway", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1/NATGateway", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet1/NATGateway", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { @@ -194,7 +194,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet1" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet1" } ] } @@ -212,11 +212,11 @@ }, "PublicSubnet2": { "id": "PublicSubnet2", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2", "children": { "Subnet": { "id": "Subnet", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/Subnet", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -244,7 +244,7 @@ }, { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -256,7 +256,7 @@ }, "Acl": { "id": "Acl", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/Acl", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/Acl", "constructInfo": { "fqn": "@aws-cdk/core.Resource", "version": "0.0.0" @@ -264,7 +264,7 @@ }, "RouteTable": { "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { @@ -274,7 +274,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -286,7 +286,7 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/RouteTableAssociation", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -305,7 +305,7 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -325,7 +325,7 @@ }, "EIP": { "id": "EIP", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/EIP", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/EIP", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::EIP", "aws:cdk:cloudformation:props": { @@ -333,7 +333,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -345,7 +345,7 @@ }, "NATGateway": { "id": "NATGateway", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2/NATGateway", + "path": "aws-cdk-neptune-integ/VPC/PublicSubnet2/NATGateway", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { @@ -361,7 +361,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PublicSubnet2" + "value": "aws-cdk-neptune-integ/VPC/PublicSubnet2" } ] } @@ -379,11 +379,11 @@ }, "PrivateSubnet1": { "id": "PrivateSubnet1", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1", "children": { "Subnet": { "id": "Subnet", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/Subnet", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -411,7 +411,7 @@ }, { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1" + "value": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" } ] } @@ -423,7 +423,7 @@ }, "Acl": { "id": "Acl", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/Acl", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/Acl", "constructInfo": { "fqn": "@aws-cdk/core.Resource", "version": "0.0.0" @@ -431,7 +431,7 @@ }, "RouteTable": { "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { @@ -441,7 +441,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1" + "value": "aws-cdk-neptune-integ/VPC/PrivateSubnet1" } ] } @@ -453,7 +453,7 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/RouteTableAssociation", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -472,7 +472,7 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet1/DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet1/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -498,11 +498,11 @@ }, "PrivateSubnet2": { "id": "PrivateSubnet2", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2", "children": { "Subnet": { "id": "Subnet", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/Subnet", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -530,7 +530,7 @@ }, { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2" + "value": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" } ] } @@ -542,7 +542,7 @@ }, "Acl": { "id": "Acl", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/Acl", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/Acl", "constructInfo": { "fqn": "@aws-cdk/core.Resource", "version": "0.0.0" @@ -550,7 +550,7 @@ }, "RouteTable": { "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/RouteTable", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { @@ -560,7 +560,7 @@ "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2" + "value": "aws-cdk-neptune-integ/VPC/PrivateSubnet2" } ] } @@ -572,7 +572,7 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/RouteTableAssociation", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -591,7 +591,7 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/PrivateSubnet2/DefaultRoute", + "path": "aws-cdk-neptune-integ/VPC/PrivateSubnet2/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -617,14 +617,14 @@ }, "IGW": { "id": "IGW", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/IGW", + "path": "aws-cdk-neptune-integ/VPC/IGW", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "aws-cdk-neptune-cluster-default-ev-integ/VPC" + "value": "aws-cdk-neptune-integ/VPC" } ] } @@ -636,7 +636,7 @@ }, "VPCGW": { "id": "VPCGW", - "path": "aws-cdk-neptune-cluster-default-ev-integ/VPC/VPCGW", + "path": "aws-cdk-neptune-integ/VPC/VPCGW", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { @@ -659,937 +659,13 @@ "version": "0.0.0" } }, - "Params": { - "id": "Params", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Params", - "children": { - "Resource": { - "id": "Resource", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Params/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Neptune::DBClusterParameterGroup", - "aws:cdk:cloudformation:props": { - "description": "A nice parameter group", - "family": "neptune1", - "parameters": { - "neptune_enable_audit_log": "1", - "neptune_query_timeout": "100000" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.CfnDBClusterParameterGroup", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.ClusterParameterGroup", - "version": "0.0.0" - } - }, - "DbSecurity": { - "id": "DbSecurity", - "path": "aws-cdk-neptune-cluster-default-ev-integ/DbSecurity", - "children": { - "Resource": { - "id": "Resource", - "path": "aws-cdk-neptune-cluster-default-ev-integ/DbSecurity/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::KMS::Key", - "aws:cdk:cloudformation:props": { - "keyPolicy": { - "Statement": [ - { - "Action": "kms:*", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - }, - "Resource": "*" - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-kms.CfnKey", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-kms.Key", - "version": "0.0.0" - } - }, - "Database": { - "id": "Database", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database", - "children": { - "Subnets": { - "id": "Subnets", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database/Subnets", - "children": { - "Resource": { - "id": "Resource", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database/Subnets/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Neptune::DBSubnetGroup", - "aws:cdk:cloudformation:props": { - "dbSubnetGroupDescription": "Subnets for Database database", - "subnetIds": [ - { - "Ref": "VPCPrivateSubnet1Subnet8BCA10E0" - }, - { - "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.CfnDBSubnetGroup", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.SubnetGroup", - "version": "0.0.0" - } - }, - "SecurityGroup": { - "id": "SecurityGroup", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database/SecurityGroup", - "children": { - "Resource": { - "id": "Resource", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database/SecurityGroup/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", - "aws:cdk:cloudformation:props": { - "groupDescription": "Neptune 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/aws-ec2.CfnSecurityGroup", - "version": "0.0.0" - } - }, - "from 0.0.0.0_0:{IndirectPort}": { - "id": "from 0.0.0.0_0:{IndirectPort}", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", - "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", - "cidrIp": "0.0.0.0/0", - "description": "Open to the world", - "fromPort": { - "Fn::GetAtt": [ - "DatabaseB269D8BB", - "Port" - ] - }, - "groupId": { - "Fn::GetAtt": [ - "DatabaseSecurityGroup5C91FDCB", - "GroupId" - ] - }, - "toPort": { - "Fn::GetAtt": [ - "DatabaseB269D8BB", - "Port" - ] - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSecurityGroupIngress", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.SecurityGroup", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Neptune::DBCluster", - "aws:cdk:cloudformation:props": { - "dbClusterParameterGroupName": { - "Ref": "ParamsA8366201" - }, - "dbSubnetGroupName": { - "Ref": "DatabaseSubnets3C9252C9" - }, - "kmsKeyId": { - "Fn::GetAtt": [ - "DbSecurity381C2C15", - "Arn" - ] - }, - "storageEncrypted": true, - "vpcSecurityGroupIds": [ - { - "Fn::GetAtt": [ - "DatabaseSecurityGroup5C91FDCB", - "GroupId" - ] - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.CfnDBCluster", - "version": "0.0.0" - } - }, - "Instance1": { - "id": "Instance1", - "path": "aws-cdk-neptune-cluster-default-ev-integ/Database/Instance1", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Neptune::DBInstance", - "aws:cdk:cloudformation:props": { - "dbInstanceClass": "db.r5.large", - "autoMinorVersionUpgrade": false, - "dbClusterIdentifier": { - "Ref": "DatabaseB269D8BB" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.CfnDBInstance", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.DatabaseCluster", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/core.Stack", - "version": "0.0.0" - } - }, - "aws-cdk-neptune-cluster-12-ev-integ": { - "id": "aws-cdk-neptune-cluster-12-ev-integ", - "path": "aws-cdk-neptune-cluster-12-ev-integ", - "children": { - "VPC": { - "id": "VPC", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC", - "children": { - "Resource": { - "id": "Resource", - "path": "aws-cdk-neptune-cluster-12-ev-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": "aws-cdk-neptune-cluster-12-ev-integ/VPC" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPC", - "version": "0.0.0" - } - }, - "PublicSubnet1": { - "id": "PublicSubnet1", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1", - "children": { - "Subnet": { - "id": "Subnet", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "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": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/Acl", - "constructInfo": { - "fqn": "@aws-cdk/core.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-12-ev-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/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - }, - "destinationCidrBlock": "0.0.0.0/0", - "gatewayId": { - "Ref": "VPCIGWB7E252D3" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" - } - }, - "EIP": { - "id": "EIP", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/EIP", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::EIP", - "aws:cdk:cloudformation:props": { - "domain": "vpc", - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", - "version": "0.0.0" - } - }, - "NATGateway": { - "id": "NATGateway", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1/NATGateway", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", - "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - }, - "allocationId": { - "Fn::GetAtt": [ - "VPCPublicSubnet1EIP6AD938E8", - "AllocationId" - ] - }, - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", - "version": "0.0.0" - } - }, - "PublicSubnet2": { - "id": "PublicSubnet2", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2", - "children": { - "Subnet": { - "id": "Subnet", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "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": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/Acl", - "constructInfo": { - "fqn": "@aws-cdk/core.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-12-ev-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/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - }, - "destinationCidrBlock": "0.0.0.0/0", - "gatewayId": { - "Ref": "VPCIGWB7E252D3" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" - } - }, - "EIP": { - "id": "EIP", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/EIP", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::EIP", - "aws:cdk:cloudformation:props": { - "domain": "vpc", - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", - "version": "0.0.0" - } - }, - "NATGateway": { - "id": "NATGateway", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2/NATGateway", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", - "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VPCPublicSubnet2Subnet74179F39" - }, - "allocationId": { - "Fn::GetAtt": [ - "VPCPublicSubnet2EIP4947BC00", - "AllocationId" - ] - }, - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PublicSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", - "version": "0.0.0" - } - }, - "PrivateSubnet1": { - "id": "PrivateSubnet1", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1", - "children": { - "Subnet": { - "id": "Subnet", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "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": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/Acl", - "constructInfo": { - "fqn": "@aws-cdk/core.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-12-ev-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/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet1/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" - }, - "destinationCidrBlock": "0.0.0.0/0", - "natGatewayId": { - "Ref": "VPCPublicSubnet1NATGatewayE0556630" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", - "version": "0.0.0" - } - }, - "PrivateSubnet2": { - "id": "PrivateSubnet2", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2", - "children": { - "Subnet": { - "id": "Subnet", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/Subnet", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "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": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" - } - }, - "Acl": { - "id": "Acl", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/Acl", - "constructInfo": { - "fqn": "@aws-cdk/core.Resource", - "version": "0.0.0" - } - }, - "RouteTable": { - "id": "RouteTable", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/RouteTable", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" - } - }, - "RouteTableAssociation": { - "id": "RouteTableAssociation", - "path": "aws-cdk-neptune-cluster-12-ev-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/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" - } - }, - "DefaultRoute": { - "id": "DefaultRoute", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/PrivateSubnet2/DefaultRoute", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::Route", - "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" - }, - "destinationCidrBlock": "0.0.0.0/0", - "natGatewayId": { - "Ref": "VPCPublicSubnet2NATGateway3C070193" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", - "version": "0.0.0" - } - }, - "IGW": { - "id": "IGW", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/IGW", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", - "aws:cdk:cloudformation:props": { - "tags": [ - { - "key": "Name", - "value": "aws-cdk-neptune-cluster-12-ev-integ/VPC" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnInternetGateway", - "version": "0.0.0" - } - }, - "VPCGW": { - "id": "VPCGW", - "path": "aws-cdk-neptune-cluster-12-ev-integ/VPC/VPCGW", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", - "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, - "internetGatewayId": { - "Ref": "VPCIGWB7E252D3" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPCGatewayAttachment", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.Vpc", - "version": "0.0.0" - } - }, - "Params": { - "id": "Params", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Params", - "children": { - "Resource": { - "id": "Resource", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Params/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Neptune::DBClusterParameterGroup", - "aws:cdk:cloudformation:props": { - "description": "A nice parameter group", - "family": "neptune1.2", - "parameters": { - "neptune_enable_audit_log": "1", - "neptune_query_timeout": "100000" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.CfnDBClusterParameterGroup", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-neptune.ClusterParameterGroup", - "version": "0.0.0" - } - }, "DbSecurity": { "id": "DbSecurity", - "path": "aws-cdk-neptune-cluster-12-ev-integ/DbSecurity", + "path": "aws-cdk-neptune-integ/DbSecurity", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-neptune-cluster-12-ev-integ/DbSecurity/Resource", + "path": "aws-cdk-neptune-integ/DbSecurity/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::KMS::Key", "aws:cdk:cloudformation:props": { @@ -1634,17 +710,46 @@ "version": "0.0.0" } }, + "Params": { + "id": "Params", + "path": "aws-cdk-neptune-integ/Params", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-neptune-integ/Params/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Neptune::DBClusterParameterGroup", + "aws:cdk:cloudformation:props": { + "description": "A nice parameter group", + "family": "neptune1", + "parameters": { + "neptune_enable_audit_log": "1", + "neptune_query_timeout": "100000" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.CfnDBClusterParameterGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-neptune.ClusterParameterGroup", + "version": "0.0.0" + } + }, "Database": { "id": "Database", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database", + "path": "aws-cdk-neptune-integ/Database", "children": { "Subnets": { "id": "Subnets", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database/Subnets", + "path": "aws-cdk-neptune-integ/Database/Subnets", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database/Subnets/Resource", + "path": "aws-cdk-neptune-integ/Database/Subnets/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Neptune::DBSubnetGroup", "aws:cdk:cloudformation:props": { @@ -1672,11 +777,11 @@ }, "SecurityGroup": { "id": "SecurityGroup", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database/SecurityGroup", + "path": "aws-cdk-neptune-integ/Database/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database/SecurityGroup/Resource", + "path": "aws-cdk-neptune-integ/Database/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { @@ -1700,7 +805,7 @@ }, "from 0.0.0.0_0:{IndirectPort}": { "id": "from 0.0.0.0_0:{IndirectPort}", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}", + "path": "aws-cdk-neptune-integ/Database/SecurityGroup/from 0.0.0.0_0:{IndirectPort}", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { @@ -1740,7 +845,7 @@ }, "Resource": { "id": "Resource", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database/Resource", + "path": "aws-cdk-neptune-integ/Database/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Neptune::DBCluster", "aws:cdk:cloudformation:props": { @@ -1750,7 +855,6 @@ "dbSubnetGroupName": { "Ref": "DatabaseSubnets3C9252C9" }, - "engineVersion": "1.2.0.0", "kmsKeyId": { "Fn::GetAtt": [ "DbSecurity381C2C15", @@ -1775,12 +879,12 @@ }, "Instance1": { "id": "Instance1", - "path": "aws-cdk-neptune-cluster-12-ev-integ/Database/Instance1", + "path": "aws-cdk-neptune-integ/Database/Instance1", "attributes": { "aws:cdk:cloudformation:type": "AWS::Neptune::DBInstance", "aws:cdk:cloudformation:props": { "dbInstanceClass": "db.r5.large", - "autoMinorVersionUpgrade": false, + "autoMinorVersionUpgrade": true, "dbClusterIdentifier": { "Ref": "DatabaseB269D8BB" } @@ -1802,42 +906,6 @@ "fqn": "@aws-cdk/core.Stack", "version": "0.0.0" } - }, - "ClusterTest": { - "id": "ClusterTest", - "path": "ClusterTest", - "children": { - "DefaultTest": { - "id": "DefaultTest", - "path": "ClusterTest/DefaultTest", - "children": { - "Default": { - "id": "Default", - "path": "ClusterTest/DefaultTest/Default", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.92" - } - }, - "DeployAssert": { - "id": "DeployAssert", - "path": "ClusterTest/DefaultTest/DeployAssert", - "constructInfo": { - "fqn": "@aws-cdk/core.Stack", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTestCase", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTest", - "version": "0.0.0" - } } }, "constructInfo": { diff --git a/packages/@aws-cdk/aws-neptune/test/integ.cluster-ev12.ts b/packages/@aws-cdk/aws-neptune/test/integ.cluster-ev12.ts new file mode 100644 index 0000000000000..4f55f06267fc5 --- /dev/null +++ b/packages/@aws-cdk/aws-neptune/test/integ.cluster-ev12.ts @@ -0,0 +1,51 @@ +import * as ec2 from '@aws-cdk/aws-ec2'; +import * as kms from '@aws-cdk/aws-kms'; +import * as cdk from '@aws-cdk/core'; +import * as integ from '@aws-cdk/integ-tests'; +import { DatabaseCluster, EngineVersion, InstanceType, ParameterGroupFamily } from '../lib'; +import { ClusterParameterGroup } from '../lib/parameter-group'; + +/* + * Test creating a cluster with engine version 1.2.0.0 and associated parameter group with family neptune1.2 + * + * Stack verification steps: + * * aws docdb describe-db-clusters --db-cluster-identifier + */ + +const app = new cdk.App(); + +const stack = new cdk.Stack(app, 'aws-cdk-neptune-integ'); + +const vpc = new ec2.Vpc(stack, 'VPC', { maxAzs: 2 }); + +const kmsKey = new kms.Key(stack, 'DbSecurity', { + removalPolicy: cdk.RemovalPolicy.DESTROY, +}); + +const clusterParameterGroup = new ClusterParameterGroup(stack, 'Params', { + description: 'A nice parameter group', + family: ParameterGroupFamily.NEPTUNE_1_2, + parameters: { + neptune_enable_audit_log: '1', + neptune_query_timeout: '100000', + }, +}); + +const cluster = new DatabaseCluster(stack, 'Database', { + vpc, + vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS }, + instanceType: InstanceType.R5_LARGE, + engineVersion: EngineVersion.V1_2_0_0, + clusterParameterGroup, + kmsKey, + removalPolicy: cdk.RemovalPolicy.DESTROY, + autoMinorVersionUpgrade: true, +}); + +cluster.connections.allowDefaultPortFromAnyIpv4('Open to the world'); + +new integ.IntegTest(app, 'ClusterTest', { + testCases: [stack], +}); + +app.synth(); diff --git a/packages/@aws-cdk/aws-neptune/test/integ.cluster.ts b/packages/@aws-cdk/aws-neptune/test/integ.cluster.ts index 5d552c426d4b0..0d7014c049b3a 100644 --- a/packages/@aws-cdk/aws-neptune/test/integ.cluster.ts +++ b/packages/@aws-cdk/aws-neptune/test/integ.cluster.ts @@ -2,8 +2,7 @@ import * as ec2 from '@aws-cdk/aws-ec2'; import * as kms from '@aws-cdk/aws-kms'; import * as cdk from '@aws-cdk/core'; import * as integ from '@aws-cdk/integ-tests'; -import * as constructs from 'constructs'; -import { DatabaseCluster, EngineVersion, InstanceType, ParameterGroupFamily } from '../lib'; +import { DatabaseCluster, InstanceType } from '../lib'; import { ClusterParameterGroup } from '../lib/parameter-group'; /* @@ -14,57 +13,38 @@ import { ClusterParameterGroup } from '../lib/parameter-group'; * * aws docdb describe-db-clusters --db-cluster-identifier */ -interface TestStackProps extends cdk.StackProps { - engineVersion?: EngineVersion; - parameterGroupFamily?: ParameterGroupFamily; -} - -class TestStack extends cdk.Stack { - constructor(scope: constructs.Construct, id: string, props?: TestStackProps) { - super(scope, id, props); - - const vpc = new ec2.Vpc(this, 'VPC', { maxAzs: 2 }); - - const params = new ClusterParameterGroup(this, 'Params', { - family: props?.parameterGroupFamily, - description: 'A nice parameter group', - parameters: { - neptune_enable_audit_log: '1', - neptune_query_timeout: '100000', - }, - }); - - const kmsKey = new kms.Key(this, 'DbSecurity', { - removalPolicy: cdk.RemovalPolicy.DESTROY, - }); +const app = new cdk.App(); - const cluster = new DatabaseCluster(this, 'Database', { - vpc, - vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS }, - instanceType: InstanceType.R5_LARGE, - clusterParameterGroup: params, - kmsKey, - removalPolicy: cdk.RemovalPolicy.DESTROY, - engineVersion: props?.engineVersion, - }); +const stack = new cdk.Stack(app, 'aws-cdk-neptune-integ'); - cluster.connections.allowDefaultPortFromAnyIpv4('Open to the world'); - } -} +const vpc = new ec2.Vpc(stack, 'VPC', { maxAzs: 2 }); -const app = new cdk.App(); +const kmsKey = new kms.Key(stack, 'DbSecurity', { + removalPolicy: cdk.RemovalPolicy.DESTROY, +}); -// Test creating a cluster without specifying engine version that defaults to engine version < 1.2.0.0 and associated parameter group with family neptune1 -const defaultEngineVersionCluster = new TestStack(app, 'aws-cdk-neptune-cluster-default-ev-integ'); +const clusterParameterGroup = new ClusterParameterGroup(stack, 'Params', { + description: 'A nice parameter group', + parameters: { + neptune_enable_audit_log: '1', + neptune_query_timeout: '100000', + }, +}); -// Test creating a cluster with engine version 1.2.0.0 and associated parameter group with family neptune1.2 -const engineVersion12Cluster = new TestStack(app, 'aws-cdk-neptune-cluster-12-ev-integ', { - engineVersion: EngineVersion.V1_2_0_0, - parameterGroupFamily: ParameterGroupFamily.NEPTUNE_1_2, +const cluster = new DatabaseCluster(stack, 'Database', { + vpc, + vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS }, + instanceType: InstanceType.R5_LARGE, + clusterParameterGroup, + kmsKey, + removalPolicy: cdk.RemovalPolicy.DESTROY, + autoMinorVersionUpgrade: true, }); +cluster.connections.allowDefaultPortFromAnyIpv4('Open to the world'); + new integ.IntegTest(app, 'ClusterTest', { - testCases: [defaultEngineVersionCluster, engineVersion12Cluster], + testCases: [stack], }); app.synth();