storagemover: validate multi-cloud ARM IDs, document env vars and MS Learn

Made-with: Cursor

Author: hqhqhqhqhqhqhqhqhqhqhq

internal/services/storagemover/storage_mover_multi_cloud_connector_endpoint_resource.go

@@ -14,8 +14,8 @@ import (
 	"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/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storagemover/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 )
@@ -74,14 +74,14 @@ func (r StorageMoverMultiCloudConnectorEndpointResource) Arguments() map[string]
 			Type:         pluginsdk.TypeString,
 			Required:     true,
 			ForceNew:     true,
-			ValidateFunc: azure.ValidateResourceID,
+			ValidateFunc: validate.MultiCloudConnectorARMResourceID,
 		},
 
 		"aws_s3_bucket_id": {
 			Type:         pluginsdk.TypeString,
 			Required:     true,
 			ForceNew:     true,
-			ValidateFunc: azure.ValidateResourceID,
+			ValidateFunc: validate.AwsS3BucketARMResourceID,
 		},
 
 		"description": {

internal/services/storagemover/storage_mover_multi_cloud_connector_endpoint_resource_test.go

@@ -1,6 +1,14 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
+// Acceptance tests for this resource require real Azure resources that are not created by these tests:
+//   - ARM_TEST_MULTI_CLOUD_CONNECTOR_ID — resource ID of a Microsoft.HybridConnectivity/publicCloudConnectors instance
+//   - ARM_TEST_AWS_S3_BUCKET_ID — resource ID of a Microsoft.AwsConnector/s3Buckets instance linked for cloud-to-cloud migration
+//
+// Create those prerequisites in the portal or via ARM as described in
+// https://learn.microsoft.com/azure/storage-mover/cloud-to-cloud-migration
+// then export the two IDs into the environment before running TF_ACC for this package.
+
 package storagemover_test
 
 import (

internal/services/storagemover/validate/multi_cloud_connector_arm_resource_id.go

@@ -0,0 +1,40 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package validate
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
+)
+
+// MultiCloudConnectorARMResourceID validates a full ARM resource ID for a Hybrid Connectivity public cloud connector.
+// See https://learn.microsoft.com/rest/api/storagemover/endpoints/create-or-update
+func MultiCloudConnectorARMResourceID(i interface{}, k string) (warnings []string, errors []error) {
+	warnings, errors = azure.ValidateResourceID(i, k)
+	if len(errors) > 0 {
+		return warnings, errors
+	}
+
+	id := strings.ToLower(i.(string))
+	if !strings.Contains(id, "/providers/microsoft.hybridconnectivity/publiccloudconnectors/") {
+		errors = append(errors, fmt.Errorf("%q must be the resource ID of a Microsoft.HybridConnectivity/publicCloudConnectors resource", k))
+	}
+	return warnings, errors
+}
+
+// AwsS3BucketARMResourceID validates a full ARM resource ID for an AWS S3 bucket resource exposed through Microsoft.AwsConnector.
+func AwsS3BucketARMResourceID(i interface{}, k string) (warnings []string, errors []error) {
+	warnings, errors = azure.ValidateResourceID(i, k)
+	if len(errors) > 0 {
+		return warnings, errors
+	}
+
+	id := strings.ToLower(i.(string))
+	if !strings.Contains(id, "/providers/microsoft.awsconnector/s3buckets/") {
+		errors = append(errors, fmt.Errorf("%q must be the resource ID of a Microsoft.AwsConnector/s3Buckets resource", k))
+	}
+	return warnings, errors
+}

internal/services/storagemover/validate/multi_cloud_connector_arm_resource_id_test.go

@@ -0,0 +1,36 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package validate
+
+import "testing"
+
+func TestMultiCloudConnectorARMResourceID(t *testing.T) {
+	t.Parallel()
+
+	valid := "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.HybridConnectivity/publicCloudConnectors/c1"
+	_, errs := MultiCloudConnectorARMResourceID(valid, "multi_cloud_connector_id")
+	if len(errs) > 0 {
+		t.Fatalf("expected valid id, got %v", errs)
+	}
+
+	_, errs = MultiCloudConnectorARMResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/sa", "multi_cloud_connector_id")
+	if len(errs) == 0 {
+		t.Fatal("expected error for wrong resource type")
+	}
+}
+
+func TestAwsS3BucketARMResourceID(t *testing.T) {
+	t.Parallel()
+
+	valid := "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.AwsConnector/s3Buckets/b1"
+	_, errs := AwsS3BucketARMResourceID(valid, "aws_s3_bucket_id")
+	if len(errs) > 0 {
+		t.Fatalf("expected valid id, got %v", errs)
+	}
+
+	_, errs = AwsS3BucketARMResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/sa", "aws_s3_bucket_id")
+	if len(errs) == 0 {
+		t.Fatal("expected error for wrong resource type")
+	}
+}

website/docs/r/storage_mover_multi_cloud_connector_endpoint.html.markdown

@@ -8,7 +8,7 @@ description: |-
 
 # azurerm_storage_mover_multi_cloud_connector_endpoint
 
-Manages a Storage Mover Multi-Cloud Connector Endpoint for migrating data from AWS S3 to Azure.
+Manages a Storage Mover **Target Endpoint** of type Multi-Cloud Connector for [cloud-to-cloud migration](https://learn.microsoft.com/azure/storage-mover/cloud-to-cloud-migration) from AWS S3 to Azure. In the Azure portal this appears under **Storage Mover** → your storage mover → **Endpoints** when creating an endpoint that uses a multi-cloud connector and AWS S3 bucket.
 
 ## Example Usage
 
@@ -28,7 +28,7 @@ resource "azurerm_storage_mover_multi_cloud_connector_endpoint" "example" {
   name                     = "example-mcce"
   storage_mover_id         = azurerm_storage_mover.example.id
   multi_cloud_connector_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example-rg/providers/Microsoft.HybridConnectivity/publicCloudConnectors/example-connector"
-  aws_s3_bucket_id         = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/aws-rg/providers/Microsoft.AWSConnector/s3Buckets/example-bucket"
+  aws_s3_bucket_id         = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/aws-rg/providers/Microsoft.AwsConnector/s3Buckets/example-bucket"
   description              = "Example Multi-Cloud Connector Endpoint"
 }
 ```