chore(v2): mock helm client factory (#1802)

* chore(v2): mock helm client factory

* feedback

Author: emosbaugh

cmd/buildtools/adminconsole.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -36,6 +37,12 @@ var updateAdminConsoleAddonCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating admin console addon")
 
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
 		logrus.Infof("getting admin console latest tag")
 		latest, err := GetLatestGitHubTag(c.Context, "replicatedhq", "kots-helm")
 		if err != nil {
@@ -64,7 +71,7 @@ var updateAdminConsoleAddonCommand = &cli.Command{
 
 		logrus.Infof("extracting images from chart")
 		withproto := fmt.Sprintf("oci://%s", upstream)
-		images, err := GetImagesFromOCIChart(withproto, "adminconsole", latest, values)
+		images, err := helm.ExtractImagesFromOCIChart(hcli, withproto, "adminconsole", latest, values)
 		if err != nil {
 			return fmt.Errorf("failed to get images from admin console chart: %w", err)
 		}

cmd/buildtools/embeddedclusteroperator.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -29,6 +30,12 @@ var updateOperatorAddonCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating embedded cluster operator addon")
 
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
 		nextChartVersion := os.Getenv("INPUT_OPERATOR_CHART_VERSION")
 		if nextChartVersion != "" {
 			logrus.Infof("using input override from INPUT_OPERATOR_CHART_VERSION: %s", nextChartVersion)
@@ -68,7 +75,7 @@ var updateOperatorAddonCommand = &cli.Command{
 			}
 		}
 
-		err := updateOperatorAddonImages(c.Context, chartURL, nextChartVersion)
+		err = updateOperatorAddonImages(c.Context, hcli, chartURL, nextChartVersion)
 		if err != nil {
 			return fmt.Errorf("failed to update embedded cluster operator images: %w", err)
 		}
@@ -86,9 +93,15 @@ var updateOperatorImagesCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating embedded cluster operator images")
 
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
 		current := embeddedclusteroperator.Metadata
 
-		err := updateOperatorAddonImages(c.Context, current.Location, current.Version)
+		err = updateOperatorAddonImages(c.Context, hcli, current.Location, current.Version)
 		if err != nil {
 			return fmt.Errorf("failed to update embedded cluster operator images: %w", err)
 		}
@@ -99,7 +112,7 @@ var updateOperatorImagesCommand = &cli.Command{
 	},
 }
 
-func updateOperatorAddonImages(ctx context.Context, chartURL string, chartVersion string) error {
+func updateOperatorAddonImages(ctx context.Context, hcli helm.Client, chartURL string, chartVersion string) error {
 	newmeta := release.AddonMetadata{
 		Version:  chartVersion,
 		Location: chartURL,
@@ -112,7 +125,7 @@ func updateOperatorAddonImages(ctx context.Context, chartURL string, chartVersio
 	}
 
 	logrus.Infof("extracting images from chart version %s", chartVersion)
-	images, err := GetImagesFromOCIChart(chartURL, "embeddedclusteroperator", chartVersion, values)
+	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "embeddedclusteroperator", chartVersion, values)
 	if err != nil {
 		return fmt.Errorf("failed to get images from embedded cluster operator chart: %w", err)
 	}

cmd/buildtools/metadata.go

@@ -44,7 +44,15 @@ var metadataExtractHelmChartImagesCommand = &cli.Command{
 		repos := metadata.Configs.Repositories
 		charts := metadata.Configs.Charts
 
-		images, err := extractImagesFromHelmExtensions(repos, charts, metadata.Versions["Kubernetes"])
+		hcli, err := helm.NewClient(helm.HelmOptions{
+			K0sVersion: metadata.Versions["Kubernetes"],
+		})
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
+		images, err := extractImagesFromHelmExtensions(hcli, repos, charts)
 		if err != nil {
 			return fmt.Errorf("failed to extract images from helm extensions: %w", err)
 		}
@@ -72,15 +80,7 @@ func readMetadataFromFile(path string) (*types.ReleaseMetadata, error) {
 	return &metadata, nil
 }
 
-func extractImagesFromHelmExtensions(repos []k0sv1beta1.Repository, charts []embeddedclusterv1beta1.Chart, k8sVersion string) ([]string, error) {
-	hcli, err := helm.NewClient(helm.HelmOptions{
-		K0sVersion: k8sVersion,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("create helm client: %w", err)
-	}
-	defer hcli.Close()
-
+func extractImagesFromHelmExtensions(hcli helm.Client, repos []k0sv1beta1.Repository, charts []embeddedclusterv1beta1.Chart) ([]string, error) {
 	for _, entry := range repos {
 		log.Printf("Adding helm repository %s", entry.Name)
 		repo := &repo.Entry{

cmd/buildtools/openebs.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/openebs"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -47,12 +48,18 @@ var updateOpenEBSAddonCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating openebs addon")
 
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
 		nextChartVersion := os.Getenv("INPUT_OPENEBS_CHART_VERSION")
 		if nextChartVersion != "" {
 			logrus.Infof("using input override from INPUT_OPENEBS_CHART_VERSION: %s", nextChartVersion)
 		} else {
 			logrus.Infof("fetching the latest openebs chart version")
-			latest, err := LatestChartVersion(openebsRepo, "openebs")
+			latest, err := LatestChartVersion(hcli, openebsRepo, "openebs")
 			if err != nil {
 				return fmt.Errorf("failed to get the latest openebs chart version: %v", err)
 			}
@@ -68,7 +75,7 @@ var updateOpenEBSAddonCommand = &cli.Command{
 		}
 
 		logrus.Infof("mirroring openebs chart version %s", nextChartVersion)
-		if err := MirrorChart(openebsRepo, "openebs", nextChartVersion); err != nil {
+		if err := MirrorChart(hcli, openebsRepo, "openebs", nextChartVersion); err != nil {
 			return fmt.Errorf("failed to mirror openebs chart: %v", err)
 		}
 
@@ -77,7 +84,7 @@ var updateOpenEBSAddonCommand = &cli.Command{
 
 		logrus.Infof("updating openebs images")
 
-		err := updateOpenEBSAddonImages(c.Context, withproto, nextChartVersion, nextChartVersion)
+		err = updateOpenEBSAddonImages(c.Context, hcli, withproto, nextChartVersion, nextChartVersion)
 		if err != nil {
 			return fmt.Errorf("failed to update openebs images: %w", err)
 		}
@@ -95,9 +102,15 @@ var updateOpenEBSImagesCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating openebs images")
 
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
 		current := openebs.Metadata
 
-		err := updateOpenEBSAddonImages(c.Context, current.Location, current.Version, current.Version)
+		err = updateOpenEBSAddonImages(c.Context, hcli, current.Location, current.Version, current.Version)
 		if err != nil {
 			return fmt.Errorf("failed to update openebs images: %w", err)
 		}
@@ -108,7 +121,7 @@ var updateOpenEBSImagesCommand = &cli.Command{
 	},
 }
 
-func updateOpenEBSAddonImages(ctx context.Context, chartURL string, chartVersion string, linuxUtilsVersion string) error {
+func updateOpenEBSAddonImages(ctx context.Context, hcli helm.Client, chartURL string, chartVersion string, linuxUtilsVersion string) error {
 	newmeta := release.AddonMetadata{
 		Version:  chartVersion,
 		Location: chartURL,
@@ -121,7 +134,7 @@ func updateOpenEBSAddonImages(ctx context.Context, chartURL string, chartVersion
 	}
 
 	logrus.Infof("extracting images from chart version %s", chartVersion)
-	images, err := GetImagesFromOCIChart(chartURL, "openebs", chartVersion, values)
+	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "openebs", chartVersion, values)
 	if err != nil {
 		return fmt.Errorf("failed to get images from openebs chart: %w", err)
 	}

cmd/buildtools/registry.go

@@ -9,6 +9,7 @@ import (
 	"helm.sh/helm/v3/pkg/repo"
 
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/registry"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 )
 
@@ -33,7 +34,14 @@ var updateRegistryAddonCommand = &cli.Command{
 	UsageText: environmentUsageText,
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating registry addon")
-		latest, err := LatestChartVersion(registryRepo, "docker-registry")
+
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
+		latest, err := LatestChartVersion(hcli, registryRepo, "docker-registry")
 		if err != nil {
 			return fmt.Errorf("unable to get the latest registry version: %v", err)
 		}
@@ -46,7 +54,7 @@ var updateRegistryAddonCommand = &cli.Command{
 		}
 
 		logrus.Infof("mirroring registry chart version %s", latest)
-		if err := MirrorChart(registryRepo, "docker-registry", latest); err != nil {
+		if err := MirrorChart(hcli, registryRepo, "docker-registry", latest); err != nil {
 			return fmt.Errorf("unable to mirror chart: %w", err)
 		}
 
@@ -64,7 +72,7 @@ var updateRegistryAddonCommand = &cli.Command{
 
 		logrus.Infof("extracting images from chart")
 		withproto := fmt.Sprintf("oci://%s", upstream)
-		images, err := GetImagesFromOCIChart(withproto, "docker-registry", latest, values)
+		images, err := helm.ExtractImagesFromOCIChart(hcli, withproto, "docker-registry", latest, values)
 		if err != nil {
 			return fmt.Errorf("failed to get images from chart: %w", err)
 		}

cmd/buildtools/seaweedfs.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/seaweedfs"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -35,12 +36,18 @@ var updateSeaweedFSAddonCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating seaweedfs addon")
 
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
 		nextChartVersion := os.Getenv("INPUT_SEAWEEDFS_CHART_VERSION")
 		if nextChartVersion != "" {
 			logrus.Infof("using input override from INPUT_SEAWEEDFS_CHART_VERSION: %s", nextChartVersion)
 		} else {
 			logrus.Infof("fetching the latest seaweedfs chart version")
-			latest, err := LatestChartVersion(seaweedfsRepo, "seaweedfs")
+			latest, err := LatestChartVersion(hcli, seaweedfsRepo, "seaweedfs")
 			if err != nil {
 				return fmt.Errorf("failed to get the latest seaweedfs chart version: %v", err)
 			}
@@ -56,7 +63,7 @@ var updateSeaweedFSAddonCommand = &cli.Command{
 		}
 
 		logrus.Infof("mirroring seaweedfs chart version %s", nextChartVersion)
-		if err := MirrorChart(seaweedfsRepo, "seaweedfs", nextChartVersion); err != nil {
+		if err := MirrorChart(hcli, seaweedfsRepo, "seaweedfs", nextChartVersion); err != nil {
 			return fmt.Errorf("failed to mirror seaweedfs chart: %v", err)
 		}
 
@@ -65,7 +72,7 @@ var updateSeaweedFSAddonCommand = &cli.Command{
 
 		logrus.Infof("updating seaweedfs images")
 
-		err := updateSeaweedFSAddonImages(c.Context, withproto, nextChartVersion)
+		err = updateSeaweedFSAddonImages(c.Context, hcli, withproto, nextChartVersion)
 		if err != nil {
 			return fmt.Errorf("failed to update seaweedfs images: %w", err)
 		}
@@ -83,9 +90,15 @@ var updateSeaweedFSImagesCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		logrus.Infof("updating seaweedfs images")
 
+		hcli, err := NewHelm()
+		if err != nil {
+			return fmt.Errorf("failed to create helm client: %w", err)
+		}
+		defer hcli.Close()
+
 		current := seaweedfs.Metadata
 
-		err := updateSeaweedFSAddonImages(c.Context, current.Location, current.Version)
+		err = updateSeaweedFSAddonImages(c.Context, hcli, current.Location, current.Version)
 		if err != nil {
 			return fmt.Errorf("failed to update seaweedfs images: %w", err)
 		}
@@ -96,7 +109,7 @@ var updateSeaweedFSImagesCommand = &cli.Command{
 	},
 }
 
-func updateSeaweedFSAddonImages(ctx context.Context, chartURL string, chartVersion string) error {
+func updateSeaweedFSAddonImages(ctx context.Context, hcli helm.Client, chartURL string, chartVersion string) error {
 	newmeta := release.AddonMetadata{
 		Version:  chartVersion,
 		Location: chartURL,
@@ -109,7 +122,7 @@ func updateSeaweedFSAddonImages(ctx context.Context, chartURL string, chartVersi
 	}
 
 	logrus.Infof("extracting images from chart version %s", chartVersion)
-	images, err := GetImagesFromOCIChart(chartURL, "seaweedfs", chartVersion, values)
+	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "seaweedfs", chartVersion, values)
 	if err != nil {
 		return fmt.Errorf("failed to get images from seaweedfs chart: %w", err)
 	}