Remove support for helm2 (databus23#454)

* Remove support for helm2

* fixup! Merge branch 'master' into remove-helm2-support

---------

Co-authored-by: Yusuke Kuoka <[email protected]>

Author: databus23

Makefile

@@ -6,10 +6,6 @@ HELM_3_PLUGINS := $(shell helm env HELM_PLUGINS)
 PKG:= github.com/databus23/helm-diff/v3
 LDFLAGS := -X $(PKG)/cmd.Version=$(VERSION)
 
-# Clear the "unreleased" string in BuildMetadata
-LDFLAGS += -X k8s.io/helm/pkg/version.BuildMetadata=
-LDFLAGS += -X k8s.io/helm/pkg/version.Version=$(shell ./scripts/dep-helm-version.sh)
-
 GO ?= go
 
 .PHONY: format

cmd/helm.go

@@ -6,18 +6,8 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
-	"path/filepath"
 	"strings"
-
-	"github.com/ghodss/yaml"
-	"google.golang.org/grpc"
-	"k8s.io/helm/pkg/downloader"
-	"k8s.io/helm/pkg/getter"
-	"k8s.io/helm/pkg/helm/environment"
-	"k8s.io/helm/pkg/helm/helmpath"
-	"k8s.io/helm/pkg/strvals"
 )
 
 /////////////// Source: cmd/helm/install.go /////////////////////////
@@ -57,143 +47,6 @@ func (v *valueFiles) Set(value string) error {
 	return nil
 }
 
-func locateChartPath(name, version string, verify bool, keyring string) (string, error) {
-	name = strings.TrimSpace(name)
-	version = strings.TrimSpace(version)
-	if fi, err := os.Stat(name); err == nil {
-		abs, err := filepath.Abs(name)
-		if err != nil {
-			return abs, err
-		}
-		if verify {
-			if fi.IsDir() {
-				return "", errors.New("cannot verify a directory")
-			}
-			if _, err := downloader.VerifyChart(abs, keyring); err != nil {
-				return "", err
-			}
-		}
-		return abs, nil
-	}
-	if filepath.IsAbs(name) || strings.HasPrefix(name, ".") {
-		return name, fmt.Errorf("path %q not found", name)
-	}
-
-	crepo := filepath.Join(helmpath.Home(homePath()).Repository(), name)
-	if _, err := os.Stat(crepo); err == nil {
-		return filepath.Abs(crepo)
-	}
-
-	dl := downloader.ChartDownloader{
-		HelmHome: helmpath.Home(homePath()),
-		Out:      os.Stdout,
-		Keyring:  keyring,
-		Getters:  getter.All(environment.EnvSettings{}),
-	}
-	if verify {
-		dl.Verify = downloader.VerifyAlways
-	}
-
-	filename, _, err := dl.DownloadTo(name, version, helmpath.Home(homePath()).Archive())
-	if err == nil {
-		lname, err := filepath.Abs(filename)
-		if err != nil {
-			return filename, err
-		}
-		return lname, nil
-	}
-
-	return filename, err
-}
-
-// Merges source and destination map, preferring values from the source map
-func mergeValues(dest map[string]interface{}, src map[string]interface{}) map[string]interface{} {
-	for k, v := range src {
-		// If the key doesn't exist already, then just set the key to that value
-		if _, exists := dest[k]; !exists {
-			dest[k] = v
-			continue
-		}
-		nextMap, ok := v.(map[string]interface{})
-		// If it isn't another map, overwrite the value
-		if !ok {
-			dest[k] = v
-			continue
-		}
-		// If the key doesn't exist already, then just set the key to that value
-		if _, exists := dest[k]; !exists {
-			dest[k] = nextMap
-			continue
-		}
-		// Edge case: If the key exists in the destination, but isn't a map
-		destMap, isMap := dest[k].(map[string]interface{})
-		// If the source map has a map for this key, prefer it
-		if !isMap {
-			dest[k] = v
-			continue
-		}
-		// If we got to this point, it is a map in both, so merge them
-		dest[k] = mergeValues(destMap, nextMap)
-	}
-	return dest
-}
-
-/////////////// Source: cmd/helm/upgrade.go /////////////////////////
-
-func (d *diffCmd) vals() ([]byte, error) {
-	base := map[string]interface{}{}
-
-	// User specified a values files via -f/--values
-	for _, filePath := range d.valueFiles {
-		currentMap := map[string]interface{}{}
-
-		var bytes []byte
-		var err error
-		if strings.TrimSpace(filePath) == "-" {
-			bytes, err = ioutil.ReadAll(os.Stdin)
-		} else {
-			bytes, err = ioutil.ReadFile(filePath)
-		}
-		if err != nil {
-			return []byte{}, err
-		}
-
-		if err := yaml.Unmarshal(bytes, &currentMap); err != nil {
-			return []byte{}, fmt.Errorf("failed to parse %s: %s", filePath, err)
-		}
-		// Merge with the previous map
-		base = mergeValues(base, currentMap)
-	}
-
-	// User specified a value via --set
-	for _, value := range d.values {
-		if err := strvals.ParseInto(value, base); err != nil {
-			return []byte{}, fmt.Errorf("failed parsing --set data: %s", err)
-		}
-	}
-
-	// User specified a value via --set-string
-	for _, value := range d.stringValues {
-		if err := strvals.ParseIntoString(value, base); err != nil {
-			return []byte{}, fmt.Errorf("failed parsing --set-string data: %s", err)
-		}
-	}
-
-	// User specified a value via --set-file
-	for _, value := range d.fileValues {
-		reader := func(rs []rune) (interface{}, error) {
-			bytes, err := ioutil.ReadFile(string(rs))
-			return string(bytes), err
-		}
-
-		if err := strvals.ParseIntoFile(value, base, reader); err != nil {
-			return []byte{}, fmt.Errorf("failed parsing --set-file data: %s", err)
-		}
-	}
-
-	return yaml.Marshal(base)
-}
-
 /////////////// Source: cmd/helm/helm.go ////////////////////////////
 
 func checkArgsLength(argsReceived int, requiredArgs ...string) error {
@@ -207,17 +60,3 @@ func checkArgsLength(argsReceived int, requiredArgs ...string) error {
 	}
 	return nil
 }
