moved ua-msi parsing as per review

hashicorp · May 18, 2020 · 0ba2ccf · 0ba2ccf
1 parent c8f7e5b
commit 0ba2ccf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/azurerm/internal/services/blueprints/validate/identity.go b/azurerm/internal/services/blueprints/validate/identity.go
@@ -2,8 +2,7 @@ package validate
 
 import (
 	"fmt"
-
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi/parse"
 )
 
 func UserAssignedIdentityId(i interface{}, k string) (warnings []string, errors []error) {
@@ -13,7 +12,7 @@ func UserAssignedIdentityId(i interface{}, k string) (warnings []string, errors
 		return
 	}
 
-	if _, err := azure.ParseUserAssignedIdentityID(v); err != nil {
+	if _, err := parse.UserAssignedIdentityID(v); err != nil {
 		errors = append(errors, fmt.Errorf("Can not parse %q as a resource id: %v", k, err))
 		return
 	}

diff --git a/azurerm/helpers/azure/identity.go → ...m/internal/services/msi/parse/identity.go b/azurerm/helpers/azure/identity.go → ...m/internal/services/msi/parse/identity.go
@@ -1,6 +1,9 @@
-package azure
+package parse
 
-import "fmt"
+import (
+	"fmt"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+)
 
 type UserAssignedIdentityId struct {
 	// "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/contoso-identity"
@@ -9,12 +12,12 @@ type UserAssignedIdentityId struct {
 	Name          string
 }
 
-func ParseUserAssignedIdentityID(input string) (*UserAssignedIdentityId, error) {
+func UserAssignedIdentityID(input string) (*UserAssignedIdentityId, error) {
 	if len(input) == 0 {
 		return nil, fmt.Errorf("Bad: UserAssignedIdentityId cannot be an empty string")
 	}
 
-	id, err := ParseAzureResourceID(input)
+	id, err := azure.ParseAzureResourceID(input)
 	if err != nil {
 		return nil, err
 	}