filestore: fixed initial_replication config not being send in request body to API (#14023) (#23001)

[upstream:027afcedcdbc1e2b91abde1a782f3a11eb02b648]

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

Author: modular-magician

.changelog/14023.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+filestore: added `effective_replication.role` and `effective_replication.replicas.peer_instance` fields to `google_filestore_instance` resource
+```
+
+```release-note:bug
+filestore: fixed bug where `google_filestore_instance.initial_replication` field could not be set
+```

google/services/filestore/resource_filestore_instance.go

@@ -239,7 +239,7 @@ Possible values include: STANDARD, PREMIUM, BASIC_HDD, BASIC_SSD, HIGH_SCALE_SSD
 				Optional: true,
 				ForceNew: true,
 				Description: `Replication configuration, once set, this cannot be updated.
-Addtionally this should be specified on the replica instance only, indicating the active as the peer_instance`,
+Additionally this should be specified on the replica instance only, indicating the active as the peer_instance`,
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -407,6 +407,11 @@ resource, see the 'google_tags_tag_value' resource.`,
 A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits.
 Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z"`,
 									},
+									"peer_instance": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: `The peer instance.`,
+									},
 									"state": {
 										Type:        schema.TypeString,
 										Computed:    true,
@@ -423,6 +428,11 @@ Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z"`,
 								},
 							},
 						},
+						"role": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: `The replication role.`,
+						},
 					},
 				},
 			},
@@ -518,6 +528,12 @@ func resourceFilestoreInstanceCreate(d *schema.ResourceData, meta interface{}) e
 	} else if v, ok := d.GetOkExists("tags"); !tpgresource.IsEmptyValue(reflect.ValueOf(tagsProp)) && (ok || !reflect.DeepEqual(v, tagsProp)) {
 		obj["tags"] = tagsProp
 	}
