commit 7017467bca16ed814fa46bb85b7572d229aa6551
author Jonathan Amsterdam <jba@google.com> Fri Nov 19 15:01:19 2021 -0500
committer Jonathan Amsterdam <jba@google.com> Mon Nov 22 18:19:45 2021 +0000
tree 7faf12217acc754d0e81acda3197cb901adb7f26
parent ed8b8d54f3eaef31dc89ec8c104f41e765098e17

internal/worker: minor changes to repo functions

- Rename to remove 'get'.

- Fix log message.

- Simplify.

Change-Id: Ib3ec15e2e83bb7eca997488a2e0ef79cc73f7234
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/365814
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Julie Qiu <julie@golang.org>

internal/worker/repo.go

diff --git a/internal/worker/repo.go b/internal/worker/repo.go
index 50f84fc..5141b8b 100644
--- a/internal/worker/repo.go
+++ b/internal/worker/repo.go
@@ -16,11 +16,10 @@
 
 const cvelistRepoURL = "https://github.com/CVEProject/cvelist"
 
-// cloneRepo returns a repo and tree object for the repo at HEAD by
-// cloning the repo at repoURL.
+// cloneRepo returns a repo by cloning the repo at repoURL.
 func cloneRepo(repoURL string) (repo *git.Repository, err error) {
 	defer derrors.Wrap(&err, "cloneRepo(%q)", repoURL)
-	log.Printf("Cloning %q...", cvelistRepoURL)
+	log.Printf("Cloning %q...", repoURL)
 	return git.Clone(memory.NewStorage(), nil, &git.CloneOptions{
 		URL:           repoURL,
 		ReferenceName: plumbing.HEAD,
@@ -30,6 +29,7 @@
 	})
 }
 
+// openRepo returns a repo by opening the repo at the local path dirpath.
 func openRepo(dirpath string) (repo *git.Repository, err error) {
 	defer derrors.Wrap(&err, "openRepo(%q)", dirpath)
 	log.Printf("Opening %q...", dirpath)
@@ -40,7 +40,8 @@
 	return repo, nil
 }
 
-func getRepoRoot(repo *git.Repository) (root *object.Tree, err error) {
+// repoRoot returns the root tree of the repo at HEAD.
+func repoRoot(repo *git.Repository) (root *object.Tree, err error) {
 	refName := plumbing.HEAD
 	ref, err := repo.Reference(refName, true)
 	if err != nil {
@@ -50,9 +51,5 @@
 	if err != nil {
 		return nil, err
 	}
-	root, err = repo.TreeObject(commit.TreeHash)
-	if err != nil {
-		return nil, err
-	}
-	return root, nil
+	return repo.TreeObject(commit.TreeHash)
 }

internal/worker/worker.go

diff --git a/internal/worker/worker.go b/internal/worker/worker.go
index 7aa150c..d2d17ee 100644
--- a/internal/worker/worker.go
+++ b/internal/worker/worker.go
@@ -34,7 +34,7 @@
 	if err != nil {
 		return err
 	}
-	root, err := getRepoRoot(repo)
+	root, err := repoRoot(repo)
 	if err != nil {
 		return err
 	}