Merge pull request #29 from grafana/20200310_fix_404_handling

better 404 delete handling

Author: jtlisi

pkg/client/alerts.go

@@ -2,9 +2,7 @@ package client
 
 import (
 	"context"
-	"fmt"
 	"io/ioutil"
-	"net/http"
 
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -26,47 +24,14 @@ func (r *CortexClient) CreateAlertmanagerConfig(ctx context.Context, cfg string,
 		return err
 	}
 
-	res, err := r.doRequest("/alertmanager/alerts", "POST", payload)
-	if err != nil {
-		return err
-	}
-
-	defer res.Body.Close()
-	err = checkResponse(res)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	_, err = r.doRequest("/alertmanager/alerts", "POST", payload)
+	return err
 }
 
 // DeleteAlermanagerConfig deletes the users alertmanagerconfig
 func (r *CortexClient) DeleteAlermanagerConfig(ctx context.Context) error {
-	res, err := r.doRequest("/alertmanager/alerts", "DELETE", nil)
-	if err != nil {
-		return err
-	}
-
-	defer res.Body.Close()
-	err = checkResponse(res)
-	if err != nil {
-		return err
-	}
-	body, err := ioutil.ReadAll(res.Body)
-
-	if err != nil {
-		return err
-	}
-
-	switch res.StatusCode {
-	case http.StatusAccepted, http.StatusOK:
-		return nil
-	case http.StatusNotFound:
-		log.Debugln("alertmanager config not found, already deleted")
-		return nil
-	}
-
-	return fmt.Errorf("error occured, %v", string(body))
+	_, err := r.doRequest("/alertmanager/alerts", "DELETE", nil)
+	return err
 }
 
 // GetAlertmanagerConfig retrieves a rule group

pkg/client/rules.go

@@ -2,9 +2,7 @@ package client
 
 import (
 	"context"
-	"fmt"
 	"io/ioutil"
-	"net/http"
 	"net/url"
 
 	"github.com/pkg/errors"
@@ -36,27 +34,8 @@ func (r *CortexClient) DeleteRuleGroup(ctx context.Context, namespace, groupName
 	escapedNamespace := url.PathEscape(namespace)
 	escapedGroupName := url.PathEscape(groupName)
 
-	res, err := r.doRequest("/api/prom/rules/"+escapedNamespace+"/"+escapedGroupName, "DELETE", nil)
-	if err != nil {
-		return err
-	}
-
-	defer res.Body.Close()
-	body, err := ioutil.ReadAll(res.Body)
-
-	if err != nil {
-		return err
-	}
-
-	switch res.StatusCode {
-	case http.StatusAccepted, http.StatusOK:
-		return nil
-	case http.StatusNotFound:
-		log.Debugln("alertmanager config not found, already deleted")
-		return nil
-	}
-
-	return fmt.Errorf("error occured, %v", string(body))
+	_, err := r.doRequest("/api/prom/rules/"+escapedNamespace+"/"+escapedGroupName, "DELETE", nil)
+	return err
 }
 
 // GetRuleGroup retrieves a rule group

pkg/commands/alerts.go

@@ -91,5 +91,9 @@ func (a *AlertCommand) loadConfig(k *kingpin.ParseContext) error {
 }
 
 func (a *AlertCommand) deleteConfig(k *kingpin.ParseContext) error {
-	return a.cli.DeleteAlermanagerConfig(context.Background())
+	err := a.cli.DeleteAlermanagerConfig(context.Background())
+	if err != nil && err != client.ErrResourceNotFound {
+		return err
+	}
+	return nil
 }

pkg/commands/rules.go

@@ -216,7 +216,7 @@ func (r *RuleCommand) getRuleGroup(k *kingpin.ParseContext) error {
 
 func (r *RuleCommand) deleteRuleGroup(k *kingpin.ParseContext) error {
 	err := r.cli.DeleteRuleGroup(context.Background(), r.Namespace, r.RuleGroup)
-	if err != nil {
+	if err != nil && err != client.ErrResourceNotFound {
 		log.Fatalf("unable to delete rule group from cortex, %v", err)
 	}
 	return nil
@@ -409,7 +409,7 @@ func (r *RuleCommand) executeChanges(ctx context.Context, changes []rules.Namesp
 				"namespace": ch.Namespace,
 			}).Infof("deleting group")
 			err = r.cli.DeleteRuleGroup(ctx, ch.Namespace, g.Name)
-			if err != nil {
+			if err != nil && err != client.ErrResourceNotFound {
 				return err
 			}
 		}