feat(opensearch): adds OpenSearch 2.13 engine version

aws · May 31, 2024 · 5953449 · 5953449
1 parent 4c3b6a0
commit 5953449
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 20 deletions.
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
@@ -22,7 +22,7 @@
     "EncryptionAtRestOptions": {
      "Enabled": false
     },
-    "EngineVersion": "OpenSearch_2.11",
+    "EngineVersion": "OpenSearch_2.13",
     "LogPublishingOptions": {
      "SEARCH_SLOW_LOGS": {
       "Enabled": false
@@ -79,4 +79,4 @@
    ]
   }
  }
-}
+}
diff --git a/...eg/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/tree.json b/...eg/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/tree.json
diff --git a/...sting/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts b/...sting/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts
@@ -7,7 +7,7 @@ class TestStack extends Stack {
     super(scope, id, props);
 
     const domainProps: opensearch.DomainProps = {
-      version: opensearch.EngineVersion.OPENSEARCH_2_11,
+      version: opensearch.EngineVersion.OPENSEARCH_2_13,
       removalPolicy: RemovalPolicy.DESTROY,
       logging: {
         auditLogEnabled: false,
@@ -26,4 +26,4 @@ class TestStack extends Stack {
 
 const app = new App();
 new TestStack(app, 'cdk-integ-opensearch-with-logging-disabled');
-app.synth();
+app.synth();
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
@@ -22,7 +22,7 @@
     "EncryptionAtRestOptions": {
      "Enabled": false
     },
-    "EngineVersion": "OpenSearch_2.11",
+    "EngineVersion": "OpenSearch_2.13",
     "LogPublishingOptions": {},
     "NodeToNodeEncryptionOptions": {
      "Enabled": false
@@ -66,4 +66,4 @@
    ]
   }
  }
-}
+}
diff --git a/...ramework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json b/...ramework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json
diff --git a/.../@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts b/.../@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts
@@ -9,7 +9,7 @@ class TestStack extends Stack {
 
     // deploy the latest opensearch domain with minimal configuration
     const domainProps: opensearch.DomainProps = {
-      version: opensearch.EngineVersion.OPENSEARCH_2_11,
+      version: opensearch.EngineVersion.OPENSEARCH_2_13,
       removalPolicy: RemovalPolicy.DESTROY,
       capacity: {
         multiAzWithStandbyEnabled: false,

diff --git a/...esource-policy.js.snapshot/cdkinteg-opensearch-without-logs-resource-policy.template.json b/...esource-policy.js.snapshot/cdkinteg-opensearch-without-logs-resource-policy.template.json
@@ -22,7 +22,7 @@
     "EncryptionAtRestOptions": {
      "Enabled": false
     },
-    "EngineVersion": "OpenSearch_2.11",
+    "EngineVersion": "OpenSearch_2.13",
     "LogPublishingOptions": {
      "ES_APPLICATION_LOGS": {
       "CloudWatchLogsLogGroupArn": {
@@ -73,4 +73,4 @@
    ]
   }
  }
-}
+}
diff --git a/...pensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/tree.json b/...pensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/tree.json
diff --git a/...rk-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.ts b/...rk-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.ts
@@ -34,7 +34,7 @@ class TestStack extends Stack {
     super(scope, id, props);
 
     const domainProps: opensearch.DomainProps = {
-      version: opensearch.EngineVersion.OPENSEARCH_2_11,
+      version: opensearch.EngineVersion.OPENSEARCH_2_13,
       removalPolicy: RemovalPolicy.DESTROY,
       logging: {
         appLogEnabled: true,

diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts
@@ -90,15 +90,18 @@ export class EngineVersion {
   /** AWS OpenSearch 2.9 */
   public static readonly OPENSEARCH_2_9 = EngineVersion.openSearch('2.9');
 
+  /** AWS OpenSearch 2.10 */
+  public static readonly OPENSEARCH_2_10 = EngineVersion.openSearch('2.10');
+
   /**
-   * AWS OpenSearch 2.10
+   * AWS OpenSearch 2.11
    * @deprecated use latest version of the OpenSearch engine
    **/
-  public static readonly OPENSEARCH_2_10 = EngineVersion.openSearch('2.10');
-
-  /** AWS OpenSearch 2.11 */
   public static readonly OPENSEARCH_2_11 = EngineVersion.openSearch('2.11');
 
+  /** AWS OpenSearch 2.13 */
+  public static readonly OPENSEARCH_2_13 = EngineVersion.openSearch('2.13');
+
   /**
    * Custom ElasticSearch version
    * @param version custom version number

diff --git a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts
@@ -42,6 +42,7 @@ const testedOpenSearchVersions = [
   EngineVersion.OPENSEARCH_2_9,
   EngineVersion.OPENSEARCH_2_10,
   EngineVersion.OPENSEARCH_2_11,
+  EngineVersion.OPENSEARCH_2_13,
 ];
 
 each(testedOpenSearchVersions).test('connections throws if domain is not placed inside a vpc', (engineVersion) => {
@@ -207,6 +208,7 @@ each([
   [EngineVersion.OPENSEARCH_2_9, 'OpenSearch_2.9'],
   [EngineVersion.OPENSEARCH_2_10, 'OpenSearch_2.10'],
   [EngineVersion.OPENSEARCH_2_11, 'OpenSearch_2.11'],
+  [EngineVersion.OPENSEARCH_2_13, 'OpenSearch_2.13'],
 ]).test('minimal example renders correctly', (engineVersion, expectedCfVersion) => {
   new Domain(stack, 'Domain', { version: engineVersion });