فهرست منبع

feat(cli): improves error message for 401 requests

bergquist 9 سال پیش
والد
کامیت
5094c1db2a
1فایلهای تغییر یافته به همراه6 افزوده شده و 1 حذف شده
  1. 6 1
      pkg/cmd/grafana-cli/services/services.go

+ 6 - 1
pkg/cmd/grafana-cli/services/services.go

@@ -3,6 +3,7 @@ package services
 import (
 import (
 	"encoding/json"
 	"encoding/json"
 	"errors"
 	"errors"
+	"fmt"
 	"github.com/franela/goreq"
 	"github.com/franela/goreq"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
@@ -12,8 +13,12 @@ import (
 var IoHelper m.IoUtil = IoUtilImp{}
 var IoHelper m.IoUtil = IoUtilImp{}
 
 
 func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
 func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
+	fullUrl := repoUrl + "/repo"
+	res, _ := goreq.Request{Uri: fullUrl, MaxRedirects: 3}.Do()
 
 
-	res, _ := goreq.Request{Uri: repoUrl + "/repo", MaxRedirects: 3}.Do()
+	if res.StatusCode != 200 {
+		return m.PluginRepo{}, fmt.Errorf("Could not access %s statuscode %v", fullUrl, res.StatusCode)
+	}
 
 
 	var resp m.PluginRepo
 	var resp m.PluginRepo
 	err := res.Body.FromJsonTo(&resp)
 	err := res.Body.FromJsonTo(&resp)