Enable updating directory service config for Filestore instance (#14203) (#11137)

[upstream:b446df388f5204f9f74d52ef6659b8b8064ae3c2]

Signed-off-by: Modular Magician <magic-modules@google.com>

Author: modular-magician

.changelog/14203.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+filestore: add support for updating `directory_services` fields in place in `google_filestore_instance`
+```

google-beta/services/filestore/resource_filestore_instance.go

@@ -312,7 +312,6 @@ Possible values include: STANDARD, PREMIUM, BASIC_HDD, BASIC_SSD, HIGH_SCALE_SSD
 			"directory_services": {
 				Type:     schema.TypeList,
 				Optional: true,
-				ForceNew: true,
 				Description: `Directory Services configuration.
 Should only be set if protocol is "NFS_V4_1".`,
 				MaxItems: 1,
@@ -321,21 +320,18 @@ Should only be set if protocol is "NFS_V4_1".`,
 						"ldap": {
 							Type:        schema.TypeList,
 							Optional:    true,
-							ForceNew:    true,
 							Description: `Configuration for LDAP servers.`,
 							MaxItems:    1,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"domain": {
 										Type:        schema.TypeString,
 										Required:    true,
-										ForceNew:    true,
 										Description: `The LDAP domain name in the format of 'my-domain.com'.`,
 									},
 									"servers": {
 										Type:     schema.TypeList,
 										Required: true,
-										ForceNew: true,
 										Description: `The servers names are used for specifying the LDAP servers names.
 The LDAP servers names can come with two formats:
 1. DNS name, for example: 'ldap.example1.com', 'ldap.example2.com'.
@@ -349,15 +345,13 @@ IP addresses.`,
 									"groups_ou": {
 										Type:     schema.TypeString,
 										Optional: true,
-										ForceNew: true,
 										Description: `The groups Organizational Unit (OU) is optional. This parameter is a hint
 to allow faster lookup in the LDAP namespace. In case that this parameter
 is not provided, Filestore instance will query the whole LDAP namespace.`,
 									},
 									"users_ou": {
 										Type:     schema.TypeString,
 										Optional: true,
-										ForceNew: true,
 										Description: `The users Organizational Unit (OU) is optional. This parameter is a hint
 to allow faster lookup in the LDAP namespace. In case that this parameter
 is not provided, Filestore instance will query the whole LDAP namespace.`,
@@ -896,6 +890,12 @@ func resourceFilestoreInstanceUpdate(d *schema.ResourceData, meta interface{}) e
 	} else if v, ok := d.GetOkExists("performance_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, performanceConfigProp)) {
 		obj["performanceConfig"] = performanceConfigProp
 	}
+	directoryServicesProp, err := expandFilestoreInstanceDirectoryServices(d.Get("directory_services"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("directory_services"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, directoryServicesProp)) {
+		obj["directoryServices"] = directoryServicesProp
+	}
 	effectiveLabelsProp, err := expandFilestoreInstanceEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -932,6 +932,10 @@ func resourceFilestoreInstanceUpdate(d *schema.ResourceData, meta interface{}) e
 		updateMask = append(updateMask, "performanceConfig")
 	}
 
+	if d.HasChange("directory_services") {
+		updateMask = append(updateMask, "directoryServices")
+	}
+
 	if d.HasChange("effective_labels") {
 		updateMask = append(updateMask, "labels")
 	}

google-beta/services/filestore/resource_filestore_instance_test.go

@@ -8,7 +8,7 @@
 //
 //	This code is generated by Magic Modules using the following:
 //
-//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go.tmpl
+//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go
 //
 //	DO NOT EDIT this file directly. Any changes made to this file will be
 //	overwritten during the next generation cycle.
@@ -566,14 +566,41 @@ func TestAccFilestoreInstance_directoryServices(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckFilestoreInstanceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccFilestoreInstance_ldap(name, location, tier),
+				Config: testAccFilestoreInstance_ldap(name, location, tier, "example.com"),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.domain", "example.com"),
+					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.servers.0", "ldap.example.com"),
+					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.users_ou", "users"),
+					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.groups_ou", "groups"),
+				),
+			},
+			{
+				ResourceName:            "google_filestore_instance.instance",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"zone"},
+			},
+			{
+				Config: testAccFilestoreInstance_nfs_v4(name, location, tier),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckNoResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.domain"),
+				),
+			},
+			{
+				ResourceName:            "google_filestore_instance.instance",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"zone"},
+			},
+			{
+				Config: testAccFilestoreInstance_ldap(name, location, tier, "example.com"),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.domain", "my-domain.com"),
-					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.servers.0", "ldap.example1.com"),
+					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.domain", "example.com"),
+					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.servers.0", "ldap.example.com"),
 					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.users_ou", "users"),
 					resource.TestCheckResourceAttr("google_filestore_instance.instance", "directory_services.0.ldap.0.groups_ou", "groups"),
 				),
@@ -584,14 +611,39 @@ func TestAccFilestoreInstance_directoryServices(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"zone"},
 			},
+			{
+				Config:      testAccFilestoreInstance_ldap(name, location, tier, "other.com"),
+				ExpectError: regexp.MustCompile("cannot update existing directory services configuration"),
+			},
 		},
 	})
 }
 
-func testAccFilestoreInstance_ldap(name, location, tier string) string {
+func testAccFilestoreInstance_nfs_v4(name, location, tier string) string {
+	return fmt.Sprintf(`
+resource "google_filestore_instance" "instance" {
+  name        = "%s"
+  location    = "%s"
+  tier        = "%s"
+  description = "An instance created during testing."
+  protocol    = "NFS_V4_1"
+
+  file_shares {
+    capacity_gb = 1024
+    name        = "share"
+  }
+
+  networks {
+    network = "default"
+		modes   = ["MODE_IPV4"]
+  }
+}
+`, name, location, tier)
+}
+
+func testAccFilestoreInstance_ldap(name, location, tier, domain string) string {
 	return fmt.Sprintf(`
 resource "google_filestore_instance" "instance" {
-  provider    = google-beta
   name        = "%s"
   location    = "%s"
   tier        = "%s"
@@ -610,14 +662,14 @@ resource "google_filestore_instance" "instance" {
 
   directory_services {
     ldap {
-      domain = "my-domain.com"
-      servers = ["ldap.example1.com"]
+      domain = "%s"
+      servers = ["ldap.example.com"]
       users_ou = "users"
       groups_ou = "groups"
     }
   }
 }
-`, name, location, tier)
+`, name, location, tier, domain)
 }
 
 func TestAccFilestoreInstance_psc(t *testing.T) {

website/docs/r/filestore_instance.html.markdown

@@ -241,7 +241,7 @@ The following arguments are supported:
   Structure is [documented below](#nested_initial_replication).
 
 * `directory_services` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   Directory Services configuration.
   Should only be set if protocol is "NFS_V4_1".
   Structure is [documented below](#nested_directory_services).