Merge branch 'master' into feature/revision-diff

Author: codenio

.gitignore

@@ -1,4 +1,5 @@
-diff
 vendor/
+bin/
+build/
 release/
 .envrc

Makefile

@@ -2,23 +2,23 @@ HELM_HOME ?= $(shell helm home)
 HAS_GLIDE := $(shell command -v glide;)
 VERSION := $(shell sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' plugin.yaml)
 
-LDFLAGS := -X main.Version=$(VERSION)
-
 PKG:= github.com/databus23/helm-diff
+LDFLAGS := -X $(PKG)/cmd.Version=$(VERSION)
 
 # Clear the "unreleased" string in BuildMetadata
 LDFLAGS += -X $(PKG)/vendor/k8s.io/helm/pkg/version.BuildMetadata=
 LDFLAGS += -X $(PKG)/vendor/k8s.io/helm/pkg/version.Version=$(shell grep -A1 "package: k8s.io/helm" glide.yaml | sed -n -e 's/[ ]*version:.*\(v[.0-9]*\).*/\1/p')
 
 .PHONY: install
-install: bootstrap build
-	mkdir -p $(HELM_HOME)/plugins/helm-diff
-	cp diff $(HELM_HOME)/plugins/helm-diff/
+install: build
+	mkdir -p $(HELM_HOME)/plugins/helm-diff/bin
+	cp bin/diff $(HELM_HOME)/plugins/helm-diff/bin
 	cp plugin.yaml $(HELM_HOME)/plugins/helm-diff/
 
 .PHONY: build
 build:
-	go build -i -v -o diff -ldflags="$(LDFLAGS)"
+	mkdir -p bin/
+	go build -i -v -o bin/diff -ldflags="$(LDFLAGS)"
 
 .PHONY: bootstrap
 bootstrap:
@@ -37,11 +37,14 @@ dist:
 	tar -C build/ -zcvf $(CURDIR)/release/helm-diff-linux.tgz diff/
 	GOOS=darwin GOARCH=amd64 go build -o build/diff/diff -ldflags="$(LDFLAGS)"
 	tar -C build/ -zcvf $(CURDIR)/release/helm-diff-macos.tgz diff/
+	rm build/diff/diff
+	GOOS=windows GOARCH=amd64 go build -o build/diff/diff.exe -ldflags="$(LDFLAGS)"
+	tar -C build/ -zcvf $(CURDIR)/release/helm-diff-windows.tgz diff/
 
 .PHONY: release
 release: dist
-ifndef GITHUB_ACCESS_TOKEN
-	$(error GITHUB_ACCESS_TOKEN is undefined)
+ifndef GITHUB_TOKEN
+	$(error GITHUB_TOKEN is undefined)
 endif
 	git push
-	gh-release create databus23/helm-diff $(VERSION) master
+	github-release databus23/helm-diff v$(VERSION) master "v$(VERSION)" "release/*"

helm.go renamed to cmd/helm.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 // This file contains functions that where blatantly copied from
 // https://github.wdf.sap.corp/kubernetes/helm
@@ -14,6 +14,8 @@ import (
 	"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"
 )
@@ -26,6 +28,22 @@ func (v *valueFiles) String() string {
 	return fmt.Sprint(*v)
 }
 
+// Ensures all valuesFiles exist
+func (v *valueFiles) Valid() error {
+	errStr := ""
+	for _, valuesFile := range *v {
+		if _, err := os.Stat(valuesFile); os.IsNotExist(err) {
+			errStr += err.Error()
+		}
+	}
+
+	if errStr == "" {
+		return nil
+	} else {
+		return errors.New(errStr)
+	}
+}
+
 func (v *valueFiles) Type() string {
 	return "valueFiles"
 }
@@ -68,12 +86,13 @@ func locateChartPath(name, version string, verify bool, keyring string) (string,
 		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, ".")
+	filename, _, err := dl.DownloadTo(name, version, helmpath.Home(homePath()).Archive())
 	if err == nil {
 		lname, err := filepath.Abs(filename)
 		if err != nil {
@@ -82,7 +101,7 @@ func locateChartPath(name, version string, verify bool, keyring string) (string,
 		return lname, nil
 	}
 
-	return filename, fmt.Errorf("file %q not found", name)
+	return filename, err
 }
 
 // Merges source and destination map, preferring values from the source map

cmd/root.go

@@ -0,0 +1,25 @@
+package cmd
+
+import "github.com/spf13/cobra"
+
+func New() *cobra.Command {
+
+	cmd := &cobra.Command{
+		Use:   "diff",
+		Short: "Show manifest differences",
+	}
+
+	chartCommand := newChartCommand()
+	cmd.AddCommand(newVersionCmd(), chartCommand)
+	//Alias root command to chart subcommand
+	cmd.Args = chartCommand.Args
+	cmd.Flags().AddFlagSet(chartCommand.Flags())
+	cmd.RunE = func(cmd *cobra.Command, args []string) error {
+		cmd.Println(`Command "helm diff" is deprecated, use "helm diff upgrade" instead`)
+		return chartCommand.RunE(cmd, args)
+	}
+	cmd.SetHelpCommand(&cobra.Command{}) // Disable the help command
+
+	return cmd
+
+}

cmd/upgrade.go

@@ -0,0 +1,116 @@
+package cmd
+
+import (
+	"os"
+
+	"github.com/databus23/helm-diff/diff"
+	"github.com/databus23/helm-diff/manifest"
+	"github.com/mgutz/ansi"
+	"github.com/spf13/cobra"
+	"k8s.io/helm/pkg/helm"
+)
+
+type diffCmd struct {
+	release         string
+	chart           string
+	chartVersion    string
+	client          helm.Interface
+	valueFiles      valueFiles
+	values          []string
+	reuseValues     bool
+	resetValues     bool
+	suppressedKinds []string
+}
+
+const globalUsage = `Show a diff explaining what a helm upgrade would change.
+
+This fetches the currently deployed version of a release
+and compares it to a chart plus values.
+This can be used visualize what changes a helm upgrade will
+perform.
+`
+
+func newChartCommand() *cobra.Command {
+	diff := diffCmd{}
+
+	cmd := &cobra.Command{
+		Use:     "upgrade [flags] [RELEASE] [CHART]",
+		Short:   "Show a diff explaining what a helm upgrade would change.",
+		Long:    globalUsage,
+		Example: "helm diff upgrade my-release stable/postgresql --values values.yaml",
+		Args: func(cmd *cobra.Command, args []string) error {
+			return checkArgsLength(len(args), "release name", "chart path")
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			if q, _ := cmd.Flags().GetBool("suppress-secrets"); q {
+				diff.suppressedKinds = append(diff.suppressedKinds, "Secret")
+			}
+
+			if nc, _ := cmd.Flags().GetBool("no-color"); nc {
+				ansi.DisableColors(true)
+			}
+
+			diff.release = args[0]
+			diff.chart = args[1]
+			if diff.client == nil {
+				diff.client = helm.NewClient(helm.Host(os.Getenv("TILLER_HOST")), helm.ConnectTimeout(int64(30)))
+			}
+			return diff.run()
+		},
+	}
+
+	f := cmd.Flags()
+	f.StringVar(&diff.chartVersion, "version", "", "specify the exact chart version to use. If this is not specified, the latest version is used")
+	f.BoolP("suppress-secrets", "q", false, "suppress secrets in the output")
+	f.Bool("no-color", false, "remove colors from the output")
+	f.VarP(&diff.valueFiles, "values", "f", "specify values in a YAML file (can specify multiple)")
+	f.StringArrayVar(&diff.values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	f.BoolVar(&diff.reuseValues, "reuse-values", false, "reuse the last release's values and merge in any new values")
+	f.BoolVar(&diff.resetValues, "reset-values", false, "reset the values to the ones built into the chart and merge in any new values")
+	f.StringArrayVar(&diff.suppressedKinds, "suppress", []string{}, "allows suppression of the values listed in the diff output")
+
+	return cmd
+
+}
+
+func (d *diffCmd) run() error {
+	chartPath, err := locateChartPath(d.chart, d.chartVersion, false, "")
+	if err != nil {
+		return err
+	}
+
+	if err := d.valueFiles.Valid(); err != nil {
+		return err
+	}
+
+	rawVals, err := d.vals()
+	if err != nil {
+		return err
+	}
+
+	releaseResponse, err := d.client.ReleaseContent(d.release)
+
+	if err != nil {
+		return prettyError(err)
+	}
+
+	upgradeResponse, err := d.client.UpdateRelease(
+		d.release,
+		chartPath,
+		helm.UpdateValueOverrides(rawVals),
+		helm.ReuseValues(d.reuseValues),
+		helm.ResetValues(d.resetValues),
+		helm.UpgradeDryRun(true),
+	)
+	if err != nil {
+		return prettyError(err)
+	}
+
+	currentSpecs := manifest.Parse(releaseResponse.Release.Manifest)
+	newSpecs := manifest.Parse(upgradeResponse.Release.Manifest)
+
+	diff.DiffManifests(currentSpecs, newSpecs, d.suppressedKinds, os.Stdout)
+
+	return nil
+}

cmd/version.go

@@ -0,0 +1,20 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+// Version identifier populated via the CI/CD process.
+var Version = "HEAD"
+
+func newVersionCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Show version of the helm diff plugin",
+		Run: func(*cobra.Command, []string) {
+			fmt.Println(Version)
+		},
+	}
+}

diff.go renamed to diff/diff.go

@@ -1,4 +1,4 @@
-package main
+package diff
 
 import (
 	"fmt"
@@ -11,7 +11,7 @@ import (
 	"github.com/databus23/helm-diff/manifest"
 )
 
-func diffManifests(oldIndex, newIndex map[string]*manifest.MappingResult, suppressedKinds []string, to io.Writer) {
+func DiffManifests(oldIndex, newIndex map[string]*manifest.MappingResult, suppressedKinds []string, to io.Writer) {
 	for key, oldContent := range oldIndex {
 		if newContent, ok := newIndex[key]; ok {
 			if oldContent.Content != newContent.Content {