Skip to content

Commit

Permalink
Merge pull request #24453 from hashicorp/dependencies/go-azure-sdk
Browse files Browse the repository at this point in the history 
dependencies: updating to `v0.20240110.1102249` of `github.com/hashicorp/go-azure-sdk`
  • Loading branch information
@tombuildsstuff
tombuildsstuff authored Jan 10, 2024
2 parents e5db927 + 74efad5 commit 6562ad4
Show file tree
Hide file tree
Showing 996 changed files with 3,913 additions and 2,655 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.1
github.com/hashicorp/go-azure-helpers v0.65.0
github.com/hashicorp/go-azure-sdk v0.20231220.1220246
github.com/hashicorp/go-azure-sdk v0.20240110.1102249
github.com/hashicorp/go-hclog v1.5.0
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
github.com/hashicorp/go-azure-helpers v0.65.0 h1:aOZV7HcxvqAlnaWJ/Fhfu321dXLs++TyBIVelWOb/8w=
github.com/hashicorp/go-azure-helpers v0.65.0/go.mod h1:ELmZ65vzHJNTk6ml4jsPD+xq2gZb7t78D35s+XN02Kk=
github.com/hashicorp/go-azure-sdk v0.20231220.1220246 h1:weUUUjjYMiz0rcgYhVPOr8wGutQQpWrE5RlboFddsyg=
github.com/hashicorp/go-azure-sdk v0.20231220.1220246/go.mod h1:69DSA+VMovHYJyQkRuUP3BCgwlEFrKvzeIHKi9m5xzY=
github.com/hashicorp/go-azure-sdk v0.20240110.1102249 h1:KRTbLIOmyvJ/WTwAiXbbT878Mxka9pCuKGPyRgwUey4=
github.com/hashicorp/go-azure-sdk v0.20240110.1102249/go.mod h1:m5lGAt22BNeuIAgBZFnA7I9E4Gm9h4PflqFbR/Ey7Fs=
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
Expand Down
4 changes: 2 additions & 2 deletions internal/services/compute/availability_set_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"time"

