Make chart loader pluggable

client.go

@@ -122,6 +122,10 @@ func newClient(options *Options, clientGetter genericclioptions.RESTClientGetter
 		linting:      options.Linting,
 		DebugLog:     debugLog,
 		output:       options.Output,
+		ChartLoader: &DefaultChartLoader{
+			Settings: settings,
+			DebugLog: debugLog,
+		},
 	}, nil
 }
 
@@ -323,8 +327,7 @@ func (c *HelmClient) install(ctx context.Context, spec *ChartSpec, opts *Generic
 		return nil, err
 	}
 
-	p := getter.All(c.Settings)
-	values, err := spec.GetValuesMap(p)
+	values, err := spec.GetValuesMap(c.Providers)
 	if err != nil {
 		return nil, err
 	}
@@ -373,8 +376,7 @@ func (c *HelmClient) upgrade(ctx context.Context, spec *ChartSpec, opts *Generic
 		return nil, err
 	}
 
-	p := getter.All(c.Settings)
-	values, err := spec.GetValuesMap(p)
+	values, err := spec.GetValuesMap(c.Providers)
 	if err != nil {
 		return nil, err
 	}
@@ -507,8 +509,7 @@ func (c *HelmClient) TemplateChart(spec *ChartSpec, options *HelmTemplateOptions
 		return nil, err
 	}
 
-	p := getter.All(c.Settings)
-	values, err := spec.GetValuesMap(p)
+	values, err := spec.GetValuesMap(c.Providers)
 	if err != nil {
 		return nil, err
 	}
@@ -544,8 +545,7 @@ func (c *HelmClient) LintChart(spec *ChartSpec) error {
 		return err
 	}
 
-	p := getter.All(c.Settings)
-	values, err := spec.GetValuesMap(p)
+	values, err := spec.GetValuesMap(c.Providers)
 	if err != nil {
 		return err
 	}
@@ -755,25 +755,6 @@ func (c *HelmClient) upgradeCRDV1(ctx context.Context, cl *clientset.Clientset,
 	return nil
 }
 
-// GetChart returns a chart matching the provided chart name and options.
-func (c *HelmClient) GetChart(chartName string, chartPathOptions *action.ChartPathOptions) (*chart.Chart, string, error) {
-	chartPath, err := chartPathOptions.LocateChart(chartName, c.Settings)
-	if err != nil {
-		return nil, "", err
-	}
-
-	helmChart, err := loader.Load(chartPath)
-	if err != nil {
-		return nil, "", err
-	}
-
-	if helmChart.Metadata.Deprecated {
-		c.DebugLog("WARNING: This chart (%q) is deprecated", helmChart.Metadata.Name)
-	}
-
-	return helmChart, chartPath, err
-}
-
 // RunTests runs the tests that were deployed with the release provided. It returns true
 // if all the tests ran successfully and false in all other cases.
 // NOTE: error = nil implies that all tests ran to either success or failure.
@@ -848,6 +829,25 @@ func (c *HelmClient) rollbackRelease(spec *ChartSpec) error {
 	return client.Run(spec.ReleaseName)
 }
 
+// GetChart returns a chart matching the provided chart name and options.
+func (l *DefaultChartLoader) GetChart(chartName string, chartPathOptions *action.ChartPathOptions) (*chart.Chart, string, error) {
+	chartPath, err := chartPathOptions.LocateChart(chartName, l.Settings)
+	if err != nil {
+		return nil, "", err
+	}
+
+	helmChart, err := loader.Load(chartPath)
+	if err != nil {
+		return nil, "", err
+	}
+
+	if helmChart.Metadata.Deprecated {
+		l.DebugLog("WARNING: This chart (%q) is deprecated", helmChart.Metadata.Name)
+	}
+
+	return helmChart, chartPath, err
+}
+
 // updateDependencies checks dependencies for given helmChart and updates dependencies with metadata if dependencyUpdate is true. returns updated HelmChart
 func updateDependencies(helmChart *chart.Chart, chartPathOptions *action.ChartPathOptions, chartPath string, c *HelmClient, dependencyUpdate bool, spec *ChartSpec) (*chart.Chart, error) {
 	if req := helmChart.Metadata.Dependencies; req != nil {

interface.go

@@ -34,10 +34,15 @@ type Client interface {
 	LintChart(spec *ChartSpec) error
 	SetDebugLog(debugLog action.DebugLog)
 	ListReleaseHistory(name string, max int) ([]*release.Release, error)
-	GetChart(chartName string, chartPathOptions *action.ChartPathOptions) (*chart.Chart, string, error)
+	// ChartLoader is an interface to abstract loading charts.
+	ChartLoader
 	RunChartTests(releaseName string) (bool, error)
 }
 
+type ChartLoader interface {
+	GetChart(chartName string, chartPathOptions *action.ChartPathOptions) (*chart.Chart, string, error)
+}
+
 type RollBack interface {
 	RollbackRelease(spec *ChartSpec) error
 }

types.go

@@ -85,6 +85,14 @@ type HelmClient struct {
 	linting      bool
 	output       io.Writer
 	DebugLog     action.DebugLog
+
+	ChartLoader
+}
+
+// DefaultChartLoader is the default implementation of the ChartLoader interface.
+type DefaultChartLoader struct {
+	Settings *cli.EnvSettings
+	DebugLog action.DebugLog
 }
 
 func (c *HelmClient) GetSettings() *cli.EnvSettings {