Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Commit

Permalink
fix lints
Browse files Browse the repository at this point in the history
  • Loading branch information
@cpanato
cpanato committed Oct 29, 2021
1 parent 856c732 commit ea61702
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 71 deletions.
130 changes: 65 additions & 65 deletions client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,78 +12,78 @@ import (

type Client interface {
CreateChannel(channel *model.Channel) (*model.Channel, *model.Response, error)
RemoveUserFromChannel(channelId, userId string) (*model.Response, error)
GetChannelMembers(channelId string, page, perPage int, etag string) (model.ChannelMembers, *model.Response, error)
AddChannelMember(channelId, userId string) (*model.ChannelMember, *model.Response, error)
DeleteChannel(channelId string) (*model.Response, error)
PermanentDeleteChannel(channelId string) (*model.Response, error)
MoveChannel(channelId, teamId string, force bool) (*model.Channel, *model.Response, error)
GetPublicChannelsForTeam(teamId string, page int, perPage int, etag string) ([]*model.Channel, *model.Response, error)
GetDeletedChannelsForTeam(teamId string, page int, perPage int, etag string) ([]*model.Channel, *model.Response, error)
GetPrivateChannelsForTeam(teamId string, page int, perPage int, etag string) ([]*model.Channel, *model.Response, error)
GetChannelsForTeamForUser(teamId, userId string, includeDeleted bool, etag string) ([]*model.Channel, *model.Response, error)
RestoreChannel(channelId string) (*model.Channel, *model.Response, error)
PatchChannel(channelId string, patch *model.ChannelPatch) (*model.Channel, *model.Response, error)
GetChannelByName(channelName, teamId string, etag string) (*model.Channel, *model.Response, error)
GetChannelByNameIncludeDeleted(channelName, teamId string, etag string) (*model.Channel, *model.Response, error)
GetChannel(channelId, etag string) (*model.Channel, *model.Response, error)
GetTeam(teamId, etag string) (*model.Team, *model.Response, error)
RemoveUserFromChannel(channelID, userID string) (*model.Response, error)
GetChannelMembers(channelID string, page, perPage int, etag string) (model.ChannelMembers, *model.Response, error)
AddChannelMember(channelID, userID string) (*model.ChannelMember, *model.Response, error)
DeleteChannel(channelID string) (*model.Response, error)
PermanentDeleteChannel(channelID string) (*model.Response, error)
MoveChannel(channelID, teamID string, force bool) (*model.Channel, *model.Response, error)
GetPublicChannelsForTeam(teamID string, page int, perPage int, etag string) ([]*model.Channel, *model.Response, error)
GetDeletedChannelsForTeam(teamID string, page int, perPage int, etag string) ([]*model.Channel, *model.Response, error)
GetPrivateChannelsForTeam(teamID string, page int, perPage int, etag string) ([]*model.Channel, *model.Response, error)
GetChannelsForTeamForUser(teamID, userID string, includeDeleted bool, etag string) ([]*model.Channel, *model.Response, error)
RestoreChannel(channelID string) (*model.Channel, *model.Response, error)
PatchChannel(channelID string, patch *model.ChannelPatch) (*model.Channel, *model.Response, error)
GetChannelByName(channelName, teamID string, etag string) (*model.Channel, *model.Response, error)
GetChannelByNameIncludeDeleted(channelName, teamID string, etag string) (*model.Channel, *model.Response, error)
GetChannel(channelID, etag string) (*model.Channel, *model.Response, error)
GetTeam(teamID, etag string) (*model.Team, *model.Response, error)
GetTeamByName(name, etag string) (*model.Team, *model.Response, error)
GetAllTeams(etag string, page int, perPage int) ([]*model.Team, *model.Response, error)
CreateTeam(team *model.Team) (*model.Team, *model.Response, error)
PatchTeam(teamId string, patch *model.TeamPatch) (*model.Team, *model.Response, error)
AddTeamMember(teamId, userId string) (*model.TeamMember, *model.Response, error)
RemoveTeamMember(teamId, userId string) (*model.Response, error)
SoftDeleteTeam(teamId string) (*model.Response, error)
PermanentDeleteTeam(teamId string) (*model.Response, error)
RestoreTeam(teamId string) (*model.Team, *model.Response, error)
UpdateTeamPrivacy(teamId string, privacy string) (*model.Team, *model.Response, error)
PatchTeam(teamID string, patch *model.TeamPatch) (*model.Team, *model.Response, error)
AddTeamMember(teamID, userID string) (*model.TeamMember, *model.Response, error)
RemoveTeamMember(teamID, userID string) (*model.Response, error)
SoftDeleteTeam(teamID string) (*model.Response, error)
PermanentDeleteTeam(teamID string) (*model.Response, error)
RestoreTeam(teamID string) (*model.Team, *model.Response, error)
UpdateTeamPrivacy(teamID string, privacy string) (*model.Team, *model.Response, error)
SearchTeams(search *model.TeamSearch) ([]*model.Team, *model.Response, error)
GetPost(postId string, etag string) (*model.Post, *model.Response, error)
GetPost(postID string, etag string) (*model.Post, *model.Response, error)
CreatePost(post *model.Post) (*model.Post, *model.Response, error)
GetPostsForChannel(channelId string, page, perPage int, etag string, collapsedThreads bool) (*model.PostList, *model.Response, error)
GetPostsForChannel(channelID string, page, perPage int, etag string, collapsedThreads bool) (*model.PostList, *model.Response, error)
DoAPIPost(url string, data string) (*http.Response, error)
GetLdapGroups() ([]*model.Group, *model.Response, error)
GetGroupsByChannel(channelId string, groupOpts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, int, *model.Response, error)
GetGroupsByTeam(teamId string, groupOpts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, int, *model.Response, error)
GetGroupsByChannel(channelID string, groupOpts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, int, *model.Response, error)
GetGroupsByTeam(teamID string, groupOpts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, int, *model.Response, error)
UploadLicenseFile(data []byte) (*model.Response, error)
RemoveLicenseFile() (*model.Response, error)
GetLogs(page, perPage int) ([]string, *model.Response, error)
GetRoleByName(name string) (*model.Role, *model.Response, error)
PatchRole(roleId string, patch *model.RolePatch) (*model.Role, *model.Response, error)
PatchRole(roleID string, patch *model.RolePatch) (*model.Role, *model.Response, error)
UploadPlugin(file io.Reader) (*model.Manifest, *model.Response, error)
UploadPluginForced(file io.Reader) (*model.Manifest, *model.Response, error)
RemovePlugin(id string) (*model.Response, error)
EnablePlugin(id string) (*model.Response, error)
DisablePlugin(id string) (*model.Response, error)
GetPlugins() (*model.PluginsResponse, *model.Response, error)
GetUser(userId, etag string) (*model.User, *model.Response, error)
GetUser(userID, etag string) (*model.User, *model.Response, error)
GetUserByUsername(userName, etag string) (*model.User, *model.Response, error)
GetUserByEmail(email, etag string) (*model.User, *model.Response, error)
PermanentDeleteUser(userId string) (*model.Response, error)
PermanentDeleteUser(userID string) (*model.Response, error)
PermanentDeleteAllUsers() (*model.Response, error)
CreateUser(user *model.User) (*model.User, *model.Response, error)
VerifyUserEmailWithoutToken(userId string) (*model.User, *model.Response, error)
UpdateUserRoles(userId, roles string) (*model.Response, error)
InviteUsersToTeam(teamId string, userEmails []string) (*model.Response, error)
VerifyUserEmailWithoutToken(userID string) (*model.User, *model.Response, error)
UpdateUserRoles(userID, roles string) (*model.Response, error)
InviteUsersToTeam(teamID string, userEmails []string) (*model.Response, error)
SendPasswordResetEmail(email string) (*model.Response, error)
UpdateUser(user *model.User) (*model.User, *model.Response, error)
UpdateUserMfa(userId, code string, activate bool) (*model.Response, error)
UpdateUserPassword(userId, currentPassword, newPassword string) (*model.Response, error)
UpdateUserHashedPassword(userId, newHashedPassword string) (*model.Response, error)
CreateUserAccessToken(userId, description string) (*model.UserAccessToken, *model.Response, error)
RevokeUserAccessToken(tokenId string) (*model.Response, error)
GetUserAccessTokensForUser(userId string, page, perPage int) ([]*model.UserAccessToken, *model.Response, error)
ConvertUserToBot(userId string) (*model.Bot, *model.Response, error)
ConvertBotToUser(userId string, userPatch *model.UserPatch, setSystemAdmin bool) (*model.User, *model.Response, error)
PromoteGuestToUser(userId string) (*model.Response, error)
DemoteUserToGuest(guestId string) (*model.Response, error)
UpdateUserMfa(userID, code string, activate bool) (*model.Response, error)
UpdateUserPassword(userID, currentPassword, newPassword string) (*model.Response, error)
UpdateUserHashedPassword(userID, newHashedPassword string) (*model.Response, error)
CreateUserAccessToken(userID, description string) (*model.UserAccessToken, *model.Response, error)
RevokeUserAccessToken(tokenID string) (*model.Response, error)
GetUserAccessTokensForUser(userID string, page, perPage int) ([]*model.UserAccessToken, *model.Response, error)
ConvertUserToBot(userID string) (*model.Bot, *model.Response, error)
ConvertBotToUser(userID string, userPatch *model.UserPatch, setSystemAdmin bool) (*model.User, *model.Response, error)
PromoteGuestToUser(userID string) (*model.Response, error)
DemoteUserToGuest(guestID string) (*model.Response, error)
CreateCommand(cmd *model.Command) (*model.Command, *model.Response, error)
ListCommands(teamId string, customOnly bool) ([]*model.Command, *model.Response, error)
GetCommandById(cmdId string) (*model.Command, *model.Response, error)
ListCommands(teamID string, customOnly bool) ([]*model.Command, *model.Response, error)
GetCommandById(cmdID string) (*model.Command, *model.Response, error)
UpdateCommand(cmd *model.Command) (*model.Command, *model.Response, error)
MoveCommand(teamId string, commandId string) (*model.Response, error)
DeleteCommand(commandId string) (*model.Response, error)
MoveCommand(teamID string, commandID string) (*model.Response, error)
DeleteCommand(commandID string) (*model.Response, error)
GetConfig() (*model.Config, *model.Response, error)
UpdateConfig(*model.Config) (*model.Config, *model.Response, error)
PatchConfig(*model.Config) (*model.Config, *model.Response, error)
Expand All @@ -92,19 +92,19 @@ type Client interface {
SyncLdap(includeRemovedMembers bool) (*model.Response, error)
MigrateIdLdap(toAttribute string) (*model.Response, error)
GetUsers(page, perPage int, etag string) ([]*model.User, *model.Response, error)
GetUsersByIds(userIds []string) ([]*model.User, *model.Response, error)
GetUsersInTeam(teamId string, page, perPage int, etag string) ([]*model.User, *model.Response, error)
UpdateUserActive(userId string, activate bool) (*model.Response, error)
GetUsersByIds(userIDs []string) ([]*model.User, *model.Response, error)
GetUsersInTeam(teamID string, page, perPage int, etag string) ([]*model.User, *model.Response, error)
UpdateUserActive(userID string, activate bool) (*model.Response, error)
UpdateTeam(team *model.Team) (*model.Team, *model.Response, error)
UpdateChannelPrivacy(channelId string, privacy model.ChannelType) (*model.Channel, *model.Response, error)
UpdateChannelPrivacy(channelID string, privacy model.ChannelType) (*model.Channel, *model.Response, error)
CreateBot(bot *model.Bot) (*model.Bot, *model.Response, error)
PatchBot(userId string, patch *model.BotPatch) (*model.Bot, *model.Response, error)
PatchBot(userID string, patch *model.BotPatch) (*model.Bot, *model.Response, error)
GetBots(page, perPage int, etag string) ([]*model.Bot, *model.Response, error)
GetBotsIncludeDeleted(page, perPage int, etag string) ([]*model.Bot, *model.Response, error)
GetBotsOrphaned(page, perPage int, etag string) ([]*model.Bot, *model.Response, error)
DisableBot(botUserId string) (*model.Bot, *model.Response, error)
EnableBot(botUserId string) (*model.Bot, *model.Response, error)
AssignBot(botUserId, newOwnerId string) (*model.Bot, *model.Response, error)
DisableBot(botUserID string) (*model.Bot, *model.Response, error)
EnableBot(botUserID string) (*model.Bot, *model.Response, error)
AssignBot(botUserID, newOwnerID string) (*model.Bot, *model.Response, error)
SetServerBusy(secs int) (*model.Response, error)
ClearServerBusy() (*model.Response, error)
GetServerBusy() (*model.ServerBusyState, *model.Response, error)
Expand All @@ -117,29 +117,29 @@ type Client interface {
GetPing() (string, *model.Response, error)
GetPingWithFullServerStatus() (map[string]string, *model.Response, error)
CreateUpload(us *model.UploadSession) (*model.UploadSession, *model.Response, error)
GetUpload(uploadId string) (*model.UploadSession, *model.Response, error)
GetUploadsForUser(userId string) ([]*model.UploadSession, *model.Response, error)
UploadData(uploadId string, data io.Reader) (*model.FileInfo, *model.Response, error)
GetUpload(uploadID string) (*model.UploadSession, *model.Response, error)
GetUploadsForUser(userID string) ([]*model.UploadSession, *model.Response, error)
UploadData(uploadID string, data io.Reader) (*model.FileInfo, *model.Response, error)
ListImports() ([]string, *model.Response, error)
GetJob(id string) (*model.Job, *model.Response, error)
GetJobs(page int, perPage int) ([]*model.Job, *model.Response, error)
GetJobsByType(jobType string, page int, perPage int) ([]*model.Job, *model.Response, error)
CreateJob(job *model.Job) (*model.Job, *model.Response, error)
CancelJob(jobId string) (*model.Response, error)
CancelJob(jobID string) (*model.Response, error)
CreateIncomingWebhook(hook *model.IncomingWebhook) (*model.IncomingWebhook, *model.Response, error)
UpdateIncomingWebhook(hook *model.IncomingWebhook) (*model.IncomingWebhook, *model.Response, error)
GetIncomingWebhooks(page int, perPage int, etag string) ([]*model.IncomingWebhook, *model.Response, error)
GetIncomingWebhooksForTeam(teamId string, page int, perPage int, etag string) ([]*model.IncomingWebhook, *model.Response, error)
GetIncomingWebhooksForTeam(teamID string, page int, perPage int, etag string) ([]*model.IncomingWebhook, *model.Response, error)
GetIncomingWebhook(hookID string, etag string) (*model.IncomingWebhook, *model.Response, error)
DeleteIncomingWebhook(hookID string) (*model.Response, error)
CreateOutgoingWebhook(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, *model.Response, error)
UpdateOutgoingWebhook(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, *model.Response, error)
GetOutgoingWebhooks(page int, perPage int, etag string) ([]*model.OutgoingWebhook, *model.Response, error)
GetOutgoingWebhook(hookId string) (*model.OutgoingWebhook, *model.Response, error)
GetOutgoingWebhooksForChannel(channelId string, page int, perPage int, etag string) ([]*model.OutgoingWebhook, *model.Response, error)
GetOutgoingWebhooksForTeam(teamId string, page int, perPage int, etag string) ([]*model.OutgoingWebhook, *model.Response, error)
RegenOutgoingHookToken(hookId string) (*model.OutgoingWebhook, *model.Response, error)
DeleteOutgoingWebhook(hookId string) (*model.Response, error)
GetOutgoingWebhook(hookID string) (*model.OutgoingWebhook, *model.Response, error)
GetOutgoingWebhooksForChannel(channelID string, page int, perPage int, etag string) ([]*model.OutgoingWebhook, *model.Response, error)
GetOutgoingWebhooksForTeam(teamID string, page int, perPage int, etag string) ([]*model.OutgoingWebhook, *model.Response, error)
RegenOutgoingHookToken(hookID string) (*model.OutgoingWebhook, *model.Response, error)
DeleteOutgoingWebhook(hookID string) (*model.Response, error)
ListExports() ([]string, *model.Response, error)
DeleteExport(name string) (*model.Response, error)
DownloadExport(name string, wr io.Writer, offset int64) (int64, *model.Response, error)
Expand Down
3 changes: 1 addition & 2 deletions commands/docs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"os"

"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"
)
Expand Down Expand Up @@ -37,7 +36,7 @@ func docsCmdF(cmd *cobra.Command, args []string) error {
return createErr
}
} else if !fileInfo.IsDir() {
return errors.New(fmt.Sprintf("File \"%s\" is not a directory", outDir))
return fmt.Errorf(fmt.Sprintf("File \"%s\" is not a directory", outDir))
}

err = doc.GenReSTTree(RootCmd, outDir)
Expand Down
6 changes: 3 additions & 3 deletions commands/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"runtime"
"strings"

"github.com/mattermost/mattermost-server/v6/model"

"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/mattermost/mattermost-server/v6/model"

"github.com/mattermost/mmctl/client"
"github.com/mattermost/mmctl/printer"
)
Expand All @@ -28,7 +28,7 @@ var (
x509.DSAWithSHA1: true,
x509.ECDSAWithSHA1: true,
}
expectedSocketMode os.FileMode = os.ModeSocket | 0600
expectedSocketMode = os.ModeSocket | 0600
)

func CheckVersionMatch(version, serverVersion string) bool {
Expand Down
2 changes: 1 addition & 1 deletion commands/sampledata_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func createUser(idx int, teamMemberships int, channelMemberships int, teamsAndCh
}

// The 75% of the users have custom profile image
var profileImage *string = nil
var profileImage *string
if rand.Intn(4) != 0 {
profileImageSelector := rand.Int()
if len(profileImages) > 0 {
Expand Down

0 comments on commit ea61702

Please sign in to comment.