Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(opensearch): OpenSearch 2.9 engine version #27612

Merged
merged 2 commits into from
Oct 19, 2023
Merged

feat(opensearch): OpenSearch 2.9 engine version #27612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eac539
feat(opensearch): opensearch 2.9 engine version
tam0ri Oct 19, 2023
34bd3ea
Merge branch 'main' into feat/opensearch-2.9
mergify[bot] Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ce/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions ...-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions ...pensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion .../framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...amework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions ...work-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json
View file
Open in desktop

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

25 changes: 13 additions & 12 deletions ...ramework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion .../@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts
View file
Open in desktop
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