Merge pull request #43270 from hashicorp/td-redshift-instance-type

resource/aws_redshift_cluster: Update `node_type` to valid value

Author: gdavison

.changelog/43270.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_redshift_cluster: Correctly set `availability_zone_relocation_enabled`
+```

internal/service/dms/endpoint_test.go

@@ -3647,12 +3647,11 @@ resource "aws_redshift_cluster" "test" {
   database_name      = "mydb"
   master_username    = "foo"
   master_password    = "Mustbe8characters"
-  node_type          = "dc2.large"
+  node_type          = "ra3.large"
   cluster_type       = "single-node"
   encrypted          = true
 
-  automated_snapshot_retention_period = 0
-  skip_final_snapshot                 = true
+  skip_final_snapshot = true
 }
 
 data "aws_partition" "current" {}

internal/service/events/target_test.go

@@ -1964,15 +1964,14 @@ resource "aws_cloudwatch_event_target" "test" {
 }
 
 resource "aws_redshift_cluster" "test" {
-  cluster_identifier                  = %[1]q
-  cluster_subnet_group_name           = aws_redshift_subnet_group.test.name
-  database_name                       = "test"
-  master_username                     = "tfacctest"
-  master_password                     = "Mustbe8characters"
-  node_type                           = "dc2.large"
-  automated_snapshot_retention_period = 0
-  allow_version_upgrade               = false
-  skip_final_snapshot                 = true
+  cluster_identifier        = %[1]q
+  cluster_subnet_group_name = aws_redshift_subnet_group.test.name
+  database_name             = "test"
+  master_username           = "tfacctest"
+  master_password           = "Mustbe8characters"
+  node_type                 = "ra3.large"
+  allow_version_upgrade     = false
+  skip_final_snapshot       = true
 
   depends_on = [aws_internet_gateway.test]
 }

internal/service/firehose/delivery_stream_test.go

@@ -4334,7 +4334,7 @@ resource "aws_redshift_cluster" "test" {
   database_name             = "test"
   master_username           = "testuser"
   master_password           = "T3stPass"
-  node_type                 = "dc2.large"
+  node_type                 = "ra3.large"
   cluster_type              = "single-node"
   skip_final_snapshot       = true
   cluster_subnet_group_name = aws_redshift_subnet_group.test.id

internal/service/pipes/pipe_test.go

@@ -3183,14 +3183,13 @@ func testAccPipeConfig_basicSQSSourceRedshiftTarget(rName string) string {
 		testAccPipeConfig_baseSQSSource(rName),
 		fmt.Sprintf(`
 resource "aws_redshift_cluster" "target" {
-  cluster_identifier                  = "%[1]s-target"
-  database_name                       = "test"
-  master_username                     = "tfacctest"
-  master_password                     = "Mustbe8characters"
-  node_type                           = "dc2.large"
-  automated_snapshot_retention_period = 0
-  allow_version_upgrade               = false
-  skip_final_snapshot                 = true
+  cluster_identifier    = "%[1]s-target"
+  database_name         = "test"
+  master_username       = "tfacctest"
+  master_password       = "Mustbe8characters"
+  node_type             = "ra3.large"
+  allow_version_upgrade = false
+  skip_final_snapshot   = true
 }
 
 resource "aws_pipes_pipe" "test" {

internal/service/redshift/cluster_credentials_data_source_test.go

@@ -43,7 +43,7 @@ resource "aws_redshift_cluster" "test" {
   database_name       = "testdb"
   master_username     = "foo"
   master_password     = "Password1"
-  node_type           = "dc2.large"
+  node_type           = "ra3.large"
   cluster_type        = "single-node"
   skip_final_snapshot = true
 }

internal/service/redshift/cluster_data_source_test.go

@@ -157,7 +157,7 @@ resource "aws_redshift_cluster" "test" {
   database_name       = "testdb"
   master_username     = "foo"
   master_password     = "Password1"
-  node_type           = "dc2.large"
+  node_type           = "ra3.large"
   cluster_type        = "single-node"
   skip_final_snapshot = true
 }
@@ -190,7 +190,7 @@ resource "aws_redshift_cluster" "test" {
   database_name             = "testdb"
   master_username           = "foo"
   master_password           = "Password1"
-  node_type                 = "dc2.large"
+  node_type                 = "ra3.large"
   cluster_type              = "multi-node"
   number_of_nodes           = 2
   publicly_accessible       = false
@@ -247,7 +247,7 @@ resource "aws_redshift_cluster" "test" {
   database_name       = "testdb"
   master_password     = "Password1"
   master_username     = "foo"
-  node_type           = "dc2.large"
+  node_type           = "ra3.large"
   skip_final_snapshot = true
 }
 

internal/service/redshift/cluster_iam_roles_test.go

@@ -132,14 +132,13 @@ EOF
 }
 
 resource "aws_redshift_cluster" "test" {
-  cluster_identifier                  = %[1]q
-  database_name                       = "mydb"
-  master_username                     = "foo_test"
-  master_password                     = "Mustbe8characters"
-  node_type                           = "dc2.large"
-  automated_snapshot_retention_period = 0
-  allow_version_upgrade               = false
-  skip_final_snapshot                 = true
+  cluster_identifier    = %[1]q
+  database_name         = "mydb"
+  master_username       = "foo_test"
+  master_password       = "Mustbe8characters"
+  node_type             = "ra3.large"
+  allow_version_upgrade = false
+  skip_final_snapshot   = true
 }
 `, rName)
 }