storage_mover_smb_file_share_endpoint: ResourceWithIdentity, guide error msg, Target Endpoint docs, inline tests

Made-with: Cursor

Author: hqhqhqhqhqhqhqhqhqhqhq

internal/services/storagemover/storage_mover_smb_file_share_endpoint_resource.go

@@ -12,6 +12,7 @@ import (
 	"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/resourceids"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/storagemover/2025-07-01/endpoints"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/storagemover/2025-07-01/storagemovers"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
@@ -30,7 +31,10 @@ type StorageMoverSmbFileShareEndpointModel struct {
 
 type StorageMoverSmbFileShareEndpointResource struct{}
 
-var _ sdk.ResourceWithUpdate = StorageMoverSmbFileShareEndpointResource{}
+var (
+	_ sdk.ResourceWithUpdate   = StorageMoverSmbFileShareEndpointResource{}
+	_ sdk.ResourceWithIdentity = StorageMoverSmbFileShareEndpointResource{}
+)
 
 func (r StorageMoverSmbFileShareEndpointResource) ResourceType() string {
 	return "azurerm_storage_mover_smb_file_share_endpoint"
@@ -44,6 +48,10 @@ func (r StorageMoverSmbFileShareEndpointResource) IDValidationFunc() pluginsdk.S
 	return endpoints.ValidateEndpointID
 }
 
+func (r StorageMoverSmbFileShareEndpointResource) Identity() resourceids.ResourceId {
+	return &endpoints.EndpointId{}
+}
+
 func (r StorageMoverSmbFileShareEndpointResource) Arguments() map[string]*pluginsdk.Schema {
 	return map[string]*pluginsdk.Schema{
 		"name": {
@@ -107,7 +115,7 @@ func (r StorageMoverSmbFileShareEndpointResource) Create() sdk.ResourceFunc {
 			id := endpoints.NewEndpointID(storageMoverId.SubscriptionId, storageMoverId.ResourceGroupName, storageMoverId.StorageMoverName, model.Name)
 			existing, err := client.Get(ctx, id)
 			if err != nil && !response.WasNotFound(existing.HttpResponse) {
-				return fmt.Errorf("checking for existing %s: %+v", id, err)
+				return fmt.Errorf("checking for presence of existing %s: %+v", id, err)
 			}
 
 			if !response.WasNotFound(existing.HttpResponse) {
@@ -133,7 +141,10 @@ func (r StorageMoverSmbFileShareEndpointResource) Create() sdk.ResourceFunc {
 			}
 
 			metadata.SetID(id)
-			return nil
+			if err := pluginsdk.SetResourceIdentityData(metadata.ResourceData, &id); err != nil {
+				return err
+			}
+			return metadata.Encode(&model)
 		},
 	}
 }
@@ -213,6 +224,9 @@ func (r StorageMoverSmbFileShareEndpointResource) Read() sdk.ResourceFunc {
 				}
 			}
 
+			if err := pluginsdk.SetResourceIdentityData(metadata.ResourceData, id); err != nil {
+				return err
+			}
 			return metadata.Encode(&state)
 		},
 	}

internal/services/storagemover/storage_mover_smb_file_share_endpoint_resource_test.go

@@ -129,7 +129,6 @@ resource "azurerm_storage_mover" "test" {
 }
 
 func (r StorageMoverSmbFileShareEndpointTestResource) basic(data acceptance.TestData) string {
-	template := r.template(data)
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
@@ -143,11 +142,10 @@ resource "azurerm_storage_mover_smb_file_share_endpoint" "test" {
   storage_account_id = azurerm_storage_account.test.id
   file_share_name    = azurerm_storage_share.test.name
 }
-`, template, data.RandomInteger)
+`, r.template(data), data.RandomInteger)
 }
 
 func (r StorageMoverSmbFileShareEndpointTestResource) requiresImport(data acceptance.TestData) string {
-	config := r.basic(data)
 	return fmt.Sprintf(`
 %s
 
@@ -157,11 +155,10 @@ resource "azurerm_storage_mover_smb_file_share_endpoint" "import" {
   storage_account_id = azurerm_storage_account.test.id
   file_share_name    = azurerm_storage_share.test.name
 }
-`, config)
+`, r.basic(data))
 }
 
 func (r StorageMoverSmbFileShareEndpointTestResource) complete(data acceptance.TestData) string {
-	template := r.template(data)
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
@@ -176,11 +173,10 @@ resource "azurerm_storage_mover_smb_file_share_endpoint" "test" {
   file_share_name    = azurerm_storage_share.test.name
   description        = "Example SMB File Share Endpoint Description"
 }
-`, template, data.RandomInteger)
+`, r.template(data), data.RandomInteger)
 }
 
 func (r StorageMoverSmbFileShareEndpointTestResource) update(data acceptance.TestData) string {
-	template := r.template(data)
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
@@ -195,5 +191,5 @@ resource "azurerm_storage_mover_smb_file_share_endpoint" "test" {
   file_share_name    = azurerm_storage_share.test.name
   description        = "Updated SMB File Share Endpoint Description"
 }
-`, template, data.RandomInteger)
+`, r.template(data), data.RandomInteger)
 }

website/docs/r/storage_mover_smb_file_share_endpoint.html.markdown

@@ -3,12 +3,14 @@ subcategory: "Storage Mover"
 layout: "azurerm"
 page_title: "Azure Resource Manager: azurerm_storage_mover_smb_file_share_endpoint"
 description: |-
-  Manages a Storage Mover SMB File Share Endpoint.
+  Manages a Storage Mover SMB File Share Target Endpoint.
 ---
 
 # azurerm_storage_mover_smb_file_share_endpoint
 
-Manages a Storage Mover SMB File Share Endpoint.
+Manages a Storage Mover **SMB File Share Target Endpoint** (an endpoint that targets an Azure Files SMB file share as the migration destination in the Azure portal).
+
+-> **Note:** For a target endpoint that uses an Azure Storage **blob container**, use [`azurerm_storage_mover_target_endpoint`](storage_mover_target_endpoint.html) instead. For **NFS** file shares, use [`azurerm_storage_mover_nfs_file_share_target_endpoint`](storage_mover_nfs_file_share_target_endpoint.html).
 
 ## Example Usage
 
@@ -43,42 +45,42 @@ resource "azurerm_storage_mover_smb_file_share_endpoint" "example" {
   storage_mover_id   = azurerm_storage_mover.example.id
   storage_account_id = azurerm_storage_account.example.id
   file_share_name    = azurerm_storage_share.example.name
-  description        = "Example SMB File Share Endpoint"
+  description        = "Example SMB File Share Target Endpoint"
 }
 ```
 
 ## Arguments Reference
 
 The following arguments are supported:
 
