diff options
Diffstat (limited to 'cmd/platform')
-rw-r--r-- | cmd/platform/channel.go | 24 | ||||
-rw-r--r-- | cmd/platform/channelargs.go | 12 | ||||
-rw-r--r-- | cmd/platform/import.go | 2 | ||||
-rw-r--r-- | cmd/platform/jobserver.go | 8 | ||||
-rw-r--r-- | cmd/platform/roles.go | 4 | ||||
-rw-r--r-- | cmd/platform/team.go | 10 | ||||
-rw-r--r-- | cmd/platform/teamargs.go | 10 | ||||
-rw-r--r-- | cmd/platform/user.go | 18 | ||||
-rw-r--r-- | cmd/platform/userargs.go | 12 |
9 files changed, 51 insertions, 49 deletions
diff --git a/cmd/platform/channel.go b/cmd/platform/channel.go index b1fededb6..d2a4edc6a 100644 --- a/cmd/platform/channel.go +++ b/cmd/platform/channel.go @@ -151,7 +151,7 @@ func createChannelCmdF(cmd *cobra.Command, args []string) error { channelType = model.CHANNEL_PRIVATE } - team := getTeamFromTeamArg(teamArg) + team := getTeamFromTeamArg(a, teamArg) if team == nil { return errors.New("Unable to find team: " + teamArg) } @@ -183,12 +183,12 @@ func removeChannelUsersCmdF(cmd *cobra.Command, args []string) error { return errors.New("Not enough arguments.") } - channel := getChannelFromChannelArg(args[0]) + channel := getChannelFromChannelArg(a, args[0]) if channel == nil { return errors.New("Unable to find channel '" + args[0] + "'") } - users := getUsersFromUserArgs(args[1:]) + users := getUsersFromUserArgs(a, args[1:]) for i, user := range users { removeUserFromChannel(a, channel, user, args[i+1]) } @@ -216,12 +216,12 @@ func addChannelUsersCmdF(cmd *cobra.Command, args []string) error { return errors.New("Not enough arguments.") } - channel := getChannelFromChannelArg(args[0]) + channel := getChannelFromChannelArg(a, args[0]) if channel == nil { return errors.New("Unable to find channel '" + args[0] + "'") } - users := getUsersFromUserArgs(args[1:]) + users := getUsersFromUserArgs(a, args[1:]) for i, user := range users { addUserToChannel(a, channel, user, args[i+1]) } @@ -249,7 +249,7 @@ func archiveChannelsCmdF(cmd *cobra.Command, args []string) error { return errors.New("Enter at least one channel to archive.") } - channels := getChannelsFromChannelArgs(args) + channels := getChannelsFromChannelArgs(a, args) for i, channel := range channels { if channel == nil { CommandPrintErrorln("Unable to find channel '" + args[i] + "'") @@ -283,7 +283,7 @@ func deleteChannelsCmdF(cmd *cobra.Command, args []string) error { } } - channels := getChannelsFromChannelArgs(args) + channels := getChannelsFromChannelArgs(a, args) for i, channel := range channels { if channel == nil { CommandPrintErrorln("Unable to find channel '" + args[i] + "'") @@ -313,12 +313,12 @@ func moveChannelsCmdF(cmd *cobra.Command, args []string) error { return errors.New("Enter the destination team and at least one channel to move.") } - team := getTeamFromTeamArg(args[0]) + team := getTeamFromTeamArg(a, args[0]) if team == nil { return errors.New("Unable to find destination team '" + args[0] + "'") } - channels := getChannelsFromChannelArgs(args[1:]) + channels := getChannelsFromChannelArgs(a, args[1:]) for i, channel := range channels { if channel == nil { CommandPrintErrorln("Unable to find channel '" + args[i] + "'") @@ -380,7 +380,7 @@ func listChannelsCmdF(cmd *cobra.Command, args []string) error { return errors.New("Enter at least one team.") } - teams := getTeamsFromTeamArgs(args) + teams := getTeamsFromTeamArgs(a, args) for i, team := range teams { if team == nil { CommandPrintErrorln("Unable to find team '" + args[i] + "'") @@ -414,7 +414,7 @@ func restoreChannelsCmdF(cmd *cobra.Command, args []string) error { return errors.New("Enter at least one channel.") } - channels := getChannelsFromChannelArgs(args) + channels := getChannelsFromChannelArgs(a, args) for i, channel := range channels { if channel == nil { CommandPrintErrorln("Unable to find channel '" + args[i] + "'") @@ -445,7 +445,7 @@ func modifyChannelCmdF(cmd *cobra.Command, args []string) error { return errors.New("You must specify only one of --public or --private") } - channel := getChannelFromChannelArg(args[0]) + channel := getChannelFromChannelArg(a, args[0]) if channel == nil { return errors.New("Unable to find channel '" + args[0] + "'") } diff --git a/cmd/platform/channelargs.go b/cmd/platform/channelargs.go index 22238dc6a..c12a9cc9a 100644 --- a/cmd/platform/channelargs.go +++ b/cmd/platform/channelargs.go @@ -12,10 +12,10 @@ import ( const CHANNEL_ARG_SEPARATOR = ":" -func getChannelsFromChannelArgs(channelArgs []string) []*model.Channel { +func getChannelsFromChannelArgs(a *app.App, channelArgs []string) []*model.Channel { channels := make([]*model.Channel, 0, len(channelArgs)) for _, channelArg := range channelArgs { - channel := getChannelFromChannelArg(channelArg) + channel := getChannelFromChannelArg(a, channelArg) channels = append(channels, channel) } return channels @@ -29,7 +29,7 @@ func parseChannelArg(channelArg string) (string, string) { return result[0], result[1] } -func getChannelFromChannelArg(channelArg string) *model.Channel { +func getChannelFromChannelArg(a *app.App, channelArg string) *model.Channel { teamArg, channelPart := parseChannelArg(channelArg) if teamArg == "" && channelPart == "" { return nil @@ -37,12 +37,12 @@ func getChannelFromChannelArg(channelArg string) *model.Channel { var channel *model.Channel if teamArg != "" { - team := getTeamFromTeamArg(teamArg) + team := getTeamFromTeamArg(a, teamArg) if team == nil { return nil } - if result := <-app.Global().Srv.Store.Channel().GetByNameIncludeDeleted(team.Id, channelPart, true); result.Err == nil { + if result := <-a.Srv.Store.Channel().GetByNameIncludeDeleted(team.Id, channelPart, true); result.Err == nil { channel = result.Data.(*model.Channel) } else { fmt.Println(result.Err.Error()) @@ -50,7 +50,7 @@ func getChannelFromChannelArg(channelArg string) *model.Channel { } if channel == nil { - if result := <-app.Global().Srv.Store.Channel().Get(channelPart, true); result.Err == nil { + if result := <-a.Srv.Store.Channel().Get(channelPart, true); result.Err == nil { channel = result.Data.(*model.Channel) } } diff --git a/cmd/platform/import.go b/cmd/platform/import.go index 85cb3835b..44ada904f 100644 --- a/cmd/platform/import.go +++ b/cmd/platform/import.go @@ -53,7 +53,7 @@ func slackImportCmdF(cmd *cobra.Command, args []string) error { return errors.New("Incorrect number of arguments.") } - team := getTeamFromTeamArg(args[0]) + team := getTeamFromTeamArg(a, args[0]) if team == nil { return errors.New("Unable to find team '" + args[0] + "'") } diff --git a/cmd/platform/jobserver.go b/cmd/platform/jobserver.go index 944bedeff..24a229552 100644 --- a/cmd/platform/jobserver.go +++ b/cmd/platform/jobserver.go @@ -10,7 +10,6 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/jobs" "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" "github.com/spf13/cobra" ) @@ -31,10 +30,13 @@ func jobserverCmdF(cmd *cobra.Command, args []string) { noSchedule, _ := cmd.Flags().GetBool("noschedule") // Initialize - utils.InitAndLoadConfig("config.json") + a, err := initDBCommandContext("config.json") + if err != nil { + panic(err.Error()) + } defer l4g.Close() - jobs.Srv.Store = store.NewLayeredStore() + jobs.Srv.Store = store.NewLayeredStore(a.Metrics, a.Cluster) defer jobs.Srv.Store.Close() jobs.Srv.LoadLicense() diff --git a/cmd/platform/roles.go b/cmd/platform/roles.go index ad64459e5..7939dc5c7 100644 --- a/cmd/platform/roles.go +++ b/cmd/platform/roles.go @@ -46,7 +46,7 @@ func makeSystemAdminCmdF(cmd *cobra.Command, args []string) error { return errors.New("Enter at least one user.") } - users := getUsersFromUserArgs(args) + users := getUsersFromUserArgs(a, args) for i, user := range users { if user == nil { return errors.New("Unable to find user '" + args[i] + "'") @@ -70,7 +70,7 @@ func makeMemberCmdF(cmd *cobra.Command, args []string) error { return errors.New("Enter at least one user.") } - users := getUsersFromUserArgs(args) + users := getUsersFromUserArgs(a, args) for i, user := range users { if user == nil { return errors.New("Unable to find user '" + args[i] + "'") diff --git a/cmd/platform/team.go b/cmd/platform/team.go index 1662bd095..c19f40152 100644 --- a/cmd/platform/team.go +++ b/cmd/platform/team.go @@ -112,12 +112,12 @@ func removeUsersCmdF(cmd *cobra.Command, args []string) error { return errors.New("Not enough arguments.") } - team := getTeamFromTeamArg(args[0]) + team := getTeamFromTeamArg(a, args[0]) if team == nil { return errors.New("Unable to find team '" + args[0] + "'") } - users := getUsersFromUserArgs(args[1:]) + users := getUsersFromUserArgs(a, args[1:]) for i, user := range users { removeUserFromTeam(a, team, user, args[i+1]) } @@ -145,12 +145,12 @@ func addUsersCmdF(cmd *cobra.Command, args []string) error { return errors.New("Not enough arguments.") } - team := getTeamFromTeamArg(args[0]) + team := getTeamFromTeamArg(a, args[0]) if team == nil { return errors.New("Unable to find team '" + args[0] + "'") } - users := getUsersFromUserArgs(args[1:]) + users := getUsersFromUserArgs(a, args[1:]) for i, user := range users { addUserToTeam(a, team, user, args[i+1]) } @@ -194,7 +194,7 @@ func deleteTeamsCmdF(cmd *cobra.Command, args []string) error { } } - teams := getTeamsFromTeamArgs(args) + teams := getTeamsFromTeamArgs(a, args) for i, team := range teams { if team == nil { CommandPrintErrorln("Unable to find team '" + args[i] + "'") diff --git a/cmd/platform/teamargs.go b/cmd/platform/teamargs.go index 0083b9e00..144db388b 100644 --- a/cmd/platform/teamargs.go +++ b/cmd/platform/teamargs.go @@ -7,23 +7,23 @@ import ( "github.com/mattermost/mattermost-server/model" ) -func getTeamsFromTeamArgs(teamArgs []string) []*model.Team { +func getTeamsFromTeamArgs(a *app.App, teamArgs []string) []*model.Team { teams := make([]*model.Team, 0, len(teamArgs)) for _, teamArg := range teamArgs { - team := getTeamFromTeamArg(teamArg) + team := getTeamFromTeamArg(a, teamArg) teams = append(teams, team) } return teams } -func getTeamFromTeamArg(teamArg string) *model.Team { +func getTeamFromTeamArg(a *app.App, teamArg string) *model.Team { var team *model.Team - if result := <-app.Global().Srv.Store.Team().GetByName(teamArg); result.Err == nil { + if result := <-a.Srv.Store.Team().GetByName(teamArg); result.Err == nil { team = result.Data.(*model.Team) } if team == nil { - if result := <-app.Global().Srv.Store.Team().Get(teamArg); result.Err == nil { + if result := <-a.Srv.Store.Team().Get(teamArg); result.Err == nil { team = result.Data.(*model.Team) } } diff --git a/cmd/platform/user.go b/cmd/platform/user.go index 695e53173..f985aba38 100644 --- a/cmd/platform/user.go +++ b/cmd/platform/user.go @@ -171,7 +171,7 @@ func userActivateCmdF(cmd *cobra.Command, args []string) error { } func changeUsersActiveStatus(a *app.App, userArgs []string, active bool) { - users := getUsersFromUserArgs(userArgs) + users := getUsersFromUserArgs(a, userArgs) for i, user := range users { err := changeUserActiveStatus(a, user, userArgs[i], active) @@ -255,7 +255,7 @@ func userCreateCmdF(cmd *cobra.Command, args []string) error { } func userInviteCmdF(cmd *cobra.Command, args []string) error { - _, err := initDBCommandContextCobra(cmd) + a, err := initDBCommandContextCobra(cmd) if err != nil { return err } @@ -271,7 +271,7 @@ func userInviteCmdF(cmd *cobra.Command, args []string) error { return errors.New("Invalid email") } - teams := getTeamsFromTeamArgs(args[1:]) + teams := getTeamsFromTeamArgs(a, args[1:]) for i, team := range teams { err := inviteUser(email, team, args[i+1]) @@ -305,7 +305,7 @@ func resetUserPasswordCmdF(cmd *cobra.Command, args []string) error { return errors.New("Expected two arguments. See help text for details.") } - user := getUserFromUserArg(args[0]) + user := getUserFromUserArg(a, args[0]) if user == nil { return errors.New("Unable to find user '" + args[0] + "'") } @@ -328,7 +328,7 @@ func resetUserMfaCmdF(cmd *cobra.Command, args []string) error { return errors.New("Expected at least one argument. See help text for details.") } - users := getUsersFromUserArgs(args) + users := getUsersFromUserArgs(a, args) for i, user := range users { if user == nil { @@ -369,7 +369,7 @@ func deleteUserCmdF(cmd *cobra.Command, args []string) error { } } - users := getUsersFromUserArgs(args) + users := getUsersFromUserArgs(a, args) for i, user := range users { if user == nil { @@ -472,7 +472,7 @@ func verifyUserCmdF(cmd *cobra.Command, args []string) error { return errors.New("Expected at least one argument. See help text for details.") } - users := getUsersFromUserArgs(args) + users := getUsersFromUserArgs(a, args) for i, user := range users { if user == nil { @@ -488,7 +488,7 @@ func verifyUserCmdF(cmd *cobra.Command, args []string) error { } func searchUserCmdF(cmd *cobra.Command, args []string) error { - _, err := initDBCommandContextCobra(cmd) + a, err := initDBCommandContextCobra(cmd) if err != nil { return err } @@ -497,7 +497,7 @@ func searchUserCmdF(cmd *cobra.Command, args []string) error { return errors.New("Expected at least one argument. See help text for details.") } - users := getUsersFromUserArgs(args) + users := getUsersFromUserArgs(a, args) for i, user := range users { if i > 0 { diff --git a/cmd/platform/userargs.go b/cmd/platform/userargs.go index 8fb0147fb..0089cc4da 100644 --- a/cmd/platform/userargs.go +++ b/cmd/platform/userargs.go @@ -7,29 +7,29 @@ import ( "github.com/mattermost/mattermost-server/model" ) -func getUsersFromUserArgs(userArgs []string) []*model.User { +func getUsersFromUserArgs(a *app.App, userArgs []string) []*model.User { users := make([]*model.User, 0, len(userArgs)) for _, userArg := range userArgs { - user := getUserFromUserArg(userArg) + user := getUserFromUserArg(a, userArg) users = append(users, user) } return users } -func getUserFromUserArg(userArg string) *model.User { +func getUserFromUserArg(a *app.App, userArg string) *model.User { var user *model.User - if result := <-app.Global().Srv.Store.User().GetByEmail(userArg); result.Err == nil { + if result := <-a.Srv.Store.User().GetByEmail(userArg); result.Err == nil { user = result.Data.(*model.User) } if user == nil { - if result := <-app.Global().Srv.Store.User().GetByUsername(userArg); result.Err == nil { + if result := <-a.Srv.Store.User().GetByUsername(userArg); result.Err == nil { user = result.Data.(*model.User) } } if user == nil { - if result := <-app.Global().Srv.Store.User().Get(userArg); result.Err == nil { + if result := <-a.Srv.Store.User().Get(userArg); result.Err == nil { user = result.Data.(*model.User) } } |