From 0dcbecac8701b2c57357616b6469ca742bd7571a Mon Sep 17 00:00:00 2001 From: Wasim Thabraze Date: Tue, 6 Nov 2018 16:50:49 +0530 Subject: [PATCH] Added MinimumNArgs to required commands in channels.go and team.go (#9792) Removed arguments length comparison as MinimumNArgs would handle it. Addressed code review --- cmd/mattermost/commands/channel.go | 40 ++++++------------------------ cmd/mattermost/commands/team.go | 15 +++-------- 2 files changed, 11 insertions(+), 44 deletions(-) diff --git a/cmd/mattermost/commands/channel.go b/cmd/mattermost/commands/channel.go index 82fb1e966f..ff3e18af31 100644 --- a/cmd/mattermost/commands/channel.go +++ b/cmd/mattermost/commands/channel.go @@ -31,6 +31,7 @@ var ChannelRenameCmd = &cobra.Command{ Short: "Rename a channel", Long: `Rename a channel.`, Example: `" channel rename myteam:mychannel newchannelname --display_name "New Display Name"`, + Args: cobra.MinimumNArgs(2), RunE: renameChannelCmdF, } @@ -48,6 +49,7 @@ var AddChannelUsersCmd = &cobra.Command{ Short: "Add users to channel", Long: "Add some users to channel", Example: " channel add myteam:mychannel user@example.com username", + Args: cobra.MinimumNArgs(2), RunE: addChannelUsersCmdF, } @@ -58,6 +60,7 @@ var ArchiveChannelsCmd = &cobra.Command{ Archive a channel along with all related information including posts from the database. Channels can be specified by [team]:[channel]. ie. myteam:mychannel or by channel ID.`, Example: " channel archive myteam:mychannel", + Args: cobra.MinimumNArgs(1), RunE: archiveChannelsCmdF, } @@ -68,6 +71,7 @@ var DeleteChannelsCmd = &cobra.Command{ Permanently deletes a channel along with all related information including posts from the database. Channels can be specified by [team]:[channel]. ie. myteam:mychannel or by channel ID.`, Example: " channel delete myteam:mychannel", + Args: cobra.MinimumNArgs(1), RunE: deleteChannelsCmdF, } @@ -77,6 +81,7 @@ var ListChannelsCmd = &cobra.Command{ Long: `List all channels on specified teams. Archived channels are appended with ' (archived)'.`, Example: " channel list myteam", + Args: cobra.MinimumNArgs(1), RunE: listChannelsCmdF, } @@ -87,6 +92,7 @@ var MoveChannelsCmd = &cobra.Command{ Validates that all users in the channel belong to the target team. Incoming/Outgoing webhooks are moved along with the channel. Channels can be specified by [team]:[channel]. ie. myteam:mychannel or by channel ID.`, Example: " channel move newteam oldteam:mychannel --username myusername", + Args: cobra.MinimumNArgs(2), RunE: moveChannelsCmdF, } @@ -96,6 +102,7 @@ var RestoreChannelsCmd = &cobra.Command{ Long: `Restore a previously deleted channel Channels can be specified by [team]:[channel]. ie. myteam:mychannel or by channel ID.`, Example: " channel restore myteam:mychannel", + Args: cobra.MinimumNArgs(1), RunE: restoreChannelsCmdF, } @@ -105,6 +112,7 @@ var ModifyChannelCmd = &cobra.Command{ Long: `Change the public/private type of a channel. Channel can be specified by [team]:[channel]. ie. myteam:mychannel or by channel ID.`, Example: " channel modify myteam:mychannel --private --username myusername", + Args: cobra.MinimumNArgs(1), RunE: modifyChannelCmdF, } @@ -252,10 +260,6 @@ func addChannelUsersCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 2 { - return errors.New("Not enough arguments.") - } - channel := getChannelFromChannelArg(a, args[0]) if channel == nil { return errors.New("Unable to find channel '" + args[0] + "'") @@ -286,10 +290,6 @@ func archiveChannelsCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 1 { - return errors.New("Enter at least one channel to archive.") - } - channels := getChannelsFromChannelArgs(a, args) for i, channel := range channels { if channel == nil { @@ -311,10 +311,6 @@ func deleteChannelsCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 1 { - return errors.New("Enter at least one channel to delete.") - } - confirmFlag, _ := command.Flags().GetBool("confirm") if !confirmFlag { var confirm string @@ -352,10 +348,6 @@ func moveChannelsCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 2 { - return errors.New("Enter the destination team and at least one channel to move.") - } - team := getTeamFromTeamArg(a, args[0]) if team == nil { return errors.New("Unable to find destination team '" + args[0] + "'") @@ -429,10 +421,6 @@ func listChannelsCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 1 { - return errors.New("Enter at least one team.") - } - teams := getTeamsFromTeamArgs(a, args) for i, team := range teams { if team == nil { @@ -464,10 +452,6 @@ func restoreChannelsCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 1 { - return errors.New("Enter at least one channel.") - } - channels := getChannelsFromChannelArgs(a, args) for i, channel := range channels { if channel == nil { @@ -489,10 +473,6 @@ func modifyChannelCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) != 1 { - return errors.New("Enter at one channel to modify.") - } - username, erru := command.Flags().GetString("username") if erru != nil || username == "" { return errors.New("Username is required.") @@ -535,10 +515,6 @@ func renameChannelCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 2 { - return errors.New("Not enough arguments.") - } - channel := getChannelFromChannelArg(a, args[0]) if channel == nil { return errors.New("Unable to find channel '" + args[0] + "'") diff --git a/cmd/mattermost/commands/team.go b/cmd/mattermost/commands/team.go index 151795f582..525ae76e3d 100644 --- a/cmd/mattermost/commands/team.go +++ b/cmd/mattermost/commands/team.go @@ -32,6 +32,7 @@ var RemoveUsersCmd = &cobra.Command{ Short: "Remove users from team", Long: "Remove some users from team", Example: " team remove myteam user@example.com username", + Args: cobra.MinimumNArgs(2), RunE: removeUsersCmdF, } @@ -40,6 +41,7 @@ var AddUsersCmd = &cobra.Command{ Short: "Add users to team", Long: "Add some users to team", Example: " team add myteam user@example.com username", + Args: cobra.MinimumNArgs(2), RunE: addUsersCmdF, } @@ -49,6 +51,7 @@ var DeleteTeamsCmd = &cobra.Command{ Long: `Permanently delete some teams. Permanently deletes a team along with all related information including posts from the database.`, Example: " team delete myteam", + Args: cobra.MinimumNArgs(1), RunE: deleteTeamsCmdF, } @@ -142,10 +145,6 @@ func removeUsersCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 2 { - return errors.New("Not enough arguments.") - } - team := getTeamFromTeamArg(a, args[0]) if team == nil { return errors.New("Unable to find team '" + args[0] + "'") @@ -176,10 +175,6 @@ func addUsersCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 2 { - return errors.New("Not enough arguments.") - } - team := getTeamFromTeamArg(a, args[0]) if team == nil { return errors.New("Unable to find team '" + args[0] + "'") @@ -210,10 +205,6 @@ func deleteTeamsCmdF(command *cobra.Command, args []string) error { } defer a.Shutdown() - if len(args) < 1 { - return errors.New("Not enough arguments.") - } - confirmFlag, _ := command.Flags().GetBool("confirm") if !confirmFlag { var confirm string