From 0633b294ee97bada85148b8b7c10605dbfc61dae Mon Sep 17 00:00:00 2001 From: Furkhat Kasymovgeniiuulu Date: Tue, 10 Jan 2023 09:50:46 +0100 Subject: [PATCH] exact string match fails, use conventional errors.Is instead --- pkg/cloudprovider/provider/openstack/provider.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/provider/openstack/provider.go b/pkg/cloudprovider/provider/openstack/provider.go index 705b5f7240..c41a68eed0 100644 --- a/pkg/cloudprovider/provider/openstack/provider.go +++ b/pkg/cloudprovider/provider/openstack/provider.go @@ -763,7 +763,7 @@ func (p *provider) Cleanup(ctx context.Context, machine *clusterv1alpha1.Machine return false, osErrorToTerminalError(err, "failed to get compute client") } - if err := osservers.Delete(computeClient, instance.ID()).ExtractErr(); err != nil && err.Error() != "Resource not found" { + if err := osservers.Delete(computeClient, instance.ID()).ExtractErr(); err != nil && !errors.Is(err, &gophercloud.ErrDefault404{}) { return false, osErrorToTerminalError(err, "failed to delete instance") } @@ -1034,7 +1034,7 @@ func (p *provider) cleanupFloatingIP(machine *clusterv1alpha1.Machine, updater c if err != nil { return fmt.Errorf("failed to create the networkv2 client for region %s: %w", c.Region, err) } - if err := osfloatingips.Delete(netClient, floatingIPID).ExtractErr(); err != nil && err.Error() != "Resource not found" { + if err := osfloatingips.Delete(netClient, floatingIPID).ExtractErr(); err != nil && !errors.Is(err, &gophercloud.ErrDefault404{}) { return fmt.Errorf("failed to delete floating ip %s: %w", floatingIPID, err) } if err := updater(machine, func(m *clusterv1alpha1.Machine) {