From a4c40b02a040f306d947e72981efef299f5f69a9 Mon Sep 17 00:00:00 2001 From: tangyouzzz <103715210+tangyouzzz@users.noreply.github.com> Date: Thu, 9 Jan 2025 04:08:19 +0800 Subject: [PATCH] fix: Resolve errors for resource not found (#633) Co-authored-by: yl5722 Co-authored-by: Alex Leites <18728999+tallaxes@users.noreply.github.com> --- pkg/providers/instance/armutils.go | 3 ++- pkg/providers/instance/instance.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/providers/instance/armutils.go b/pkg/providers/instance/armutils.go index 11bd6adac..dcd899e5c 100644 --- a/pkg/providers/instance/armutils.go +++ b/pkg/providers/instance/armutils.go @@ -118,7 +118,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 0149c875e..197634e5e 100644 --- a/pkg/providers/instance/instance.go +++ b/pkg/providers/instance/instance.go @@ -163,7 +163,8 @@ func (p *DefaultProvider) Get(ctx context.Context, vmName string) (*armcompute.V 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)