-* `name` - (Required) Specifies the name which should be used for this Storage Mover SMB File Share Endpoint. Changing this forces a new resource to be created.
+* `name` - (Required) Specifies the name of this Storage Mover SMB File Share Target Endpoint. Changing this forces a new resource to be created.
 
-* `storage_mover_id` - (Required) Specifies the ID of the Storage Mover for this SMB File Share Endpoint. Changing this forces a new resource to be created.
+* `storage_mover_id` - (Required) Specifies the ID of the Storage Mover. Changing this forces a new resource to be created.
 
-* `storage_account_id` - (Required) Specifies the ID of the Storage Account for this SMB File Share Endpoint. Changing this forces a new resource to be created.
+* `storage_account_id` - (Required) Specifies the ID of the Storage Account that hosts the SMB file share. Changing this forces a new resource to be created.
 
-* `file_share_name` - (Required) Specifies the name of the SMB File Share for this Storage Mover SMB File Share Endpoint. Changing this forces a new resource to be created.
+* `file_share_name` - (Required) The name of the Azure Files share (the same value as the `name` argument of the [`azurerm_storage_share`](storage_share.html) resource). Changing this forces a new resource to be created.
 
-* `description` - (Optional) Specifies a description for the Storage Mover SMB File Share Endpoint.
+* `description` - (Optional) A description for this Target Endpoint.
 
 ## Attributes Reference
 
 In addition to the Arguments listed above - the following Attributes are exported:
 
-* `id` - The ID of the Storage Mover SMB File Share Endpoint.
+* `id` - The ID of the Storage Mover SMB File Share Target Endpoint.
 
 ## Timeouts
 
 The `timeouts` block allows you to specify [timeouts](https://developer.hashicorp.com/terraform/language/resources/configure#define-operation-timeouts) for certain actions:
 
-* `create` - (Defaults to 30 minutes) Used when creating the Storage Mover SMB File Share Endpoint.
-* `read` - (Defaults to 5 minutes) Used when retrieving the Storage Mover SMB File Share Endpoint.
-* `update` - (Defaults to 30 minutes) Used when updating the Storage Mover SMB File Share Endpoint.
-* `delete` - (Defaults to 30 minutes) Used when deleting the Storage Mover SMB File Share Endpoint.
+* `create` - (Defaults to 30 minutes) Used when creating the Storage Mover SMB File Share Target Endpoint.
+* `read` - (Defaults to 5 minutes) Used when retrieving the Storage Mover SMB File Share Target Endpoint.
+* `update` - (Defaults to 30 minutes) Used when updating the Storage Mover SMB File Share Target Endpoint.
+* `delete` - (Defaults to 30 minutes) Used when deleting the Storage Mover SMB File Share Target Endpoint.
 
 ## Import
 
-Storage Mover SMB File Share Endpoint can be imported using the `resource id`, e.g.
+Storage Mover SMB File Share Target Endpoints can be imported using the `resource id`, e.g.
 
 ```shell
 terraform import azurerm_storage_mover_smb_file_share_endpoint.example /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroup1/providers/Microsoft.StorageMover/storageMovers/storageMover1/endpoints/endpoint1

website/docs/r/storage_mover_target_endpoint.html.markdown

@@ -8,7 +8,9 @@ description: |-
 
 # azurerm_storage_mover_target_endpoint
 
-Manages a Storage Mover Target Endpoint.
+Manages a Storage Mover **Target Endpoint** for an Azure Storage **blob container** migration destination (as shown in the Azure portal).
+
+-> **Note:** To target an **NFS file share** on Azure Files instead, use [`azurerm_storage_mover_nfs_file_share_target_endpoint`](storage_mover_nfs_file_share_target_endpoint.html). For an **SMB** file share target, use [`azurerm_storage_mover_smb_file_share_endpoint`](storage_mover_smb_file_share_endpoint.html).
 
 ## Example Usage