Merge pull request #18928 from hashicorp/refactor/disks-to-go-azure-sdk

disks: refactoring to use `go-azure-sdk`
hashicorp · Oct 24, 2022 · 7770685 · 7770685
2 parents 4d886a2 + 8d52f7b
commit 7770685
Show file tree

Hide file tree

Showing 102 changed files with 816 additions and 3,240 deletions.
diff --git a/internal/services/disks/client/client.go b/internal/services/disks/client/client.go
@@ -1,9 +1,9 @@
 package client
 
 import (
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/diskpools"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/iscsitargets"
 )
 
 type Client struct {

diff --git a/internal/services/disks/disk_pool_iscsi_target_lun_resource.go b/internal/services/disks/disk_pool_iscsi_target_lun_resource.go
@@ -9,13 +9,14 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	computeParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/parse"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/diskpools"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/iscsitargets"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -86,11 +87,11 @@ func (d DiskPoolIscsiTargetLunModel) Create() sdk.ResourceFunc {
 			if err != nil {
 				return err
 			}
-			attachmentId, err := diskpools.DiskPoolManagedDiskAttachmentID(m.ManagedDiskAttachmentId)
+			attachmentId, err := parse.DiskPoolManagedDiskAttachmentID(m.ManagedDiskAttachmentId)
 			if err != nil {
 				return err
 			}
-			id := iscsitargets.NewDiskPoolIscsiTargetLunId(*iscsiTargetId, attachmentId.ManagedDiskId)
+			id := parse.NewDiskPoolIscsiTargetLunId(*iscsiTargetId, attachmentId.ManagedDiskId)
 
 			locks.ByID(iscsiTargetId.ID())
 			defer locks.UnlockByID(iscsiTargetId.ID())
@@ -146,7 +147,7 @@ func (d DiskPoolIscsiTargetLunModel) Read() sdk.ResourceFunc {
 	return sdk.ResourceFunc{
 		Timeout: 5 * time.Minute,
 		Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
-			id, err := iscsitargets.ParseIscsiTargetLunID(metadata.ResourceData.Id())
+			id, err := parse.ParseIscsiTargetLunID(metadata.ResourceData.Id())
 			if err != nil {
 				return err
 			}
@@ -174,7 +175,7 @@ func (d DiskPoolIscsiTargetLunModel) Read() sdk.ResourceFunc {
 					if err != nil {
 						return fmt.Errorf("invalid managed disk id in iscsi target response %q : %q", iscsiTargetId.ID(), lun.ManagedDiskAzureResourceId)
 					}
-					attachmentId := diskpools.NewDiskPoolManagedDiskAttachmentId(diskPoolId, *diskId)
+					attachmentId := parse.NewDiskPoolManagedDiskAttachmentId(diskPoolId, *diskId)
 					if lun.Lun == nil {
 						return fmt.Errorf("malformed Iscsi Target response %q : %+v", iscsiTargetId.ID(), resp)
 					}
@@ -206,11 +207,11 @@ func (d DiskPoolIscsiTargetLunModel) Delete() sdk.ResourceFunc {
 			if err != nil {
 				return err
 			}
-			attachmentId, err := diskpools.DiskPoolManagedDiskAttachmentID(m.ManagedDiskAttachmentId)
+			attachmentId, err := parse.DiskPoolManagedDiskAttachmentID(m.ManagedDiskAttachmentId)
 			if err != nil {
 				return err
 			}
-			id := iscsitargets.NewDiskPoolIscsiTargetLunId(*iscsiTargetId, attachmentId.ManagedDiskId)
+			id := parse.NewDiskPoolIscsiTargetLunId(*iscsiTargetId, attachmentId.ManagedDiskId)
 
 			locks.ByID(iscsiTargetId.ID())
 			defer locks.UnlockByID(iscsiTargetId.ID())

diff --git a/internal/services/disks/disk_pool_iscsi_target_lun_resource_test.go b/internal/services/disks/disk_pool_iscsi_target_lun_resource_test.go
@@ -8,12 +8,13 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/iscsitargets"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
 )
@@ -97,7 +98,7 @@ func TestAccDiskPoolIscsiTargetLun_destroy(t *testing.T) {
 }
 
 func (r DisksPoolIscsiTargetLunResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
-	id, err := iscsitargets.ParseIscsiTargetLunID(state.ID)
+	id, err := parse.ParseIscsiTargetLunID(state.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -126,7 +127,7 @@ func (r DisksPoolIscsiTargetLunResource) Exists(ctx context.Context, clients *cl
 func (r DisksPoolIscsiTargetLunResource) Destroy(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
 	ctx, cancel := context.WithTimeout(ctx, 60*time.Minute)
 	defer cancel()
-	id, err := iscsitargets.ParseIscsiTargetLunID(state.ID)
+	id, err := parse.ParseIscsiTargetLunID(state.ID)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/services/disks/disk_pool_iscsi_target_resource.go b/internal/services/disks/disk_pool_iscsi_target_resource.go
@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"

diff --git a/internal/services/disks/disk_pool_iscsi_target_resource_test.go b/internal/services/disks/disk_pool_iscsi_target_resource_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
 )

diff --git a/internal/services/disks/disk_pool_managed_disk_attachment_resource.go b/internal/services/disks/disk_pool_managed_disk_attachment_resource.go
@@ -5,13 +5,15 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/parse"
+
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	computeParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/parse"
 	computeValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/validate"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/diskpools"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 )
@@ -77,7 +79,7 @@ func (d DiskPoolManagedDiskAttachmentResource) Create() sdk.ResourceFunc {
 			}
 			locks.ByID(attachment.DiskPoolId)
 			defer locks.UnlockByID(attachment.DiskPoolId)
-			id := diskpools.NewDiskPoolManagedDiskAttachmentId(*poolId, *diskId)
+			id := parse.NewDiskPoolManagedDiskAttachmentId(*poolId, *diskId)
 
 			client := metadata.Client.Disks.DiskPoolsClient
 			poolResp, err := client.Get(ctx, *poolId)
@@ -122,7 +124,7 @@ func (d DiskPoolManagedDiskAttachmentResource) Read() sdk.ResourceFunc {
 	return sdk.ResourceFunc{
 		Timeout: 5 * time.Minute,
 		Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
-			id, err := diskpools.DiskPoolManagedDiskAttachmentID(metadata.ResourceData.Id())
+			id, err := parse.DiskPoolManagedDiskAttachmentID(metadata.ResourceData.Id())
 			if err != nil {
 				return err
 			}

diff --git a/internal/services/disks/disk_pool_managed_disk_attachment_resource_test.go b/internal/services/disks/disk_pool_managed_disk_attachment_resource_test.go
@@ -7,10 +7,11 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/diskpools"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
 )
@@ -81,7 +82,7 @@ func TestAccDiskPoolDiskAttachment_destroy(t *testing.T) {
 }
 
 func (a DisksPoolManagedDiskAttachmentResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
-	id, err := diskpools.DiskPoolManagedDiskAttachmentID(state.ID)
+	id, err := parse.DiskPoolManagedDiskAttachmentID(state.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -110,7 +111,7 @@ func (a DisksPoolManagedDiskAttachmentResource) Exists(ctx context.Context, clie
 func (a DisksPoolManagedDiskAttachmentResource) Destroy(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
 	ctx, cancel := context.WithTimeout(ctx, 60*time.Minute)
 	defer cancel()
-	id, err := diskpools.DiskPoolManagedDiskAttachmentID(state.ID)
+	id, err := parse.DiskPoolManagedDiskAttachmentID(state.ID)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/services/disks/disk_pool_resource.go b/internal/services/disks/disk_pool_resource.go
@@ -6,6 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
+
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
@@ -15,7 +17,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/diskpools"
 	disksValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/validate"
 	networkValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/network/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"

diff --git a/internal/services/disks/disk_pool_resource_test.go b/internal/services/disks/disk_pool_resource_test.go
@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
+
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/disks/sdk/2021-08-01/diskpools"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
 )

diff --git a/...s/id_disk_pool_managed_disk_attachment.go → ...arse/disk_pool_managed_disk_attachment.go b/...s/id_disk_pool_managed_disk_attachment.go → ...arse/disk_pool_managed_disk_attachment.go
@@ -1,31 +1,40 @@
-package diskpools
+package parse
 
 import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/resourceid"
+	"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
 	computeParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/parse"
 )
 
 const storageDiskPoolManagedDiskAttachmentIdSeparator = "/managedDisks|"
 
-var _ resourceid.Formatter = DiskPoolManagedDiskAttachmentId{}
+var _ resourceids.Id = DiskPoolManagedDiskAttachmentId{}
 
 type DiskPoolManagedDiskAttachmentId struct {
-	DiskPoolId    DiskPoolId
+	DiskPoolId    diskpools.DiskPoolId
 	ManagedDiskId computeParse.ManagedDiskId
 }
 
-func NewDiskPoolManagedDiskAttachmentId(diskPoolId DiskPoolId, managedDiskId computeParse.ManagedDiskId) DiskPoolManagedDiskAttachmentId {
+func NewDiskPoolManagedDiskAttachmentId(diskPoolId diskpools.DiskPoolId, managedDiskId computeParse.ManagedDiskId) DiskPoolManagedDiskAttachmentId {
 	return DiskPoolManagedDiskAttachmentId{
 		DiskPoolId:    diskPoolId,
 		ManagedDiskId: managedDiskId,
 	}
 }
 
-func (d DiskPoolManagedDiskAttachmentId) ID() string {
-	return fmt.Sprintf("%s%s%s", d.DiskPoolId.ID(), storageDiskPoolManagedDiskAttachmentIdSeparator, d.ManagedDiskId.ID())
+func (id DiskPoolManagedDiskAttachmentId) ID() string {
+	return fmt.Sprintf("%s%s%s", id.DiskPoolId.ID(), storageDiskPoolManagedDiskAttachmentIdSeparator, id.ManagedDiskId.ID())
+}
+
+func (id DiskPoolManagedDiskAttachmentId) String() string {
+	components := []string{
+		fmt.Sprintf("Disk Pool %q", id.DiskPoolId.String()),
+		fmt.Sprintf("Managed Disk %q", id.ManagedDiskId.String()),
+	}
+	return fmt.Sprintf("Disk Pool Managed Disk Attachment: %s", strings.Join(components, " / "))
 }
 
 func DiskPoolManagedDiskAttachmentID(input string) (*DiskPoolManagedDiskAttachmentId, error) {
@@ -37,7 +46,7 @@ func DiskPoolManagedDiskAttachmentID(input string) (*DiskPoolManagedDiskAttachme
 		return nil, fmt.Errorf("malformed disks pool managed disk attachment id:%q", input)
 	}
 
-	poolId, err := ParseDiskPoolID(parts[0])
+	poolId, err := diskpools.ParseDiskPoolID(parts[0])
 	if poolId == nil {
 		return nil, fmt.Errorf("malformed disks pool managed disk attachment id:%q", input)
 	}

diff --git a/...disk_pool_managed_disk_attachment_test.go → ...disk_pool_managed_disk_attachment_test.go b/...disk_pool_managed_disk_attachment_test.go → ...disk_pool_managed_disk_attachment_test.go
@@ -1,13 +1,14 @@
-package diskpools
+package parse
 
 import (
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/diskpools"
 	computeparse "github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/parse"
 )
 
 func TestDiskPoolManagedDiskAttachmentIDFormatter(t *testing.T) {
-	diskPoolId := NewDiskPoolID("12345678-1234-9876-4563-123456789012", "resGroup1", "storagePool1")
+	diskPoolId := diskpools.NewDiskPoolID("12345678-1234-9876-4563-123456789012", "resGroup1", "storagePool1")
 	managedDiskId := computeparse.NewManagedDiskID("12345678-1234-9876-4563-123456789012", "resGroup1", "diks1")
 	actual := NewDiskPoolManagedDiskAttachmentId(diskPoolId, managedDiskId).ID()
 	expected := "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.StoragePool/diskPools/storagePool1/managedDisks|/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/disks/diks1"

diff --git a/...-08-01/iscsitargets/id_iscsitarget_lun.go → ...l/services/disks/parse/iscsitarget_lun.go b/...-08-01/iscsitargets/id_iscsitarget_lun.go → ...l/services/disks/parse/iscsitarget_lun.go
@@ -1,9 +1,10 @@
-package iscsitargets
+package parse
 
 import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/iscsitargets"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/resourceid"
 	computeParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/parse"
 )
@@ -13,11 +14,11 @@ const iscsiTargetLunSeparator = "/lun|"
 var _ resourceid.Formatter = DiskPoolIscsiTargetLunId{}
 
 type DiskPoolIscsiTargetLunId struct {
-	IscsiTargetId IscsiTargetId
+	IscsiTargetId iscsitargets.IscsiTargetId
 	ManagedDiskId computeParse.ManagedDiskId
 }
 
-func NewDiskPoolIscsiTargetLunId(iscsiTargetId IscsiTargetId, managedDiskId computeParse.ManagedDiskId) DiskPoolIscsiTargetLunId {
+func NewDiskPoolIscsiTargetLunId(iscsiTargetId iscsitargets.IscsiTargetId, managedDiskId computeParse.ManagedDiskId) DiskPoolIscsiTargetLunId {
 	return DiskPoolIscsiTargetLunId{
 		IscsiTargetId: iscsiTargetId,
 		ManagedDiskId: managedDiskId,
@@ -37,7 +38,7 @@ func ParseIscsiTargetLunID(input string) (*DiskPoolIscsiTargetLunId, error) {
 		return nil, fmt.Errorf("malformed iscsi target lun id:%q", input)
 	}
 
-	iscsiTargetId, err := ParseIscsiTargetID(parts[0])
+	iscsiTargetId, err := iscsitargets.ParseIscsiTargetID(parts[0])
 	if iscsiTargetId == nil {
 		return nil, fmt.Errorf("malformed iscsi target lun id:%q", input)
 	}

diff --git a/...1/iscsitargets/id_iscsitarget_lun_test.go → ...vices/disks/parse/iscsitarget_lun_test.go b/...1/iscsitargets/id_iscsitarget_lun_test.go → ...vices/disks/parse/iscsitarget_lun_test.go
@@ -1,13 +1,14 @@
-package iscsitargets
+package parse
 
 import (
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/resource-manager/storagepool/2021-08-01/iscsitargets"
 	computeParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/compute/parse"
 )
 
 func TestNewDiskPoolIscsiTargetLunId(t *testing.T) {
-	iscsiTargetId := NewIscsiTargetID("12345678-1234-9876-4563-123456789012", "example-resource-group", "diskPoolValue", "iscsiTargetValue")
+	iscsiTargetId := iscsitargets.NewIscsiTargetID("12345678-1234-9876-4563-123456789012", "example-resource-group", "diskPoolValue", "iscsiTargetValue")
 	managedDiskId := computeParse.NewManagedDiskID("12345678-1234-9876-4563-123456789012", "resGroup1", "disk1")
 	id := NewDiskPoolIscsiTargetLunId(iscsiTargetId, managedDiskId)
 
@@ -21,7 +22,7 @@ func TestNewDiskPoolIscsiTargetLunId(t *testing.T) {
 }
 
 func TestFormatIscsiTargetLunId(t *testing.T) {
-	iscsiTargetId := NewIscsiTargetID("12345678-1234-9876-4563-123456789012", "example-resource-group", "diskPoolValue", "iscsiTargetValue")
+	iscsiTargetId := iscsitargets.NewIscsiTargetID("12345678-1234-9876-4563-123456789012", "example-resource-group", "diskPoolValue", "iscsiTargetValue")
 	managedDiskId := computeParse.NewManagedDiskID("12345678-1234-9876-4563-123456789012", "resGroup1", "disk1")
 	id := NewDiskPoolIscsiTargetLunId(iscsiTargetId, managedDiskId)
 
@@ -102,7 +103,7 @@ func TestParseIscsiTargetLunID(t *testing.T) {
 			// Valid URI
 			Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/example-resource-group/providers/Microsoft.StoragePool/diskPools/diskPoolValue/iscsiTargets/iscsiTargetValue/lun|/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.Compute/disks/disk1",
 			Expected: &DiskPoolIscsiTargetLunId{
-				IscsiTargetId: NewIscsiTargetID("12345678-1234-9876-4563-123456789012", "example-resource-group", "diskPoolValue", "iscsiTargetValue"),
+				IscsiTargetId: iscsitargets.NewIscsiTargetID("12345678-1234-9876-4563-123456789012", "example-resource-group", "diskPoolValue", "iscsiTargetValue"),
 				ManagedDiskId: computeParse.NewManagedDiskID("12345678-1234-9876-4563-123456789012", "resGroup1", "disk1"),
 			},
 		},