Merge pull request #28 from grafana/20200310_fix_delete_handling

fix delete handling

Author: jtlisi

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ## v0.1.4 / 2020-03-10
 
+* [CHANGE] Ensure 404 deletes do not trigger an error for `rules` and `alertmanager` commands #28
 * [ENHANCEMENT] Add separate `chunktool` for operating on cortex chunk backends #23 #26
 * [ENHANCEMENT] Add `--disable-color` flag to `rules print`, `rules diff`, and `alertmanager get` command #25
 * [BUGFIX] `alertmanager load` command will ensure provided template files are also loaded #25

pkg/client/alerts.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"net/http"
 
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -57,11 +58,15 @@ func (r *CortexClient) DeleteAlermanagerConfig(ctx context.Context) error {
 		return err
 	}
 
-	if res.StatusCode%2 > 0 {
-		return fmt.Errorf("error occured, %v", string(body))
+	switch res.StatusCode {
+	case http.StatusAccepted, http.StatusOK:
+		return nil
+	case http.StatusNotFound:
+		log.Debugln("alertmanager config not found, already deleted")
+		return nil
 	}
 
-	return nil
+	return fmt.Errorf("error occured, %v", string(body))
 }
 
 // GetAlertmanagerConfig retrieves a rule group

pkg/client/rules.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"net/http"
 	"net/url"
 
 	"github.com/pkg/errors"
@@ -47,11 +48,15 @@ func (r *CortexClient) DeleteRuleGroup(ctx context.Context, namespace, groupName
 		return err
 	}
 
-	if res.StatusCode%2 > 0 {
-		return fmt.Errorf("error occured, %v", string(body))
+	switch res.StatusCode {
+	case http.StatusAccepted, http.StatusOK:
+		return nil
+	case http.StatusNotFound:
+		log.Debugln("alertmanager config not found, already deleted")
+		return nil
 	}
 
-	return nil
+	return fmt.Errorf("error occured, %v", string(body))
 }
 
 // GetRuleGroup retrieves a rule group