fix: make it possible to override chart repository in a particular pipeline

this includes override with the empty string to get a default value

Author: msvticket

pkg/cmd/helm/release/release.go

@@ -9,8 +9,6 @@ import (
 	"strings"
 
 	"github.com/jenkins-x-plugins/jx-gitops/pkg/chart"
-	"github.com/jenkins-x/jx-helpers/v3/pkg/yamls"
-
 	"github.com/jenkins-x-plugins/jx-gitops/pkg/ghpages"
 	"github.com/jenkins-x-plugins/jx-gitops/pkg/plugins"
 	"github.com/jenkins-x-plugins/jx-gitops/pkg/rootcmd"
@@ -29,6 +27,7 @@ import (
 	"github.com/jenkins-x/jx-helpers/v3/pkg/scmhelpers"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/stringhelpers"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/termcolor"
+	"github.com/jenkins-x/jx-helpers/v3/pkg/yamls"
 	"github.com/jenkins-x/jx-logging/v3/pkg/log"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -102,6 +101,7 @@ type Options struct {
 	CommandRunner        cmdrunner.CommandRunner
 	Requirements         *jxcore.RequirementsConfig
 	ReleasedCharts       int
+	Cmd                  *cobra.Command
 }
 
 // NewCmdHelmRelease creates a command object for the command
@@ -113,7 +113,8 @@ func NewCmdHelmRelease() (*cobra.Command, *Options) {
 		Short:   "Performs a release of all the charts in the charts folder",
 		Long:    cmdLong,
 		Example: fmt.Sprintf(cmdExample, rootcmd.BinaryName),
-		Run: func(_ *cobra.Command, _ []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
+			o.Cmd = cmd
 			err := o.Run()
 			helper.CheckErr(err)
 		},
@@ -291,10 +292,14 @@ func (o *Options) Run() error {
 
 		// find the repository URL
 		if repoURL == "" {
-			repoURL, err = variablefinders.FindRepositoryURL(o.Requirements, o.ContainerRegistryOrg, name)
-			if err != nil {
-				return errors.Wrapf(err, "failed to find chart repository URL")
-			}
+			repoURL = variablefinders.FindRepositoryURL(
+				o.Requirements,
+				o.ContainerRegistryOrg,
+				name,
+				o.ChartOCI,
+				o.ChartPages,
+				o.flagChanged("repo-url"),
+			)
 		}
 		if o.ChartPages {
 			err = o.ChartPageRegistry(repoURL, chartDir, name)
@@ -701,3 +706,14 @@ func (o *Options) findChartRepositoryUserPassword() (string, string, error) {
 	}
 	return userName, password, err
 }
+
+// FlagChanged returns true if the given flag was supplied on the command line
+func (o *Options) flagChanged(name string) bool {
+	if o.Cmd != nil {
+		f := o.Cmd.Flag(name)
+		if f != nil {
+			return f.Changed
+		}
+	}
+	return false
+}

pkg/cmd/variables/variables.go

@@ -190,10 +190,15 @@ func (o *Options) Validate() error {
 			return errors.Wrapf(err, "failed to find container registry org")
 		}
 
-		o.RepositoryURL, err = variablefinders.FindRepositoryURL(o.Requirements, registryOrg, o.Repository)
-		if err != nil {
-			return errors.Wrapf(err, "failed to find chart repository URL")
-		}
+		chartKind := o.Requirements.Cluster.ChartKind
+		o.RepositoryURL = variablefinders.FindRepositoryURL(
+			o.Requirements,
+			registryOrg,
+			o.Repository,
+			chartKind == jxcore.ChartRepositoryTypeOCI,
+			chartKind == jxcore.ChartRepositoryTypePages,
+			false,
+		)
 	}
 
 	if o.Options.Branch == "" || o.Options.Branch == "HEAD" {
@@ -270,7 +275,15 @@ func (o *Options) Validate() error {
 				if err != nil {
 					return "", errors.Wrapf(err, "failed to find container registry org")
 				}
-				return variablefinders.FindRepositoryURL(o.Requirements, registryOrg, o.Options.Repository)
+				chartKind := o.Requirements.Cluster.ChartKind
+				return variablefinders.FindRepositoryURL(
+					o.Requirements,
+					registryOrg,
+					o.Options.Repository,
+					chartKind == jxcore.ChartRepositoryTypeOCI,
+					chartKind == jxcore.ChartRepositoryTypePages,
+					false,
+				), nil
 			},
 		},
 		{

pkg/variablefinders/repo_url.go

@@ -8,23 +8,23 @@ import (
 )
 
 // FindRepositoryURL finds the chart repository URL via environment variables or the dev Environment CRD
-func FindRepositoryURL(requirements *jxcore.RequirementsConfig, registryOrg, appName string) (string, error) {
-	answer := ""
-	if requirements != nil {
-		answer = requirements.Cluster.ChartRepository
-	}
-	if answer == "" {
-		answer = os.Getenv("JX_CHART_REPOSITORY")
-	}
-	if answer == "" {
-		registry := requirements.Cluster.Registry
-		if requirements.Cluster.ChartKind == jxcore.ChartRepositoryTypeOCI && registryOrg != "" && appName != "" && registry != "" {
-			return stringhelpers.UrlJoin(registry, registryOrg, appName), nil
+func FindRepositoryURL(requirements *jxcore.RequirementsConfig, registryOrg, appName string, oci, pages, explicitlyEmpty bool) string {
+	if !explicitlyEmpty {
+		answer, exists := os.LookupEnv("JX_CHART_REPOSITORY")
+		if !exists && requirements != nil {
+			answer = requirements.Cluster.ChartRepository
 		}
-		if requirements.Cluster.ChartKind != jxcore.ChartRepositoryTypeOCI && requirements.Cluster.ChartKind != jxcore.ChartRepositoryTypePages {
-			// assume default chart museum
-			answer = "http://jenkins-x-chartmuseum:8080"
+		if answer != "" {
+			return answer
 		}
 	}
-	return answer, nil
+	registry := requirements.Cluster.Registry
+	if oci && registryOrg != "" && appName != "" && registry != "" {
+		return stringhelpers.UrlJoin(registry, registryOrg, appName)
+	}
+	if !oci && !pages {
+		// assume default chart museum
+		return "http://jenkins-x-chartmuseum:8080"
+	}
+	return ""
 }