update per comments

Author: ziyeqf

internal/services/dataprotection/data_protection_backup_instance_data_lake_storage_resource.go

@@ -6,20 +6,21 @@ package dataprotection
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
+	"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/dataprotection/2025-07-01/backupinstanceresources"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/dataprotection/2025-07-01/backupvaultresources"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/dataprotection/2025-07-01/basebackuppolicyresources"
 	"github.com/hashicorp/go-azure-sdk/sdk/client/pollers"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/dataprotection/custompollers"
-	storageValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 )
@@ -34,9 +35,18 @@ type BackupInstanceDataLakeStorageModel struct {
 	ProtectionState             string   `tfschema:"protection_state"`
 }
 
+//go:generate go run ../../tools/generator-tests resourceidentity -resource-name data_protection_backup_instance_data_lake_storage -service-package-name dataprotection -properties "name" -compare-values "subscription_id:data_protection_backup_vault_id,resource_group_name:data_protection_backup_vault_id,backup_vault_name:data_protection_backup_vault_id"
+
 type DataProtectionBackupInstanceDataLakeStorageResource struct{}
 
-var _ sdk.Resource = DataProtectionBackupInstanceDataLakeStorageResource{}
+var (
+	_ sdk.Resource             = DataProtectionBackupInstanceDataLakeStorageResource{}
+	_ sdk.ResourceWithIdentity = DataProtectionBackupInstanceDataLakeStorageResource{}
+)
+
+func (r DataProtectionBackupInstanceDataLakeStorageResource) Identity() resourceids.ResourceId {
+	return &backupinstanceresources.BackupInstanceId{}
+}
 
 func (r DataProtectionBackupInstanceDataLakeStorageResource) ResourceType() string {
 	return "azurerm_data_protection_backup_instance_data_lake_storage"
@@ -72,8 +82,11 @@ func (r DataProtectionBackupInstanceDataLakeStorageResource) Arguments() map[str
 			Required: true,
 			MinItems: 1,
 			Elem: &pluginsdk.Schema{
-				Type:         pluginsdk.TypeString,
-				ValidateFunc: storageValidate.StorageContainerName,
+				Type: pluginsdk.TypeString,
+				ValidateFunc: validation.All(
+					validation.StringLenBetween(3, 63),
+					validation.StringMatch(regexp.MustCompile(`^[0-9a-z][0-9a-z-]*$`), "only lowercase alphanumeric characters and hyphens are allowed, and the value must not start with a hyphen"),
+				),
 			},
 		},
 	}
@@ -176,6 +189,9 @@ func (r DataProtectionBackupInstanceDataLakeStorageResource) Create() sdk.Resour
 			}
 
 			metadata.SetID(id)
+			if err := pluginsdk.SetResourceIdentityData(metadata.ResourceData, &id); err != nil {
+				return err
+			}
 			return nil
 		},
 	}
@@ -238,6 +254,9 @@ func (r DataProtectionBackupInstanceDataLakeStorageResource) Read() sdk.Resource
 				}
 			}
 
+			if err := pluginsdk.SetResourceIdentityData(metadata.ResourceData, id); err != nil {
+				return err
+			}
 			return metadata.Encode(&state)
 		},
 	}

internal/services/dataprotection/data_protection_backup_instance_data_lake_storage_resource_identity_gen_test.go

@@ -0,0 +1,40 @@
+// Copyright IBM Corp. 2014, 2025
+// SPDX-License-Identifier: MPL-2.0
+
+package dataprotection_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/statecheck"
+	"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
+	customstatecheck "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/statecheck"
+)
+
+func TestAccDataProtectionBackupInstanceDataLakeStorage_resourceIdentity(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_data_protection_backup_instance_data_lake_storage", "test")
+	r := DataProtectionBackupInstanceDataLakeStorageResource{}
+
+	checkedFields := map[string]struct{}{
+		"name":                {},
+		"backup_vault_name":   {},
+		"resource_group_name": {},
+		"subscription_id":     {},
+	}
+
+	data.ResourceIdentityTest(t, []acceptance.TestStep{
+		{
+			Config: r.basic(data),
+			ConfigStateChecks: []statecheck.StateCheck{
+				customstatecheck.ExpectAllIdentityFieldsAreChecked("azurerm_data_protection_backup_instance_data_lake_storage.test", checkedFields),
+				statecheck.ExpectIdentityValueMatchesStateAtPath("azurerm_data_protection_backup_instance_data_lake_storage.test", tfjsonpath.New("name"), tfjsonpath.New("name")),
+				customstatecheck.ExpectStateContainsIdentityValueAtPath("azurerm_data_protection_backup_instance_data_lake_storage.test", tfjsonpath.New("backup_vault_name"), tfjsonpath.New("data_protection_backup_vault_id")),
+				customstatecheck.ExpectStateContainsIdentityValueAtPath("azurerm_data_protection_backup_instance_data_lake_storage.test", tfjsonpath.New("resource_group_name"), tfjsonpath.New("data_protection_backup_vault_id")),
+				customstatecheck.ExpectStateContainsIdentityValueAtPath("azurerm_data_protection_backup_instance_data_lake_storage.test", tfjsonpath.New("subscription_id"), tfjsonpath.New("data_protection_backup_vault_id")),
+			},
+		},
+		data.ImportBlockWithResourceIdentityStep(false),
+		data.ImportBlockWithIDStep(false),
+	}, false)
+}

website/docs/r/data_protection_backup_instance_data_lake_storage.html.markdown

@@ -27,6 +27,16 @@ resource "azurerm_storage_account" "example" {
   is_hns_enabled           = true
 }
 
+resource "azurerm_storage_container" "example" {
+  name               = "example-container"
+  storage_account_id = azurerm_storage_account.example.id
+}
+
+resource "azurerm_storage_container" "example2" {
+  name               = "example-container2"
+  storage_account_id = azurerm_storage_account.example.id
+}
+
 resource "azurerm_data_protection_backup_vault" "example" {
   name                = "example-backup-vault"
   resource_group_name = azurerm_resource_group.example.name
@@ -58,7 +68,7 @@ resource "azurerm_data_protection_backup_instance_data_lake_storage" "example" {
   location                        = azurerm_resource_group.example.location
   storage_account_id              = azurerm_storage_account.example.id
   backup_policy_id                = azurerm_data_protection_backup_policy_data_lake_storage.example.id
-  storage_container_names         = ["container1", "container2"]
+  storage_container_names         = [azurerm_storage_container.example.name, azurerm_storage_container.example2.name]
 
   depends_on = [azurerm_role_assignment.example]
 }