diff --git a/server/.golangci.yml b/server/.golangci.yml index 7b7000841824..ba8c708f9231 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -79,7 +79,6 @@ issues: channels/api4/export.go|\ channels/api4/export_test.go|\ channels/api4/file_test.go|\ - channels/api4/group.go|\ channels/api4/group_local.go|\ channels/api4/handlers_test.go|\ channels/api4/import_test.go|\ diff --git a/server/channels/api4/group.go b/server/channels/api4/group.go index 539fb8580f9c..3c9aad6d2b22 100644 --- a/server/channels/api4/group.go +++ b/server/channels/api4/group.go @@ -13,6 +13,7 @@ import ( "strings" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" "github.com/mattermost/mattermost/server/v8/channels/app" "github.com/mattermost/mattermost/server/v8/channels/audit" "github.com/mattermost/mattermost/server/v8/channels/store" @@ -146,7 +147,9 @@ func getGroup(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func createGroup(c *Context, w http.ResponseWriter, r *http.Request) { @@ -206,7 +209,9 @@ func createGroup(c *Context, w http.ResponseWriter, r *http.Request) { } auditRec.Success() w.WriteHeader(http.StatusCreated) - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func patchGroup(c *Context, w http.ResponseWriter, r *http.Request) { @@ -303,7 +308,9 @@ func patchGroup(c *Context, w http.ResponseWriter, r *http.Request) { } auditRec.Success() - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func linkGroupSyncable(c *Context, w http.ResponseWriter, r *http.Request) { @@ -389,7 +396,9 @@ func linkGroupSyncable(c *Context, w http.ResponseWriter, r *http.Request) { return } auditRec.Success() - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroupSyncable(c *Context, w http.ResponseWriter, r *http.Request) { @@ -437,7 +446,9 @@ func getGroupSyncable(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroupSyncables(c *Context, w http.ResponseWriter, r *http.Request) { @@ -479,7 +490,9 @@ func getGroupSyncables(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func patchGroupSyncable(c *Context, w http.ResponseWriter, r *http.Request) { @@ -566,7 +579,9 @@ func patchGroupSyncable(c *Context, w http.ResponseWriter, r *http.Request) { return } auditRec.Success() - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func unlinkGroupSyncable(c *Context, w http.ResponseWriter, r *http.Request) { @@ -726,7 +741,9 @@ func getGroupMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroupStats(c *Context, w http.ResponseWriter, r *http.Request) { @@ -766,7 +783,9 @@ func getGroupStats(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroupsByUserId(c *Context, w http.ResponseWriter, r *http.Request) { @@ -802,7 +821,9 @@ func getGroupsByUserId(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroupsByChannel(c *Context, w http.ResponseWriter, r *http.Request) { @@ -820,7 +841,9 @@ func getGroupsByChannel(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = appErr return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroupsByTeam(c *Context, w http.ResponseWriter, r *http.Request) { @@ -839,7 +862,9 @@ func getGroupsByTeam(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = appError return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroupsByTeamCommon(c *Context, r *http.Request) ([]byte, *model.AppError) { @@ -973,7 +998,9 @@ func getGroupsAssociatedToChannelsByTeam(c *Context, w http.ResponseWriter, r *h return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getGroups(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1138,7 +1165,9 @@ func getGroups(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func deleteGroup(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1190,7 +1219,9 @@ func deleteGroup(c *Context, w http.ResponseWriter, r *http.Request) { return } auditRec.Success() - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func restoreGroup(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1244,7 +1275,9 @@ func restoreGroup(c *Context, w http.ResponseWriter, r *http.Request) { } auditRec.Success() - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func addGroupMembers(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1303,7 +1336,9 @@ func addGroupMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } auditRec.Success() - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func deleteGroupMembers(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1362,7 +1397,9 @@ func deleteGroupMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } auditRec.Success() - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } // hasPermissionToReadGroupMembers check if a user has the permission to read the list of members of a given team.