bugfix: format azurerm resource ID when move resource (#797)

* bugfix: format azurerm resource ID when move resource

* add `azurerm_role_definition`

CHANGELOG.md

@@ -11,6 +11,7 @@ ENHANCEMENTS:
 BUG FIXES:
 - Fix a bug that query parameters and headers don't work properly with unknown values
 - Fix more edge cases that the provider produced inconsistent result after apply when default output feature is enabled.
+- Fix a bug that when moving resource from `azurerm` resource, the id could not be parsed correctly.
 
 
 ## v2.2.0

internal/services/azapi_resource.go

@@ -1094,12 +1094,19 @@ func (r *AzapiResource) MoveState(ctx context.Context) []resource.StateMover {
 					response.Diagnostics.AddError("Invalid source state", "The source state does not contain an id")
 					return
 				}
-				id, err := parse.ResourceID(requestID)
+
+				azureId, err := parse.AzurermIdToAzureId(request.SourceTypeName, requestID)
 				if err != nil {
 					response.Diagnostics.AddError("Invalid Resource ID", fmt.Errorf("parsing Resource ID %q: %+v", requestID, err).Error())
 					return
 				}
 
+				id, err := parse.ResourceID(azureId)
+				if err != nil {
+					response.Diagnostics.AddError("Invalid Resource ID", fmt.Errorf("parsing Resource ID %q: %+v", azureId, err).Error())
+					return
+				}
+
 				state := r.defaultAzapiResourceModel()
 				state.ID = types.StringValue(id.ID())
 				state.Name = types.StringValue(id.Name)

internal/services/parse/azurerm_resource_id.go

@@ -0,0 +1,32 @@
+package parse
+
+import (
+	"fmt"
+	"strings"
+)
+
+// AzurermIdToAzureId converts an azurerm id to an azure resource id
+func AzurermIdToAzureId(azurermResourceType string, azurermId string) (string, error) {
+	switch azurermResourceType {
+	case "azurerm_monitor_diagnostic_setting":
+		// input: <target id>|<diagnostic setting name>
+		// output: <target id>/providers/Microsoft.Insights/diagnosticSettings/<diagnostic setting name>
+		azurermIdSplit := strings.Split(azurermId, "|")
+		if len(azurermIdSplit) != 2 {
+			return "", fmt.Errorf("invalid id: %s, expected format: <target id>|<diagnostic setting name>", azurermId)
+		}
+		return fmt.Sprintf("%s/providers/Microsoft.Insights/diagnosticSettings/%s", azurermIdSplit[0], azurermIdSplit[1]), nil
+	case "azurerm_role_definition":
+		// input: <role definition id>|<scope>
+		// output: <role definition id>
+		azurermIdSplit := strings.Split(azurermId, "|")
+		if len(azurermIdSplit) != 2 {
+			return "", fmt.Errorf("invalid id: %s, expected format: <role definition id>|<scope>", azurermId)
+		}
+		return azurermIdSplit[0], nil
+
+		// add more cases here as needed
+	}
+	// return azure id
+	return azurermId, nil
+}

internal/services/parse/azurerm_resource_id_test.go

@@ -0,0 +1,52 @@
+package parse_test
+
+import (
+	"testing"
+
+	"github.com/Azure/terraform-provider-azapi/internal/services/parse"
+)
+
+func Test_AzurermIdToAzureId(t *testing.T) {
+	testcases := []struct {
+		name                string
+		azurermResourceType string
+		azurermId           string
+		expectedAzureId     string
+		expectError         bool
+	}{
+		{
+			name:                "azurerm_monitor_diagnostic_setting valid",
+			azurermResourceType: "azurerm_monitor_diagnostic_setting",
+			azurermId:           "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/vm|diagnosticSettingName",
+			expectedAzureId:     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/vm/providers/Microsoft.Insights/diagnosticSettings/diagnosticSettingName",
+			expectError:         false,
+		},
+		{
+			name:                "azurerm_monitor_diagnostic_setting invalid",
+			azurermResourceType: "azurerm_monitor_diagnostic_setting",
+			azurermId:           "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/vm|diagnosticSettingName|foo",
+			expectedAzureId:     "",
+			expectError:         true,
+		},
+		{
+			name:                "azurerm_role_definition valid",
+			azurermResourceType: "azurerm_role_definition",
+			azurermId:           "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Authorization/roleDefinitions/roleDefinitionId|/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg",
+			expectedAzureId:     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Authorization/roleDefinitions/roleDefinitionId",
+			expectError:         false,
+		},
+	}
+
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			azureId, err := parse.AzurermIdToAzureId(tc.azurermResourceType, tc.azurermId)
+			if (err != nil) != tc.expectError {
+				t.Fatalf("expected error: %v, got: %v", tc.expectError, err)
+			}
+			if azureId != tc.expectedAzureId {
+				t.Fatalf("expected azure id: %s, got: %s", tc.expectedAzureId, azureId)
+			}
+		})
+	}
+
+}