fix: handle all types of 404 (#37) (#38)

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

scaleway/baremetal.go

@@ -190,12 +190,10 @@ func (b *baremetal) getServerOfferName(server *scwbaremetal.Server) (string, err
 		Zone:    server.Zone,
 	})
 	if err != nil {
-		switch err.(type) {
-		case *scw.ResourceNotFoundError:
+		if is404Error(err) {
 			return "UNKNOWN", nil
-		default:
-			return "", err
 		}
+		return "", err
 	}
 
 	return offer.Name, nil
@@ -215,12 +213,10 @@ func (b *baremetal) getServerByName(name string) (*scwbaremetal.Server, error) {
 			Name: &name,
 		}, scw.WithAllPages())
 		if err != nil {
-			switch err.(type) {
-			case *scw.ResourceNotFoundError:
+			if is404Error(err) {
 				continue
-			default:
-				return nil, err
 			}
+			return nil, err
 		}
 
 		for _, srv := range resp.Servers {
@@ -255,12 +251,10 @@ func (b *baremetal) getServerByProviderID(providerID string) (*scwbaremetal.Serv
 		Zone:     scw.Zone(zone),
 	})
 	if err != nil {
-		switch err.(type) {
-		case *scw.ResourceNotFoundError:
+		if is404Error(err) {
 			return nil, cloudprovider.InstanceNotFound
-		default:
-			return nil, err
 		}
+		return nil, err
 	}
 	return server, nil
 }

scaleway/instances.go

@@ -202,12 +202,10 @@ func (i *instances) getServerByName(name string) (*scwinstance.Server, error) {
 		}, scw.WithAllPages())
 
 		if err != nil {
-			switch err.(type) {
-			case *scw.ResourceNotFoundError:
+			if is404Error(err) {
 				continue
-			default:
-				return nil, err
 			}
+			return nil, err
 		}
 
 		for _, srv := range resp.Servers {
@@ -243,12 +241,10 @@ func (i *instances) getServerByProviderID(providerID string) (*scwinstance.Serve
 		Zone:     scw.Zone(zone),
 	})
 	if err != nil {
-		switch err.(type) {
-		case *scw.ResourceNotFoundError:
+		if is404Error(err) {
 			return nil, cloudprovider.InstanceNotFound
-		default:
-			return nil, err
 		}
+		return nil, err
 	}
 
 	return resp.Server, nil

scaleway/loadbalancers.go

@@ -382,13 +382,11 @@ func (l *loadbalancers) fetchLoadBalancer(ctx context.Context, clusterName strin
 			Region: region,
 		})
 		if err != nil {
-			switch err.(type) {
-			case *scw.ResourceNotFoundError:
+			if is404Error(err) {
 				return nil, LoadBalancerNotFound
-			default:
-				klog.Errorf("an error occurred while fetching loadbalancer '%s/%s' for service '%s/%s'", region, loadBalancerID, service.Namespace, service.Name)
-				return nil, err
 			}
+			klog.Errorf("an error occurred while fetching loadbalancer '%s/%s' for service '%s/%s'", region, loadBalancerID, service.Namespace, service.Name)
+			return nil, err
 		}
 
 		return resp, nil
@@ -408,12 +406,10 @@ func (l *loadbalancers) getLoadbalancerByName(ctx context.Context, service *v1.S
 			Region: region,
 		}, scw.WithAllPages())
 		if err != nil {
-			switch err.(type) {
-			case *scw.ResourceNotFoundError:
+			if is404Error(err) {
 				continue
-			default:
-				return nil, err
 			}
+			return nil, err
 		}
 
 		for _, lb := range resp.LBs {

scaleway/utils.go

@@ -0,0 +1,21 @@
+package scaleway
+
+import (
+	"net/http"
+
+	"github.com/scaleway/scaleway-sdk-go/scw"
+)
+
+// is404Error returns true if err is an HTTP 404 error
+func is404Error(err error) bool {
+	switch newErr := err.(type) {
+	case *scw.ResourceNotFoundError:
+		return true
+	case *scw.ResponseError:
+		if newErr.StatusCode == http.StatusNotFound {
+			return true
+		}
+	}
+
+	return false
+}