Merge branch 'main' into fix/destroy-not-exits

aws · Mar 18, 2024 · ab639fa · ab639fa
2 parents e5ac121 + 5142cba
commit ab639fa
Show file tree

Hide file tree

Showing 11 changed files with 597 additions and 42 deletions.
diff --git a/...g.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json b/...g.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json
diff --git a/...opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json b/...opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json
diff --git a/...search.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.assets.json b/...search.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.assets.json
diff --git a/...arch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.template.json b/...arch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.template.json
@@ -0,0 +1,82 @@
+{
+ "Resources": {
+  "Domain66AC69E0": {
+   "Type": "AWS::OpenSearchService::Domain",
+   "Properties": {
+    "ClusterConfig": {
+     "DedicatedMasterEnabled": false,
+     "InstanceCount": 1,
+     "InstanceType": "r5.large.search",
+     "MultiAZWithStandbyEnabled": false,
+     "ZoneAwarenessEnabled": false
+    },
+    "DomainEndpointOptions": {
+     "EnforceHTTPS": false,
+     "TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07"
+    },
+    "EBSOptions": {
+     "EBSEnabled": true,
+     "VolumeSize": 10,
+     "VolumeType": "gp2"
+    },
+    "EncryptionAtRestOptions": {
+     "Enabled": false
+    },
+    "EngineVersion": "OpenSearch_2.11",
+    "LogPublishingOptions": {
+     "SEARCH_SLOW_LOGS": {
+      "Enabled": false
+     },
+     "INDEX_SLOW_LOGS": {
+      "Enabled": false
+     },
+     "ES_APPLICATION_LOGS": {
+      "Enabled": false
+     },
+     "AUDIT_LOGS": {
+      "Enabled": false
+     }
+    },
+    "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/...nteg/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk.out b/...nteg/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk.out
diff --git a/...g/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/integ.json b/...g/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/integ.json
diff --git a/...est/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/manifest.json b/...est/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/manifest.json