IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-55409] Enable revive linter on enterprise code (#25391)

Browse Source
This commit is contained in:
Ben Schumacher
2023-11-10 15:24:12 +01:00
committed by GitHub
parent 8e84adb176
commit 612e4458ef
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/.golangci.yml
View File

@@ -42,12 +42,14 @@ issues:
- linters:
- revive
text: "var-naming|error-naming|exported|increment-decrement|error-strings|if-return|unused-parameter|blank-imports|context-as-argument|empty-block"
text: "var-naming|error-naming|exported|increment-decrement|error-strings|if-return|unused-parameter|blank-imports|empty-block"
# We need to fix the unused parameter issues and remove the exception.
# Use a seperate set of exception for the enterprise code to allow community members to fix only the open source issues.
- linters:
- revive
path: "enterprise" # TODO: fix this
path: "enterprise"
text: "var-naming|error-naming|exported|increment-decrement|error-strings|if-return|unused-parameter|blank-imports|empty-block"
- linters:
- misspell

2
server/channels/app/file.go
View File

@@ -232,7 +232,7 @@ func (a *App) WriteExportFile(fr io.Reader, path string) (int64, *model.AppError
func writeFileContext(ctx context.Context, backend filestore.FileBackend, fr io.Reader, path string) (int64, *model.AppError) {
// Check if we can provide a custom context, otherwise just use the default method.
written, err := filestore.TryWriteFileContext(backend, ctx, fr, path)
written, err := filestore.TryWriteFileContext(ctx, backend, fr, path)
if err != nil {
return written, model.NewAppError("WriteFile", "api.file.write_file.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
}

8
server/channels/app/oauthproviders/gitlab/gitlab.go
View File

@@ -84,7 +84,7 @@ func (glu *GitLabUser) getAuthData() string {
return strconv.FormatInt(glu.Id, 10)
}
func (m *GitLabProvider) GetUserFromJSON(c request.CTX, data io.Reader, tokenUser *model.User) (*model.User, error) {
func (gp *GitLabProvider) GetUserFromJSON(c request.CTX, data io.Reader, tokenUser *model.User) (*model.User, error) {
glu, err := gitLabUserFromJSON(data)
if err != nil {
return nil, err
@@ -96,14 +96,14 @@ func (m *GitLabProvider) GetUserFromJSON(c request.CTX, data io.Reader, tokenUse
return userFromGitLabUser(c.Logger(), glu), nil
}
func (m *GitLabProvider) GetSSOSettings(_ request.CTX, config *model.Config, service string) (*model.SSOSettings, error) {
func (gp *GitLabProvider) GetSSOSettings(_ request.CTX, config *model.Config, service string) (*model.SSOSettings, error) {
return &config.GitLabSettings, nil
}
func (m *GitLabProvider) GetUserFromIdToken(_ request.CTX, idToken string) (*model.User, error) {
func (gp *GitLabProvider) GetUserFromIdToken(_ request.CTX, idToken string) (*model.User, error) {
return nil, nil
}
func (m *GitLabProvider) IsSameUser(_ request.CTX, dbUser, oauthUser *model.User) bool {
func (gp *GitLabProvider) IsSameUser(_ request.CTX, dbUser, oauthUser *model.User) bool {
return dbUser.AuthData == oauthUser.AuthData
}

2
server/platform/shared/filestore/filesstore.go
View File

@@ -159,7 +159,7 @@ func newFileBackend(settings FileBackendSettings, canBeCloud bool) (FileBackend,
// TryWriteFileContext checks if the file backend supports context writes and passes the context in that case.
// Should the file backend not support contexts, it just calls WriteFile instead. This can be used to disable
// the timeouts for long writes (like exports).
func TryWriteFileContext(fb FileBackend, ctx context.Context, fr io.Reader, path string) (int64, error) {
func TryWriteFileContext(ctx context.Context, fb FileBackend, fr io.Reader, path string) (int64, error) {
type ContextWriter interface {
WriteFileContext(context.Context, io.Reader, string) (int64, error)
}