Address feedback of #9917 (#10338)

hashicorp · Jan 27, 2021 · a752b4d · a752b4d
1 parent 5efb549
commit a752b4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/azurerm/internal/services/storage/storage_data_lake_gen2_filesystem_resource.go b/azurerm/internal/services/storage/storage_data_lake_gen2_filesystem_resource.go
@@ -124,7 +124,7 @@ func resourceStorageDataLakeGen2FileSystemCreate(d *schema.ResourceData, meta in
 	}
 
 	aceRaw := d.Get("ace").([]interface{})
-	acl, err := parse.ExpandDataLakeGen2AceList(aceRaw)
+	acl, err := ExpandDataLakeGen2AceList(aceRaw)
 	if err != nil {
 		return fmt.Errorf("Error parsing ace list: %s", err)
 	}
@@ -201,7 +201,7 @@ func resourceStorageDataLakeGen2FileSystemUpdate(d *schema.ResourceData, meta in
 	}
 
 	aceRaw := d.Get("ace").([]interface{})
-	acl, err := parse.ExpandDataLakeGen2AceList(aceRaw)
+	acl, err := ExpandDataLakeGen2AceList(aceRaw)
 	if err != nil {
 		return fmt.Errorf("Error parsing ace list: %s", err)
 	}
@@ -309,7 +309,7 @@ func resourceStorageDataLakeGen2FileSystemRead(d *schema.ResourceData, meta inte
 	if err != nil {
 		return fmt.Errorf("Error parsing response ACL %q: %s", pathResponse.ACL, err)
 	}
-	d.Set("ace", parse.FlattenDataLakeGen2AceList(acl))
+	d.Set("ace", FlattenDataLakeGen2AceList(acl))
 
 	return nil
 }

diff --git a/azurerm/internal/services/storage/storage_data_lake_gen2_path_resource.go b/azurerm/internal/services/storage/storage_data_lake_gen2_path_resource.go
@@ -184,7 +184,7 @@ func resourceStorageDataLakeGen2PathCreate(d *schema.ResourceData, meta interfac
 		return fmt.Errorf("Unhandled resource type %q", resourceString)
 	}
 	aceRaw := d.Get("ace").([]interface{})
-	acl, err := parse.ExpandDataLakeGen2AceList(aceRaw)
+	acl, err := ExpandDataLakeGen2AceList(aceRaw)
 	if err != nil {
 		return fmt.Errorf("Error parsing ace list: %s", err)
 	}
@@ -248,7 +248,7 @@ func resourceStorageDataLakeGen2PathUpdate(d *schema.ResourceData, meta interfac
 	path := d.Get("path").(string)
 
 	aceRaw := d.Get("ace").([]interface{})
-	acl, err := parse.ExpandDataLakeGen2AceList(aceRaw)
+	acl, err := ExpandDataLakeGen2AceList(aceRaw)
 	if err != nil {
 		return fmt.Errorf("Error parsing ace list: %s", err)
 	}
@@ -336,7 +336,7 @@ func resourceStorageDataLakeGen2PathRead(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return fmt.Errorf("Error parsing response ACL %q: %s", resp.ACL, err)
 	}
-	d.Set("ace", parse.FlattenDataLakeGen2AceList(acl))
+	d.Set("ace", FlattenDataLakeGen2AceList(acl))
 
 	return nil
 }

diff --git a/...s/storage/parse/storage_filesystem_ace.go → ...ervices/storage/storage_filesystem_ace.go b/...s/storage/parse/storage_filesystem_ace.go → ...ervices/storage/storage_filesystem_ace.go
@@ -1,4 +1,4 @@
-package parse
+package storage
 
 import (
 	"github.com/google/uuid"
@@ -58,9 +58,11 @@ func FlattenDataLakeGen2AceList(acl accesscontrol.ACL) []interface{} {
 		}
 		ace["scope"] = scope
 		ace["type"] = string(v.TagType)
+		id := ""
 		if v.TagQualifier != nil {
-			ace["id"] = v.TagQualifier.String()
+			id = v.TagQualifier.String()
 		}
+		ace["id"] = id
 		ace["permissions"] = v.Permissions
 
 		output[i] = ace