fix or ignore issues found by golangci-lint

Author: fho

cmd/goordinator/main.go

@@ -203,7 +203,6 @@ func mustParseCommandlineParams() {
 	}
 
 	pflag.Parse()
-
 }
 
 func mustParseCfg() *cfg.Config {
@@ -382,7 +381,7 @@ func main() {
 
 	if *args.ShowVersion {
 		fmt.Printf("%s %s\n", appName, Version)
-		os.Exit(0)
+		os.Exit(0) // nolint:gocritic // defer functions won't run
 	}
 
 	config := mustParseCfg()

internal/autoupdate/autoupdate.go

@@ -146,7 +146,6 @@ func NewAutoupdater(
 	}
 
 	return &a
-
 }
 
 // branchRefToRef returns ref without a leading refs/heads/ prefix.
@@ -731,6 +730,7 @@ func (a *Autoupdater) processPushEvent(ctx context.Context, logger *zap.Logger,
 
 	a.ResumeAllForBaseBranch(ctx, bb)
 }
+
 func (a *Autoupdater) processPullRequestReviewEvent(ctx context.Context, logger *zap.Logger, ev *github.PullRequestReviewEvent) {
 	owner := ev.GetRepo().GetOwner().GetLogin()
 	repo := ev.GetRepo().GetName()
@@ -1201,7 +1201,6 @@ func (a *Autoupdater) ChangeBaseBranch(
 
 	if err := a.Enqueue(ctx, newBaseBranch, pr); err != nil {
 		return fmt.Errorf("could not enqueue in queue for new base branch: %w", err)
-
 	}
 
 	return nil

internal/autoupdate/autoupdate_test.go

@@ -23,12 +23,16 @@ import (
 	github_prov "github.com/simplesurance/goordinator/internal/provider/github"
 )
 
-const repo = "repo"
-const repoOwner = "testman"
-const queueHeadLabel = "first"
+const (
+	repo           = "repo"
+	repoOwner      = "testman"
+	queueHeadLabel = "first"
+)
 
-const condCheckInterval = 20 * time.Millisecond
-const condWaitTimeout = 5 * time.Second
+const (
+	condCheckInterval = 20 * time.Millisecond
+	condWaitTimeout   = 5 * time.Second
+)
 
 // mustGetActivePR fetches from the base-branch queue of the autoupdater the
 // pull request with the given pull request number.
@@ -1571,7 +1575,6 @@ func TestBaseBranchUpdatesBlockUntilFinished(t *testing.T) {
 	require.Eventually(t, func() bool {
 		return queue.getExecuting() == nil
 	}, queue.updateBranchPollInterval+2*time.Second, queue.updateBranchPollInterval/2)
-
 }
 
 func TestPRHeadLabelIsAppliedToNextAfterMerge(t *testing.T) {

internal/autoupdate/events_test.go

@@ -22,6 +22,7 @@ func newBasicPullRequestEvent(prNumber int, branchName, baseBranchName string) *
 		},
 	}
 }
+
 func newBasicPullRequest(prNumber int, baseBranchName, branchName string) *github.PullRequest {
 	return &github.PullRequest{
 		Number: &prNumber,
@@ -71,6 +72,7 @@ func newPullRequestAutomergeEnabledEvent(prNumber int, branchName, baseBranchNam
 
 	return pr
 }
+
 func newPullRequestAutomergeDisabledEvent(prNumber int, branchName, baseBranchName string) *github.PullRequestEvent {
 	pr := newBasicPullRequestEvent(prNumber, branchName, baseBranchName)
 	pr.Action = strPtr("auto_merge_disabled")

internal/autoupdate/httpservice.go

@@ -2,13 +2,12 @@ package autoupdate
 
 import (
 	"embed"
+	"html/template"
 	"io/fs"
 	"net/http"
 
 	_ "embed" // used to embed html templates and static docs
 
-	"html/template"
-
 	"go.uber.org/zap"
 )
 

internal/autoupdate/queue.go

@@ -835,7 +835,8 @@ func (q *queue) prReadyForMergeStatus(ctx context.Context, pr *PullRequest) (*gi
 				logfields.Commit(status.Commit),
 				logfields.ReviewDecision(string(status.ReviewDecision)),
 				logfields.CIStatusSummary(string(status.CIStatus)),
-				zap.Any("github.ci_statuses", status.Statuses)}, loggingFields...)...,
+				zap.Any("github.ci_statuses", status.Statuses),
+			}, loggingFields...)...,
 		)
 
 		return nil
