From c8b60c2d75f5456e33bb3c4dec8b3ec0ac89e40a Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Fri, 13 Mar 2020 08:44:39 +0530 Subject: [PATCH] MM-22783: Fix scopelint issues (#13969) * Fix scopelint issues * Incorporating review comments * Keeping the order of linters alphabetical * Fix issues after merge Co-authored-by: mattermod --- .golangci.yml | 6 ++++++ app/channel.go | 1 + app/import_functions.go | 6 ++++++ app/import_validators.go | 4 ++++ store/sqlstore/channel_store.go | 3 ++- store/sqlstore/preference_store.go | 1 + store/sqlstore/team_store.go | 3 ++- 7 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index af1296fdae..9497854664 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -23,6 +23,7 @@ linters: - gosimple - govet - ineffassign + - scopelint - structcheck - unconvert - unused @@ -38,6 +39,11 @@ issues: - unused text: "RedisSupplier|LocalCacheSupplier|Enterprise" + - linters: + - scopelint + # ignore warnings from table tests. https://github.com/kyoh86/scopelint/issues/4 + path: ".*_test.go|store/storetest" + - linters: # ignore golint error for a lot of packages for now - golint diff --git a/app/channel.go b/app/channel.go index fc3c918728..2cfd9e2077 100644 --- a/app/channel.go +++ b/app/channel.go @@ -1557,6 +1557,7 @@ func (a *App) GetChannelMembersForUserWithPagination(teamId, userId string, page members := make([]*model.ChannelMember, 0) if m != nil { for _, member := range *m { + member := member members = append(members, &member) } } diff --git a/app/import_functions.go b/app/import_functions.go index e67185c7aa..56699afe3b 100644 --- a/app/import_functions.go +++ b/app/import_functions.go @@ -855,6 +855,7 @@ func (a *App) importReplies(data []ReplyImportData, post *model.Post, teamId str var err *model.AppError usernames := []string{} for _, replyData := range data { + replyData := replyData if err = validateReplyImportData(&replyData, post.CreateAt, a.MaxPostSize()); err != nil { return err } @@ -871,6 +872,7 @@ func (a *App) importReplies(data []ReplyImportData, post *model.Post, teamId str postsForOverwriteList := []*model.Post{} for _, replyData := range data { + replyData := replyData user := users[*replyData.User] // Check if this post already exists. @@ -1144,6 +1146,7 @@ func (a *App) importMultiplePosts(data []*PostImportData, dryRun bool) *model.Ap var lastPostWithData *postAndData repliesBulk := []ReplyImportData{} for _, postWithData := range postsWithData { + postWithData := postWithData if postWithData.postData.FlaggedBy != nil { var preferences model.Preferences @@ -1167,6 +1170,7 @@ func (a *App) importMultiplePosts(data []*PostImportData, dryRun bool) *model.Ap if postWithData.postData.Reactions != nil { for _, reaction := range *postWithData.postData.Reactions { + reaction := reaction if err := a.importReaction(&reaction, postWithData.post, dryRun); err != nil { return err } @@ -1204,6 +1208,7 @@ func (a *App) uploadAttachments(attachments *[]AttachmentImportData, post *model } fileIds := make(map[string]bool) for _, attachment := range *attachments { + attachment := attachment fileInfo, err := a.importAttachment(&attachment, post, teamId, dryRun) if err != nil { return nil, err @@ -1432,6 +1437,7 @@ func (a *App) importMultipleDirectPosts(data []*DirectPostImportData, dryRun boo if postWithData.directPostData.Reactions != nil { for _, reaction := range *postWithData.directPostData.Reactions { + reaction := reaction if err := a.importReaction(&reaction, postWithData.post, dryRun); err != nil { return err } diff --git a/app/import_validators.go b/app/import_validators.go index 5243d100e6..2cbceb17d5 100644 --- a/app/import_validators.go +++ b/app/import_validators.go @@ -434,12 +434,14 @@ func validatePostImportData(data *PostImportData, maxPostSize int) *model.AppErr if data.Reactions != nil { for _, reaction := range *data.Reactions { + reaction := reaction validateReactionImportData(&reaction, *data.CreateAt) } } if data.Replies != nil { for _, reply := range *data.Replies { + reply := reply validateReplyImportData(&reply, *data.CreateAt, maxPostSize) } } @@ -528,12 +530,14 @@ func validateDirectPostImportData(data *DirectPostImportData, maxPostSize int) * if data.Reactions != nil { for _, reaction := range *data.Reactions { + reaction := reaction validateReactionImportData(&reaction, *data.CreateAt) } } if data.Replies != nil { for _, reply := range *data.Replies { + reply := reply validateReplyImportData(&reply, *data.CreateAt, maxPostSize) } } diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index 1d05a26194..0a9c6d7745 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -2545,7 +2545,8 @@ func (s SqlChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId return nil, nil } - for _, member := range channelMembers { + for i := range channelMembers { + member := channelMembers[i] roles := strings.Fields(member.Roles) var newRoles []string if !member.SchemeAdmin.Valid { diff --git a/store/sqlstore/preference_store.go b/store/sqlstore/preference_store.go index be3feb2e1b..d3b5730ae9 100644 --- a/store/sqlstore/preference_store.go +++ b/store/sqlstore/preference_store.go @@ -63,6 +63,7 @@ func (s SqlPreferenceStore) Save(preferences *model.Preferences) *model.AppError defer finalizeTransaction(transaction) for _, preference := range *preferences { + preference := preference if upsertErr := s.save(transaction, &preference); upsertErr != nil { return upsertErr } diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index 563c94d917..60de970a33 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -913,7 +913,8 @@ func (s SqlTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) ( return nil, nil } - for _, member := range teamMembers { + for i := range teamMembers { + member := teamMembers[i] roles := strings.Fields(member.Roles) var newRoles []string if !member.SchemeAdmin.Valid {