Fix helm sql datastore to return values.yaml

cloudfoundry · nwmac · Mar 31, 2019 · Apr 2, 2019 · Apr 2, 2019 · Apr 2, 2019
commit 9c9722d7efca8592cfaa5df1a758488b78c92131
diff --git a/src/jetstream/plugins/monocular/chartsvc/datastore.go b/src/jetstream/plugins/monocular/chartsvc/datastore.go
@@ -12,4 +12,5 @@ type ChartSvcDatastore interface {
 	GetChartVersion(chartID, version string) (models.Chart, error)
 	GetChartIcon(chartID string) ([]byte, error)
 	GetChartVersionReadme(chartID, version string) ([]byte, error)
+	GetChartVersionValuesYaml(chartID, version string) ([]byte, error)
 }
diff --git a/src/jetstream/plugins/monocular/chartsvc/handler.go b/src/jetstream/plugins/monocular/chartsvc/handler.go
@@ -173,17 +173,21 @@ func getChartVersionReadme(w http.ResponseWriter, req *http.Request, params Para
 
 // getChartVersionValues returns the values.yaml for a given chart
 func getChartVersionValues(w http.ResponseWriter, req *http.Request, params Params) {
-	db, closer := dbSession.DB()
-	defer closer()
-	var files models.ChartFiles
-	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
-	if err := db.C(filesCollection).FindId(fileID).One(&files); err != nil {
-		log.WithError(err).Errorf("could not find values.yaml with id %s", fileID)
+	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
+	version := params["version"]
+	fileID := fmt.Sprintf("%s-%s", chartID, version)
+	values, err := dataStore.GetChartVersionValuesYaml(chartID, version)
+	if err != nil {
+		log.WithError(err).Errorf("could not find files with id %s", fileID)
 		http.NotFound(w, req)
 		return
 	}
-
-	w.Write([]byte(files.Values))
+	if len(values) == 0 {
+		log.Errorf("could not find a values.yaml for id %s", fileID)
+		http.NotFound(w, req)
+		return
+	}
+	w.Write(values)
 }
 
 // listChartsWithFilters returns the list of repos that contains the given chart and the latest version found

diff --git a/src/jetstream/plugins/monocular/chartsvc/mongodb.go b/src/jetstream/plugins/monocular/chartsvc/mongodb.go
@@ -2,7 +2,9 @@ package chartsvc
 
 import (
 	//"bytes"
+	"errors"
 	"fmt"
+
 	"github.com/globalsign/mgo/bson"
 	"github.com/helm/monocular/chartsvc/models"
 	"github.com/kubeapps/common/datastore"
@@ -86,3 +88,7 @@ func (m *MongoDBChartSvcDatastore) GetChartVersionReadme(chartID, version string
 	readme := []byte(files.Readme)
 	return readme, nil
 }
+
+func (m *MongoDBChartSvcDatastore) GetChartVersionValuesYaml(chartID, version string) ([]byte, error) {
+	return nil, errors.New("Not implemented")
+}
diff --git a/src/jetstream/plugins/monocular/sql_datastore.go b/src/jetstream/plugins/monocular/sql_datastore.go
@@ -322,6 +322,17 @@ func (s *SQLDBCMonocularDatastore) GetChartVersionReadme(chartID, version string
 	return content, nil
 }
 
+func (s *SQLDBCMonocularDatastore) GetChartVersionValuesYaml(chartID, version string) ([]byte, error) {
+	var content []byte
+	fileID := fmt.Sprintf("%s-%s", chartID, version)
+	err := s.db.QueryRow(getChartFileByID, fileID, "values").Scan(&content)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
+	}
+
+	return content, nil
+}
+
 // ListRepositories gets all repository names
 func (s *SQLDBCMonocularDatastore) ListRepositories() ([]string, error) {
 	rows, err := s.db.Query(getRepositories)