upgrade golangci-lint to v2

Author: lukegb

.golangci.yml

@@ -1,50 +1,66 @@
+version: "2"
 run:
-  timeout: 5m
   modules-download-mode: readonly
-
-linters-settings:
-  gofmt:
-    simplify: true
-  goimports:
-    local-prefixes: github.com/lukegb/mattermost-plugin-uffd
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment
-  misspell:
-    locale: US
-
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
     - errcheck
     - gocritic
-    - gofmt
-    - goimports
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - nakedret
     - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unused
     - whitespace
-
-issues:
-  exclude-rules:
-    - path: server/configuration.go
-      linters:
-        - unused
-    - path: _test\.go
-      linters:
-        - bodyclose
-        - scopelint # https://github.com/kyoh86/scopelint/issues/4
-    - linters:
-        - revive
-      text: unused-parameter
+  settings:
+    govet:
+      disable:
+        - fieldalignment
+      enable-all: true
+    misspell:
+      locale: US
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters: [ govet ]
+        text: 'shadow: declaration of "(err|ctx|appErr)" shadows declaration at'
+      - linters:
+          - unused
+        path: server/configuration.go
+      - linters:
+          - bodyclose
+          - scopelint
+        path: _test\.go
+      - linters:
+          - revive
+        text: unused-parameter
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      simplify: true
+    goimports:
+      local-prefixes:
+        - github.com/lukegb/mattermost-plugin-uffd
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -164,7 +164,7 @@ apply:
 ## Install go tools
 install-go-tools:
 	@echo Installing go tools
-	$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
+	$(GO) install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2
 	$(GO) install gotest.tools/gotestsum@v1.7.0
 
 ## Runs eslint and golangci-lint

build/pluginctl/logs.go

@@ -178,7 +178,7 @@ func checkJSONLogsSetting(ctx context.Context, client *model.Client4) error {
 		return fmt.Errorf("failed to fetch config: %w", err)
 	}
 	if cfg.LogSettings.FileJson == nil || !*cfg.LogSettings.FileJson {
-		return errors.New("JSON output for file logs are disabled. Please enable LogSettings.FileJson via the configration in Mattermost.") //nolint:revive,stylecheck
+		return errors.New("JSON output for file logs are disabled. Please enable LogSettings.FileJson via the configration in Mattermost.") //nolint:all
 	}
 
 	return nil

server/api.go

@@ -14,12 +14,12 @@ import (
 func (p *Plugin) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Request) {
 	router := mux.NewRouter()
 
-	router.HandleFunc("/login", p.HttpSyncThenLogin).Methods(http.MethodGet)
+	router.HandleFunc("/login", p.HTTPSyncThenLogin).Methods(http.MethodGet)
 
 	apiRouter := router.PathPrefix("/api/v1").Subrouter()
 	apiRouter.Use(p.MattermostAuthorizationRequired)
 	// No particular permissions are required to force a sync (at the moment...)
-	apiRouter.HandleFunc("/sync", p.HttpSyncNow).Methods(http.MethodPost)
+	apiRouter.HandleFunc("/sync", p.HTTPSyncNow).Methods(http.MethodPost)
 
 	router.ServeHTTP(w, r)
 }
@@ -37,7 +37,7 @@ func (p *Plugin) MattermostAuthorizationRequired(next http.Handler) http.Handler
 }
 
 // e.g. http://localhost:8065/plugins/org.emfcamp.mattermost-plugin-uffd/login
