Skip to content

Commit

Permalink
feat(opensearch): OpenSearch 2.9 engine version (#27612)
Browse files Browse the repository at this point in the history
[Amazon OpenSearch Service now supports OpenSearch version 2.9](https://aws.amazon.com/about-aws/whats-new/2023/10/amazon-opensearch-service-opensearch-version-2-9/). This PR adds the new engine version.

Closes #27574

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
tam0ri committed Oct 19, 2023
1 parent a54ea0f commit 1f7075f
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 24 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"DedicatedMasterEnabled": false,
"InstanceCount": 1,
"InstanceType": "r5.large.search",
"ZoneAwarenessEnabled": false,
"MultiAZWithStandbyEnabled": false
"MultiAZWithStandbyEnabled": false,
"ZoneAwarenessEnabled": false
},
"DomainEndpointOptions": {
"EnforceHTTPS": false,
Expand All @@ -22,7 +22,7 @@
"EncryptionAtRestOptions": {
"Enabled": false
},
"EngineVersion": "OpenSearch_2.7",
"EngineVersion": "OpenSearch_2.9",
"LogPublishingOptions": {},
"NodeToNodeEncryptionOptions": {
"Enabled": false
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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_7,
version: opensearch.EngineVersion.OPENSEARCH_2_9,
removalPolicy: RemovalPolicy.DESTROY,
capacity: {
multiAzWithStandbyEnabled: false,
Expand Down
3 changes: 3 additions & 0 deletions packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ export class EngineVersion {
/** AWS OpenSearch 2.7 */
public static readonly OPENSEARCH_2_7 = EngineVersion.openSearch('2.7');

/** AWS OpenSearch 2.9 */
public static readonly OPENSEARCH_2_9 = EngineVersion.openSearch('2.9');

/**
* Custom ElasticSearch version
* @param version custom version number
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const testedOpenSearchVersions = [
EngineVersion.OPENSEARCH_2_3,
EngineVersion.OPENSEARCH_2_5,
EngineVersion.OPENSEARCH_2_7,
EngineVersion.OPENSEARCH_2_9,
];

each(testedOpenSearchVersions).test('connections throws if domain is not placed inside a vpc', (engineVersion) => {
Expand Down Expand Up @@ -201,6 +202,7 @@ each([
[EngineVersion.OPENSEARCH_2_3, 'OpenSearch_2.3'],
[EngineVersion.OPENSEARCH_2_5, 'OpenSearch_2.5'],
[EngineVersion.OPENSEARCH_2_7, 'OpenSearch_2.7'],
[EngineVersion.OPENSEARCH_2_9, 'OpenSearch_2.9'],
]).test('minimal example renders correctly', (engineVersion, expectedCfVersion) => {
new Domain(stack, 'Domain', { version: engineVersion });

Expand Down

0 comments on commit 1f7075f

Please sign in to comment.