Ignore file path and use all files for hash

snorwin · Mar 25, 2021 · 53c87df · 53c87df
1 parent 133f0e6
commit 53c87df
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/pkg/utils/hash.go b/pkg/utils/hash.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"hash/fnv"
+	"path/filepath"
 	"sort"
 
 	helm "helm.sh/helm/v3/pkg/chart"
@@ -15,16 +16,16 @@ func Hash(chart *helm.Chart, values chartutil.Values) string {
 	algorithm := fnv.New64()
 
 	// copy and sort the helm chart's files
-	files := make([]*helm.File, len(chart.Files))
-	copy(files, chart.Files)
+	files := make([]*helm.File, len(chart.Raw))
+	copy(files, chart.Raw)
 	sort.Slice(files, func(i, j int) bool {
-		return files[i] == nil || files[j] == nil || files[i].Name > files[j].Name
+		return files[i] == nil || files[j] == nil || filepath.Base(files[i].Name) > filepath.Base(files[j].Name)
 	})
 
 	// add files to the hash
 	for _, file := range files {
 		if file != nil {
-			_, _ = algorithm.Write([]byte(file.Name))
+			_, _ = algorithm.Write([]byte(filepath.Base(file.Name)))
 			_, _ = algorithm.Write(file.Data)
 		}
 	}

diff --git a/pkg/utils/hash_test.go b/pkg/utils/hash_test.go
@@ -14,7 +14,7 @@ var _ = Describe("Hash", func() {
 	Context("Hash", func() {
 		It("should_be_idempotent", func() {
 			chart := &chart.Chart{
-				Files: []*chart.File{
+				Raw: []*chart.File{
 					{
 						Name: "file1.yaml",
 						Data: []byte{1, 1, 1, 1},
@@ -41,36 +41,36 @@ var _ = Describe("Hash", func() {
 				ShouldNot(Equal(utils.Hash(&chart.Chart{}, chartutil.Values{"key1": "value1", "key2": "value2", "key3": "changed"})))
 		})
 		It("should_be_different_if_chart_files_are_different", func() {
-			Ω(utils.Hash(&chart.Chart{Files: []*chart.File{{Name: "file1.yaml", Data: []byte{1, 1, 1, 1}}}}, chartutil.Values{})).
-				ShouldNot(Equal(utils.Hash(&chart.Chart{Files: []*chart.File{{Name: "file1.yaml", Data: []byte{1, 1, 1}}}}, chartutil.Values{})))
+			Ω(utils.Hash(&chart.Chart{Raw: []*chart.File{{Name: "file1.yaml", Data: []byte{1, 1, 1, 1}}}}, chartutil.Values{})).
+				ShouldNot(Equal(utils.Hash(&chart.Chart{Raw: []*chart.File{{Name: "file1.yaml", Data: []byte{1, 1, 1}}}}, chartutil.Values{})))
 
-			Ω(utils.Hash(&chart.Chart{Files: []*chart.File{{Name: "file1.yaml", Data: []byte{1, 1, 1, 1}}}}, chartutil.Values{})).
-				ShouldNot(Equal(utils.Hash(&chart.Chart{Files: []*chart.File{{Name: "file2.yaml", Data: []byte{1, 1, 1, 1}}}}, chartutil.Values{})))
+			Ω(utils.Hash(&chart.Chart{Raw: []*chart.File{{Name: "file1.yaml", Data: []byte{1, 1, 1, 1}}}}, chartutil.Values{})).
+				ShouldNot(Equal(utils.Hash(&chart.Chart{Raw: []*chart.File{{Name: "file2.yaml", Data: []byte{1, 1, 1, 1}}}}, chartutil.Values{})))
 		})
-		It("should_ignore_file_order_and_nil", func() {
+		It("should_ignore_file_order_and_full_path_and_nil", func() {
 			chart1 := &chart.Chart{
-				Files: []*chart.File{
+				Raw: []*chart.File{
 					{
-						Name: "file1.yaml",
+						Name: "..1111/file1.yaml",
 						Data: []byte{1, 1, 1, 1},
 					},
 					{
-						Name: "file2.yaml",
+						Name: "..1111/file2.yaml",
 						Data: []byte{2, 2, 2, 2},
 					},
 					nil,
 				},
 			}
 
 			chart2 := &chart.Chart{
-				Files: []*chart.File{
+				Raw: []*chart.File{
 					{
-						Name: "file2.yaml",
+						Name: "..2222/file2.yaml",
 						Data: []byte{2, 2, 2, 2},
 					},
 					nil,
 					{
-						Name: "file1.yaml",
+						Name: "..2222/file1.yaml",
 						Data: []byte{1, 1, 1, 1},
 					},
 					nil,
@@ -96,7 +96,7 @@ var _ = Describe("Hash", func() {
 		})
 		It("should_not_modify_file_order", func() {
 			expected := &chart.Chart{
-				Files: []*chart.File{
+				Raw: []*chart.File{
 					{
 						Name: "zzzz",
 						Data: []byte{1, 1, 1, 1},
@@ -112,7 +112,7 @@ var _ = Describe("Hash", func() {
 				},
 			}
 			actual := &chart.Chart{
-				Files: []*chart.File{
+				Raw: []*chart.File{
 					{
 						Name: "zzzz",
 						Data: []byte{1, 1, 1, 1},
@@ -130,7 +130,7 @@ var _ = Describe("Hash", func() {
 
 			utils.Hash(actual, chartutil.Values{})
 
-			Ω(actual.Files).Should(Equal(expected.Files))
+			Ω(actual.Raw).Should(Equal(expected.Raw))
 		})
 	})
 })