-
-func homePath() string {
-	return os.Getenv("HELM_HOME")
-}
-
-func prettyError(err error) error {
-	if err == nil {
-		return nil
-	}
-	// This is ridiculous. Why is 'grpc.rpcError' not exported? The least they
-	// could do is throw an interface on the lib that would let us get back
-	// the desc. Instead, we have to pass ALL errors through this.
-	return errors.New(grpc.ErrorDesc(err))
-}

cmd/helm3.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"os/exec"
 	"regexp"
@@ -110,7 +110,7 @@ func (d *diffCmd) template(isUpgrade bool) ([]byte, error) {
 	// See https://medium.com/@kcatstack/understand-helm-upgrade-flags-reset-values-reuse-values-6e58ac8f127e
 	shouldDefaultReusingValues := isUpgrade && len(d.values) == 0 && len(d.stringValues) == 0 && len(d.valueFiles) == 0 && len(d.fileValues) == 0
 	if (d.reuseValues || shouldDefaultReusingValues) && !d.resetValues && !d.dryRun {
-		tmpfile, err := ioutil.TempFile("", "existing-values")
+		tmpfile, err := os.CreateTemp("", "existing-values")
 		if err != nil {
 			return nil, err
 		}
@@ -128,12 +128,12 @@ func (d *diffCmd) template(isUpgrade bool) ([]byte, error) {
 	}
 	for _, valueFile := range d.valueFiles {
 		if strings.TrimSpace(valueFile) == "-" {
-			bytes, err := ioutil.ReadAll(os.Stdin)
+			bytes, err := io.ReadAll(os.Stdin)
 			if err != nil {
 				return nil, err
 			}
 
-			tmpfile, err := ioutil.TempFile("", "helm-diff-stdin-values")
+			tmpfile, err := os.CreateTemp("", "helm-diff-stdin-values")
 			if err != nil {
 				return nil, err
 			}

cmd/helpers.go

@@ -7,32 +7,19 @@ import (
 	"path/filepath"
 	"strings"
 
-	flag "github.com/spf13/pflag"
 	"k8s.io/client-go/util/homedir"
-	"k8s.io/helm/pkg/helm"
-	helm_env "k8s.io/helm/pkg/helm/environment"
-	"k8s.io/helm/pkg/tlsutil"
 )
 
 const (
-	tlsCaCertDefault = "$HELM_HOME/ca.pem"
-	tlsCertDefault   = "$HELM_HOME/cert.pem"
-	tlsKeyDefault    = "$HELM_HOME/key.pem"
-
 	helm2TestSuccessHook = "test-success"
 	helm3TestHook        = "test"
 )
 
 var (
-	settings helm_env.EnvSettings
 	// DefaultHelmHome to hold default home path of .helm dir
 	DefaultHelmHome = filepath.Join(homedir.HomeDir(), ".helm")
 )
 
-func isHelm3() bool {
-	return os.Getenv("TILLER_HOST") == ""
-}
-
 func isDebug() bool {
 	return os.Getenv("HELM_DEBUG") == "true"
 }
@@ -42,47 +29,6 @@ func debugPrint(format string, a ...interface{}) {
 	}
 }
 
-func addCommonCmdOptions(f *flag.FlagSet) {
-	settings.AddFlagsTLS(f)
-	settings.InitTLS(f)
-
-	f.StringVar((*string)(&settings.Home), "home", DefaultHelmHome, "location of your Helm config. Overrides $HELM_HOME")
-}
-
-func createHelmClient() helm.Interface {
-	options := []helm.Option{helm.Host(os.Getenv("TILLER_HOST")), helm.ConnectTimeout(int64(30))}
-
-	if settings.TLSVerify || settings.TLSEnable {
-		tlsopts := tlsutil.Options{
-			ServerName:         settings.TLSServerName,
-			KeyFile:            settings.TLSKeyFile,
-			CertFile:           settings.TLSCertFile,
-			InsecureSkipVerify: true,
-		}
-
-		if settings.TLSVerify {
-			tlsopts.CaCertFile = settings.TLSCaCertFile
-			tlsopts.InsecureSkipVerify = false
-		}
-
-		tlscfg, err := tlsutil.ClientConfig(tlsopts)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(2)
-		}
-
-		options = append(options, helm.WithTLS(tlscfg))
-	}
-
-	return helm.NewClient(options...)
-}
-
-func expandTLSPaths() {
-	settings.TLSCaCertFile = os.ExpandEnv(settings.TLSCaCertFile)
-	settings.TLSCertFile = os.ExpandEnv(settings.TLSCertFile)
-	settings.TLSKeyFile = os.ExpandEnv(settings.TLSKeyFile)
-}
-
 func outputWithRichError(cmd *exec.Cmd) ([]byte, error) {
 	debugPrint("Executing %s", strings.Join(cmd.Args, " "))
 	output, err := cmd.Output()

cmd/release.go

@@ -7,14 +7,12 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"k8s.io/helm/pkg/helm"
 
 	"github.com/databus23/helm-diff/v3/diff"
 	"github.com/databus23/helm-diff/v3/manifest"
 )
 
 type release struct {
-	client             helm.Interface
 	detailedExitCode   bool
 	releases           []string
 	includeTests       bool
@@ -41,9 +39,6 @@ func releaseCmd() *cobra.Command {
 		Use:   "release [flags] RELEASE release1 [release2]",
 		Short: "Shows diff between release's manifests",
 		Long:  releaseCmdLongUsage,
-		PreRun: func(*cobra.Command, []string) {
-			expandTLSPaths()
-		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Suppress the command usage on error. See #77 for more info
 			cmd.SilenceUsage = true
@@ -61,13 +56,7 @@ func releaseCmd() *cobra.Command {
 			ProcessDiffOptions(cmd.Flags(), &diff.Options)
 
 			diff.releases = args[0:]
-			if isHelm3() {
-				return diff.differentiateHelm3()
-			}
-			if diff.client == nil {
-				diff.client = createHelmClient()
-			}
-			return diff.differentiate()
+			return diff.differentiateHelm3()
 		},
 	}
 
@@ -78,10 +67,6 @@ func releaseCmd() *cobra.Command {
 
 	releaseCmd.SuggestionsMinimumDistance = 1
 
-	if !isHelm3() {
-		addCommonCmdOptions(releaseCmd.Flags())
-	}
-
 	return releaseCmd
 }
 
@@ -139,34 +124,3 @@ func (d *release) differentiateHelm3() error {
 	}
 	return nil
 }
-
-func (d *release) differentiate() error {
-
-	releaseResponse1, err := d.client.ReleaseContent(d.releases[0])
-	if err != nil {
-		return prettyError(err)
-	}
-
-	releaseResponse2, err := d.client.ReleaseContent(d.releases[1])
-	if err != nil {
-		return prettyError(err)
-	}
-
-	if releaseResponse1.Release.Chart.Metadata.Name == releaseResponse2.Release.Chart.Metadata.Name {
-		seenAnyChanges := diff.Releases(
-			manifest.ParseRelease(releaseResponse1.Release, d.includeTests, d.normalizeManifests),
-			manifest.ParseRelease(releaseResponse2.Release, d.includeTests, d.normalizeManifests),
-			&d.Options,
-			os.Stdout)
-
-		if d.detailedExitCode && seenAnyChanges {
-			return Error{
-				error: errors.New("identified at least one change, exiting with non-zero exit code (detailed-exitcode parameter enabled)"),
-				Code:  2,
-			}
-		}
-	} else {
-		fmt.Printf("Error : Incomparable Releases \n Unable to compare releases from two different charts \"%s\", \"%s\". \n try helm diff release --help to know more \n", releaseResponse1.Release.Chart.Metadata.Name, releaseResponse2.Release.Chart.Metadata.Name)
-	}
-	return nil
-}