"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/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/availabilitysets"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
Expand Down Expand Up @@ -64,7 +64,7 @@ func dataSourceAvailabilitySetRead(d *pluginsdk.ResourceData, meta interface{})
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id := availabilitysets.NewAvailabilitySetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
id := commonids.NewAvailabilitySetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
resp, err := client.Get(ctx, id)
if err != nil {
if response.WasNotFound(resp.HttpResponse) {
Expand Down
9 changes: 5 additions & 4 deletions internal/services/compute/availability_set_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"time"

"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/tags"
Expand All @@ -31,7 +32,7 @@ func resourceAvailabilitySet() *pluginsdk.Resource {
Update: resourceAvailabilitySetCreateUpdate,
Delete: resourceAvailabilitySetDelete,
Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
_, err := availabilitysets.ParseAvailabilitySetID(id)
_, err := commonids.ParseAvailabilitySetID(id)
return err
}),

Expand Down Expand Up @@ -103,7 +104,7 @@ func resourceAvailabilitySetCreateUpdate(d *pluginsdk.ResourceData, meta interfa
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

id := availabilitysets.NewAvailabilitySetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
id := commonids.NewAvailabilitySetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
if d.IsNewResource() {
existing, err := client.Get(ctx, id)
if err != nil {
Expand Down Expand Up @@ -158,7 +159,7 @@ func resourceAvailabilitySetRead(d *pluginsdk.ResourceData, meta interface{}) er
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := availabilitysets.ParseAvailabilitySetID(d.Id())
id, err := commonids.ParseAvailabilitySetID(d.Id())
if err != nil {
return err
}
Expand Down Expand Up @@ -206,7 +207,7 @@ func resourceAvailabilitySetDelete(d *pluginsdk.ResourceData, meta interface{})
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := availabilitysets.ParseAvailabilitySetID(d.Id())
id, err := commonids.ParseAvailabilitySetID(d.Id())
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions internal/services/compute/availability_set_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/availabilitysets"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"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"
Expand Down Expand Up @@ -144,7 +144,7 @@ func TestAccAvailabilitySet_unmanaged(t *testing.T) {
}

func (AvailabilitySetResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := availabilitysets.ParseAvailabilitySetID(state.ID)
id, err := commonids.ParseAvailabilitySetID(state.ID)
if err != nil {
return nil, err
}
Expand All @@ -158,7 +158,7 @@ func (AvailabilitySetResource) Exists(ctx context.Context, clients *clients.Clie
}

func (AvailabilitySetResource) Destroy(ctx context.Context, client *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := availabilitysets.ParseAvailabilitySetID(state.ID)
id, err := commonids.ParseAvailabilitySetID(state.ID)
if err != nil {
return nil, err
}
Expand Down
3 changes: 2 additions & 1 deletion internal/services/compute/dedicated_host_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"time"

"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/tags"
Expand Down Expand Up @@ -54,7 +55,7 @@ func dataSourceDedicatedHostRead(d *pluginsdk.ResourceData, meta interface{}) er
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id := dedicatedhosts.NewHostID(subscriptionId, d.Get("resource_group_name").(string), d.Get("dedicated_host_group_name").(string), d.Get("name").(string))
id := commonids.NewDedicatedHostID(subscriptionId, d.Get("resource_group_name").(string), d.Get("dedicated_host_group_name").(string), d.Get("name").(string))

resp, err := client.Get(ctx, id, dedicatedhosts.DefaultGetOperationOptions())
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion internal/services/compute/dedicated_host_group_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"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/tags"
Expand Down Expand Up @@ -62,7 +63,7 @@ func dataSourceDedicatedHostGroupRead(d *pluginsdk.ResourceData, meta interface{
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id := dedicatedhostgroups.NewHostGroupID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
id := commonids.NewDedicatedHostGroupID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
resp, err := client.Get(ctx, id, dedicatedhostgroups.DefaultGetOperationOptions())
if err != nil {
if response.WasNotFound(resp.HttpResponse) {
Expand Down
11 changes: 6 additions & 5 deletions internal/services/compute/dedicated_host_group_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"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/tags"
Expand All @@ -30,7 +31,7 @@ func resourceDedicatedHostGroup() *pluginsdk.Resource {
Delete: resourceDedicatedHostGroupDelete,

Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
_, err := dedicatedhostgroups.ParseHostGroupID(id)
_, err := commonids.ParseDedicatedHostGroupID(id)
return err
}),

Expand Down Expand Up @@ -79,7 +80,7 @@ func resourceDedicatedHostGroupCreate(d *pluginsdk.ResourceData, meta interface{
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()

id := dedicatedhostgroups.NewHostGroupID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
id := commonids.NewDedicatedHostGroupID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
if d.IsNewResource() {
existing, err := client.Get(ctx, id, dedicatedhostgroups.DefaultGetOperationOptions())
if err != nil {
Expand Down Expand Up @@ -126,7 +127,7 @@ func resourceDedicatedHostGroupRead(d *pluginsdk.ResourceData, meta interface{})
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := dedicatedhostgroups.ParseHostGroupID(d.Id())
id, err := commonids.ParseDedicatedHostGroupID(d.Id())
if err != nil {
return err
}
Expand Down Expand Up @@ -172,7 +173,7 @@ func resourceDedicatedHostGroupUpdate(d *pluginsdk.ResourceData, meta interface{
ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := dedicatedhostgroups.ParseHostGroupID(d.Id())
id, err := commonids.ParseDedicatedHostGroupID(d.Id())
if err != nil {
return err
}
Expand All @@ -193,7 +194,7 @@ func resourceDedicatedHostGroupDelete(d *pluginsdk.ResourceData, meta interface{
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := dedicatedhostgroups.ParseHostGroupID(d.Id())
id, err := commonids.ParseDedicatedHostGroupID(d.Id())
if err != nil {
return err
}
Expand Down
3 changes: 2 additions & 1 deletion internal/services/compute/dedicated_host_group_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhostgroups"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
Expand Down Expand Up @@ -81,7 +82,7 @@ func TestAccDedicatedHostGroup_complete(t *testing.T) {
}

func (r DedicatedHostGroupResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := dedicatedhostgroups.ParseHostGroupID(state.ID)
id, err := commonids.ParseDedicatedHostGroupID(state.ID)
if err != nil {
return nil, err
}
Expand Down
20 changes: 10 additions & 10 deletions internal/services/compute/dedicated_host_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ 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/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhostgroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhosts"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand All @@ -33,7 +33,7 @@ func resourceDedicatedHost() *pluginsdk.Resource {
Delete: resourceDedicatedHostDelete,

Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
_, err := dedicatedhosts.ParseHostID(id)
_, err := commonids.ParseDedicatedHostID(id)
return err
}),

Expand All @@ -56,7 +56,7 @@ func resourceDedicatedHost() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: dedicatedhostgroups.ValidateHostGroupID,
ValidateFunc: commonids.ValidateDedicatedHostGroupID,
},

"location": commonschema.Location(),
Expand Down Expand Up @@ -148,12 +148,12 @@ func resourceDedicatedHostCreate(d *pluginsdk.ResourceData, meta interface{}) er
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()

hostGroupId, err := dedicatedhostgroups.ParseHostGroupID(d.Get("dedicated_host_group_id").(string))
hostGroupId, err := commonids.ParseDedicatedHostGroupID(d.Get("dedicated_host_group_id").(string))
if err != nil {
return err
}

id := dedicatedhosts.NewHostID(hostGroupId.SubscriptionId, hostGroupId.ResourceGroupName, hostGroupId.HostGroupName, d.Get("name").(string))
id := commonids.NewDedicatedHostID(hostGroupId.SubscriptionId, hostGroupId.ResourceGroupName, hostGroupId.HostGroupName, d.Get("name").(string))
if d.IsNewResource() {
existing, err := client.Get(ctx, id, dedicatedhosts.DefaultGetOperationOptions())
if err != nil {
Expand Down Expand Up @@ -193,7 +193,7 @@ func resourceDedicatedHostRead(d *pluginsdk.ResourceData, meta interface{}) erro
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := dedicatedhosts.ParseHostID(d.Id())
id, err := commonids.ParseDedicatedHostID(d.Id())
if err != nil {
return err
}
Expand All @@ -210,7 +210,7 @@ func resourceDedicatedHostRead(d *pluginsdk.ResourceData, meta interface{}) erro
}

d.Set("name", id.HostName)
d.Set("dedicated_host_group_id", dedicatedhostgroups.NewHostGroupID(id.SubscriptionId, id.ResourceGroupName, id.HostGroupName).ID())
d.Set("dedicated_host_group_id", commonids.NewDedicatedHostGroupID(id.SubscriptionId, id.ResourceGroupName, id.HostGroupName).ID())

if model := resp.Model; model != nil {
d.Set("location", location.Normalize(model.Location))
Expand Down Expand Up @@ -239,7 +239,7 @@ func resourceDedicatedHostUpdate(d *pluginsdk.ResourceData, meta interface{}) er
ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := dedicatedhosts.ParseHostID(d.Id())
id, err := commonids.ParseDedicatedHostID(d.Id())
if err != nil {
return err
}
Expand Down Expand Up @@ -273,7 +273,7 @@ func resourceDedicatedHostDelete(d *pluginsdk.ResourceData, meta interface{}) er
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := dedicatedhosts.ParseHostID(d.Id())
id, err := commonids.ParseDedicatedHostID(d.Id())
if err != nil {
return err
}
Expand All @@ -300,7 +300,7 @@ func resourceDedicatedHostDelete(d *pluginsdk.ResourceData, meta interface{}) er
return nil
}

func dedicatedHostDeletedRefreshFunc(ctx context.Context, client *dedicatedhosts.DedicatedHostsClient, id dedicatedhosts.HostId) pluginsdk.StateRefreshFunc {
func dedicatedHostDeletedRefreshFunc(ctx context.Context, client *dedicatedhosts.DedicatedHostsClient, id commonids.DedicatedHostId) pluginsdk.StateRefreshFunc {
return func() (interface{}, string, error) {
res, err := client.Get(ctx, id, dedicatedhosts.DefaultGetOperationOptions())
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion internal/services/compute/dedicated_host_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/dedicatedhosts"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
Expand Down Expand Up @@ -169,7 +170,7 @@ func TestAccDedicatedHost_requiresImport(t *testing.T) {
}

func (t DedicatedHostResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := dedicatedhosts.ParseHostID(state.ID)
id, err := commonids.ParseDedicatedHostID(state.ID)
if err != nil {
return nil, err
}
Expand Down
3 changes: 2 additions & 1 deletion internal/services/compute/disk_encryption_set.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ import (
"context"
"fmt"

"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/diskencryptionsets"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2023-04-02/disks"
)

// retrieveDiskEncryptionSetEncryptionType returns encryption type of the disk encryption set
func retrieveDiskEncryptionSetEncryptionType(ctx context.Context, client *diskencryptionsets.DiskEncryptionSetsClient, diskEncryptionSetId string) (*disks.EncryptionType, error) {
id, err := diskencryptionsets.ParseDiskEncryptionSetID(diskEncryptionSetId)
id, err := commonids.ParseDiskEncryptionSetID(diskEncryptionSetId)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/services/compute/disk_encryption_set_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"time"

"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/identity"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-02/diskencryptionsets"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
Expand Down Expand Up @@ -62,7 +62,7 @@ func dataSourceDiskEncryptionSetRead(d *pluginsdk.ResourceData, meta interface{}
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id := diskencryptionsets.NewDiskEncryptionSetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
id := commonids.NewDiskEncryptionSetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))

resp, err := client.Get(ctx, id)
model := resp.Model
Expand Down
8 changes: 4 additions & 4 deletions internal/services/compute/disk_encryption_set_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func resourceDiskEncryptionSetCreate(d *pluginsdk.ResourceData, meta interface{}
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()

id := diskencryptionsets.NewDiskEncryptionSetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
id := commonids.NewDiskEncryptionSetID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))

existing, err := client.Get(ctx, id)
if err != nil {
Expand Down Expand Up @@ -223,7 +223,7 @@ func resourceDiskEncryptionSetRead(d *pluginsdk.ResourceData, meta interface{})
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := diskencryptionsets.ParseDiskEncryptionSetID(d.Id())
id, err := commonids.ParseDiskEncryptionSetID(d.Id())
if err != nil {
return err
}
Expand Down Expand Up @@ -314,7 +314,7 @@ func resourceDiskEncryptionSetUpdate(d *pluginsdk.ResourceData, meta interface{}
ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := diskencryptionsets.ParseDiskEncryptionSetID(d.Id())
id, err := commonids.ParseDiskEncryptionSetID(d.Id())
if err != nil {
return err
}
Expand Down Expand Up @@ -431,7 +431,7 @@ func resourceDiskEncryptionSetDelete(d *pluginsdk.ResourceData, meta interface{}
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := diskencryptionsets.ParseDiskEncryptionSetID(d.Id())
id, err := commonids.ParseDiskEncryptionSetID(d.Id())
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit 6562ad4

Please sign in to comment.