Fix azapi_resource move from azurerm_storage_share by converting /fileshares/ to /shares/

Author: ms-henglu

CHANGELOG.md

@@ -24,6 +24,7 @@ ENHANCEMENTS:
 BUG FIXES:
 - Fix validation logic for properties that are both `ReadOnly` and `Required`.
 - Fix panic when using `sensitive_body_version` with empty `sensitive_body` (GH-999). 
+- Fix `azapi_resource` resource move from `azurerm_storage_share` by converting `/fileshares/` to `/shares/` in resource ID.
 
 ## v2.7.0
 

internal/services/azapi_resource.go

@@ -1370,6 +1370,7 @@ func (r *AzapiResource) tagsWithDefaultTags(config types.Map, state *AzapiResour
 // into the corresponding ARM ID. Some azurerm resources expose management-plane IDs using alternative attribute names.
 // Supported cases:
 //   - azurerm_storage_container: uses `resource_manager_id`
+//   - azurerm_storage_share: uses `resource_manager_id`
 //   - azurerm_key_vault_secret: uses `resource_versionless_id`
 //   - azurerm_key_vault_key: uses `resource_versionless_id`
 //
@@ -1389,6 +1390,17 @@ func deriveAzureArmIdFromAzurermState(ctx context.Context, azurermType, primaryI
 			}
 			return "", fmt.Errorf("unable to derive ARM resource ID for storage container: missing attribute 'resource_manager_id' in source state")
 		}
+	case "azurerm_storage_share":
+		if isHTTPS {
+			if sourceState != nil {
+				var armId string
+				if err := sourceState.GetAttribute(ctx, path.Root("resource_manager_id"), &armId); err == nil && armId != "" {
+					// Convert /fileshares/ to /shares/ in the resource ID
+					return parse.AzurermIdToAzureId(azurermType, armId)
+				}
+			}
+			return "", fmt.Errorf("unable to derive ARM resource ID for storage share: missing attribute 'resource_manager_id' in source state")
+		}
 	case "azurerm_key_vault_secret":
 		if isHTTPS {
 			if sourceState != nil {

internal/services/azapi_resource_test.go

@@ -700,6 +700,31 @@ func TestAccGenericResource_moveStorageContainer(t *testing.T) {
 	})
 }
 
+func TestAccGenericResource_moveStorageShare(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azapi_resource", "test")
+	r := GenericResource{}
+	data.ResourceTest(t, r, []resource.TestStep{
+		{
+			Config:            r.moveStorageShareSetup(data),
+			ExternalProviders: externalProvidersAzurerm(),
+		},
+		{
+			Config: r.moveStorageShareStartMoving(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+			ExternalProviders: externalProvidersAzurerm(),
+		},
+		{
+			Config: r.moveStorageShareUpdate(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+			ExternalProviders: externalProvidersAzurerm(),
+		},
+	})
+}
+
 func TestAccGenericResource_moveKeyVaultSecret(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azapi_resource", "test")
 	r := GenericResource{}
@@ -2749,6 +2774,128 @@ resource "azapi_resource" "test" {
 `, r.template(data), data.RandomString)
 }
 
+func (r GenericResource) moveStorageShareSetup(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_storage_account" "sa" {
+  name                     = "acctestsa%[2]s"
+  location                 = azapi_resource.resourceGroup.location
+  resource_group_name      = azapi_resource.resourceGroup.name
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_share" "share" {
+  name                 = "acctestshare%[2]s"
+  storage_account_name = azurerm_storage_account.sa.name
+  quota                = 50
+}
+`, r.template(data), data.RandomString)
+}
+
+func (r GenericResource) moveStorageShareStartMoving(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+provider "azurerm" {
+  features {}
+}
+
+moved {
+  from = azurerm_storage_share.share
+  to   = azapi_resource.test
+}
+
+resource "azurerm_storage_account" "sa" {
+  name                     = "acctestsa%[2]s"
+  location                 = azapi_resource.resourceGroup.location
+  resource_group_name      = azapi_resource.resourceGroup.name
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+//resource "azurerm_storage_share" "share" {
+//  name                 = "acctestshare%[2]s"
+//  storage_account_name = azurerm_storage_account.sa.name
+//  quota                = 50
+//}
+
+data "azapi_resource_id" "fileService" {
+  type      = "Microsoft.Storage/storageAccounts/fileServices@2023-05-01"
+  parent_id = azurerm_storage_account.sa.id
+  name      = "default"
+}
+
+resource "azapi_resource" "test" {
+  type      = "Microsoft.Storage/storageAccounts/fileServices/shares@2023-05-01"
+  parent_id = data.azapi_resource_id.fileService.id
+  name      = "acctestshare%[2]s"
+  body = {
+    properties = {
+      shareQuota = 50
+    }
+  }
+  ignore_casing             = false
+  schema_validation_enabled = true
+  ignore_missing_property   = true
+}
+`, r.template(data), data.RandomString)
+}
+
+func (r GenericResource) moveStorageShareUpdate(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+provider "azurerm" {
+  features {}
+}
+
+moved {
+  from = azurerm_storage_share.share
+  to   = azapi_resource.test
+}
+
+resource "azurerm_storage_account" "sa" {
+  name                     = "acctestsa%[2]s"
+  location                 = azapi_resource.resourceGroup.location
+  resource_group_name      = azapi_resource.resourceGroup.name
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+//resource "azurerm_storage_share" "share" {
+//  name                 = "acctestshare%[2]s"
+//  storage_account_name = azurerm_storage_account.sa.name
+//  quota                = 50
+//}
+
+data "azapi_resource_id" "fileService" {
+  type      = "Microsoft.Storage/storageAccounts/fileServices@2023-05-01"
+  parent_id = azurerm_storage_account.sa.id
+  name      = "default"
+}
+
+resource "azapi_resource" "test" {
+  type      = "Microsoft.Storage/storageAccounts/fileServices/shares@2023-05-01"
+  parent_id = data.azapi_resource_id.fileService.id
+  name      = "acctestshare%[2]s"
+  body = {
+    properties = {
+      shareQuota = 100
+    }
+  }
+  ignore_casing             = false
+  schema_validation_enabled = true
+  ignore_missing_property   = true
+}
+`, r.template(data), data.RandomString)
+}
+
 func (r GenericResource) moveKeyVaultSecretSetup(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s

internal/services/parse/azurerm_resource_id.go

@@ -24,6 +24,8 @@ func AzurermIdToAzureId(azurermResourceType string, azurermId string) (string, e
 			return "", fmt.Errorf("invalid id: %s, expected format: <role definition id>|<scope>", azurermId)
 		}
 		return azurermIdSplit[0], nil
+	case "azurerm_storage_share":
+		return strings.Replace(azurermId, "/fileshares/", "/shares/", 1), nil
 
 		// add more cases here as needed
 	}

internal/services/parse/azurerm_resource_id_test.go

@@ -35,6 +35,13 @@ func Test_AzurermIdToAzureId(t *testing.T) {
 			expectedAzureId:     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Authorization/roleDefinitions/roleDefinitionId",
 			expectError:         false,
 		},
+		{
+			name:                "azurerm_storage_share",
+			azurermResourceType: "azurerm_storage_share",
+			azurermId:           "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/sa/fileServices/default/fileshares/share",
+			expectedAzureId:     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/sa/fileServices/default/shares/share",
+			expectError:         false,
+		},
 	}
 
 	for _, tc := range testcases {