diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch-min.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch-min.assets.json index 1d985372e9bca..18c06909d63d9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch-min.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch-min.assets.json @@ -1,16 +1,16 @@ { "version": "48.0.0", "files": { - "01af71c998c7fb36d39350c7db1d7ef85ffff79d67120321c52b3a85d3db7bbc": { + "6be984dcf4677dc96af5bb9fa0e9cccc3b4af58f83cc6567da742d81dcf0f9b2": { "displayName": "cdk-integ-opensearch-min Template", "source": { "path": "cdk-integ-opensearch-min.template.json", "packaging": "file" }, "destinations": { - "current_account-current_region-0467589f": { + "current_account-current_region-5dba820b": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "01af71c998c7fb36d39350c7db1d7ef85ffff79d67120321c52b3a85d3db7bbc.json", + "objectKey": "6be984dcf4677dc96af5bb9fa0e9cccc3b4af58f83cc6567da742d81dcf0f9b2.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-min.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch-min.template.json index 220901beec0c0..dcd98fffaba10 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch-min.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch-min.template.json @@ -123,6 +123,37 @@ }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" + }, + "OpenSearch333036DEFB": { + "Type": "AWS::OpenSearchService::Domain", + "Properties": { + "ClusterConfig": { + "DedicatedMasterEnabled": false, + "InstanceCount": 1, + "InstanceType": "r5.large.search", + "MultiAZWithStandbyEnabled": false, + "ZoneAwarenessEnabled": false + }, + "DomainEndpointOptions": { + "EnforceHTTPS": false, + "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07" + }, + "EBSOptions": { + "EBSEnabled": true, + "VolumeSize": 10, + "VolumeType": "gp2" + }, + "EncryptionAtRestOptions": { + "Enabled": false + }, + "EngineVersion": "OpenSearch_3.3", + "LogPublishingOptions": {}, + "NodeToNodeEncryptionOptions": { + "Enabled": false + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" } }, "Parameters": { 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 2db6fb875e201..fb8fd9b579f8c 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 @@ -18,7 +18,7 @@ "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}/01af71c998c7fb36d39350c7db1d7ef85ffff79d67120321c52b3a85d3db7bbc.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6be984dcf4677dc96af5bb9fa0e9cccc3b4af58f83cc6567da742d81dcf0f9b2.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -37,7 +37,13 @@ "/cdk-integ-opensearch-min/OpenSearch_2.13": [ { "type": "aws:cdk:analytics:construct", - "data": "*" + "data": { + "version": "*", + "removalPolicy": "destroy", + "capacity": { + "multiAzWithStandbyEnabled": false + } + } } ], "/cdk-integ-opensearch-min/OpenSearch_2.13/Resource": [ @@ -49,7 +55,13 @@ "/cdk-integ-opensearch-min/OpenSearch_2.15": [ { "type": "aws:cdk:analytics:construct", - "data": "*" + "data": { + "version": "*", + "removalPolicy": "destroy", + "capacity": { + "multiAzWithStandbyEnabled": false + } + } } ], "/cdk-integ-opensearch-min/OpenSearch_2.15/Resource": [ @@ -61,7 +73,13 @@ "/cdk-integ-opensearch-min/OpenSearch_2.17": [ { "type": "aws:cdk:analytics:construct", - "data": "*" + "data": { + "version": "*", + "removalPolicy": "destroy", + "capacity": { + "multiAzWithStandbyEnabled": false + } + } } ], "/cdk-integ-opensearch-min/OpenSearch_2.17/Resource": [ @@ -73,7 +91,13 @@ "/cdk-integ-opensearch-min/OpenSearch_3.1": [ { "type": "aws:cdk:analytics:construct", - "data": "*" + "data": { + "version": "*", + "removalPolicy": "destroy", + "capacity": { + "multiAzWithStandbyEnabled": false + } + } } ], "/cdk-integ-opensearch-min/OpenSearch_3.1/Resource": [ @@ -82,6 +106,24 @@ "data": "OpenSearch31BFB5A26D" } ], + "/cdk-integ-opensearch-min/OpenSearch_3.3": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "version": "*", + "removalPolicy": "destroy", + "capacity": { + "multiAzWithStandbyEnabled": false + } + } + } + ], + "/cdk-integ-opensearch-min/OpenSearch_3.3/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "OpenSearch333036DEFB" + } + ], "/cdk-integ-opensearch-min/BootstrapVersion": [ { "type": "aws:cdk:logicalId", @@ -157,6 +199,7 @@ "module": "aws-cdk-lib", "flags": { "@aws-cdk/aws-signer:signingProfileNamePassedToCfn": { + "userValue": true, "recommendedValue": true, "explanation": "Pass signingProfileName to CfnSigningProfile" }, @@ -175,6 +218,7 @@ } }, "@aws-cdk/aws-ecs-patterns:secGroupsDisablesImplicitOpenListener": { + "userValue": true, "recommendedValue": true, "explanation": "Disable implicit openListener when custom security groups are provided" }, @@ -286,7 +330,7 @@ "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": { "userValue": true, "recommendedValue": true, - "explanation": "Enable this feature to by default create default policy names for imported roles that depend on the stack the role is in." + "explanation": "Enable this feature to create default policy names for imported roles that depend on the stack the role is in." }, "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": { "userValue": true, @@ -625,10 +669,25 @@ "userValue": true, "recommendedValue": true, "explanation": "When enabled, CDK creates and manages loggroup for the lambda function" + }, + "@aws-cdk/aws-elasticloadbalancingv2:networkLoadBalancerWithSecurityGroupByDefault": { + "recommendedValue": true, + "explanation": "When enabled, Network Load Balancer will be created with a security group by default." + }, + "@aws-cdk/aws-stepfunctions-tasks:httpInvokeDynamicJsonPathEndpoint": { + "recommendedValue": true, + "explanation": "When enabled, allows using a dynamic apiEndpoint with JSONPath format in HttpInvoke tasks.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-ecs-patterns:uniqueTargetGroupId": { + "recommendedValue": true, + "explanation": "When enabled, ECS patterns will generate unique target group IDs to prevent conflicts during load balancer replacement" } } } } }, - "minimumCliVersion": "2.1027.0" + "minimumCliVersion": "2.1033.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/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json index c8f7d6109401f..ceed008ddfbb3 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 @@ -1 +1 @@ -{"version":"tree-0.1","tree":{"id":"App","path":"","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"children":{"cdk-integ-opensearch-min":{"id":"cdk-integ-opensearch-min","path":"cdk-integ-opensearch-min","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"children":{"OpenSearch_2.13":{"id":"OpenSearch_2.13","path":"cdk-integ-opensearch-min/OpenSearch_2.13","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2","metadata":["*"]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_2.13/Resource","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_2.13","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"OpenSearch_2.15":{"id":"OpenSearch_2.15","path":"cdk-integ-opensearch-min/OpenSearch_2.15","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2","metadata":["*"]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_2.15/Resource","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_2.15","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"OpenSearch_2.17":{"id":"OpenSearch_2.17","path":"cdk-integ-opensearch-min/OpenSearch_2.17","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2","metadata":["*"]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_2.17/Resource","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_2.17","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"OpenSearch_3.1":{"id":"OpenSearch_3.1","path":"cdk-integ-opensearch-min/OpenSearch_3.1","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2","metadata":["*"]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_3.1/Resource","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_3.1","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"BootstrapVersion":{"id":"BootstrapVersion","path":"cdk-integ-opensearch-min/BootstrapVersion","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"cdk-integ-opensearch-min/CheckBootstrapVersion","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}}}},"integ-openseach-min":{"id":"integ-openseach-min","path":"integ-openseach-min","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTest","version":"0.0.0"},"children":{"DefaultTest":{"id":"DefaultTest","path":"integ-openseach-min/DefaultTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTestCase","version":"0.0.0"},"children":{"Default":{"id":"Default","path":"integ-openseach-min/DefaultTest/Default","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}},"DeployAssert":{"id":"DeployAssert","path":"integ-openseach-min/DefaultTest/DeployAssert","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"children":{"BootstrapVersion":{"id":"BootstrapVersion","path":"integ-openseach-min/DefaultTest/DeployAssert/BootstrapVersion","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"integ-openseach-min/DefaultTest/DeployAssert/CheckBootstrapVersion","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}}}}}}}},"Tree":{"id":"Tree","path":"Tree","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}}}}} \ No newline at end of file +{"version":"tree-0.1","tree":{"id":"App","path":"","constructInfo":{"fqn":"aws-cdk-lib.App","version":"0.0.0"},"children":{"cdk-integ-opensearch-min":{"id":"cdk-integ-opensearch-min","path":"cdk-integ-opensearch-min","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"OpenSearch_2.13":{"id":"OpenSearch_2.13","path":"cdk-integ-opensearch-min/OpenSearch_2.13","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.Domain","version":"0.0.0","metadata":[{"version":"*","removalPolicy":"destroy","capacity":{"multiAzWithStandbyEnabled":false}}]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_2.13/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.CfnDomain","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_2.13","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"OpenSearch_2.15":{"id":"OpenSearch_2.15","path":"cdk-integ-opensearch-min/OpenSearch_2.15","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.Domain","version":"0.0.0","metadata":[{"version":"*","removalPolicy":"destroy","capacity":{"multiAzWithStandbyEnabled":false}}]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_2.15/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.CfnDomain","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_2.15","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"OpenSearch_2.17":{"id":"OpenSearch_2.17","path":"cdk-integ-opensearch-min/OpenSearch_2.17","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.Domain","version":"0.0.0","metadata":[{"version":"*","removalPolicy":"destroy","capacity":{"multiAzWithStandbyEnabled":false}}]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_2.17/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.CfnDomain","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_2.17","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"OpenSearch_3.1":{"id":"OpenSearch_3.1","path":"cdk-integ-opensearch-min/OpenSearch_3.1","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.Domain","version":"0.0.0","metadata":[{"version":"*","removalPolicy":"destroy","capacity":{"multiAzWithStandbyEnabled":false}}]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_3.1/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.CfnDomain","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_3.1","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"OpenSearch_3.3":{"id":"OpenSearch_3.3","path":"cdk-integ-opensearch-min/OpenSearch_3.3","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.Domain","version":"0.0.0","metadata":[{"version":"*","removalPolicy":"destroy","capacity":{"multiAzWithStandbyEnabled":false}}]},"children":{"Resource":{"id":"Resource","path":"cdk-integ-opensearch-min/OpenSearch_3.3/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_opensearchservice.CfnDomain","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::OpenSearchService::Domain","aws:cdk:cloudformation:props":{"clusterConfig":{"dedicatedMasterEnabled":false,"instanceCount":1,"instanceType":"r5.large.search","multiAzWithStandbyEnabled":false,"zoneAwarenessEnabled":false},"domainEndpointOptions":{"enforceHttps":false,"tlsSecurityPolicy":"Policy-Min-TLS-1-2-2019-07"},"ebsOptions":{"ebsEnabled":true,"volumeSize":10,"volumeType":"gp2"},"encryptionAtRestOptions":{"enabled":false},"engineVersion":"OpenSearch_3.3","logPublishingOptions":{},"nodeToNodeEncryptionOptions":{"enabled":false}}}}}},"BootstrapVersion":{"id":"BootstrapVersion","path":"cdk-integ-opensearch-min/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"cdk-integ-opensearch-min/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}},"integ-openseach-min":{"id":"integ-openseach-min","path":"integ-openseach-min","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTest","version":"0.0.0"},"children":{"DefaultTest":{"id":"DefaultTest","path":"integ-openseach-min/DefaultTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTestCase","version":"0.0.0"},"children":{"Default":{"id":"Default","path":"integ-openseach-min/DefaultTest/Default","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}},"DeployAssert":{"id":"DeployAssert","path":"integ-openseach-min/DefaultTest/DeployAssert","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"BootstrapVersion":{"id":"BootstrapVersion","path":"integ-openseach-min/DefaultTest/DeployAssert/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"integ-openseach-min/DefaultTest/DeployAssert/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}}}}}},"Tree":{"id":"Tree","path":"Tree","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}}}}} \ 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 55de1c8ba59e2..87a15738cf31f 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 @@ -12,6 +12,7 @@ class TestStack extends Stack { opensearch.EngineVersion.OPENSEARCH_2_15, opensearch.EngineVersion.OPENSEARCH_2_17, opensearch.EngineVersion.OPENSEARCH_3_1, + opensearch.EngineVersion.OPENSEARCH_3_3, ]; // deploy opensearch domain with minimal configuration diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts index f28e0d20b9275..5d44ebdd6c0a9 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts @@ -114,6 +114,9 @@ export class EngineVersion { /** AWS OpenSearch 3.1 */ public static readonly OPENSEARCH_3_1 = EngineVersion.openSearch('3.1'); + /** AWS OpenSearch 3.3 */ + public static readonly OPENSEARCH_3_3 = EngineVersion.openSearch('3.3'); + /** * 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 3b2a59289460d..f58e64414ff54 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts @@ -47,6 +47,7 @@ const testedOpenSearchVersions = [ EngineVersion.OPENSEARCH_2_17, EngineVersion.OPENSEARCH_2_19, EngineVersion.OPENSEARCH_3_1, + EngineVersion.OPENSEARCH_3_3, ]; each(testedOpenSearchVersions).test('connections throws if domain is not placed inside a vpc', (engineVersion) => { @@ -206,6 +207,7 @@ each([ [EngineVersion.OPENSEARCH_2_17, 'OpenSearch_2.17'], [EngineVersion.OPENSEARCH_2_19, 'OpenSearch_2.19'], [EngineVersion.OPENSEARCH_3_1, 'OpenSearch_3.1'], + [EngineVersion.OPENSEARCH_3_3, 'OpenSearch_3.3'], ]).test('minimal example renders correctly', (engineVersion, expectedCfVersion) => { new Domain(stack, 'Domain', { version: engineVersion });