Populate app versions in app crds (#422)

We previously just used helm chart versions, but can dive into the Chart.yaml and grab app version where present
pluralsh · Jul 18, 2023 · f7da9ad · f7da9ad
1 parent 84fd497
commit f7da9ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/pkg/api/charts.go b/pkg/api/charts.go
@@ -138,6 +138,7 @@ func convertVersion(version *gqlclient.VersionFragment) *Version {
 	v := &Version{
 		Id:      version.ID,
 		Version: version.Version,
+		Helm:    version.Helm,
 	}
 	if version.Readme != nil {
 		v.Readme = *version.Readme

diff --git a/pkg/api/models.go b/pkg/api/models.go
@@ -50,6 +50,7 @@ type Version struct {
 	Id             string
 	Version        string
 	Readme         string
+	Helm           map[string]interface{}
 	Package        string
 	ValuesTemplate string
 	TemplateType   gqlclient.TemplateType

diff --git a/pkg/scaffold/helm.go b/pkg/scaffold/helm.go
@@ -406,6 +406,13 @@ func repoUrl(w *wkspace.Workspace, repo string, chart string) string {
 func appVersion(charts []*api.ChartInstallation) string {
 	for _, inst := range charts {
 		if inst.Chart.Dependencies.Application {
+			if inst.Version.Helm != nil {
+				if vsn, ok := inst.Version.Helm["appVersion"]; ok {
+					if v, ok := vsn.(string); ok {
+						return v
+					}
+				}
+			}
 			return inst.Version.Version
 		}
 	}