Fix linter problems

mike-gregory-ovo · mike-gregory-ovo · commit 7c562154cb3e · 2025-06-17T10:46:45.000+01:00
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,65 +1,74 @@
-issues:
-  exclude-rules:
-    # Test functions tend to be quite long due to the large amount of fixtures & test data etc.
-    - linters:
-        - funlen
-      path: _test\.go
-      text: "is too long"
-    # There's no need to wrap errors in a test.
-    - linters:
-        - wrapcheck
-      path: _test\.go
-      text: "error returned from external package is unwrapped"
-    # Commonly used in tests, and using sentinel errors for this is overkill.
-    - linters:
-        - nilnil
-      path: _test\.go
-      text: " use a sentinel error instead"
-
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
-    # tmpfix - currently breaking things
-    - musttag
-
     - depguard
     - exhaustruct
     - forcetypeassert
     - godox
     - gomoddirectives
     - gomodguard
     - ireturn
-
-    # deprecated
-    - testableexamples
-
-    # disabled because of generics
+    - musttag
     - rowserrcheck
+    - testableexamples
     - wastedassign
-
-linters-settings:
-  gomoddirectives:
-    replace-local: true
-
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(github.com/ovotech)
-      - blank
-      - dot
-    skip-generated: true
-    custom-order: true
-
-  revive:
-    confidence: 0.1
-    severity: warning
+  settings:
+    gomoddirectives:
+      replace-local: true
+    revive:
+      confidence: 0.1
+      severity: warning
+      rules:
+        - name: exported
+          arguments:
+            - checkPrivateReceivers
+          severity: error
+          disabled: false
+    funcorder:
+      struct-method: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: exported
-        severity: error
-        disabled: false
-        arguments:
-          - checkPrivateReceivers
-
-run:
-  timeout: "5m"
+      - linters:
+          - funlen
+        path: _test\.go
+        text: is too long
+      - linters:
+          - wrapcheck
+        path: _test\.go
+        text: error returned from external package is unwrapped
+      - linters:
+          - nilnil
+        path: _test\.go
+        text: ' use a sentinel error instead'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/ovotech)
+        - blank
+        - dot
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/adapters/azuread/groupmembership/groupmembership_internal_test.go b/adapters/azuread/groupmembership/groupmembership_internal_test.go
@@ -464,11 +464,9 @@ func (r *MockRequestAdapter) GetSerializationWriterFactory() serialization.Seria
 func (r *MockRequestAdapter) EnableBackingStore(_ store.BackingStoreFactory) {
 }
 
-//nolint:stylecheck
 func (r *MockRequestAdapter) SetBaseUrl(_ string) {
 }
 
-//nolint:stylecheck
 func (r *MockRequestAdapter) GetBaseUrl() string {
 	return ""
 }
diff --git a/adapters/azuread/user/user_internal_test.go b/adapters/azuread/user/user_internal_test.go
@@ -96,11 +96,9 @@ func (r *MockRequestAdapter) GetSerializationWriterFactory() serialization.Seria
 func (r *MockRequestAdapter) EnableBackingStore(_ store.BackingStoreFactory) {
 }
 
-//nolint:stylecheck
 func (r *MockRequestAdapter) SetBaseUrl(_ string) {
 }
 
-//nolint:stylecheck
 func (r *MockRequestAdapter) GetBaseUrl() string {
 	return ""
 }
@@ -234,7 +232,7 @@ func TestInit(t *testing.T) {
 			adapter, err := Init(ctx, map[gosync.ConfigKey]string{})
 
 			require.NoError(t, err)
-			assert.Equal(t, "", adapter.filter)
+			assert.Empty(t, adapter.filter)
 		})
 	})
 }
