Merge pull request #460 from acch/457-import-security_account

Set `owner` (SVM) when importing `security_account` resource

Author: suhasbshekar

CHANGELOG.md

@@ -4,6 +4,10 @@ ENHANCEMENTS:
 
 - **netapp-ontap_aggregate_data_source**, **netapp-ontap_aggregates_data_source**: added `space.block_storage.available` option ([#256](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/256))
 
+BUG FIXES:
+
+- **netapp-ontap_security_account**: Error importing security_account resource if same account exists on multiple SVMs([#457](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/457))
+
 # 2.1.2 (not released)
 
 BUG FIXES:

docs/resources/security_account.md

@@ -23,8 +23,8 @@ Create/Modify/Delete a ONTAP user account
 
 ## Supported Platforms
 
-* On-prem ONTAP system 9.6 or higher
-* Amazon FSx for NetApp ONTAP
+- On-prem ONTAP system 9.6 or higher
+- Amazon FSx for NetApp ONTAP
 
 ## Example Usage
 
@@ -43,6 +43,7 @@ resource "netapp-ontap_security_account" "security_account" {
 ```
 
 <!-- schema generated by tfplugindocs -->
+
 ## Schema
 
 ### Required
@@ -96,17 +97,17 @@ Optional:
 ## Import
 
 This resource supports import, which allows you to import existing security account into the state of this resource.
-Import require a unique ID composed of the security account name and connection profile, separated by a comma.
+Import require a unique ID composed of the security account name, SVM name, and connection profile, separated by a comma.
 
-id = `name`, `cx_profile_name`
+id = `name`,`svm`,`cx_profile_name`
 
 ### Terraform Import
 
- For example
+For example
 
- ```shell
-  terraform import netapp-ontap_security_account.act_import acc_user,cluster4
- ```
+```shell
+ terraform import netapp-ontap_security_account.act_import acc_user,acc_svm,cluster4
+```
 
 ### Terraform Import Block
 
@@ -117,7 +118,7 @@ First create the block
 ```terraform
 import {
   to = netapp-ontap_security_account.act_import
-  id = "acc_user,cluster4"
+  id = "acc_user,acc_svm,cluster4"
 }
 ```
 
@@ -132,7 +133,7 @@ This will generate a file called generated.tf, which will contain the configurat
 ```terraform
 # __generated__ by Terraform
 # Please review these resources and move them into your main configuration files.
-# __generated__ by Terraform from "acc_user,cluster4"
+# __generated__ by Terraform from "acc_user,acc_svm,cluster4"
 resource "netapp-ontap_security_account" "act_import" {
   cx_profile_name = "cluster4"
   name       = "acc_user"
@@ -146,7 +147,7 @@ resource "netapp-ontap_security_account" "act_import" {
   comment         = null
   locked          = false
   owner = {
-    name = "abccluster-1"
+    name = "acc_svm"
   }
   password = null # sensitive
   role = {

internal/provider/security/security_account_resource.go

@@ -561,14 +561,15 @@ func (r *SecurityAccountResource) ImportState(ctx context.Context, req resource.
 	tflog.Debug(ctx, fmt.Sprintf("import req security account resource: %#v", req))
 	// Parse the ID
 	idParts := strings.Split(req.ID, ",")
-	if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" {
+	if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" {
 		resp.Diagnostics.AddError(
 			"Unexpected Import Identifier",
-			fmt.Sprint("Expected ID in the format 'name,cx_profile_name', got: ", req.ID),
+			fmt.Sprint("Expected ID in the format 'name,svm,cx_profile_name', got: ", req.ID),
 		)
 		return
 	}
 
 	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("name"), idParts[0])...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("cx_profile_name"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("owner").AtName("name"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("cx_profile_name"), idParts[2])...)
 }

internal/provider/security/security_account_resource_alias_test.go

@@ -26,7 +26,7 @@ func TestAccSecurityAccountResourceAlias(t *testing.T) {
 			{
 				ResourceName:  "netapp-ontap_security_account_resource.security_account",
 				ImportState:   true,
-				ImportStateId: fmt.Sprintf("%s,%s", "vsadmin", "cluster2"),
+				ImportStateId: fmt.Sprintf("%s,%s,%s", "vsadmin", "tf_acc_svm", "cluster2"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_security_account_resource.security_account", "name", "vsadmin"),
 				),

internal/provider/security/security_account_resource_test.go

@@ -53,7 +53,7 @@ func TestAccSecurityAccountResource(t *testing.T) {
 			{
 				ResourceName:  "netapp-ontap_security_account.security_account",
 				ImportState:   true,
-				ImportStateId: fmt.Sprintf("%s,%s", "vsadmin", "cluster2"),
+				ImportStateId: fmt.Sprintf("%s,%s,%s", "vsadmin", "tf_acc_svm", "cluster2"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_security_account.security_account", "name", "vsadmin"),
 				),