Merge pull request chartmuseum#21 from fmotrifork/errorHandlingFromCM

Logging errors from ChartMuseum, added support for organizations in CM

README.md

@@ -85,6 +85,15 @@ $ curl -L --data-binary "@<packge-name>" <chartmuseum-url>/api/charts
 
 In the browser, navigate to localhost and view your charts
 
+### Using with ChartMuseum with Multitenancy enabled
+
+To use ChartMuseumUI on a ChartMuseum with Multitenancy support enabled, add the following environment variable to ChartMuseumUI
+
+```
+CHART_MUSESUM_API_GET_CHARTS: "/api/org1/charts"
+```
+
+Currently only one organization is allowed per ChartMuseumUI.
 
 ## Built With
 

controllers/chartmuseum.go

@@ -13,14 +13,19 @@ import (
 func getCharts() map[string][]models.Chart {
 
 	l := logs.GetLogger()
-	res, err := httplib.Get(os.Getenv("CHART_MUSESUM_URL") + api_get_charts).Debug(true).Bytes()
+	l.Printf("Getting charts on url: %s\n", getBaseUrl())
+	res, err := httplib.Get(getBaseUrl()).Debug(true).Bytes()
 	if err != nil {
 		l.Panic(err.Error)
 	}
 
 	charts, err := models.NewCharts(res)
 	if err != nil {
-		l.Panic(err)
+		errorRes, innerErr := models.NewError(res)
+		if innerErr != nil {
+			l.Panic(innerErr)
+		}
+		l.Panicf("Error received from ChartMuseum application: %s\n", errorRes.Message, err)
 	}
 	return charts
 }
@@ -29,7 +34,7 @@ func uploadChart(filePath string) {
 
 	l := logs.GetLogger()
 
-	cmd := exec.Command("curl", "-L", "--data-binary", "@"+filePath, os.Getenv("CHART_MUSESUM_URL")+api_get_charts)
+	cmd := exec.Command("curl", "-L", "--data-binary", "@"+filePath, getBaseUrl())
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		l.Fatalf("cmd.Run() failed with %s\n", err)
@@ -41,10 +46,19 @@ func deleteChart(name string, version string) {
 
 	l := logs.GetLogger()
 	l.Println("in deleteChart()")
-	cmd := exec.Command("curl", "-X", "DELETE", os.Getenv("CHART_MUSESUM_URL")+api_get_charts+"/"+name+"/"+version)
+	cmd := exec.Command("curl", "-X", "DELETE", getBaseUrl() + "/"+name+"/" + version)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		l.Fatalf("cmd.Run() failed with %s\n", err)
 	}
 	l.Printf("combined out:\n%s\n", string(out))
 }
+
+func getBaseUrl() string {
+	api := os.Getenv("CHART_MUSESUM_API_GET_CHARTS")
+	if len(api) == 0 {
+		api = api_get_charts
+	}
+	url := os.Getenv("CHART_MUSESUM_URL") + api
+	return url
+}

models/error.go

@@ -0,0 +1,15 @@
+package models
+
+import (
+	"encoding/json"
+)
+
+type Error struct {
+	Message        string       `json:"error"`
+}
+
+func NewError(data []byte) (Error, error) {
+	var e Error
+	err := json.Unmarshal(data, &e)
+	return e, err
+}