Truncate fields to fit db width (#487)

cloudfoundry · Sep 17, 2020 · 3279924 · 3279924
1 parent 99ff9e9
commit 3279924
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/jetstream/plugins/monocular/chart_svc.go b/src/jetstream/plugins/monocular/chart_svc.go
@@ -227,6 +227,8 @@ func (m *Monocular) translateToChart(record *store.ChartStoreRecord, chartYaml *
 
 	if chartYaml != nil {
 		chart.Keywords = chartYaml.Keywords
+		// Prefer the Chart Yaml description if we have it (db one might be truncated)
+		chart.Description = chartYaml.Description
 		chart.Maintainers = make([]ChartMaintainer, len(chartYaml.Maintainers))
 		for index, maintainer := range chartYaml.Maintainers {
 			chart.Maintainers[index] = *maintainer

diff --git a/src/jetstream/plugins/monocular/store/chart_store_db.go b/src/jetstream/plugins/monocular/store/chart_store_db.go
@@ -50,6 +50,10 @@ func NewHelmChartDBStore(dcp *sql.DB) (ChartStore, error) {
 	return &HelmChartDBStore{db: dcp}, nil
 }
 
+func truncate(in string) string {
+	return fmt.Sprintf("%.255s", in)
+}
+
 // Save a Helm Chart to the database
 func (p *HelmChartDBStore) Save(chart ChartStoreRecord, batchID string) error {
 
@@ -67,11 +71,11 @@ func (p *HelmChartDBStore) Save(chart ChartStoreRecord, batchID string) error {
 
 	if err == nil {
 		// The record already exists, so update it
-		_, err := p.db.Exec(updateChartVersion, chart.Created, chart.AppVersion, chart.Description, chart.IconURL, chart.ChartURL, sourceURL, chart.Digest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
+		_, err := p.db.Exec(updateChartVersion, chart.Created, chart.AppVersion, truncate(chart.Description), truncate(chart.IconURL), truncate(chart.ChartURL), truncate(sourceURL), chart.Digest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
 		return err
 	}
 
-	if _, err := p.db.Exec(saveChartVersion, chart.EndpointID, chart.Name, chart.Repository, chart.Version, chart.Created, chart.AppVersion, chart.Description, chart.IconURL, chart.ChartURL, sourceURL, chart.Digest, chart.IsLatest, batchID); err != nil {
+	if _, err := p.db.Exec(saveChartVersion, chart.EndpointID, chart.Name, chart.Repository, chart.Version, chart.Created, chart.AppVersion, truncate(chart.Description), truncate(chart.IconURL), truncate(chart.ChartURL), truncate(sourceURL), chart.Digest, chart.IsLatest, batchID); err != nil {
 		return fmt.Errorf("Unable to save Helm Chart Version: %v", err)
 	}
 	return nil