terraform: updating the segments for User Assigned Identity ID

Matching the behaviour introduced in #2011 which unblocks fixing https://github.com/hashicorp/pandora/actions/runs/4073772510 Dependent on hashicorp/go-azure-helpers#147 / being fixed in `terraform-provider-azurerm`
hashicorp · Feb 2, 2023 · 1086fe1 · 1086fe1
1 parent 2d22f8d
commit 1086fe1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config/resources/managedidentity.hcl b/config/resources/managedidentity.hcl
@@ -4,7 +4,7 @@ service "ManagedIdentity" {
   api "2022-01-31-preview" {
     package "ManagedIdentities" {
       definition "user_assigned_identity" {
-        id = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
+        id = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{userAssignedIdentityName}"
         display_name = "User Assigned Identity"
         website_subcategory = "Authorization"
         description = "Manages a User Assigned Identity"

diff --git a/...importer-rest-api-specs/components/parser/resourceids/common_id_user_assigned_identity.go b/...importer-rest-api-specs/components/parser/resourceids/common_id_user_assigned_identity.go
@@ -22,7 +22,7 @@ func (commonIdUserAssignedIdentity) id() models.ParsedResourceId {
 			models.StaticResourceIDSegment("providers", "providers"),
 			models.ResourceProviderResourceIDSegment("resourceProvider", "Microsoft.ManagedIdentity"),
 			models.StaticResourceIDSegment("userAssignedIdentities", "userAssignedIdentities"),
-			models.UserSpecifiedResourceIDSegment("resourceName"),
+			models.UserSpecifiedResourceIDSegment("userAssignedIdentityName"),
 		},
 	}
 }
diff --git a/...ter-rest-api-specs/components/parser/resourceids/common_id_user_assigned_identity_test.go b/...ter-rest-api-specs/components/parser/resourceids/common_id_user_assigned_identity_test.go
@@ -18,7 +18,7 @@ func TestCommonResourceID_UserAssignedIdentity(t *testing.T) {
 			models.StaticResourceIDSegment("providers", "providers"),
 			models.ResourceProviderResourceIDSegment("resourceProvider", "Microsoft.ManagedIdentity"),
 			models.StaticResourceIDSegment("userAssignedIdentities", "userAssignedIdentities"),
-			models.UserSpecifiedResourceIDSegment("resourceName"),
+			models.UserSpecifiedResourceIDSegment("userAssignedIdentityName"),
 		},
 	}
 	invalid := models.ParsedResourceId{
@@ -31,7 +31,7 @@ func TestCommonResourceID_UserAssignedIdentity(t *testing.T) {
 			models.StaticResourceIDSegment("providers", "providers"),
 			models.ResourceProviderResourceIDSegment("resourceProvider", "Microsoft.ManagedIdentity"),
 			models.StaticResourceIDSegment("userAssignedIdentities", "userAssignedIdentities"),
-			models.UserSpecifiedResourceIDSegment("userIdentityName"),
+			models.UserSpecifiedResourceIDSegment("userAssignedIdentityName"),
 			models.StaticResourceIDSegment("someResource", "someResource"),
 			models.UserSpecifiedResourceIDSegment("resourceName"),
 		},