diff --git a/internal/services/compute/linux_virtual_machine_resource.go b/internal/services/compute/linux_virtual_machine_resource.go index 4dfe0cb01125..3c298cbbdd67 100644 --- a/internal/services/compute/linux_virtual_machine_resource.go +++ b/internal/services/compute/linux_virtual_machine_resource.go @@ -956,10 +956,6 @@ func resourceLinuxVirtualMachineUpdate(d *pluginsdk.ResourceData, meta interface log.Printf("[DEBUG] Retrieving Linux Virtual Machine %q (Resource Group %q)..", id.Name, id.ResourceGroup) existing, err := client.Get(ctx, id.ResourceGroup, id.Name, compute.InstanceViewTypesUserData) if err != nil { - if utils.ResponseWasNotFound(existing.Response) { - return nil - } - return fmt.Errorf("retrieving Linux Virtual Machine %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } diff --git a/internal/services/compute/ssh_public_key_resource.go b/internal/services/compute/ssh_public_key_resource.go index a7ab0ac1d01f..dbb8b9b38cc1 100644 --- a/internal/services/compute/ssh_public_key_resource.go +++ b/internal/services/compute/ssh_public_key_resource.go @@ -150,12 +150,8 @@ func resourceSshPublicKeyUpdate(d *pluginsdk.ResourceData, meta interface{}) err return err } - existing, err := client.Get(ctx, *id) + _, err = client.Get(ctx, *id) if err != nil { - if response.WasNotFound(existing.HttpResponse) { - return nil - } - return fmt.Errorf("retrieving %s: %+v", *id, err) } diff --git a/internal/services/compute/windows_virtual_machine_resource.go b/internal/services/compute/windows_virtual_machine_resource.go index 9ad08b1c00b8..17fc94eb08c1 100644 --- a/internal/services/compute/windows_virtual_machine_resource.go +++ b/internal/services/compute/windows_virtual_machine_resource.go @@ -1006,10 +1006,6 @@ func resourceWindowsVirtualMachineUpdate(d *pluginsdk.ResourceData, meta interfa log.Printf("[DEBUG] Retrieving Windows Virtual Machine %q (Resource Group %q)..", id.Name, id.ResourceGroup) existing, err := client.Get(ctx, id.ResourceGroup, id.Name, compute.InstanceViewTypesUserData) if err != nil { - if utils.ResponseWasNotFound(existing.Response) { - return nil - } - return fmt.Errorf("retrieving Windows Virtual Machine %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err) } diff --git a/internal/services/frontdoor/frontdoor_resource.go b/internal/services/frontdoor/frontdoor_resource.go index 7adaec19ceb1..3768c8b09ba1 100644 --- a/internal/services/frontdoor/frontdoor_resource.go +++ b/internal/services/frontdoor/frontdoor_resource.go @@ -135,18 +135,16 @@ func resourceFrontDoorUpdate(d *pluginsdk.ResourceData, meta interface{}) error // remove in 3.0 // due to a change in the RP, if a Frontdoor exists in a location other than 'Global' it may continue to // exist in that location, if this is a brand new Frontdoor it must be created in the 'Global' location - location := "Global" - cfgLocation, hasLocation := d.GetOk("location") + var location string exists, err := client.Get(ctx, id) if err != nil || exists.Model == nil { - if !response.WasNotFound(exists.HttpResponse) { - return fmt.Errorf("locating %s: %+v", id, err) - } + return fmt.Errorf("locating %s: %+v", id, err) } else { location = azure.NormalizeLocation(*exists.Model.Location) } + cfgLocation, hasLocation := d.GetOk("location") if hasLocation { if location != azure.NormalizeLocation(cfgLocation) { return fmt.Errorf("the Front Door %q (Resource Group %q) already exists in %q and cannot be moved to the %q location", name, resourceGroup, location, cfgLocation)