Revert "collect cluster tests into a single file using integ.IntegTes…

…t test cases" This reverts commit 7e9858c.
aws · Sep 7, 2022 · b82f109 · b82f109
1 parent 7e9858c
commit b82f109
Show file tree

Hide file tree

Showing 15 changed files with 1,553 additions and 1,422 deletions.
diff --git a/...faultTestDeployAssert6A1BBA9D.assets.json → ...faultTestDeployAssert6A1BBA9D.assets.json b/...faultTestDeployAssert6A1BBA9D.assets.json → ...faultTestDeployAssert6A1BBA9D.assets.json
diff --git a/...ultTestDeployAssert6A1BBA9D.template.json → ...ultTestDeployAssert6A1BBA9D.template.json b/...ultTestDeployAssert6A1BBA9D.template.json → ...ultTestDeployAssert6A1BBA9D.template.json
diff --git a/...k-neptune-cluster-12-ev-integ.assets.json → ...napshot/aws-cdk-neptune-integ.assets.json b/...k-neptune-cluster-12-ev-integ.assets.json → ...napshot/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/...neptune-cluster-12-ev-integ.template.json → ...pshot/aws-cdk-neptune-integ.template.json b/...neptune-cluster-12-ev-integ.template.json → ...pshot/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
@@ -0,0 +1 @@
+{"version":"21.0.0"}
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
@@ -0,0 +1,12 @@
+{
+ "version": "21.0.0",
+ "testCases": {
+ "ClusterTest/DefaultTest": {
+ "stacks": [
+ "aws-cdk-neptune-integ"
+ ],
+ "assertionStack": "ClusterTest/DefaultTest/DeployAssert",
+ "assertionStackName": "ClusterTestDefaultTestDeployAssert6A1BBA9D"
+ }
+ }
+}