diff --git a/pkg/providers/instance/armutils.go b/pkg/providers/instance/armutils.go index b76053083..01d154670 100644 --- a/pkg/providers/instance/armutils.go +++ b/pkg/providers/instance/armutils.go @@ -126,7 +126,8 @@ func deleteNicIfExists(ctx context.Context, client NetworkInterfacesAPI, rg, nic func deleteVirtualMachineIfExists(ctx context.Context, client VirtualMachinesAPI, rg, vmName string) error { _, err := client.Get(ctx, rg, vmName, nil) if err != nil { - if sdkerrors.IsNotFoundErr(err) { + azErr := sdkerrors.IsResponseError(err) + if azErr != nil && (azErr.ErrorCode == "NotFound" || azErr.ErrorCode == "ResourceNotFound") { return nil } return err diff --git a/pkg/providers/instance/instance.go b/pkg/providers/instance/instance.go index 97ae15d9c..86441f51f 100644 --- a/pkg/providers/instance/instance.go +++ b/pkg/providers/instance/instance.go @@ -148,7 +148,8 @@ func (p *Provider) Get(ctx context.Context, vmName string) (*armcompute.VirtualM var err error if vm, err = p.AZClient.virtualMachinesClient.Get(ctx, p.resourceGroup, vmName, nil); err != nil { - if sdkerrors.IsNotFoundErr(err) { + azErr := sdkerrors.IsResponseError(err) + if azErr != nil && (azErr.ErrorCode == "NotFound" || azErr.ErrorCode == "ResourceNotFound") { return nil, corecloudprovider.NewNodeClaimNotFoundError(err) } return nil, fmt.Errorf("failed to get VM instance, %w", err)