Fix staticcheck errors from _test.go files (#18033)

Automatic Merge

store/storetest/channel_store.go

@@ -659,20 +659,20 @@ func testChannelStoreGetByName(t *testing.T, ss store.Store) {
 
 	channelID := result.Id
 
-	result, err = ss.Channel().GetByName(o1.TeamId, "", true)
+	_, err = ss.Channel().GetByName(o1.TeamId, "", true)
 	require.Error(t, err, "Missing id should have failed")
 
 	result, err = ss.Channel().GetByName(o1.TeamId, o1.Name, false)
 	require.NoError(t, err)
 	require.Equal(t, o1.ToJson(), result.ToJson(), "invalid returned channel")
 
-	result, err = ss.Channel().GetByName(o1.TeamId, "", false)
+	_, err = ss.Channel().GetByName(o1.TeamId, "", false)
 	require.Error(t, err, "Missing id should have failed")
 
 	nErr = ss.Channel().Delete(channelID, model.GetMillis())
 	require.NoError(t, nErr, "channel should have been deleted")
 
-	result, err = ss.Channel().GetByName(o1.TeamId, o1.Name, false)
+	_, err = ss.Channel().GetByName(o1.TeamId, o1.Name, false)
 	require.Error(t, err, "Deleted channel should not be returned by GetByName()")
 }
 

store/storetest/compliance_store.go

@@ -357,7 +357,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 			post.UserId = u1.Id
 			post.CreateAt = createAt
 			post.Message = "zz" + model.NewId() + "b"
-			post, nErr = ss.Post().Save(post)
+			_, nErr = ss.Post().Save(post)
 			require.NoError(t, nErr)
 		}
 

store/storetest/group_store.go

