azurerm_managed_disk - remove old parse/validate and update state m…

…igration
hashicorp · Oct 26, 2022 · 9221a7c · 9221a7c
1 parent 8cf2bd9
commit 9221a7c
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 332 deletions.
diff --git a/internal/services/compute/disk_sas_token_resource.go b/internal/services/compute/disk_sas_token_resource.go
@@ -9,8 +9,6 @@ import (
 
 	"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/disks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/parse"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
@@ -42,7 +40,7 @@ func resourceManagedDiskSasToken() *pluginsdk.Resource {
 		},
 
 		Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
-			_, err := parse.ManagedDiskID(id)
+			_, err := disks.ParseDiskID(id)
 			return err
 		}),
 
@@ -51,7 +49,7 @@ func resourceManagedDiskSasToken() *pluginsdk.Resource {
 				Type:         pluginsdk.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validate.ManagedDiskID,
+				ValidateFunc: disks.ValidateDiskID,
 			},
 
 			// unable to provide upper value of 4294967295 as it's not comptabile with 32-bit (overflow errors)

diff --git a/internal/services/compute/managed_disk_resource.go b/internal/services/compute/managed_disk_resource.go
@@ -41,7 +41,7 @@ func resourceManagedDisk() *pluginsdk.Resource {
 		}),
 
 		Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
-			_, err := parse.ManagedDiskID(id)
+			_, err := disks.ParseDiskID(id)
 			return err
 		}),
 

diff --git a/internal/services/compute/migration/managed_disk_v0_to_v1.go b/internal/services/compute/migration/managed_disk_v0_to_v1.go
@@ -2,6 +2,7 @@ package migration
 
 import (
 	"context"
+	"log"
 
 	"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/disks"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -15,12 +16,15 @@ type ManagedDiskV0ToV1 struct{}
 
 func (ManagedDiskV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc {
 	return func(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
-		oldId, err := disks.ParseDiskIDInsensitively(rawState["id"].(string))
+		oldIdRaw := rawState["id"].(string)
+		oldId, err := disks.ParseDiskIDInsensitively(oldIdRaw)
 		if err != nil {
 			return rawState, err
 		}
 
-		rawState["id"] = oldId.ID()
+		newId := oldId.ID()
+		log.Printf("[DEBUG] Updating the ID from %q to %q", oldIdRaw, newId)
+		rawState["id"] = newId
 		return rawState, nil
 	}
 }
@@ -129,7 +133,7 @@ func (ManagedDiskV0ToV1) Schema() map[string]*pluginsdk.Schema {
 			Optional: true,
 		},
 
-		"encryption_settings": encryptionSettingsSchema(),
+		"encryption_settings": managedDiskEncryptionSettingsSchemaV0(),
 
 		"network_access_policy": {
 			Type:     pluginsdk.TypeString,
@@ -197,7 +201,7 @@ func (ManagedDiskV0ToV1) Schema() map[string]*pluginsdk.Schema {
 	}
 }
 
-func encryptionSettingsSchema() *pluginsdk.Schema {
+func managedDiskEncryptionSettingsSchemaV0() *pluginsdk.Schema {
 	if !features.FourPointOhBeta() {
 		return &pluginsdk.Schema{
 			Type:     pluginsdk.TypeList,

diff --git a/internal/services/compute/parse/managed_disk.go b/internal/services/compute/parse/managed_disk.go
diff --git a/internal/services/compute/parse/managed_disk_test.go b/internal/services/compute/parse/managed_disk_test.go
diff --git a/internal/services/compute/resourceids.go b/internal/services/compute/resourceids.go
@@ -6,7 +6,6 @@ package compute
 //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=GalleryApplication -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/galleries/gallery1/applications/galleryApplication1
 //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=GalleryApplicationVersion -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/galleries/gallery1/applications/galleryApplication1/versions/galleryApplicationVersion1
 //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=Image -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/images/image1
-//go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=ManagedDisk -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/disks/disk1
 //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=SharedImage -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/galleries/gallery1/images/image1
 //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=SharedImageGallery -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/galleries/gallery1
 //go:generate go run ../../tools/generator-resource-id/main.go -path=./ -name=SharedImageVersion -id=/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/galleries/gallery1/images/image1/versions/version1

diff --git a/internal/services/compute/validate/managed_disk_id.go b/internal/services/compute/validate/managed_disk_id.go
diff --git a/internal/services/compute/validate/managed_disk_id_test.go b/internal/services/compute/validate/managed_disk_id_test.go