Merge pull request #78 from aiyengar2/flip_order_of_arguments_to_fix_validation

Arvind Iyengar · web-flow · commit a46c0df20db9 · 2022-02-16T15:29:14.000-08:00
Fix broken validation of charts that exists in both upstream and local
diff --git a/pkg/validate/validate.go b/pkg/validate/validate.go
@@ -135,7 +135,7 @@ func CompareGeneratedAssets(repoFs billy.Filesystem, u options.UpstreamOptions,
 		return copyAndUnzip(repoFs, upstreamPath, localPath)
 	}
 
-	localAndUpstream := func(fs billy.Filesystem, upstreamPath, localPath string, isDir bool) error {
+	localAndUpstream := func(fs billy.Filesystem, localPath, upstreamPath string, isDir bool) error {
 		if isDir {
 			// We only care about modified files
 			return nil

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func CompareGeneratedAssets(repoFs billy.Filesystem, u options.UpstreamOptions,`
`135`	`135`	`return copyAndUnzip(repoFs, upstreamPath, localPath)`
`136`	`136`	`}`
`137`	`137`
`138`		`- localAndUpstream := func(fs billy.Filesystem, upstreamPath, localPath string, isDir bool) error {`
	`138`	`+ localAndUpstream := func(fs billy.Filesystem, localPath, upstreamPath string, isDir bool) error {`
`139`	`139`	`if isDir {`
`140`	`140`	`// We only care about modified files`
`141`	`141`	`return nil`