Redshift cluster AZ relocation support

.changelog/19098.txt

@@ -0,0 +1,4 @@
+```release-note:enhancement
+internal/service/redshift/cluster: Add `availability_zone_relocation` and `availability_zone_relocation_status` attributes.
+internal/service/redshift/cluster_data_source: Add `availability_zone_relocation` and `availability_zone_relocation_status` attributes.
+```

internal/service/redshift/cluster.go

@@ -59,6 +59,15 @@ func ResourceCluster() *schema.Resource {
 				ForceNew: true,
 				Computed: true,
 			},
+			"availability_zone_relocation": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+			"availability_zone_relocation_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"cluster_identifier": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -354,6 +363,10 @@ func resourceClusterCreate(d *schema.ResourceData, meta interface{}) error {
 			restoreOpts.AvailabilityZone = aws.String(v.(string))
 		}
 
+		if v, ok := d.GetOk("availability_zone_relocation"); ok {
+			restoreOpts.AvailabilityZoneRelocation = aws.Bool(v.(bool))
+		}
+
 		if v, ok := d.GetOk("cluster_subnet_group_name"); ok {
 			restoreOpts.ClusterSubnetGroupName = aws.String(v.(string))
 		}
@@ -446,6 +459,10 @@ func resourceClusterCreate(d *schema.ResourceData, meta interface{}) error {
 			createOpts.AvailabilityZone = aws.String(v.(string))
 		}
 
+		if v, ok := d.GetOk("availability_zone_relocation"); ok {
+			createOpts.AvailabilityZoneRelocation = aws.Bool(v.(bool))
+		}
+
 		if v, ok := d.GetOk("preferred_maintenance_window"); ok {
 			createOpts.PreferredMaintenanceWindow = aws.String(v.(string))
 		}
@@ -550,6 +567,12 @@ func resourceClusterRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("arn", arn)
 	d.Set("automated_snapshot_retention_period", rsc.AutomatedSnapshotRetentionPeriod)
 	d.Set("availability_zone", rsc.AvailabilityZone)
+	d.Set("availability_zone_relocation_status", rsc.AvailabilityZoneRelocationStatus)
+	azr, err := availabilityZoneRelocationStatus(rsc)
+	if err != nil {
+		return fmt.Errorf("error reading Redshift Cluster (%s): %w", d.Id(), err)
+	}
+	d.Set("availability_zone_relocation", azr)
 	d.Set("cluster_identifier", rsc.ClusterIdentifier)
 	if err := d.Set("cluster_nodes", flattenRedshiftClusterNodes(rsc.ClusterNodes)); err != nil {
 		return fmt.Errorf("error setting cluster_nodes: %w", err)
@@ -661,6 +684,11 @@ func resourceClusterUpdate(d *schema.ResourceData, meta interface{}) error {
 		requestUpdate = true
 	}
 
+	if d.HasChange("availability_zone_relocation") {
+		req.AvailabilityZoneRelocation = aws.Bool(d.Get("availability_zone_relocation").(bool))
+		requestUpdate = true
+	}
+
 	if d.HasChange("cluster_security_groups") {
 		req.ClusterSecurityGroups = flex.ExpandStringSet(d.Get("cluster_security_groups").(*schema.Set))
 		requestUpdate = true

internal/service/redshift/cluster_data_source.go

@@ -37,6 +37,16 @@ func DataSourceCluster() *schema.Resource {
 				Computed: true,
 			},
 
+			"availability_zone_relocation": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+
+			"availability_zone_relocation_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"bucket_name": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -196,6 +206,12 @@ func dataSourceClusterRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("allow_version_upgrade", rsc.AllowVersionUpgrade)
 	d.Set("automated_snapshot_retention_period", rsc.AutomatedSnapshotRetentionPeriod)
 	d.Set("availability_zone", rsc.AvailabilityZone)
+	d.Set("availability_zone_relocation_status", rsc.AvailabilityZoneRelocationStatus)
+	azr, err := availabilityZoneRelocationStatus(rsc)
+	if err != nil {
+		return fmt.Errorf("error reading Redshift Cluster (%s): %w", d.Id(), err)
+	}
+	d.Set("availability_zone_relocation", azr)
 	d.Set("cluster_identifier", rsc.ClusterIdentifier)
 
 	if len(rsc.ClusterParameterGroups) > 0 {

internal/service/redshift/cluster_data_source_test.go

@@ -40,6 +40,7 @@ func TestAccRedshiftClusterDataSource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(dataSourceName, "port"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "preferred_maintenance_window"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "publicly_accessible"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "availability_zone_relocation"),
 				),
 			},
 		},

internal/service/redshift/cluster_test.go

@@ -546,6 +546,46 @@ func TestAccRedshiftCluster_changeEncryption2(t *testing.T) {
 	})
 }
 
