Add allow_fewer_zones_deployment to Memorystore (#14677) (#23845)

[upstream:b6ee44125ce6bbe9732bc9bbfc867906113cc9cd]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14677.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+memorystore: added `allow_fewer_zones_Deployment` field to `google_memorystore_instance` resource
+```

google/services/memorystore/resource_memorystore_instance.go

@@ -85,6 +85,15 @@ This value is subject to the following restrictions:
 				Required:    true,
 				Description: `Required. Number of shards for the instance.`,
 			},
+			"allow_fewer_zones_deployment": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				ForceNew: true,
+				Description: `Allows customers to specify if they are okay with deploying a multi-zone
+instance in less than 3 zones. Once set, if there is a zonal outage during
+the instance creation, the instance will only be deployed in 2 zones, and
+stay within the 2 zones for its lifecycle.`,
+			},
 			"authorization_mode": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -1035,6 +1044,12 @@ func resourceMemorystoreInstanceCreate(d *schema.ResourceData, meta interface{})
 	} else if v, ok := d.GetOkExists("zone_distribution_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(zoneDistributionConfigProp)) && (ok || !reflect.DeepEqual(v, zoneDistributionConfigProp)) {
 		obj["zoneDistributionConfig"] = zoneDistributionConfigProp
 	}
+	allowFewerZonesDeploymentProp, err := expandMemorystoreInstanceAllowFewerZonesDeployment(d.Get("allow_fewer_zones_deployment"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("allow_fewer_zones_deployment"); !tpgresource.IsEmptyValue(reflect.ValueOf(allowFewerZonesDeploymentProp)) && (ok || !reflect.DeepEqual(v, allowFewerZonesDeploymentProp)) {
+		obj["allowFewerZonesDeployment"] = allowFewerZonesDeploymentProp
+	}
 	deletionProtectionEnabledProp, err := expandMemorystoreInstanceDeletionProtectionEnabled(d.Get("deletion_protection_enabled"), d, config)
 	if err != nil {
 		return err
@@ -1257,6 +1272,9 @@ func resourceMemorystoreInstanceRead(d *schema.ResourceData, meta interface{}) e
 	if err := d.Set("zone_distribution_config", flattenMemorystoreInstanceZoneDistributionConfig(res["zoneDistributionConfig"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
+	if err := d.Set("allow_fewer_zones_deployment", flattenMemorystoreInstanceAllowFewerZonesDeployment(res["allowFewerZonesDeployment"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Instance: %s", err)
+	}
 	if err := d.Set("deletion_protection_enabled", flattenMemorystoreInstanceDeletionProtectionEnabled(res["deletionProtectionEnabled"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
@@ -2101,6 +2119,10 @@ func flattenMemorystoreInstanceZoneDistributionConfigMode(v interface{}, d *sche
 	return v
 }
 
+func flattenMemorystoreInstanceAllowFewerZonesDeployment(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenMemorystoreInstanceDeletionProtectionEnabled(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -2914,6 +2936,10 @@ func expandMemorystoreInstanceZoneDistributionConfigMode(v interface{}, d tpgres
 	return v, nil
 }
 
+func expandMemorystoreInstanceAllowFewerZonesDeployment(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandMemorystoreInstanceDeletionProtectionEnabled(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

google/services/memorystore/resource_memorystore_instance_generated_meta.yaml

@@ -6,6 +6,7 @@ api_version: 'v1'
 api_resource_type_kind: 'Instance'
 autogen_status: true
 fields:
+  - field: 'allow_fewer_zones_deployment'
   - field: 'authorization_mode'
   - field: 'automated_backup_config.fixed_frequency_schedule.start_time.hours'
   - field: 'automated_backup_config.retention'

google/services/memorystore/resource_memorystore_instance_generated_test.go

@@ -151,41 +151,42 @@ func TestAccMemorystoreInstance_memorystoreInstanceFullExample(t *testing.T) {
 func testAccMemorystoreInstance_memorystoreInstanceFullExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_memorystore_instance" "instance-full" {
-  instance_id = "tf-test-full-instance%{random_suffix}"
-  shard_count = 1
+  instance_id                  = "tf-test-full-instance%{random_suffix}"
+  shard_count                  = 1
   desired_auto_created_endpoints {
-    network    = google_compute_network.producer_net.id
-    project_id = data.google_project.project.project_id
-  }
-  location                = "us-central1"
-  replica_count           = 1
-  node_type               = "SHARED_CORE_NANO"
-  transit_encryption_mode = "TRANSIT_ENCRYPTION_DISABLED"
-  authorization_mode      = "AUTH_DISABLED"
-  kms_key                 = "%{kms_key_name}"
-  engine_configs = {
-    maxmemory-policy = "volatile-ttl"
+    network                    = google_compute_network.producer_net.id
+    project_id                 = data.google_project.project.project_id
+  }     
+  location                     = "us-central1"
+  replica_count                = 1
+  node_type                    = "SHARED_CORE_NANO"
+  transit_encryption_mode      = "TRANSIT_ENCRYPTION_DISABLED"
+  authorization_mode           = "AUTH_DISABLED"
+  kms_key                      = "%{kms_key_name}"
+  engine_configs = {     
+    maxmemory-policy           = "volatile-ttl"
   }
+  allow_fewer_zones_deployment = true
   zone_distribution_config {
-    mode = "SINGLE_ZONE"
-    zone = "us-central1-b"
+    mode                       = "SINGLE_ZONE"
+    zone                       = "us-central1-b"
   }
   maintenance_policy {
     weekly_maintenance_window {
-      day = "MONDAY"
+      day                      = "MONDAY"
       start_time {
-        hours = 1
-        minutes = 0
-        seconds = 0
-        nanos = 0
+        hours                  = 1
+        minutes                = 0
+        seconds                = 0
+        nanos                  = 0
       }
     }
   }
   engine_version              = "VALKEY_7_2"
   deletion_protection_enabled = false
-  mode = "CLUSTER"
+  mode                        = "CLUSTER"
   persistence_config {
-    mode = "RDB"
+    mode                      = "RDB"
     rdb_config {
       rdb_snapshot_period     = "ONE_HOUR"
       rdb_snapshot_start_time = "2024-10-02T15:01:23Z"

website/docs/r/memorystore_instance.html.markdown

@@ -104,41 +104,42 @@ data "google_project" "project" {
 
 ```hcl
 resource "google_memorystore_instance" "instance-full" {
-  instance_id = "full-instance"
-  shard_count = 1
+  instance_id                  = "full-instance"
+  shard_count                  = 1
   desired_auto_created_endpoints {
-    network    = google_compute_network.producer_net.id
-    project_id = data.google_project.project.project_id
-  }
-  location                = "us-central1"
-  replica_count           = 1
-  node_type               = "SHARED_CORE_NANO"
-  transit_encryption_mode = "TRANSIT_ENCRYPTION_DISABLED"
-  authorization_mode      = "AUTH_DISABLED"
-  kms_key                 = "my-key"
-  engine_configs = {
-    maxmemory-policy = "volatile-ttl"
+    network                    = google_compute_network.producer_net.id
+    project_id                 = data.google_project.project.project_id
+  }     
+  location                     = "us-central1"
+  replica_count                = 1
+  node_type                    = "SHARED_CORE_NANO"
+  transit_encryption_mode      = "TRANSIT_ENCRYPTION_DISABLED"
+  authorization_mode           = "AUTH_DISABLED"
+  kms_key                      = "my-key"
+  engine_configs = {     
+    maxmemory-policy           = "volatile-ttl"
   }
+  allow_fewer_zones_deployment = true
   zone_distribution_config {
-    mode = "SINGLE_ZONE"
-    zone = "us-central1-b"
+    mode                       = "SINGLE_ZONE"
+    zone                       = "us-central1-b"
   }
   maintenance_policy {
     weekly_maintenance_window {
-      day = "MONDAY"
+      day                      = "MONDAY"
       start_time {
-        hours = 1
-        minutes = 0
-        seconds = 0
-        nanos = 0
+        hours                  = 1
+        minutes                = 0
+        seconds                = 0
+        nanos                  = 0
       }
     }
   }
   engine_version              = "VALKEY_7_2"
   deletion_protection_enabled = false
-  mode = "CLUSTER"
+  mode                        = "CLUSTER"
   persistence_config {
-    mode = "RDB"
+    mode                      = "RDB"
     rdb_config {
       rdb_snapshot_period     = "ONE_HOUR"
       rdb_snapshot_start_time = "2024-10-02T15:01:23Z"
@@ -467,6 +468,13 @@ The following arguments are supported:
   Zone distribution configuration for allocation of instance resources.
   Structure is [documented below](#nested_zone_distribution_config).
 
+* `allow_fewer_zones_deployment` -
+  (Optional)
+  Allows customers to specify if they are okay with deploying a multi-zone
+  instance in less than 3 zones. Once set, if there is a zonal outage during
+  the instance creation, the instance will only be deployed in 2 zones, and
+  stay within the 2 zones for its lifecycle.
+
 * `deletion_protection_enabled` -
   (Optional)
   Optional. If set to true deletion of the instance will fail.