Merge branch 'main' into ec2-alpha-rangesoverlap

aws · Dec 10, 2024 · 1b29712 · 1b29712
2 parents 7de950d + ce0e09f
commit 1b29712
Show file tree

Hide file tree

Showing 12 changed files with 1,876 additions and 2 deletions.
diff --git a/packages/@aws-cdk/aws-redshift-alpha/README.md b/packages/@aws-cdk/aws-redshift-alpha/README.md
@@ -700,6 +700,7 @@ as it's a fast operation and typically completes in minutes. Elastic resize is o
   * dc2.8xlarge
   * ds2.xlarge
   * ds2.8xlarge
+  * ra3.large
   * ra3.xlplus
   * ra3.4xlarge
   * ra3.16xlarge

diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts
@@ -49,6 +49,11 @@ export enum NodeType {
    */
   DC2_8XLARGE = 'dc2.8xlarge',
 
+  /**
+   * ra3.large
+   */
+  RA3_LARGE = 'ra3.large',
+
   /**
    * ra3.xlplus
    */

diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/cluster.test.ts b/packages/@aws-cdk/aws-redshift-alpha/test/cluster.test.ts
@@ -734,7 +734,7 @@ describe('multi AZ cluster', () => {
         masterPassword: cdk.SecretValue.unsafePlainText('tooshort'),
       },
       vpc,
-      nodeType: NodeType.RA3_XLPLUS,
+      nodeType: NodeType.RA3_LARGE,
       multiAz: true,
     });
 
@@ -747,7 +747,7 @@ describe('multi AZ cluster', () => {
       AutomatedSnapshotRetentionPeriod: 1,
       Encrypted: true,
       NumberOfNodes: 2,
-      NodeType: 'ra3.xlplus',
+      NodeType: 'ra3.large',
       DBName: 'default_db',
       PubliclyAccessible: false,
       ClusterSubnetGroupName: { Ref: 'RedshiftSubnetsDFE70E0A' },

diff --git a/...ter-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json b/...ter-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.assets.json
diff --git a/...r-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json b/...r-nodetype.js.snapshot/RA3LargeNodeIntegTestDefaultTestDeployAssert1EF91947.template.json
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/cdk.out b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/cdk.out
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/integ.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/integ.json
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/manifest.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-nodetype.js.snapshot/manifest.json