@@ -1065,8 +1066,8 @@ func (q *queue) Stop() {
 // The function returns a Set of branch names for that no PR in the queue could
 // be found.
 func (q *queue) SetPRStaleSinceIfNewerByBranch(branchNames []string, t time.Time) (
-	notFound set.Set[string]) {
-
+	notFound set.Set[string],
+) {
 	branchSet := set.From(branchNames)
 	prs, notFound := q.prsByBranch(branchSet)
 

internal/autoupdate/queue_test.go

@@ -55,10 +55,10 @@ func TestUpdatePRWithBaseReturnsChangedWhenScheduled(t *testing.T) {
 		UpdateBranch(gomock.Any(), gomock.Eq(repoOwner), gomock.Eq(repo), gomock.Any()).
 		DoAndReturn(func(context.Context, string, string, int) (*githubclt.UpdateBranchResult, error) {
 			if updateBranchCalls == 0 {
-				updateBranchCalls = updateBranchCalls + 1
+				updateBranchCalls++
 				return &githubclt.UpdateBranchResult{HeadCommitID: headCommitID, Changed: true, Scheduled: true}, nil
 			}
-			updateBranchCalls = updateBranchCalls + 1
+			updateBranchCalls++
 			return &githubclt.UpdateBranchResult{HeadCommitID: headCommitID, Changed: false, Scheduled: false}, nil
 		}).
 		Times(2)

internal/autoupdate/routines/pool_test.go

@@ -25,7 +25,6 @@ func TestScheduleAndWait(t *testing.T) {
 	for i := range workDone {
 		assert.Equal(t, int32(1), atomic.LoadInt32(&workDone[i]), "work %d not done", i)
 	}
-
 }
 
 func TestQueuePanicsAfterWait(t *testing.T) {

internal/githubclt/client.go

@@ -177,7 +177,7 @@ func (clt *Client) UpdateBranch(ctx context.Context, owner, repo string, pullReq
 
 	_, _, err = clt.restClt.PullRequests.UpdateBranch(ctx, owner, repo, pullRequestNumber, &github.PullRequestBranchUpdateOptions{ExpectedHeadSHA: &prHEADSHA})
 	if err != nil {
-		if _, ok := err.(*github.AcceptedError); ok {
+		if _, ok := err.(*github.AcceptedError); ok { // nolint:errorlint // errors.As not needed here
 			// It is not clear if the response ensures that the
 			// branch will be updated or if the scheduled operation
 			// can fail.
@@ -334,7 +334,7 @@ func (clt *Client) ListPullRequests(ctx context.Context, owner, repo, state, sor
 }
 
 func (clt *Client) wrapRetryableErrors(err error) error {
-	switch v := err.(type) {
+	switch v := err.(type) { // nolint:errorlint // errors.As not needed here
 	case *github.RateLimitError:
 		clt.logger.Info(
 			"rate limit exceeded",

internal/githubclt/client_test.go

@@ -21,7 +21,7 @@ func TestWrapRetryableErrorsGraphql(t *testing.T) {
 
 	// is the same then in vendor/github.com/shurcooL/graphql/graphql.go do()
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.WriteHeader(503)
+		w.WriteHeader(http.StatusServiceUnavailable)
 	}))
 
 	t.Cleanup(srv.Close)

internal/goordinator/action/httprequest/config.go

@@ -85,7 +85,6 @@ func NewConfigFromMap(m map[string]any) (*Config, error) {
 		data:     data,
 		logger:   zap.L().Named(loggerName),
 	}, nil
-
 }
 
 // Render runs renderFunc on all configuration options that can contain

internal/goordinator/events_test.go

@@ -482,7 +482,7 @@ func newPullRequestSyncHTTPReq() *http.Request {
 	hdrs.Set("X-GitHub-Event", "pull_request")
 
 	return &http.Request{
-		Method: "POST",
+		Method: http.MethodPost,
 		Header: hdrs,
 		Body:   io.NopCloser(strings.NewReader(pullRequestSynchronizeEventPayload)),
 	}

internal/goordinator/evloop.go

@@ -168,7 +168,6 @@ func (e *EvLoop) scheduleAction(ctx context.Context, event *Event, action action
 			logFieldActionResult("success"),
 		)
 	}()
-
 }
 
 // Stop stops the event loop and waits until all scheduled go-routines