-func (p *Plugin) HttpSyncThenLogin(w http.ResponseWriter, r *http.Request) {
+func (p *Plugin) HTTPSyncThenLogin(w http.ResponseWriter, r *http.Request) {
 	if err := p.runSync(context.WithoutCancel(r.Context()), "HTTP /login"); err != nil {
 		http.Redirect(w, r, "/error", http.StatusSeeOther)
 		return
@@ -46,7 +46,7 @@ func (p *Plugin) HttpSyncThenLogin(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, "/oauth/openid/login", http.StatusSeeOther)
 }
 
-func (p *Plugin) HttpSyncNow(w http.ResponseWriter, r *http.Request) {
+func (p *Plugin) HTTPSyncNow(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("content-type", "text/plain; charset=utf-8")
 
 	if err := p.runSync(context.WithoutCancel(r.Context()), "HTTP /sync"); err != nil {

server/configuration.go

@@ -65,11 +65,11 @@ type configuration struct {
 	// which the API endpoints will be derived.
 	UffdAddress string
 
-	// UffdApiUser is the username used for authenticating with the UFFD API.
-	UffdApiUser string
+	// UffdAPIUser is the username used for authenticating with the UFFD API.
+	UffdAPIUser string
 
-	// UffdApiPassword is the password used for authenticating with the UFFD API.
-	UffdApiPassword string
+	// UffdAPIPassword is the password used for authenticating with the UFFD API.
+	UffdAPIPassword string
 }
 
 // Clone shallow copies the configuration. Your implementation may require a deep copy if
@@ -125,13 +125,15 @@ func (p *Plugin) OnConfigurationChange() error {
 	var configuration = new(configuration)
 
 	// Load the public configuration fields from the Mattermost server configuration.
-	if err := p.MattermostPlugin.API.LoadPluginConfiguration(configuration); err != nil {
+	if err := p.API.LoadPluginConfiguration(configuration); err != nil {
 		return errors.Wrap(err, "failed to load plugin configuration")
 	}
 
 	p.setConfiguration(configuration)
 
-	p.rescheduleSync()
+	if err := p.rescheduleSync(); err != nil {
+		return errors.Wrap(err, "setting up sync scheduled job")
+	}
 
 	return nil
 }

server/job.go

@@ -3,14 +3,15 @@ package main
 import (
 	"context"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/lukegb/mattermost-plugin-uffd/server/ctxlog"
 	"github.com/lukegb/mattermost-plugin-uffd/server/syncablesync"
 	"github.com/lukegb/mattermost-plugin-uffd/server/syncengine"
-	log "github.com/sirupsen/logrus"
 )
 
 func (p *Plugin) runSyncJob() {
-	p.runSync(context.Background(), "schedule")
+	_ = p.runSync(context.Background(), "schedule")
 }
 
 func (p *Plugin) runSync(ctx context.Context, trigger string) error {
@@ -27,13 +28,13 @@ func (p *Plugin) runSync(ctx context.Context, trigger string) error {
 
 	l.Info("Performing UFFD group sync")
 	se := &syncengine.SyncEngine{
-		IdP: &syncengine.UffdIdP{
+		IDP: &syncengine.UffdIDP{
 			API:              p.uffd,
 			EnabledGroup:     cfg.EnabledGroup,
 			GroupFilterRegex: cfg.SyncGroupRegex,
 		},
 		Service: &syncengine.MattermostService{
-			API: p.MattermostPlugin.API,
+			API: p.API,
 		},
 	}
 	out, err := se.FullSync(ctx)
@@ -46,7 +47,7 @@ func (p *Plugin) runSync(ctx context.Context, trigger string) error {
 	l.Info("Performing syncables sync")
 	ss := &syncablesync.Engine{
 		API: &syncablesync.Mattermost{
-			API:                p.MattermostPlugin.API,
+			API:                p.API,
 			SystemAdminGroup:   cfg.SystemAdminGroup,
 			SystemManagerGroup: cfg.SystemManagerGroup,
 		},

server/plugin.go

@@ -44,12 +44,12 @@ func (p *Plugin) rescheduleSync() error {
 
 	if p.syncJob != nil {
 		if err := p.syncJob.Close(); err != nil {
-			p.MattermostPlugin.API.LogError("Failed to close sync job", "err", err)
+			p.API.LogError("Failed to close sync job", "err", err)
 		}
 	}
 
 	job, err := cluster.Schedule(
-		p.MattermostPlugin.API,
+		p.API,
 		"SyncJob",
 		cluster.MakeWaitForRoundedInterval(time.Duration(p.getConfiguration().SyncInterval)),
 		p.runSyncJob,
@@ -65,24 +65,24 @@ func (p *Plugin) rescheduleSync() error {
 
 // OnActivate is invoked when the plugin is activated. If an error is returned, the plugin will be deactivated.
 func (p *Plugin) OnActivate() error {
-	p.client = pluginapi.NewClient(p.MattermostPlugin.API, p.MattermostPlugin.Driver)
+	p.client = pluginapi.NewClient(p.API, p.Driver)
 
 	pluginapi.ConfigureLogrus(log.StandardLogger(), p.client)
 
 	cfg := p.getConfiguration()
 	p.uffd = &uffd.API{
 		HTTPClient:   http.DefaultClient,
 		EndpointBase: cfg.UffdAddress,
-		Username:     cfg.UffdApiUser,
-		Password:     cfg.UffdApiPassword,
+		Username:     cfg.UffdAPIUser,
+		Password:     cfg.UffdAPIPassword,
 	}
 
 	if err := p.rescheduleSync(); err != nil {
 		return fmt.Errorf("rescheduleSync: %w", err)
 	}
 
 	syncMutex, err := cluster.NewMutex(
-		p.MattermostPlugin.API,
+		p.API,
 		"SyncMutex",
 	)
 	if err != nil {
@@ -108,7 +108,7 @@ func (p *Plugin) UserWillLogIn(c *plugin.Context, user *model.User) string {
 	if user.Props != nil && user.Props[syncengine.MMIdPUsernameProp] != user.Username {
 		user.Username = user.Props[syncengine.MMIdPUsernameProp]
 		var appErr *model.AppError
-		user, appErr = p.MattermostPlugin.API.UpdateUser(user)
+		user, appErr = p.API.UpdateUser(user)
 		if appErr != nil {
 			log.WithFields(log.Fields{
 				"user": user,

server/syncablesync/mattermost_channel.go

@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/mattermost/mattermost/server/public/model"
+
 	"github.com/lukegb/mattermost-plugin-uffd/server/paginator"
 	"github.com/lukegb/mattermost-plugin-uffd/server/stringset"
-	"github.com/mattermost/mattermost/server/public/model"
 )
 
 type mattermostChannelHandler struct {

server/syncablesync/mattermost_systemrole.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/mattermost/mattermost/server/public/model"
+
 	"github.com/lukegb/mattermost-plugin-uffd/server/paginator"
 	"github.com/lukegb/mattermost-plugin-uffd/server/stringset"
 	"github.com/lukegb/mattermost-plugin-uffd/server/syncengine"
-	"github.com/mattermost/mattermost/server/public/model"
 )
 
 type mattermostSystemRoleHandler struct {

server/syncablesync/mattermost_systemrole_test.go

@@ -5,8 +5,9 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/lukegb/mattermost-plugin-uffd/server/syncengine"
 	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/lukegb/mattermost-plugin-uffd/server/syncengine"
 )
 
 var dummySystemRoleST = SyncableTarget{Type: mattermostSyncableTypeSystemRole, ID: "system_admin"}