Merge pull request #10 from grafana/20191217_404_info

clean exit message when 404 occurs

Author: jtlisi

.golangci.yaml

@@ -0,0 +1,5 @@
+run:
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  deadline: 5m
+
+  modules-download-mode: vendor

Makefile

@@ -17,13 +17,13 @@ cmd/cortextool/cortextool: $(APP_GO_FILES) cmd/cortextool/main.go
 	CGO_ENABLED=0 go build $(GO_FLAGS) -o $@ ./$(@D)
 
 lint:
-	GOGC=20 golangci-lint --deadline=20m run
+	golangci-lint run
 
 cross:
 	CGO_ENABLED=0 gox -output="dist/{{.Dir}}-{{.OS}}-{{.Arch}}" -ldflags=${LDFLAGS} -arch="amd64" -os="linux windows darwin" ./cmd/cortextool
 
 test:
-	go test -p=8 ./...
+	go test -mod=vendor -p=8 ./...
 
 clean:
 	rm -rf cmd/cortextool/cortextool

go.mod

@@ -6,7 +6,7 @@ replace github.com/hashicorp/consul => github.com/hashicorp/consul v1.5.1
 
 require (
 	cloud.google.com/go v0.35.0
-	github.com/alecthomas/chroma v0.6.6
+	github.com/alecthomas/chroma v0.7.0
 	github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/cortexproject/cortex v0.1.1-0.20190808112445-606262b7a637

go.sum

@@ -36,8 +36,8 @@ github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmx
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
-github.com/alecthomas/chroma v0.6.6 h1:AwWMP1sWgMNgEiptNtV/T5GWOLtZFDdrc2ZfWx1ogmg=
-github.com/alecthomas/chroma v0.6.6/go.mod h1:zVlgtbRS7BJDrDY9SB238RmpoCBCYFlLmcfZ3durxTk=
+github.com/alecthomas/chroma v0.7.0 h1:z+0HgTUmkpRDRz0SRSdMaqOLfJV4F+N1FPDZUZIDUzw=
+github.com/alecthomas/chroma v0.7.0/go.mod h1:1U/PfCsTALWWYHDnsIQkxEBM0+6LLe0v8+RSVMOwxeY=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=

pkg/commands/alerts.go

@@ -9,6 +9,7 @@ import (
 	"github.com/alecthomas/chroma/quick"
 	"github.com/grafana/cortextool/pkg/client"
 	"github.com/prometheus/alertmanager/config"
+	log "github.com/sirupsen/logrus"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -51,6 +52,10 @@ func (a *AlertCommand) setup(k *kingpin.ParseContext) error {
 func (a *AlertCommand) getConfig(k *kingpin.ParseContext) error {
 	cfg, templates, err := a.cli.GetAlertmanagerConfig(context.Background())
 	if err != nil {
+		if err == client.ErrResourceNotFound {
+			log.Infof("no alertmanager config currently exist for this user")
+			return nil
+		}
 		return err
 	}
 

pkg/commands/rules.go

@@ -110,6 +110,10 @@ func (r *RuleCommand) listRules(k *kingpin.ParseContext) error {
 func (r *RuleCommand) printRules(k *kingpin.ParseContext) error {
 	rules, err := r.cli.ListRules(context.Background(), "")
 	if err != nil {
+		if err == client.ErrResourceNotFound {
+			log.Infof("no rule groups currently exist for this user")
+			return nil
+		}
 		log.Fatalf("unable to read rules from cortex, %v", err)
 	}
 	d, err := yaml.Marshal(&rules)
@@ -128,6 +132,10 @@ func (r *RuleCommand) printRules(k *kingpin.ParseContext) error {
 func (r *RuleCommand) getRuleGroup(k *kingpin.ParseContext) error {
 	group, err := r.cli.GetRuleGroup(context.Background(), r.Namespace, r.RuleGroup)
 	if err != nil {
+		if err == client.ErrResourceNotFound {
+			log.Infof("this rule group does not currently exist")
+			return nil
+		}
 		log.Fatalf("unable to read rules from cortex, %v", err)
 	}
 	d, err := yaml.Marshal(&group)