Merge branch 'main' into update115

Author: vasireddy99

CONTRIBUTING.md

@@ -218,7 +218,7 @@ The following tools need to be installed on your system prior to installing the
 - [Node.js >= 20.x](https://nodejs.org/en/download)
   - We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
 - [Yarn >= 1.19.1, < 2](https://yarnpkg.com/lang/en/docs/install)
-- [.NET SDK >= 6.0.x](https://www.microsoft.com/net/download)
+- [.NET SDK >= 8.0.x](https://www.microsoft.com/net/download)
 - [Python >= 3.8.0, < 4.0](https://www.python.org/downloads/release/python-380/)
 - Either [Docker >= 19.03](https://docs.docker.com/get-docker/), [Finch >= 0.3.0](https://runfinch.com/), or another Docker replacement
   - If using a Docker replacement, the `CDK_DOCKER` environment variable must be set to the replacement command's name (e.g. `export CDK_DOCKER=finch`)

README.md

@@ -24,7 +24,7 @@ The CDK is available in the following languages:
   * We recommend using a version in [Active LTS](https://nodejs.org/en/about/previous-releases)
 * Python ([Python ≥ 3.8](https://www.python.org/downloads/))
 * Java ([Java ≥ 8](https://www.oracle.com/technetwork/java/javase/downloads/index.html) and [Maven ≥ 3.5.4](https://maven.apache.org/download.cgi))
-* .NET ([.NET ≥ 6.0](https://dotnet.microsoft.com/download))
+* .NET ([.NET ≥ 8.0](https://dotnet.microsoft.com/download))
 * Go ([Go ≥ 1.16.4](https://golang.org/))
 
 Third-party Language Deprecation: language version is only supported until its EOL (End Of Life) shared by the vendor or community and is subject to change with prior notice.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.gp3.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json

@@ -4,11 +4,16 @@
    "Type": "AWS::OpenSearchService::Domain",
    "Properties": {
     "ClusterConfig": {
-     "DedicatedMasterEnabled": false,
-     "InstanceCount": 1,
-     "InstanceType": "r5.large.search",
+     "DedicatedMasterCount": 3,
+     "DedicatedMasterEnabled": true,
+     "DedicatedMasterType": "m7g.large.search",
+     "InstanceCount": 3,
+     "InstanceType": "m7g.medium.search",
      "MultiAZWithStandbyEnabled": true,
-     "ZoneAwarenessEnabled": false
+     "ZoneAwarenessConfig": {
+      "AvailabilityZoneCount": 3
+     },
+     "ZoneAwarenessEnabled": true
     },
     "DomainEndpointOptions": {
      "EnforceHTTPS": false,

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

@@ -1,7 +1,7 @@
 import { App, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import * as opensearch from 'aws-cdk-lib/aws-opensearchservice';
-import { EbsDeviceVolumeType } from 'aws-cdk-lib/aws-ec2';
+import { EbsDeviceVolumeType, SubnetType } from 'aws-cdk-lib/aws-ec2';
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 
 class TestStack extends Stack {
@@ -19,6 +19,21 @@ class TestStack extends Stack {
         throughput: 125,
         iops: 3000,
       },
+      zoneAwareness: {
+        enabled: true,
+        availabilityZoneCount: 3,
+      },
+      vpcSubnets: [
+        { subnetType: SubnetType.PRIVATE_WITH_EGRESS },
+      ],
+      capacity: {
+        dataNodeInstanceType: 'm7g.medium.search',
+        dataNodes: 3,
+        // Add dedicated master node - required for multi-AZ with standby
+        // m7g.large.search has 8GB RAM (minimum for 30 nodes/15K shards)
+        masterNodeInstanceType: 'm7g.large.search',
+        masterNodes: 3,
+      },
     };
 
     new opensearch.Domain(this, 'Domain', domainProps);