Skip to content

Commit db3e77d

Browse files
authored
feat(opensearch): add OpenSearch 2.13 engine version (#30399)
### Reason for this change [Amazon OpenSearch Service now supports OpenSearch version 2.13](https://aws.amazon.com/about-aws/whats-new/2024/05/amazon-opensearch-supports-opensearch-version-2-13/) ### Description of changes Adds support for OpenSearch engine version 2.13 ### Description of how you validated changes `yarn test` ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 69c5dde commit db3e77d

File tree

11 files changed

+21
-16
lines changed

11 files changed

+21
-16
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"EncryptionAtRestOptions": {
2323
"Enabled": false
2424
},
25-
"EngineVersion": "OpenSearch_2.11",
25+
"EngineVersion": "OpenSearch_2.13",
2626
"LogPublishingOptions": {
2727
"SEARCH_SLOW_LOGS": {
2828
"Enabled": false
@@ -79,4 +79,4 @@
7979
]
8080
}
8181
}
82-
}
82+
}

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/tree.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class TestStack extends Stack {
77
super(scope, id, props);
88

99
const domainProps: opensearch.DomainProps = {
10-
version: opensearch.EngineVersion.OPENSEARCH_2_11,
10+
version: opensearch.EngineVersion.OPENSEARCH_2_13,
1111
removalPolicy: RemovalPolicy.DESTROY,
1212
logging: {
1313
auditLogEnabled: false,
@@ -26,4 +26,4 @@ class TestStack extends Stack {
2626

2727
const app = new App();
2828
new TestStack(app, 'cdk-integ-opensearch-with-logging-disabled');
29-
app.synth();
29+
app.synth();

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"EncryptionAtRestOptions": {
2323
"Enabled": false
2424
},
25-
"EngineVersion": "OpenSearch_2.11",
25+
"EngineVersion": "OpenSearch_2.13",
2626
"LogPublishingOptions": {},
2727
"NodeToNodeEncryptionOptions": {
2828
"Enabled": false
@@ -66,4 +66,4 @@
6666
]
6767
}
6868
}
69-
}
69+
}

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class TestStack extends Stack {
99

1010
// deploy the latest opensearch domain with minimal configuration
1111
const domainProps: opensearch.DomainProps = {
12-
version: opensearch.EngineVersion.OPENSEARCH_2_11,
12+
version: opensearch.EngineVersion.OPENSEARCH_2_13,
1313
removalPolicy: RemovalPolicy.DESTROY,
1414
capacity: {
1515
multiAzWithStandbyEnabled: false,

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/cdkinteg-opensearch-without-logs-resource-policy.template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"EncryptionAtRestOptions": {
2323
"Enabled": false
2424
},
25-
"EngineVersion": "OpenSearch_2.11",
25+
"EngineVersion": "OpenSearch_2.13",
2626
"LogPublishingOptions": {
2727
"ES_APPLICATION_LOGS": {
2828
"CloudWatchLogsLogGroupArn": {
@@ -73,4 +73,4 @@
7373
]
7474
}
7575
}
76-
}
76+
}

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/tree.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class TestStack extends Stack {
3434
super(scope, id, props);
3535

3636
const domainProps: opensearch.DomainProps = {
37-
version: opensearch.EngineVersion.OPENSEARCH_2_11,
37+
version: opensearch.EngineVersion.OPENSEARCH_2_13,
3838
removalPolicy: RemovalPolicy.DESTROY,
3939
logging: {
4040
appLogEnabled: true,

packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts

+3
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ export class EngineVersion {
9999
/** AWS OpenSearch 2.11 */
100100
public static readonly OPENSEARCH_2_11 = EngineVersion.openSearch('2.11');
101101

102+
/** AWS OpenSearch 2.13 */
103+
public static readonly OPENSEARCH_2_13 = EngineVersion.openSearch('2.13');
104+
102105
/**
103106
* Custom ElasticSearch version
104107
* @param version custom version number

packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const testedOpenSearchVersions = [
4242
EngineVersion.OPENSEARCH_2_9,
4343
EngineVersion.OPENSEARCH_2_10,
4444
EngineVersion.OPENSEARCH_2_11,
45+
EngineVersion.OPENSEARCH_2_13,
4546
];
4647

4748
each(testedOpenSearchVersions).test('connections throws if domain is not placed inside a vpc', (engineVersion) => {
@@ -207,6 +208,7 @@ each([
207208
[EngineVersion.OPENSEARCH_2_9, 'OpenSearch_2.9'],
208209
[EngineVersion.OPENSEARCH_2_10, 'OpenSearch_2.10'],
209210
[EngineVersion.OPENSEARCH_2_11, 'OpenSearch_2.11'],
211+
[EngineVersion.OPENSEARCH_2_13, 'OpenSearch_2.13'],
210212
]).test('minimal example renders correctly', (engineVersion, expectedCfVersion) => {
211213
new Domain(stack, 'Domain', { version: engineVersion });
212214

0 commit comments

Comments
 (0)