Merge pull request #102 from tstromberg/main

lint upgrades & go code modernization

Author: tstromberg

.golangci.yml

@@ -186,6 +186,8 @@ linters:
           arguments: [10]
         - name: flag-parameter # fixes are difficult
           disabled: true
+        - name: bare-return
+          disabled: true
 
     rowserrcheck:
       # database/sql is always checked.

Makefile

@@ -251,7 +251,7 @@ LINTERS :=
 FIXERS :=
 
 GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
-GOLANGCI_LINT_VERSION ?= v2.5.0
+GOLANGCI_LINT_VERSION ?= v2.7.2
 GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
 $(GOLANGCI_LINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
@@ -298,6 +298,7 @@ fix:
 
 # END: lint-install .
 
+
 # Release workflow - creates a new version tag
 # Usage: make release VERSION=v1.0.0
 release:

cmd/review-goose/notifications.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"maps"
 	"time"
 
 	"github.com/gen2brain/beeep"
@@ -16,9 +17,7 @@ func (app *App) processNotifications(ctx context.Context) {
 	// Get the list of PRs that need notifications
 	app.mu.RLock()
 	hiddenOrgs := make(map[string]bool)
-	for org, hidden := range app.hiddenOrgs {
-		hiddenOrgs[org] = hidden
-	}
+	maps.Copy(hiddenOrgs, app.hiddenOrgs)
 	incoming := make([]PR, len(app.incoming))
 	copy(incoming, app.incoming)
 	outgoing := make([]PR, len(app.outgoing))

cmd/review-goose/pr_state.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"log/slog"
+	"maps"
 	"sync"
 	"time"
 )
@@ -180,9 +181,7 @@ func (m *PRStateManager) BlockedPRs() map[string]*PRState {
 	defer m.mu.RUnlock()
 
 	result := make(map[string]*PRState)
-	for url, state := range m.states {
-		result[url] = state
-	}
+	maps.Copy(result, m.states)
 	return result
 }
 

cmd/review-goose/sprinkler.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -202,13 +203,7 @@ func (sm *sprinklerMonitor) handleEvent(event client.Event) {
 
 	// Check if this org is in our monitored list
 	sm.mu.RLock()
-	monitored := false
-	for _, o := range sm.orgs {
-		if o == org {
-			monitored = true
-			break
-		}
-	}
+	monitored := slices.Contains(sm.orgs, org)
 	orgCount := len(sm.orgs)
 	sm.mu.RUnlock()
 

cmd/review-goose/ui.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"maps"
 	"runtime"
 	"sort"
 	"strconv"
@@ -259,9 +260,7 @@ func (app *App) addPRSection(ctx context.Context, prs []PR, sectionTitle string,
 	// Get hidden orgs with proper locking
 	app.mu.RLock()
 	hiddenOrgs := make(map[string]bool)
-	for org, hidden := range app.hiddenOrgs {
-		hiddenOrgs[org] = hidden
-	}
+	maps.Copy(hiddenOrgs, app.hiddenOrgs)
 	hideStale := app.hideStaleIncoming
 	app.mu.RUnlock()
 
@@ -444,9 +443,7 @@ func (app *App) generateMenuTitles() []string {
 	outgoing := make([]PR, len(app.outgoing))
 	copy(outgoing, app.outgoing)
 	hiddenOrgs := make(map[string]bool)
-	for org, hidden := range app.hiddenOrgs {
-		hiddenOrgs[org] = hidden
-	}
+	maps.Copy(hiddenOrgs, app.hiddenOrgs)
 	hideStale := app.hideStaleIncoming
 	app.mu.RUnlock()
 
@@ -813,9 +810,7 @@ func (app *App) addStaticMenuItems(ctx context.Context) {
 		orgs = append(orgs, org)
 	}
 	hiddenOrgs := make(map[string]bool)
-	for org, hidden := range app.hiddenOrgs {
-		hiddenOrgs[org] = hidden
-	}
+	maps.Copy(hiddenOrgs, app.hiddenOrgs)
 	app.mu.RUnlock()
 
 	sort.Strings(orgs)