Disable diffing against test hooks by default (#119)

Use `--include-tests` to opt-in

Fixes #114

Author: regner

cmd/upgrade.go

@@ -29,6 +29,7 @@ type diffCmd struct {
 	resetValues      bool
 	allowUnreleased  bool
 	noHooks          bool
+	includeTests     bool
 	suppressedKinds  []string
 	outputContext    int
 }
@@ -84,6 +85,7 @@ func newChartCommand() *cobra.Command {
 	f.BoolVar(&diff.resetValues, "reset-values", false, "reset the values to the ones built into the chart and merge in any new values")
 	f.BoolVar(&diff.allowUnreleased, "allow-unreleased", false, "enables diffing of releases that are not yet deployed via Helm")
 	f.BoolVar(&diff.noHooks, "no-hooks", false, "disable diffing of hooks")
+	f.BoolVar(&diff.includeTests, "include-tests", false, "enable the diffing of the helm test hooks")
 	f.BoolVar(&diff.devel, "devel", false, "use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.")
 	f.StringArrayVar(&diff.suppressedKinds, "suppress", []string{}, "allows suppression of the values listed in the diff output")
 	f.IntVarP(&diff.outputContext, "context", "C", -1, "output NUM lines of context around changes")
@@ -164,8 +166,8 @@ func (d *diffCmd) run() error {
 			currentSpecs = manifest.Parse(releaseResponse.Release.Manifest, releaseResponse.Release.Namespace)
 			newSpecs = manifest.Parse(upgradeResponse.Release.Manifest, upgradeResponse.Release.Namespace)
 		} else {
-			currentSpecs = manifest.ParseRelease(releaseResponse.Release)
-			newSpecs = manifest.ParseRelease(upgradeResponse.Release)
+			currentSpecs = manifest.ParseRelease(releaseResponse.Release, d.includeTests)
+			newSpecs = manifest.ParseRelease(upgradeResponse.Release, d.includeTests)
 		}
 	}
 

manifest/parse.go

@@ -61,9 +61,13 @@ func splitSpec(token string) (string, string) {
 	return "", ""
 }
 
-func ParseRelease(release *release.Release) map[string]*MappingResult {
+func ParseRelease(release *release.Release, includeTests bool) map[string]*MappingResult {
 	manifest := release.Manifest
 	for _, hook := range release.Hooks {
+		if !includeTests && isTestHook(hook.Events) {
+			continue
+		}
+
 		manifest += "\n---\n"
 		manifest += fmt.Sprintf("# Source: %s\n", hook.Path)
 		manifest += hook.Manifest
@@ -105,5 +109,14 @@ func Parse(manifest string, defaultNamespace string) map[string]*MappingResult {
 		}
 	}
 	return result
+}
+
+func isTestHook(hookEvents []release.Hook_Event) bool {
+	for _, event := range hookEvents {
+		if event == release.Hook_RELEASE_TEST_FAILURE || event == release.Hook_RELEASE_TEST_SUCCESS {
+			return true
+		}
+	}
 
+	return false
 }