Respect ignoreMissingValueFiles when generating hashes

Follow-up for #31

We were not checking for `ignoreMissingValueFiles` when generating file
hashes.

Author: v-yarotsky

pkg/helm/helm.go

@@ -13,7 +13,6 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
-	"regexp"
 	"sort"
 	"strings"
 	"sync"
@@ -54,12 +53,7 @@ func buildParams(payload *v1alpha1.Application, ignoreValueFile string) (string,
 
 	}
 	for i := 0; i < len(helmFiles); i++ {
-		isExplicitlyIgnored := ignoreValueFile != "" && strings.Contains(helmFiles[i], ignoreValueFile)
-		isMissingAndShouldBeIgnored :=
-			!fileExists(path.Join(payload.Spec.Source.Path, helmFiles[i])) &&
-				payload.Spec.Source.Helm.IgnoreMissingValueFiles
-
-		if !isExplicitlyIgnored && !isMissingAndShouldBeIgnored {
+		if !ignoredValueFile(payload, helmFiles[i], ignoreValueFile) {
 			fileValues += fmt.Sprintf("%s,", helmFiles[i])
 		}
 	}
@@ -219,11 +213,9 @@ func GenerateHash(crd *v1alpha1.Application, ignoreValueFile string) (string, er
 	if crd.Spec.Source.Helm != nil && len(crd.Spec.Source.Helm.ValueFiles) > 0 {
 		oHash := sha256.New()
 		overrideFiles := crd.Spec.Source.Helm.ValueFiles
-		matchDots := regexp.MustCompile(`\.\.\/`)
 		for i := 0; i < len(overrideFiles); i++ {
-			if ignoreValueFile == "" || !strings.Contains(overrideFiles[i], ignoreValueFile) {
-				trimmedFilename := matchDots.ReplaceAllString(overrideFiles[i], "")
-				oHashReturned, err := generalHashFunction(trimmedFilename)
+			if !ignoredValueFile(crd, overrideFiles[i], ignoreValueFile) {
+				oHashReturned, err := generalHashFunction(path.Join(crd.Spec.Source.Path, overrideFiles[i]))
 				if err != nil {
 					return "", err
 				}
@@ -437,6 +429,15 @@ func Read(inputCRD string) ([]*v1alpha1.Application, error) {
 	return crdSpecs, nil
 }
 
+func ignoredValueFile(crd *v1alpha1.Application, f string, ignoreValueFile string) bool {
+	isExplicitlyIgnored := ignoreValueFile != "" && strings.Contains(f, ignoreValueFile)
+	isMissingAndShouldBeIgnored :=
+		!fileExists(path.Join(crd.Spec.Source.Path, f)) &&
+			crd.Spec.Source.Helm.IgnoreMissingValueFiles
+
+	return isExplicitlyIgnored || isMissingAndShouldBeIgnored
+}
+
 func fileExists(path string) bool {
 	_, err := os.Stat(path)
 	return !os.IsNotExist(err)

pkg/helm/helm_test.go

@@ -224,6 +224,7 @@ kind: Application
 		}
 
 		for _, tt := range testFiles {
+			tt := tt
 			t.Run(tt.name, func(t *testing.T) {
 				t.Parallel()
 				hash, err := generalHashFunction(tt.file) //nolint:govet
@@ -326,6 +327,54 @@ kind: Application
 		}
 	})
 
+	t.Run("GenerateHash", func(t *testing.T) {
+		testFiles := []struct {
+			name            string
+			file            string
+			ignoreValueFile string
+			hash            string
+		}{
+			{
+				name:            "Generating hash for an Application",
+				file:            "crdData_testfile_3.yaml",
+				ignoreValueFile: "",
+				hash:            "7ce0306f218c7147b388dbb1ec2fa78389e44ebd11ca31b208e085b82158d787",
+			},
+			{
+				name:            "Generate hash for an application with ignoreMissingValueFiles and a missing value file",
+				file:            "crdData_testfile_4.yaml",
+				ignoreValueFile: "",
+				hash:            "349f7da89b1c47362663daedb6fcc28980d017613a9cb9da7d53bb852467fa6c",
+			},
+		}
+
+		for _, tt := range testFiles {
+			tt := tt
+			t.Run(tt.name, func(t *testing.T) {
+				t.Parallel()
+
+				data, err := Read(tt.file)
+				if err != nil {
+					t.Error(err)
+				}
+				if len(data) != 1 {
+					t.Fatal("This test can work only with one Application at a time")
+				}
+				crd := data[0]
+
+				got, err := GenerateHash(crd, tt.ignoreValueFile)
+				if err != nil {
+					t.Error(err)
+				}
+
+				want := tt.hash //nolint:govet
+				if got != want {
+					t.Errorf("Failed to generate a correct hash on an overrides. got: %s want %s", got, want)
+				}
+			})
+		}
+	})
+
 	t.Run("IsMissingDependencyErr", func(t *testing.T) {
 		templateErrors := []struct {
 			name       string