clean up some lint violations

Author: lukegb

server/job.go

@@ -33,7 +33,7 @@ func (p *Plugin) runSync(ctx context.Context, trigger string) error {
 		API: p.API,
 	}
 	ftr := p.API.GetLicense().Features
-	if ftr == nil || ftr.LDAPGroups == nil || *ftr.LDAPGroups == false {
+	if ftr == nil || ftr.LDAPGroups == nil || !*ftr.LDAPGroups {
 		l.Warning("Force-enabling custom-groups syncing: installed license does not have LDAP groups support!")
 		cfg.SyncAsCustomGroups = true
 	}

server/syncengine/mattermost_restgroup.go

@@ -40,8 +40,8 @@ type mattermostRESTAPI interface {
 
 	// GetGroupMembers(ctx context.Context, groupID string) (*model.GroupMemberList, *model.Response, error) // This API is useless because it doesn't paginate. WTF?
 	DoAPIGet(ctx context.Context, url string, etag string) (*http.Response, error)
-	UpsertGroupMembers(ctx context.Context, groupID string, userIds *model.GroupModifyMembers) ([]*model.GroupMember, *model.Response, error)
-	DeleteGroupMembers(ctx context.Context, groupID string, userIds *model.GroupModifyMembers) ([]*model.GroupMember, *model.Response, error)
+	UpsertGroupMembers(ctx context.Context, groupID string, userIDs *model.GroupModifyMembers) ([]*model.GroupMember, *model.Response, error)
+	DeleteGroupMembers(ctx context.Context, groupID string, userIDs *model.GroupModifyMembers) ([]*model.GroupMember, *model.Response, error)
 }
 
 var _ mattermostRESTAPI = ((*model.Client4)(nil))

server/syncengine/mattermostservice_test.go

@@ -247,6 +247,15 @@ func (f *fakeMattermostPluginAPI) CreateSession(session *model.Session) (*model.
 
 var _ mattermostPluginAPI = (*fakeMattermostPluginAPI)(nil)
 
+func makeService(p *fakeMattermostPluginAPI) *MattermostService {
+	return &MattermostService{
+		MattermostGroupBackend: &MattermostPluginGroupBackend{
+			API: p,
+		},
+		API: p,
+	}
+}
+
 func TestMattermostFetchUsers(t *testing.T) {
 	p := &fakeMattermostPluginAPI{
 		Users: []*model.User{{
@@ -276,7 +285,7 @@ func TestMattermostFetchUsers(t *testing.T) {
 			AuthService: "password",
 		}},
 	}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	want := []*User[string]{{
 		UserID:        "id::user::testuser",
@@ -319,7 +328,7 @@ func TestMattermostCreateUsersThatAreUnassociated(t *testing.T) {
 			AuthService: "email",
 		}},
 	}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	got, err := m.CreateUsers(context.Background(), []*User[int]{{
 		UserID:      1000,
@@ -391,7 +400,7 @@ func TestMattermostFetchGroups(t *testing.T) {
 			UserId:  "id::user::testuser",
 		}},
 	}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	want := []*Group[string]{{
 		GroupID:       "id::group::testgroup",
@@ -417,7 +426,7 @@ func TestMattermostFetchGroups(t *testing.T) {
 
 func TestMattermostCreateUsers(t *testing.T) {
 	p := &fakeMattermostPluginAPI{}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	got, err := m.CreateUsers(context.Background(), []*User[int]{{
 		UserID:      1000,
@@ -491,7 +500,7 @@ func TestMattermostCreateUsers(t *testing.T) {
 
 func TestMattermostCreateGroups(t *testing.T) {
 	p := &fakeMattermostPluginAPI{}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	got, err := m.CreateGroups(context.Background(), []*Group[int]{{
 		GroupID:       1000,
@@ -588,7 +597,7 @@ func TestMattermostUpdateUsers(t *testing.T) {
 			DisableWelcomeEmail: true,
 		}},
 	}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	got, updated, err := m.UpdateUsers(context.Background(), []*User[string]{{
 		UserID:      "id::user::testuser",
@@ -739,7 +748,7 @@ func TestMattermostDeleteGroups(t *testing.T) {
 			Source:      MMPluginSource,
 		}},
 	}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	err := m.DeleteGroups(context.Background(), []*Group[string]{{
 		GroupID: "id::group::testgroup",
@@ -780,7 +789,7 @@ func TestMattermostAddGroupMembers(t *testing.T) {
 			Source:      MMPluginSource,
 		}},
 	}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	err := m.AddGroupMembers(context.Background(), "id::group::testgroup", []string{"id::user::testuser"})
 	if err != nil {
@@ -821,7 +830,7 @@ func TestMattermostRemoveGroupMembers(t *testing.T) {
 			GroupId: "id::group::testgroup",
 		}},
 	}
-	m := &MattermostService{&MattermostPluginGroupBackend{p}, p}
+	m := makeService(p)
 
 	err := m.RemoveGroupMembers(context.Background(), "id::group::testgroup", []string{"id::user::testuser"})
 	if err != nil {