+	replicationProp, err := expandFilestoreInstanceInitialReplication(d.Get("initial_replication"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("initial_replication"); !tpgresource.IsEmptyValue(reflect.ValueOf(replicationProp)) && (ok || !reflect.DeepEqual(v, replicationProp)) {
+		obj["replication"] = replicationProp
+	}
 	labelsProp, err := expandFilestoreInstanceEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -1202,10 +1218,16 @@ func flattenFilestoreInstanceEffectiveReplication(v interface{}, d *schema.Resou
 		return nil
 	}
 	transformed := make(map[string]interface{})
+	transformed["role"] =
+		flattenFilestoreInstanceEffectiveReplicationRole(original["role"], d, config)
 	transformed["replicas"] =
 		flattenFilestoreInstanceEffectiveReplicationReplicas(original["replicas"], d, config)
 	return []interface{}{transformed}
 }
+func flattenFilestoreInstanceEffectiveReplicationRole(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenFilestoreInstanceEffectiveReplicationReplicas(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -1219,13 +1241,18 @@ func flattenFilestoreInstanceEffectiveReplicationReplicas(v interface{}, d *sche
 			continue
 		}
 		transformed = append(transformed, map[string]interface{}{
+			"peer_instance":         flattenFilestoreInstanceEffectiveReplicationReplicasPeerInstance(original["peerInstance"], d, config),
 			"state":                 flattenFilestoreInstanceEffectiveReplicationReplicasState(original["state"], d, config),
 			"state_reasons":         flattenFilestoreInstanceEffectiveReplicationReplicasStateReasons(original["stateReasons"], d, config),
 			"last_active_sync_time": flattenFilestoreInstanceEffectiveReplicationReplicasLastActiveSyncTime(original["lastActiveSyncTime"], d, config),
 		})
 	}
 	return transformed
 }
+func flattenFilestoreInstanceEffectiveReplicationReplicasPeerInstance(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenFilestoreInstanceEffectiveReplicationReplicasState(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -1559,6 +1586,62 @@ func expandFilestoreInstanceTags(v interface{}, d tpgresource.TerraformResourceD
 	return m, nil
 }
 
+func expandFilestoreInstanceInitialReplication(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedRole, err := expandFilestoreInstanceInitialReplicationRole(original["role"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedRole); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["role"] = transformedRole
+	}
+
+	transformedReplicas, err := expandFilestoreInstanceInitialReplicationReplicas(original["replicas"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedReplicas); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["replicas"] = transformedReplicas
+	}
+
+	return transformed, nil
+}
+
+func expandFilestoreInstanceInitialReplicationRole(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandFilestoreInstanceInitialReplicationReplicas(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	req := make([]interface{}, 0, len(l))
+	for _, raw := range l {
+		if raw == nil {
+			continue
+		}
+		original := raw.(map[string]interface{})
+		transformed := make(map[string]interface{})
+
+		transformedPeerInstance, err := expandFilestoreInstanceInitialReplicationReplicasPeerInstance(original["peer_instance"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedPeerInstance); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["peerInstance"] = transformedPeerInstance
+		}
+
+		req = append(req, transformed)
+	}
+	return req, nil
+}
+
+func expandFilestoreInstanceInitialReplicationReplicasPeerInstance(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandFilestoreInstanceEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google/services/filestore/resource_filestore_instance_generated_meta.yaml

@@ -13,10 +13,14 @@ fields:
     provider_only: true
   - field: 'effective_replication.replicas.last_active_sync_time'
     api_field: 'replication.replicas.last_active_sync_time'
+  - field: 'effective_replication.replicas.peer_instance'
+    api_field: 'replication.replicas.peer_instance'
   - field: 'effective_replication.replicas.state'
     api_field: 'replication.replicas.state'
   - field: 'effective_replication.replicas.state_reasons'
     api_field: 'replication.replicas.state_reasons'
+  - field: 'effective_replication.role'
+    api_field: 'replication.role'
   - field: 'etag'
   - field: 'file_shares.capacity_gb'
   - field: 'file_shares.name'
@@ -27,9 +31,9 @@ fields:
   - field: 'file_shares.nfs_export_options.squash_mode'
   - field: 'file_shares.source_backup'
   - field: 'initial_replication.replicas.peer_instance'
-    provider_only: true
+    api_field: 'replication.replicas.peer_instance'
   - field: 'initial_replication.role'
-    provider_only: true
+    api_field: 'replication.role'
   - field: 'kms_key_name'
   - field: 'labels'
   - field: 'location'

google/services/filestore/resource_filestore_instance_test.go

@@ -481,6 +481,7 @@ func TestAccFilestoreInstance_replication(t *testing.T) {
 		"location_1":    "us-east1",
 		"location_2":    "us-west1",
 		"tier":          "ENTERPRISE",
+		"project":       envvar.GetTestProjectFromEnv(),
 	}
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
@@ -489,9 +490,21 @@ func TestAccFilestoreInstance_replication(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccFilestoreInstance_replication(context),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"google_filestore_instance.replica_instance",
+						"effective_replication.0.replicas.0.peer_instance",
+						"projects/"+context["project"].(string)+"/locations/us-east1/instances/tf-test-source-instance-"+context["random_suffix"].(string),
+					),
+					resource.TestCheckResourceAttr(
+						"google_filestore_instance.replica_instance",
+						"effective_replication.0.role",
+						"STANDBY",
+					),
+				),
 			},
 			{
-				ResourceName:            "google_filestore_instance.replica-instance",
+				ResourceName:            "google_filestore_instance.replica_instance",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"zone", "initial_replication"},
@@ -502,11 +515,11 @@ func TestAccFilestoreInstance_replication(t *testing.T) {
 
 func testAccFilestoreInstance_replication(context map[string]interface{}) string {
 	return acctest.Nprintf(`
-resource "google_filestore_instance" "instance" {
-  name             = "tf-test-instance-%{random_suffix}"
+resource "google_filestore_instance" "source_instance" {
+  name             = "tf-test-source-instance-%{random_suffix}"
   location         = "%{location_1}"
   tier             = "%{tier}"
-  description      = "An instance created during testing."
+  description      = "An source instance created during testing."
 
   file_shares {
     capacity_gb    = 1024
@@ -519,8 +532,8 @@ resource "google_filestore_instance" "instance" {
   }
 }
 
-resource "google_filestore_instance" "replica-instance" {
-  name          	= "tf-test-instance-%{random_suffix}"
+resource "google_filestore_instance" "replica_instance" {
+  name          	= "tf-test-replica-instance-%{random_suffix}"
   location      	= "%{location_2}"
   tier          	= "%{tier}"
   description   	= "An replica instance created during testing."
@@ -537,7 +550,7 @@ resource "google_filestore_instance" "replica-instance" {
 
   initial_replication {
     replicas {
-      peer_instance = google_filestore_instance.instance.id
+      peer_instance = google_filestore_instance.source_instance.id
     }
   }
 }

website/docs/r/filestore_instance.html.markdown

@@ -348,7 +348,7 @@ The following arguments are supported:
 * `initial_replication` -
   (Optional)
   Replication configuration, once set, this cannot be updated.
-  Addtionally this should be specified on the replica instance only, indicating the active as the peer_instance
+  Additionally this should be specified on the replica instance only, indicating the active as the peer_instance
   Structure is [documented below](#nested_initial_replication).
 
 * `directory_services` -
@@ -486,6 +486,10 @@ In addition to the arguments listed above, the following computed attributes are
 
 <a name="nested_effective_replication"></a>The `effective_replication` block contains:
 
+* `role` -
+  (Output)
+  The replication role.
+
 * `replicas` -
   (Optional)
   The replication role.
@@ -494,6 +498,10 @@ In addition to the arguments listed above, the following computed attributes are
 
 <a name="nested_effective_replication_replicas"></a>The `replicas` block supports:
 
+* `peer_instance` -
+  (Output)
+  The peer instance.
+
 * `state` -
   (Output)
   Output only. The replica state