@@ -967,12 +967,14 @@ func testUpsertMember(t *testing.T, ss store.Store) {
 	require.NoError(t, err)
 
 	groupMembers, err := ss.Group().GetMemberUsers(group.Id)
+	require.NoError(t, err)
 	beforeRestoreCount := len(groupMembers)
 
 	_, err = ss.Group().UpsertMember(group.Id, user.Id)
 	require.NoError(t, err)
 
 	groupMembers, err = ss.Group().GetMemberUsers(group.Id)
+	require.NoError(t, err)
 	afterRestoreCount := len(groupMembers)
 
 	require.Equal(t, beforeRestoreCount+1, afterRestoreCount)

store/storetest/plugin_store.go

@@ -1285,7 +1285,6 @@ func testPluginList(t *testing.T, ss store.Store) {
 		pluginId := model.NewId()
 
 		var keys []string
-		var expiredKeys []string
 		now := model.GetMillis()
 		for i := 0; i < 150; i++ {
 			key := model.NewId()
@@ -1311,8 +1310,6 @@ func testPluginList(t *testing.T, ss store.Store) {
 
 			if expireAt == 0 || expireAt > now {
 				keys = append(keys, key)
-			} else {
-				expiredKeys = append(expiredKeys, key)
 			}
 		}
 		sort.Strings(keys)

store/storetest/post_store.go

@@ -483,7 +483,7 @@ func testPostStoreGetSingle(t *testing.T, ss store.Store) {
 	o4.Message = model.NewRandomString(10)
 	o4.RootId = o1.Id
 
-	o3, err = ss.Post().Save(o3)
+	_, err = ss.Post().Save(o3)
 	require.NoError(t, err)
 
 	o4, err = ss.Post().Save(o4)
@@ -500,7 +500,7 @@ func testPostStoreGetSingle(t *testing.T, ss store.Store) {
 	require.Equal(t, post.CreateAt, o1.CreateAt, "invalid returned post")
 	require.Equal(t, int64(1), post.ReplyCount, "wrong replyCount computed")
 
-	post, err = ss.Post().GetSingle(o2.Id, false)
+	_, err = ss.Post().GetSingle(o2.Id, false)
 	require.Error(t, err, "should not return deleted post")
 
 	post, err = ss.Post().GetSingle(o2.Id, true)

store/storetest/remote_cluster_store.go

@@ -121,7 +121,6 @@ func testRemoteClusterGetAll(t *testing.T, ss store.Store) {
 
 	idsAll := make([]string, 0)
 	idsOnline := make([]string, 0)
-	idsOffline := make([]string, 0)
 	idsShareTopic := make([]string, 0)
 
 	for _, item := range data {
@@ -131,8 +130,6 @@ func testRemoteClusterGetAll(t *testing.T, ss store.Store) {
 		idsAll = append(idsAll, saved.RemoteId)
 		if online {
 			idsOnline = append(idsOnline, saved.RemoteId)
-		} else {
-			idsOffline = append(idsOffline, saved.RemoteId)
 		}
 		if strings.Contains(saved.Topics, " shared ") {
 			idsShareTopic = append(idsShareTopic, saved.RemoteId)

store/storetest/session_store.go

@@ -56,14 +56,14 @@ func testSessionGet(t *testing.T, ss store.Store) {
 	s2 := &model.Session{}
 	s2.UserId = s1.UserId
 
-	s2, err = ss.Session().Save(s2)
+	_, err = ss.Session().Save(s2)
 	require.NoError(t, err)
 
 	s3 := &model.Session{}
 	s3.UserId = s1.UserId
 	s3.ExpiresAt = 1
 
-	s3, err = ss.Session().Save(s3)
+	_, err = ss.Session().Save(s3)
 	require.NoError(t, err)
 
 	session, err := ss.Session().Get(context.Background(), s1.Id)
@@ -88,7 +88,7 @@ func testSessionGetWithDeviceId(t *testing.T, ss store.Store) {
 	s2.DeviceId = model.NewId()
 	s2.ExpiresAt = model.GetMillis() + 10000
 
-	s2, err = ss.Session().Save(s2)
+	_, err = ss.Session().Save(s2)
 	require.NoError(t, err)
 
 	s3 := &model.Session{}
@@ -96,7 +96,7 @@ func testSessionGetWithDeviceId(t *testing.T, ss store.Store) {
 	s3.ExpiresAt = 1
 	s3.DeviceId = model.NewId()
 
-	s3, err = ss.Session().Save(s3)
+	_, err = ss.Session().Save(s3)
 	require.NoError(t, err)
 
 	data, err := ss.Session().GetSessionsWithActiveDeviceIds(s1.UserId)
@@ -255,7 +255,7 @@ func testSessionCount(t *testing.T, ss store.Store) {
 	s1.UserId = model.NewId()
 	s1.ExpiresAt = model.GetMillis() + 100000
 
-	s1, err := ss.Session().Save(s1)
+	_, err := ss.Session().Save(s1)
 	require.NoError(t, err)
 
 	count, err := ss.Session().AnalyticsSessionCount()
@@ -326,7 +326,7 @@ func testGetSessionsExpired(t *testing.T, ss store.Store) {
 	s1.UserId = model.NewId()
 	s1.DeviceId = model.NewId()
 	s1.ExpiresAt = 0 // never expires
-	s1, err = ss.Session().Save(s1)
+	_, err = ss.Session().Save(s1)
 	require.NoError(t, err)
 
 	s2 := &model.Session{}
@@ -340,7 +340,7 @@ func testGetSessionsExpired(t *testing.T, ss store.Store) {
 	s3.UserId = model.NewId()
 	s3.DeviceId = model.NewId()
 	s3.ExpiresAt = now - (TenMinutes * 100) // expired outside threshold
-	s3, err = ss.Session().Save(s3)
+	_, err = ss.Session().Save(s3)
 	require.NoError(t, err)
 
 	s4 := &model.Session{}
@@ -353,7 +353,7 @@ func testGetSessionsExpired(t *testing.T, ss store.Store) {
 	s5.UserId = model.NewId()
 	s5.DeviceId = model.NewId()
 	s5.ExpiresAt = now + (TenMinutes * 100000) // not expired
-	s5, err = ss.Session().Save(s5)
+	_, err = ss.Session().Save(s5)
 	require.NoError(t, err)
 
 	sessions, err := ss.Session().GetSessionsExpired(TenMinutes*2, true, true) // mobile only

store/storetest/shared_channel_store.go

@@ -668,15 +668,13 @@ func testGetRemoteForUser(t *testing.T, ss store.Store) {
 		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), RemoteTeamId: teamId, Name: "Test_Remote_2"},
 		{RemoteId: model.NewId(), SiteURL: model.NewId(), CreatorId: model.NewId(), RemoteTeamId: teamId, Name: "Test_Remote_3"},
 	}
-	var channelRemotes []*model.SharedChannelRemote
 	for _, rc := range remotes {
 		_, err := ss.RemoteCluster().Save(rc)
 		require.NoError(t, err)
 
 		scr := &model.SharedChannelRemote{Id: model.NewId(), CreatorId: rc.CreatorId, ChannelId: channel.Id, RemoteId: rc.RemoteId}
-		scr, err = ss.SharedChannel().SaveRemote(scr)
+		_, err = ss.SharedChannel().SaveRemote(scr)
 		require.NoError(t, err)
-		channelRemotes = append(channelRemotes, scr)
 	}
 	users := []string{model.NewId(), model.NewId(), model.NewId()}
 	for _, id := range users {

store/storetest/user_access_token_store.go

@@ -111,7 +111,7 @@ func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) {
 	s2.UserId = uat.UserId
 	s2.Token = uat.Token
 
-	s2, err = ss.Session().Save(s2)
+	_, err = ss.Session().Save(s2)
 	require.NoError(t, err)
 
 	nErr = ss.UserAccessToken().UpdateTokenEnable(uat.Id)
@@ -136,7 +136,7 @@ func testUserAccessTokenSearch(t *testing.T, ss store.Store) {
 	s1.UserId = uat.UserId
 	s1.Token = uat.Token
 
-	s1, nErr := ss.Session().Save(s1)
+	_, nErr := ss.Session().Save(s1)
 	require.NoError(t, nErr)
 
 	_, nErr = ss.UserAccessToken().Save(uat)

store/storetest/webhook_store.go

@@ -226,7 +226,7 @@ func testWebhookStoreDeleteIncoming(t *testing.T, ss store.Store) {
 	err = ss.Webhook().DeleteIncoming(o1.Id, model.GetMillis())
 	require.NoError(t, err)
 
-	webhook, err = ss.Webhook().GetIncoming(o1.Id, true)
+	_, err = ss.Webhook().GetIncoming(o1.Id, true)
 	require.Error(t, err)
 }
 
@@ -409,7 +409,7 @@ func testWebhookStoreGetOutgoingByChannelByUser(t *testing.T, ss store.Store) {
 	o2.TeamId = model.NewId()
 	o2.CallbackURLs = []string{"http://nowhere.com/"}
 
-	o2, err = ss.Webhook().SaveOutgoing(o2)
+	_, err = ss.Webhook().SaveOutgoing(o2)
 	require.NoError(t, err)
 
 	t.Run("GetOutgoingByChannelByUser, no user filter", func(t *testing.T) {