From 747460a298ce749bbd145032513b370ae24ff897 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Thu, 12 Sep 2024 14:12:36 +0200
Subject: pkg/covermerger: delete unused, simplify

---
 pkg/covermerger/covermerger.go       | 10 +++++-----
 pkg/covermerger/covermerger_test.go  | 11 ++++++-----
 pkg/covermerger/provider_monorepo.go |  4 ++--
 pkg/covermerger/provider_web.go      |  6 ++----
 4 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'pkg')

diff --git a/pkg/covermerger/covermerger.go b/pkg/covermerger/covermerger.go
index 7f5eeeadd..5af6162a3 100644
--- a/pkg/covermerger/covermerger.go
+++ b/pkg/covermerger/covermerger.go
@@ -51,13 +51,13 @@ type FileCoverageMerger interface {
 
 func batchFileData(c *Config, targetFilePath string, records []*FileRecord) (*MergeResult, error) {
 	log.Logf(1, "processing %d records for %s", len(records), targetFilePath)
-	repoBranchCommitsMap := make(map[RepoCommit]bool)
+	repoCommitsMap := make(map[RepoCommit]bool)
 	for _, record := range records {
-		repoBranchCommitsMap[record.RepoCommit] = true
+		repoCommitsMap[record.RepoCommit] = true
 	}
-	repoBranchCommitsMap[c.Base] = true
-	repoBranchCommits := maps.Keys(repoBranchCommitsMap)
-	fvs, err := c.FileVersProvider.GetFileVersions(c, targetFilePath, repoBranchCommits)
+	repoCommitsMap[c.Base] = true
+	repoCommits := maps.Keys(repoCommitsMap)
+	fvs, err := c.FileVersProvider.GetFileVersions(targetFilePath, repoCommits...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to getFileVersions: %w", err)
 	}
diff --git a/pkg/covermerger/covermerger_test.go b/pkg/covermerger/covermerger_test.go
index 8a33c9872..286f58737 100644
--- a/pkg/covermerger/covermerger_test.go
+++ b/pkg/covermerger/covermerger_test.go
@@ -115,13 +115,12 @@ samp_time,1,360,arch,b1,ci-mock,git://repo,master,commit2,not_changed.c,func1,4,
 			aggregation, err := MergeCSVData(
 				&Config{
 					Jobs:          2,
-					Workdir:       test.workdir,
 					skipRepoClone: true,
 					Base: RepoCommit{
 						Repo:   test.baseRepo,
 						Commit: test.baseCommit,
 					},
-					FileVersProvider: &fileVersProviderMock{},
+					FileVersProvider: &fileVersProviderMock{Workdir: test.workdir},
 				},
 				strings.NewReader(test.bqTable),
 			)
@@ -133,13 +132,15 @@ samp_time,1,360,arch,b1,ci-mock,git://repo,master,commit2,not_changed.c,func1,4,
 	}
 }
 
-type fileVersProviderMock struct{}
+type fileVersProviderMock struct {
+	Workdir string
+}
 
-func (m *fileVersProviderMock) GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
+func (m *fileVersProviderMock) GetFileVersions(targetFilePath string, repoCommits ...RepoCommit,
 ) (fileVersions, error) {
 	res := make(fileVersions)
 	for _, repoCommit := range repoCommits {
-		filePath := filepath.Join(c.Workdir, "repos", repoCommit.Commit, targetFilePath)
+		filePath := filepath.Join(m.Workdir, "repos", repoCommit.Commit, targetFilePath)
 		if bytes, err := os.ReadFile(filePath); err == nil {
 			res[repoCommit] = string(bytes)
 		}
diff --git a/pkg/covermerger/provider_monorepo.go b/pkg/covermerger/provider_monorepo.go
index 62da828d5..ab1695f09 100644
--- a/pkg/covermerger/provider_monorepo.go
+++ b/pkg/covermerger/provider_monorepo.go
@@ -14,7 +14,7 @@ import (
 )
 
 type FileVersProvider interface {
-	GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
+	GetFileVersions(targetFilePath string, repoCommits ...RepoCommit,
 	) (fileVersions, error)
 }
 
@@ -26,7 +26,7 @@ type monoRepo struct {
 
 type fileVersions map[RepoCommit]string
 
-func (mr *monoRepo) GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
+func (mr *monoRepo) GetFileVersions(targetFilePath string, repoCommits ...RepoCommit,
 ) (fileVersions, error) {
 	mr.mu.RLock()
 	if !mr.allRepoCommitsPresent(repoCommits) {
diff --git a/pkg/covermerger/provider_web.go b/pkg/covermerger/provider_web.go
index 5e8bee4a6..6acb120ed 100644
--- a/pkg/covermerger/provider_web.go
+++ b/pkg/covermerger/provider_web.go
@@ -14,7 +14,7 @@ import (
 type webGit struct {
 }
 
-func (mr *webGit) GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
+func (mr *webGit) GetFileVersions(targetFilePath string, repoCommits ...RepoCommit,
 ) (fileVersions, error) {
 	res := make(fileVersions)
 	for _, repoCommit := range repoCommits {
@@ -69,9 +69,7 @@ func MakeWebGit() FileVersProvider {
 
 func GetFileVersion(filePath, repo, commit string) (string, error) {
 	repoCommit := RepoCommit{repo, commit}
-	files, err := MakeWebGit().GetFileVersions(nil,
-		filePath,
-		[]RepoCommit{repoCommit})
+	files, err := MakeWebGit().GetFileVersions(filePath, repoCommit)
 	if err != nil {
 		return "", fmt.Errorf("failed to GetFileVersions: %w", err)
 	}
-- 
cgit mrf-deployment