Enable azurerm_netapp_account importing (#25384)

* read AD properties for netapp account * updates working correctly * add requirewith * cleanup * linting
hashicorp · Mar 26, 2024 · 0438eb4 · 0438eb4
1 parent ec8b14f
commit 0438eb4
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 5 deletions.
diff --git a/internal/services/netapp/netapp_account_resource.go b/internal/services/netapp/netapp_account_resource.go
@@ -137,10 +137,11 @@ func resourceNetAppAccount() *pluginsdk.Resource {
 							Description: "If enabled, NFS client local users can also (in addition to LDAP users) access the NFS volumes.",
 						},
 						"ldap_over_tls_enabled": {
-							Type:        pluginsdk.TypeBool,
-							Optional:    true,
-							Default:     false,
-							Description: "Specifies whether or not the LDAP traffic needs to be secured via TLS.",
+							Type:         pluginsdk.TypeBool,
+							Optional:     true,
+							Default:      false,
+							RequiredWith: []string{"active_directory.0.server_root_ca_certificate"},
+							Description:  "Specifies whether or not the LDAP traffic needs to be secured via TLS.",
 						},
 						"server_root_ca_certificate": {
 							Type:         pluginsdk.TypeString,
@@ -313,6 +314,20 @@ func resourceNetAppAccountRead(d *pluginsdk.ResourceData, meta interface{}) erro
 			}
 		}
 
+		if model.Properties.ActiveDirectories != nil {
+			adProps := *model.Properties.ActiveDirectories
+			// response returns an array, but only 1 NetApp AD connection is allowed per the Azure platform currently
+			if len(adProps) > 0 {
+				// the API returns opaque('***') values for password and server_root_ca_certificate, so we pass through current state values so change detection works
+				prevPassword := d.Get("active_directory.0.password").(string)
+				prevCaCert := d.Get("active_directory.0.server_root_ca_certificate").(string)
+
+				if err = d.Set("active_directory", flattenNetAppActiveDirectories(&adProps[0], &prevPassword, &prevCaCert)); err != nil {
+					return fmt.Errorf("setting `active_directory`: %+v", err)
+				}
+			}
+		}
+
 		return tags.FlattenAndSet(d, model.Tags)
 	}
 
@@ -370,3 +385,28 @@ func expandNetAppActiveDirectories(input []interface{}) *[]netappaccounts.Active
 	}
 	return &results
 }
+
+func flattenNetAppActiveDirectories(input *netappaccounts.ActiveDirectory, prevPassword *string, prevCaCert *string) []interface{} {
+	if input == nil {
+		return []interface{}{}
+	}
+
+	return []interface{}{
+		map[string]interface{}{
+			"dns_servers":                       utils.FlattenStringSliceWithDelimiter(input.Dns, ","),
+			"domain":                            input.Domain,
+			"organizational_unit":               input.OrganizationalUnit,
+			"password":                          prevPassword,
+			"smb_server_name":                   input.SmbServerName,
+			"username":                          input.Username,
+			"site_name":                         input.Site,
+			"kerberos_ad_name":                  input.AdName,
+			"kerberos_kdc_ip":                   input.KdcIP,
+			"aes_encryption_enabled":            input.AesEncryption,
+			"local_nfs_users_with_ldap_allowed": input.AllowLocalNfsUsersWithLdap,
+			"ldap_over_tls_enabled":             input.LdapOverTLS,
+			"server_root_ca_certificate":        prevCaCert,
+			"ldap_signing_enabled":              input.LdapSigning,
+		},
+	}
+}
diff --git a/internal/services/netapp/netapp_account_resource_test.go b/internal/services/netapp/netapp_account_resource_test.go
@@ -103,7 +103,7 @@ func testAccNetAppAccount_complete(t *testing.T) {
 				check.That(data.ResourceName).Key("tags.FoO").HasValue("BaR"),
 			),
 		},
-		data.ImportStep("active_directory"),
+		data.ImportStep("active_directory.0.password", "active_directory.0.server_root_ca_certificate"),
 	})
 }
 

diff --git a/website/docs/r/netapp_account.html.markdown b/website/docs/r/netapp_account.html.markdown
@@ -135,3 +135,5 @@ NetApp Accounts can be imported using the `resource id`, e.g.
 ```shell
 terraform import azurerm_netapp_account.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.NetApp/netAppAccounts/account1
 ```
+
+~> **IMPORTANT:** When importing a NetApp account, the `active_directory.password` and `active_directory.server_root_ca_certificate` values *cannot* be retrieved from the Azure API and will need to be redeclared within the resource.