From 4eac5392d5a56ec88a42c7b46934b995ce88f532 Mon Sep 17 00:00:00 2001 From: Tatsuya Mori Date: Thu, 19 Oct 2023 15:33:43 +0000 Subject: [PATCH] feat(opensearch): opensearch 2.9 engine version --- ...efaultTestDeployAssert4E6713E1.assets.json | 2 +- .../cdk-integ-opensearch.assets.json | 6 ++--- .../cdk-integ-opensearch.template.json | 6 ++--- .../integ.opensearch.min.js.snapshot/cdk.out | 2 +- .../integ.json | 2 +- .../manifest.json | 6 +++-- .../tree.json | 25 ++++++++++--------- .../test/integ.opensearch.min.ts | 2 +- .../aws-opensearchservice/lib/version.ts | 3 +++ .../aws-opensearchservice/test/domain.test.ts | 2 ++ 10 files changed, 32 insertions(+), 24 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json index b4769dfd10a1d..618513371ae9f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json @@ -1,5 +1,5 @@ { - "version": "32.0.0", + "version": "34.0.0", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json index 71d99115dfdcf..dc5d0b6cdb3ea 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json @@ -1,7 +1,7 @@ { - "version": "32.0.0", + "version": "34.0.0", "files": { - "92f1cdc59ceaf5ee6852a715bbbc3c03a3c592f5049d88c0aa67001e43b87313": { + "cdd60d711c9bfd7500d5a52cdbebff193489964e870211425b73cf996a23dac4": { "source": { "path": "cdk-integ-opensearch.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "92f1cdc59ceaf5ee6852a715bbbc3c03a3c592f5049d88c0aa67001e43b87313.json", + "objectKey": "cdd60d711c9bfd7500d5a52cdbebff193489964e870211425b73cf996a23dac4.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json index 96ef1b2bd6d94..54b79098b3e70 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json @@ -7,8 +7,8 @@ "DedicatedMasterEnabled": false, "InstanceCount": 1, "InstanceType": "r5.large.search", - "ZoneAwarenessEnabled": false, - "MultiAZWithStandbyEnabled": false + "MultiAZWithStandbyEnabled": false, + "ZoneAwarenessEnabled": false }, "DomainEndpointOptions": { "EnforceHTTPS": false, @@ -22,7 +22,7 @@ "EncryptionAtRestOptions": { "Enabled": false }, - "EngineVersion": "OpenSearch_2.7", + "EngineVersion": "OpenSearch_2.9", "LogPublishingOptions": {}, "NodeToNodeEncryptionOptions": { "Enabled": false diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out index f0b901e7c06e5..2313ab5436501 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"32.0.0"} \ No newline at end of file +{"version":"34.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json index 778d2e2b910d5..4c156b0bd644a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "32.0.0", + "version": "34.0.0", "testCases": { "Integ/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json index 9f22e51716f98..475ce60decde1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "32.0.0", + "version": "34.0.0", "artifacts": { "cdk-integ-opensearch.assets": { "type": "cdk:asset-manifest", @@ -14,10 +14,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "cdk-integ-opensearch.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/92f1cdc59ceaf5ee6852a715bbbc3c03a3c592f5049d88c0aa67001e43b87313.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cdd60d711c9bfd7500d5a52cdbebff193489964e870211425b73cf996a23dac4.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -67,6 +68,7 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "IntegDefaultTestDeployAssert4E6713E1.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json index 5bd26ee28aca1..abfa743ab6d0f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json @@ -22,6 +22,7 @@ "dedicatedMasterEnabled": false, "instanceCount": 1, "instanceType": "r5.large.search", + "multiAzWithStandbyEnabled": false, "zoneAwarenessEnabled": false }, "domainEndpointOptions": { @@ -36,7 +37,7 @@ "encryptionAtRestOptions": { "enabled": false }, - "engineVersion": "OpenSearch_2.7", + "engineVersion": "OpenSearch_2.9", "logPublishingOptions": {}, "nodeToNodeEncryptionOptions": { "enabled": false @@ -45,13 +46,13 @@ }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } }, "BootstrapVersion": { @@ -59,7 +60,7 @@ "path": "cdk-integ-opensearch/BootstrapVersion", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } }, "CheckBootstrapVersion": { @@ -67,13 +68,13 @@ "path": "cdk-integ-opensearch/CheckBootstrapVersion", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } }, "Integ": { @@ -89,7 +90,7 @@ "path": "Integ/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } }, "DeployAssert": { @@ -101,7 +102,7 @@ "path": "Integ/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } }, "CheckBootstrapVersion": { @@ -109,13 +110,13 @@ "path": "Integ/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } } }, @@ -135,13 +136,13 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.55" + "version": "10.2.70" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts index 2861e1090b74c..a7293ce236256 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts +++ b/packages/@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_7, + version: opensearch.EngineVersion.OPENSEARCH_2_9, 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 index d9e94c1715b29..8965e1284ab44 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts @@ -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 diff --git a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts index fb9057fed85f0..ccd97c4324ed5 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts @@ -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) => { @@ -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 });