diff --git a/adapters/google/group/group.go b/adapters/google/group/group.go
@@ -65,7 +65,7 @@ var (
 
 // callList allows us to mock the returned struct from the List Google API call.
 func callList(ctx context.Context, call *admin.MembersListCall, pageToken string) (*admin.Members, error) {
-	return call.Context(ctx).PageToken(pageToken).MaxResults(200).Do() //nolint:wrapcheck,gomnd,mnd
+	return call.Context(ctx).PageToken(pageToken).MaxResults(200).Do() //nolint:wrapcheck,mnd
 }
 
 // callInsert allows us to mock the returned struct from the Insert Google API call.
diff --git a/adapters/google/group/group_internal_test.go b/adapters/google/group/group_internal_test.go
@@ -217,8 +217,8 @@ func TestInit(t *testing.T) {
 		require.NoError(t, err)
 		assert.IsType(t, &Group{}, adapter)
 		assert.Equal(t, "name", adapter.name)
-		assert.Equal(t, "", adapter.DeliverySettings)
-		assert.Equal(t, "", adapter.Role)
+		assert.Empty(t, adapter.DeliverySettings)
+		assert.Empty(t, adapter.Role)
 	})
 
 	t.Run("missing config", func(t *testing.T) {
diff --git a/adapters/opsgenie/go.mod b/adapters/opsgenie/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.23
 	github.com/ovotech/go-sync v0.14.0
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476
 )
 
 require (
diff --git a/adapters/opsgenie/go.sum b/adapters/opsgenie/go.sum
@@ -61,8 +61,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 h1:bsqhLWFR6G6xiQcb+JoGqdKdRU6WzPWmK8E0jxTjzo4=
-golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
 golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
diff --git a/adapters/opsgenie/schedule/schedule.go b/adapters/opsgenie/schedule/schedule.go
@@ -25,11 +25,11 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"slices"
 
 	"github.com/opsgenie/opsgenie-go-sdk-v2/client"
 	"github.com/opsgenie/opsgenie-go-sdk-v2/og"
 	ogSchedule "github.com/opsgenie/opsgenie-go-sdk-v2/schedule"
-	"golang.org/x/exp/slices"
 
 	gosync "github.com/ovotech/go-sync"
 )
diff --git a/adapters/opsgenie/schedule/schedule_internal_test.go b/adapters/opsgenie/schedule/schedule_internal_test.go
@@ -84,7 +84,7 @@ func testBuildScheduleGetResult(numRotations int, emails ...string) *schedule.Ge
 			StartDate:       nil,
 			EndDate:         nil,
 			Type:            og.Weekly,
-			Length:          uint32(len(participants)),
+			Length:          uint32(len(participants)), //nolint:gosec
 			Participants:    participants,
 			TimeRestriction: nil,
 		}
