Fix linter

Author: g-gaston

hack/tools/release/notes/github.go

@@ -51,22 +51,13 @@ type githubCommitter struct {
 	Date time.Time `json:"date"`
 }
 
-// getDiff calls the `compare` endpoint.
-func (c githubClient) getDiff(base, head string) (githubDiff, error) {
-	diff := githubDiff{}
-	if err := c.runGHAPICommand(fmt.Sprintf("repos/%s/compare/%s...%s?per_page=1'", c.repo, base, head), &diff); err != nil {
-		return githubDiff{}, err
-	}
-	return diff, nil
-}
-
 // getDiffAllCommits calls the `compare` endpoint, iterating over all pages and aggregating results.
 func (c githubClient) getDiffAllCommits(base, head string) (*githubDiff, error) {
 	pageSize := 250
 	url := fmt.Sprintf("repos/%s/compare/%s...%s", c.repo, base, head)
 
-	diff, commits, err := iterate(c, url, pageSize, nil, func(new *githubDiff) ([]githubCommitNode, int) {
-		return new.Commits, new.Total
+	diff, commits, err := iterate(c, url, pageSize, nil, func(page *githubDiff) ([]githubCommitNode, int) {
+		return page.Commits, page.Total
 	})
 	if err != nil {
 		return nil, err
@@ -158,8 +149,8 @@ func (c githubClient) listMergedPRs(after, before time.Time, baseBranches ...str
 		searchQuery += "+base:" + strings.Join(baseBranches, "+base:")
 	}
 
-	_, prs, err := iterate(c, "search/issues", pageSize, []string{"q=" + searchQuery}, func(new *githubPRList) ([]githubPR, int) {
-		return new.Items, new.Total
+	_, prs, err := iterate(c, "search/issues", pageSize, []string{"q=" + searchQuery}, func(page *githubPRList) ([]githubPR, int) {
+		return page.Items, page.Total
 	})
 	if err != nil {
 		return nil, err
@@ -179,7 +170,7 @@ func (c githubClient) runGHAPICommand(url string, response any) error {
 	return json.Unmarshal(out, response)
 }
 
-type extractFunc[T, C any] func(newPage *T) (pageElements []C, totalElements int)
+type extractFunc[T, C any] func(page *T) (pageElements []C, totalElements int)
 
 func iterate[T, C any](client githubClient, url string, pageSize int, extraQueryArgs []string, extract extractFunc[T, C]) (*T, []C, error) {
 	page := 0

hack/tools/release/notes/main.go

@@ -195,15 +195,15 @@ func defaultBranchForNewTag(newTag semver.Version) string {
 		} else if len(newTag.Pre) == 2 && newTag.Pre[0].VersionStr == "rc" && newTag.Pre[1].VersionNum >= 1 {
 			// for the second or later RCs, we use the release branch since we cut this branch with the first RC
 			return releaseBranchForVersion(newTag)
-		} else {
-			// for any other pre release, we always cut from main
-			// this includes all beta releases and the first RC
-			return "main"
 		}
-	} else {
-		// If it's a patch, we use the release branch
-		return releaseBranchForVersion(newTag)
+
+		// for any other pre release, we always cut from main
+		// this includes all beta releases and the first RC
+		return "main"
 	}
+
+	// If it's a patch, we use the release branch
+	return releaseBranchForVersion(newTag)
 }
 
 func releaseBranchForVersion(version semver.Version) string {