Merge branch 'main' into conroy/import

aws · Nov 23, 2023 · 651d67a · 651d67a
2 parents c64d573 + 31c18f7
commit 651d67a
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 31 deletions.
diff --git a/...ce/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json b/...ce/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json
diff --git a/...-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json b/...-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json
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.9",
+ "EngineVersion": "OpenSearch_2.11",
  "LogPublishingOptions": {},
  "NodeToNodeEncryptionOptions": {
  "Enabled": false

diff --git a/.../framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out b/.../framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out
diff --git a/...amework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json b/...amework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json
diff --git a/...work-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json b/...work-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json
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_9,
+ version: opensearch.EngineVersion.OPENSEARCH_2_11,
  removalPolicy: RemovalPolicy.DESTROY,
  capacity: {
  multiAzWithStandbyEnabled: false,

diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts
@@ -90,6 +90,12 @@ 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.11 */
+ public static readonly OPENSEARCH_2_11 = EngineVersion.openSearch('2.11');
+
  /**
  * 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
@@ -40,6 +40,8 @@ const testedOpenSearchVersions = [
  EngineVersion.OPENSEARCH_2_5,
  EngineVersion.OPENSEARCH_2_7,
  EngineVersion.OPENSEARCH_2_9,
+ EngineVersion.OPENSEARCH_2_10,
+ EngineVersion.OPENSEARCH_2_11,
 ];
 
 each(testedOpenSearchVersions).test('connections throws if domain is not placed inside a vpc', (engineVersion) => {
@@ -203,6 +205,8 @@ each([
  [EngineVersion.OPENSEARCH_2_5, 'OpenSearch_2.5'],
  [EngineVersion.OPENSEARCH_2_7, 'OpenSearch_2.7'],
  [EngineVersion.OPENSEARCH_2_9, 'OpenSearch_2.9'],
+ [EngineVersion.OPENSEARCH_2_10, 'OpenSearch_2.10'],
+ [EngineVersion.OPENSEARCH_2_11, 'OpenSearch_2.11'],
 ]).test('minimal example renders correctly', (engineVersion, expectedCfVersion) => {
  new Domain(stack, 'Domain', { version: engineVersion });