fix(lint): honor the --since flag when checking for version increment

Signed-off-by: Alexandre-P <[email protected]>

Author: AlexandrePicosson

pkg/chart/chart.go

@@ -50,8 +50,8 @@ const maxNameLength = 63
 // ValidateRepository checks that the current working directory is a valid git repository,
 // and returns nil if valid.
 type Git interface {
-	FileExistsOnBranch(file string, remote string, branch string) bool
-	Show(file string, remote string, branch string) (string, error)
+	FileExistsOnBranch(commit string, file string) bool
+	Show(file string, commit string) (string, error)
 	AddWorktree(path string, ref string) error
 	RemoveWorktree(path string) error
 	MergeBase(commit1 string, commit2 string) (string, error)
@@ -820,15 +820,18 @@ func (t *Testing) checkBreakingChangeAllowed(chart *Chart) (allowed bool, err er
 
 // GetOldChartVersion gets the version of the old Chart.yaml file from the target branch.
 func (t *Testing) GetOldChartVersion(chartPath string) (string, error) {
-	cfg := t.config
+	mergeBase, err := t.computeMergeBase()
+	if err != nil {
+		return "", err
+	}
 
 	chartYamlFile := filepath.Join(chartPath, "Chart.yaml")
-	if !t.git.FileExistsOnBranch(chartYamlFile, cfg.Remote, cfg.TargetBranch) {
-		fmt.Printf("Unable to find chart on %s. New chart detected.\n", cfg.TargetBranch)
+	if !t.git.FileExistsOnBranch(mergeBase, chartYamlFile) {
+		fmt.Printf("Unable to find chart on commit %s. New chart detected.\n", mergeBase)
 		return "", nil
 	}
 
-	chartYamlContents, err := t.git.Show(chartYamlFile, cfg.Remote, cfg.TargetBranch)
+	chartYamlContents, err := t.git.Show(mergeBase, chartYamlFile)
 	if err != nil {
 		return "", fmt.Errorf("failed reading old Chart.yaml: %w", err)
 	}

pkg/chart/chart_test.go

@@ -27,11 +27,11 @@ import (
 
 type fakeGit struct{}
 
-func (g fakeGit) FileExistsOnBranch(file string, remote string, branch string) bool {
+func (g fakeGit) FileExistsOnBranch(commit string, file string) bool {
 	return true
 }
 
-func (g fakeGit) Show(file string, remote string, branch string) (string, error) {
+func (g fakeGit) Show(commit string, file string) (string, error) {
 	return "", nil
 }
 

pkg/tool/git.go

@@ -31,8 +31,8 @@ func NewGit(exec exec.ProcessExecutor) Git {
 	}
 }
 
-func (g Git) FileExistsOnBranch(file string, remote string, branch string) bool {
-	fileSpec := fmt.Sprintf("%s/%s:%s", remote, branch, file)
+func (g Git) FileExistsOnBranch(commit string, file string) bool {
+	fileSpec := fmt.Sprintf("%s:%s", commit, file)
 	_, err := g.exec.RunProcessAndCaptureOutput("git", "cat-file", "-e", fileSpec)
 	return err == nil
 }
@@ -45,8 +45,8 @@ func (g Git) RemoveWorktree(path string) error {
 	return g.exec.RunProcess("git", "worktree", "remove", path)
 }
 
-func (g Git) Show(file string, remote string, branch string) (string, error) {
-	fileSpec := fmt.Sprintf("%s/%s:%s", remote, branch, file)
+func (g Git) Show(commit string, file string) (string, error) {
+	fileSpec := fmt.Sprintf("%s:%s", commit, file)
 	return g.exec.RunProcessAndCaptureOutput("git", "show", fileSpec)
 }