diff --git a/adapters/slack/conversation/conversation.go b/adapters/slack/conversation/conversation.go
@@ -94,7 +94,7 @@ func (c *Conversation) getListOfSlackUsernames() ([]string, error) {
 		params := &slack.GetUsersInConversationParameters{
 			ChannelID: c.conversationName,
 			Cursor:    cursor,
-			Limit:     50, //nolint:gomnd,mnd
+			Limit:     50, //nolint:mnd
 		}
 
 		var pageOfUsers []string
diff --git a/adapters/slack/conversation/conversation_internal_test.go b/adapters/slack/conversation/conversation_internal_test.go
@@ -168,7 +168,7 @@ func TestConversation_Remove(t *testing.T) {
 	t.Run("Restricted kick from public conversation", func(t *testing.T) {
 		t.Parallel()
 
-		restrictedAction := errors.New("restricted_action") //nolint:goerr113
+		restrictedAction := errors.New("restricted_action") //nolint:err113
 
 		slackClient := newMockISlackConversation(t)
 		adapter := &Conversation{
diff --git a/adapters/slack/usergroup/usergroup.go b/adapters/slack/usergroup/usergroup.go
@@ -73,10 +73,19 @@ var (
 
 // iSlackUserGroup is a subset of the Slack Client, and used to build mocks for easy testing.
 type iSlackUserGroup interface {
-	GetUserGroupMembersContext(ctx context.Context, userGroup string, options ...slack.GetUserGroupMembersOption) ([]string, error)
+	GetUserGroupMembersContext(
+		ctx context.Context,
+		userGroup string,
+		options ...slack.GetUserGroupMembersOption,
+	) ([]string, error)
 	GetUsersInfoContext(ctx context.Context, users ...string) (*[]slack.User, error)
 	GetUserByEmailContext(ctx context.Context, email string) (*slack.User, error)
-	UpdateUserGroupMembersContext(ctx context.Context, userGroup string, members string, options ...slack.UpdateUserGroupMembersOption) (slack.UserGroup, error)
+	UpdateUserGroupMembersContext(
+		ctx context.Context,
+		userGroup string,
+		members string,
+		options ...slack.UpdateUserGroupMembersOption,
+	) (slack.UserGroup, error)
 }
 
 type UserGroup struct {
@@ -198,7 +207,7 @@ func (u *UserGroup) Add(ctx context.Context, emails []string) error {
 		}
 
 		// Calls to GetUserByEmail are heavily rate limited, so sleep to avoid this.
-		time.Sleep(2 * time.Second) //nolint:gomnd,mnd
+		time.Sleep(2 * time.Second) //nolint:mnd
 	}
 
 	if isUserGroupUpdated {
diff --git a/adapters/slack/usergroup/usergroup_internal_test.go b/adapters/slack/usergroup/usergroup_internal_test.go
@@ -130,7 +130,11 @@ func TestUserGroup_Add(t *testing.T) {
 		slackClient.EXPECT().GetUserByEmailContext(ctx, "buzz@email").Return(&slack.User{ID: "buzz"}, nil)
 		slackClient.EXPECT().UpdateUserGroupMembersContext(ctx,
 			"test", mock.Anything,
-		).Run(func(ctx context.Context, userGroup, members string, _ ...slack.UpdateUserGroupMembersOption) { //nolint:contextcheck
+		).Run(func( //nolint:contextcheck
+			_ context.Context,
+			userGroup, members string,
+			_ ...slack.UpdateUserGroupMembersOption,
+		) {
 			assert.Equal(t, "test", userGroup)
 			assert.ElementsMatch(t, strings.Split(members, ","), []string{"foo", "bar", "fizz", "buzz"})
 		}).Return(slack.UserGroup{DateDelete: 0}, nil)
@@ -214,7 +218,7 @@ func TestUserGroup_Remove(t *testing.T) {
 		t.Parallel()
 
 		// Mock the error returned from the Slack API.
-		errInvalidArguments := errors.New("invalid_arguments") //nolint:goerr113
+		errInvalidArguments := errors.New("invalid_arguments") //nolint:err113
 
 		slackClient := newMockISlackUserGroup(t)
 
diff --git a/sync.go b/sync.go
@@ -183,7 +183,7 @@ func (s *Sync) SyncWith(ctx context.Context, adapter Adapter) error {
 
 	s.Logger.Printf("Running in %s operating mode", s.OperatingMode)
 
-	operations := make([]func() error, 0, 2) //nolint:gomnd,mnd
+	operations := make([]func() error, 0, 2) //nolint:mnd
 
 	switch s.OperatingMode {
 	case AddOnly:
diff --git a/sync_internal_test.go b/sync_internal_test.go
@@ -56,7 +56,7 @@ func TestSync_SyncWith(t *testing.T) { //nolint:maintidx
 
 			syncService := New(source)
 
-			testErr := errors.New("foo") //nolint:goerr113
+			testErr := errors.New("foo") //nolint:err113
 
 			source.EXPECT().Get(ctx).Once().Return([]string{"foo", "bar"}, nil)
 			destination.EXPECT().Get(ctx).Once().Return([]string{}, nil)
@@ -78,7 +78,7 @@ func TestSync_SyncWith(t *testing.T) { //nolint:maintidx
 			syncService := New(source)
 			syncService.cache = map[string]bool{}
 
-			testErr := errors.New("foo") //nolint:goerr113
+			testErr := errors.New("foo") //nolint:err113
 
 			source.EXPECT().Get(ctx).Once().Return([]string{"foo", "bar"}, nil)
 			destination.EXPECT().Get(ctx).Once().Return([]string{}, testErr)
@@ -118,7 +118,7 @@ func TestSync_SyncWith(t *testing.T) { //nolint:maintidx
 
 			syncService := New(source)
 
-			testErr := errors.New("foo") //nolint:goerr113
+			testErr := errors.New("foo") //nolint:err113
 
 			source.EXPECT().Get(ctx).Once().Return([]string{}, nil)
 			destination.EXPECT().Get(ctx).Once().Return([]string{"foo", "bar"}, nil)
@@ -139,7 +139,7 @@ func TestSync_SyncWith(t *testing.T) { //nolint:maintidx
 
 			syncService := New(source)
 
-			testErr := errors.New("foo") //nolint:goerr113
+			testErr := errors.New("foo") //nolint:err113
 
 			source.EXPECT().Get(ctx).Once().Return([]string{}, nil)
 			destination.EXPECT().Get(ctx).Once().Return([]string{}, testErr)
@@ -157,7 +157,7 @@ func TestSync_SyncWith(t *testing.T) { //nolint:maintidx
 
 			syncService := New(source)
 
-			testErr := errors.New("foo") //nolint:goerr113
+			testErr := errors.New("foo") //nolint:err113
 
 			source.EXPECT().Get(ctx).Once().Return([]string{}, nil)
 			destination.EXPECT().Get(ctx).Once().Return([]string{"foo", "bar"}, nil)

Original file line number	Diff line number	Diff line change
`@@ -464,11 +464,9 @@ func (r *MockRequestAdapter) GetSerializationWriterFactory() serialization.Seria`
`464`	`464`	`func (r *MockRequestAdapter) EnableBackingStore(_ store.BackingStoreFactory) {`
`465`	`465`	`}`
`466`	`466`
`467`		`-//nolint:stylecheck`
`468`	`467`	`func (r *MockRequestAdapter) SetBaseUrl(_ string) {`
`469`	`468`	`}`
`470`	`469`
`471`		`-//nolint:stylecheck`
`472`	`470`	`func (r *MockRequestAdapter) GetBaseUrl() string {`
`473`	`471`	`return ""`
`474`	`472`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,9 @@ func (r *MockRequestAdapter) GetSerializationWriterFactory() serialization.Seria`
`96`	`96`	`func (r *MockRequestAdapter) EnableBackingStore(_ store.BackingStoreFactory) {`
`97`	`97`	`}`
`98`	`98`
`99`		`-//nolint:stylecheck`
`100`	`99`	`func (r *MockRequestAdapter) SetBaseUrl(_ string) {`
`101`	`100`	`}`
`102`	`101`
`103`		`-//nolint:stylecheck`
`104`	`102`	`func (r *MockRequestAdapter) GetBaseUrl() string {`
`105`	`103`	`return ""`
`106`	`104`	`}`
`@@ -234,7 +232,7 @@ func TestInit(t *testing.T) {`
`234`	`232`	`adapter, err := Init(ctx, map[gosync.ConfigKey]string{})`
`235`	`233`
`236`	`234`	`require.NoError(t, err)`
`237`		`- assert.Equal(t, "", adapter.filter)`
	`235`	`+ assert.Empty(t, adapter.filter)`
`238`	`236`	`})`
`239`	`237`	`})`
`240`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ var (`
`65`	`65`
`66`	`66`	`// callList allows us to mock the returned struct from the List Google API call.`
`67`	`67`	`func callList(ctx context.Context, call admin.MembersListCall, pageToken string) (admin.Members, error) {`
`68`		`- return call.Context(ctx).PageToken(pageToken).MaxResults(200).Do() //nolint:wrapcheck,gomnd,mnd`
	`68`	`+ return call.Context(ctx).PageToken(pageToken).MaxResults(200).Do() //nolint:wrapcheck,mnd`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// callInsert allows us to mock the returned struct from the Insert Google API call.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ require (`
`6`	`6`	`github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.23`
`7`	`7`	`github.com/ovotech/go-sync v0.14.0`
`8`	`8`	`github.com/stretchr/testify v1.10.0`
`9`		`- golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476`
`10`	`9`	`)`
`11`	`10`
`12`	`11`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func testBuildScheduleGetResult(numRotations int, emails ...string) *schedule.Ge`
`84`	`84`	`StartDate: nil,`
`85`	`85`	`EndDate: nil,`
`86`	`86`	`Type: og.Weekly,`
`87`		`- Length: uint32(len(participants)),`
	`87`	`+ Length: uint32(len(participants)), //nolint:gosec`
`88`	`88`	`Participants: participants,`
`89`	`89`	`TimeRestriction: nil,`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (c *Conversation) getListOfSlackUsernames() ([]string, error) {`
`94`	`94`	`params := &slack.GetUsersInConversationParameters{`
`95`	`95`	`ChannelID: c.conversationName,`
`96`	`96`	`Cursor: cursor,`
`97`		`- Limit: 50, //nolint:gomnd,mnd`
	`97`	`+ Limit: 50, //nolint:mnd`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`var pageOfUsers []string`