+func TestAccRedshiftCluster_availabilityZoneRelocation(t *testing.T) {
+	var v redshift.Cluster
+	rInt := sdkacctest.RandInt()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { acctest.PreCheck(t) },
+		ErrorCheck:   acctest.ErrorCheck(t, redshift.EndpointsID),
+		Providers:    acctest.Providers,
+		CheckDestroy: testAccCheckClusterDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccClusterConfig_availabilityZoneRelocation(rInt, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckClusterExists("aws_redshift_cluster.default", &v),
+					resource.TestCheckResourceAttr(
+						"aws_redshift_cluster.default", "availability_zone_relocation", "true"),
+				),
+			},
+			{
+				ResourceName:      "aws_redshift_cluster.default",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{
+					"final_snapshot_identifier",
+					"master_password",
+					"skip_final_snapshot",
+				},
+			},
+			{
+				Config: testAccClusterConfig_availabilityZoneRelocation(rInt, false),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckClusterExists("aws_redshift_cluster.default", &v),
+					resource.TestCheckResourceAttr(
+						"aws_redshift_cluster.default", "availability_zone_relocation", "false"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckClusterDestroy(s *terraform.State) error {
 	conn := acctest.Provider.Meta().(*conns.AWSClient).RedshiftConn
 
@@ -1278,3 +1318,23 @@ resource "aws_redshift_cluster" "test" {
 }
 `, rName))
 }
+
+func testAccClusterConfig_availabilityZoneRelocation(rInt int, enabled bool) string {
+	return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptInExclude("usw2-az2"), fmt.Sprintf(`
+resource "aws_redshift_cluster" "default" {
+  cluster_identifier                  = "tf-redshift-cluster-%[1]d"
+  availability_zone                   = data.aws_availability_zones.available.names[0]
+  database_name                       = "mydb"
+  master_username                     = "foo_test"
+  master_password                     = "Mustbe8characters"
+  node_type                           = "ra3.xlplus"
+  number_of_nodes                     = 2
+  cluster_type                        = "multi-node"
+  availability_zone_relocation        = tobool("%[2]t")
+  publicly_accessible                 = false
+  automated_snapshot_retention_period = 1
+  allow_version_upgrade               = false
+  skip_final_snapshot                 = true
+}
+`, rInt, enabled))
+}

internal/service/redshift/status.go

@@ -1,6 +1,8 @@
 package redshift
 
 import (
+	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/redshift"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -22,3 +24,15 @@ func statusCluster(conn *redshift.Redshift, id string) resource.StateRefreshFunc
 		return output, aws.StringValue(output.ClusterStatus), nil
 	}
 }
+
+func availabilityZoneRelocationStatus(cluster *redshift.Cluster) (bool, error) {
+	// AvailabilityZoneRelocation is not returned by the API, and AvailabilityZoneRelocationStatus is not implemented as Const at this time.
+	switch availabilityZoneRelocationStatus := *cluster.AvailabilityZoneRelocationStatus; availabilityZoneRelocationStatus {
+	case "enabled", "pending_enabling":
+		return true, nil
+	case "disabled", "pending_disabling":
+		return false, nil
+	default:
+		return false, fmt.Errorf("unexpected AvailabilityZoneRelocationStatus attribute value: %s", availabilityZoneRelocationStatus)
+	}
+}

website/docs/d/redshift_cluster.html.markdown

@@ -54,6 +54,8 @@ In addition to all arguments above, the following attributes are exported:
 * `allow_version_upgrade` - Whether major version upgrades can be applied during maintenance period
 * `automated_snapshot_retention_period` - The backup retention period
 * `availability_zone` - The availability zone of the cluster
+* `availability_zone_relocation` - Relocation for an Amazon Redshift cluster between Availability Zones.
+* `availability_zone_relocation_status` - The status of the Availability Zone relocation operation (enabled, disabled, pending_enabling, pending_disabling)
 * `bucket_name` - The name of the S3 bucket where the log files are to be stored
 * `cluster_identifier` - The cluster identifier
 * `cluster_parameter_group_name` - The name of the parameter group to be associated with this cluster

website/docs/r/redshift_cluster.html.markdown

@@ -48,6 +48,7 @@ string.
 * `vpc_security_group_ids` - (Optional) A list of Virtual Private Cloud (VPC) security groups to be associated with the cluster.
 * `cluster_subnet_group_name` - (Optional) The name of a cluster subnet group to be associated with this cluster. If this parameter is not provided the resulting cluster will be deployed outside virtual private cloud (VPC).
 * `availability_zone` - (Optional) The EC2 Availability Zone (AZ) in which you want Amazon Redshift to provision the cluster. For example, if you have several EC2 instances running in a specific Availability Zone, then you might want the cluster to be provisioned in the same zone in order to decrease network latency.
+* `availability_zone_relocation` - (Optional) Enable relocation for an Amazon Redshift cluster between Availability Zones. Default is false. Available for use on clusters from the RA3 instance family.
 * `preferred_maintenance_window` - (Optional) The weekly time range (in UTC) during which automated cluster maintenance can occur.
                                               Format: ddd:hh24:mi-ddd:hh24:mi
 * `cluster_parameter_group_name` - (Optional) The name of the parameter group to be associated with this cluster.
@@ -108,6 +109,7 @@ In addition to all arguments above, the following attributes are exported:
 * `node_type` - The type of nodes in the cluster
 * `database_name` - The name of the default database in the Cluster
 * `availability_zone` - The availability zone of the Cluster
+* `availability_zone_relocation_status` - The status of the Availability Zone relocation operation (enabled, disabled, pending_enabling, pending_disabling)
 * `automated_snapshot_retention_period` - The backup retention period
 * `preferred_maintenance_window` - The backup window
 * `endpoint` - The connection endpoint