added integration test and ENABLE_OPENSEARCH_MULTIAZ_WITH_STANDBY fea…

…ture flag
lpizzinidev · Jun 29, 2023 · 75db8ae · 75db8ae
1 parent 509ced2
commit 75db8ae
Show file tree

Hide file tree

Showing 23 changed files with 540 additions and 14 deletions.
diff --git a/...st/aws-appsync/test/integ.graphql-opensearch.js.snapshot/appsync-opensearch.template.json b/...st/aws-appsync/test/integ.graphql-opensearch.js.snapshot/appsync-opensearch.template.json
@@ -22,7 +22,6 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "MultiAZWithStandbyEnabled": false,
      "ZoneAwarenessEnabled": false
     },
     "DomainEndpointOptions": {

diff --git a/...ensearch.advancedsecurity.js.snapshot/cdk-integ-opensearch-advancedsecurity.template.json b/...ensearch.advancedsecurity.js.snapshot/cdk-integ-opensearch-advancedsecurity.template.json
@@ -22,7 +22,6 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "MultiAZWithStandbyEnabled": false,
      "ZoneAwarenessEnabled": false
     },
     "DomainEndpointOptions": {

diff --git a/...ognitodashboardsauth.js.snapshot/cdk-integ-opensearch-cognitodashboardsauth.template.json b/...ognitodashboardsauth.js.snapshot/cdk-integ-opensearch-cognitodashboardsauth.template.json
@@ -84,7 +84,6 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "MultiAZWithStandbyEnabled": false,
      "ZoneAwarenessEnabled": false
     },
     "CognitoOptions": {

diff --git a/...g.opensearch.custom-kms-key.js.snapshot/cdk-integ-opensearch-custom-kms-key.template.json b/...g.opensearch.custom-kms-key.js.snapshot/cdk-integ-opensearch-custom-kms-key.template.json
@@ -42,7 +42,6 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "MultiAZWithStandbyEnabled": false,
      "ZoneAwarenessEnabled": false
     },
     "DomainEndpointOptions": {

diff --git a/...ws-opensearchservice/test/integ.opensearch.js.snapshot/cdk-integ-opensearch.template.json b/...ws-opensearchservice/test/integ.opensearch.js.snapshot/cdk-integ-opensearch.template.json
@@ -114,7 +114,6 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "MultiAZWithStandbyEnabled": false,
      "ZoneAwarenessEnabled": false
     },
     "DomainEndpointOptions": {
@@ -428,7 +427,6 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "MultiAZWithStandbyEnabled": false,
      "ZoneAwarenessEnabled": false
     },
     "DomainEndpointOptions": {

diff --git a/...pensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json b/...pensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json
@@ -7,7 +7,6 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "MultiAZWithStandbyEnabled": false,
      "ZoneAwarenessEnabled": false
     },
     "DomainEndpointOptions": {

diff --git a/....js.snapshot/IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.assets.json b/....js.snapshot/IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...s.snapshot/IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.template.json b/...s.snapshot/IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.template.json
@@ -0,0 +1,36 @@
+{
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...ch.multiaz-with-standby.js.snapshot/cdk-integ-opensearch-multiaz-with-standby.assets.json b/...ch.multiaz-with-standby.js.snapshot/cdk-integ-opensearch-multiaz-with-standby.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "722892555255764f20f275e929016594c8562b137bbdfb5df2a004c9565301df": {
+      "source": {
+        "path": "cdk-integ-opensearch-multiaz-with-standby.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "722892555255764f20f275e929016594c8562b137bbdfb5df2a004c9565301df.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/....multiaz-with-standby.js.snapshot/cdk-integ-opensearch-multiaz-with-standby.template.json b/....multiaz-with-standby.js.snapshot/cdk-integ-opensearch-multiaz-with-standby.template.json
@@ -0,0 +1,74 @@
+{
+ "Resources": {
+  "Domain66AC69E0": {
+   "Type": "AWS::OpenSearchService::Domain",
+   "Properties": {
+    "ClusterConfig": {
+     "DedicatedMasterCount": 3,
+     "DedicatedMasterEnabled": true,
+     "DedicatedMasterType": "r5.large.search",
+     "InstanceCount": 3,
+     "InstanceType": "r5.large.search",
+     "MultiAZWithStandbyEnabled": true,
+     "ZoneAwarenessConfig": {
+      "AvailabilityZoneCount": 3
+     },
+     "ZoneAwarenessEnabled": true
+    },
+    "DomainEndpointOptions": {
+     "EnforceHTTPS": false,
+     "TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07"
+    },
+    "EBSOptions": {
+     "EBSEnabled": true,
+     "VolumeSize": 10,
+     "VolumeType": "gp3"
+    },
+    "EncryptionAtRestOptions": {
+     "Enabled": false
+    },
+    "EngineVersion": "OpenSearch_1.3",
+    "LogPublishingOptions": {},
+    "NodeToNodeEncryptionOptions": {
+     "Enabled": false
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...test/aws-opensearchservice/test/integ.opensearch.multiaz-with-standby.js.snapshot/cdk.out b/...test/aws-opensearchservice/test/integ.opensearch.multiaz-with-standby.js.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"32.0.0"}
diff --git a/...t/aws-opensearchservice/test/integ.opensearch.multiaz-with-standby.js.snapshot/integ.json b/...t/aws-opensearchservice/test/integ.opensearch.multiaz-with-standby.js.snapshot/integ.json
@@ -0,0 +1,12 @@
+{
+  "version": "32.0.0",
+  "testCases": {
+    "IntegOpenSearchMultiAzWithStandby/DefaultTest": {
+      "stacks": [
+        "cdk-integ-opensearch-multiaz-with-standby"
+      ],
+      "assertionStack": "IntegOpenSearchMultiAzWithStandby/DefaultTest/DeployAssert",
+      "assertionStackName": "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982"
+    }
+  }
+}
diff --git a/...ws-opensearchservice/test/integ.opensearch.multiaz-with-standby.js.snapshot/manifest.json b/...ws-opensearchservice/test/integ.opensearch.multiaz-with-standby.js.snapshot/manifest.json
@@ -0,0 +1,111 @@
+{
+  "version": "32.0.0",
+  "artifacts": {
+    "cdk-integ-opensearch-multiaz-with-standby.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "cdk-integ-opensearch-multiaz-with-standby.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "cdk-integ-opensearch-multiaz-with-standby": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "cdk-integ-opensearch-multiaz-with-standby.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}/722892555255764f20f275e929016594c8562b137bbdfb5df2a004c9565301df.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+        "additionalDependencies": [
+          "cdk-integ-opensearch-multiaz-with-standby.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": [
+        "cdk-integ-opensearch-multiaz-with-standby.assets"
+      ],
+      "metadata": {
+        "/cdk-integ-opensearch-multiaz-with-standby/Domain/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Domain66AC69E0"
+          }
+        ],
+        "/cdk-integ-opensearch-multiaz-with-standby/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/cdk-integ-opensearch-multiaz-with-standby/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "cdk-integ-opensearch-multiaz-with-standby"
+    },
+    "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.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": [
+          "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.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": [
+        "IntegOpenSearchMultiAzWithStandbyDefaultTestDeployAssertFD2E7982.assets"
+      ],
+      "metadata": {
+        "/IntegOpenSearchMultiAzWithStandby/DefaultTest/DeployAssert/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/IntegOpenSearchMultiAzWithStandby/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "IntegOpenSearchMultiAzWithStandby/DefaultTest/DeployAssert"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    }
+  }
+}