From ba0a9b4d50a7412da434926d05012bf466f770ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 29 Nov 2018 11:49:45 +0100 Subject: [PATCH] MM-12368: Fixing webhook create incomming (#9905) --- cmd/mattermost/commands/webhook.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/cmd/mattermost/commands/webhook.go b/cmd/mattermost/commands/webhook.go index 879e482e5d..4f24eb9cc1 100644 --- a/cmd/mattermost/commands/webhook.go +++ b/cmd/mattermost/commands/webhook.go @@ -116,24 +116,34 @@ func createIncomingWebhookCmdF(command *cobra.Command, args []string) error { } defer app.Shutdown() - channelArg, _ := command.Flags().GetString("channel") + channelArg, errChannel := command.Flags().GetString("channel") + if errChannel != nil || channelArg == "" { + return errors.New("Channel is required") + } channel := getChannelFromChannelArg(app, channelArg) if channel == nil { return errors.New("Unable to find channel '" + channelArg + "'") } - userArg, _ := command.Flags().GetString("user") + userArg, errUser := command.Flags().GetString("user") + if errUser != nil || userArg == "" { + return errors.New("User is required") + } user := getUserFromUserArg(app, userArg) + if user == nil { + return errors.New("Unable to find user '" + userArg + "'") + } + displayName, _ := command.Flags().GetString("display-name") description, _ := command.Flags().GetString("description") - iconUrl, _ := command.Flags().GetString("icon") + iconURL, _ := command.Flags().GetString("icon") channelLocked, _ := command.Flags().GetBool("lock-to-channel") incomingWebhook := &model.IncomingWebhook{ ChannelId: channel.Id, DisplayName: displayName, Description: description, - IconURL: iconUrl, + IconURL: iconURL, ChannelLocked: channelLocked, } @@ -298,8 +308,8 @@ func deleteWebhookCmdF(command *cobra.Command, args []string) error { } func init() { - WebhookCreateIncomingCmd.Flags().String("channel", "", "Channel ID") - WebhookCreateIncomingCmd.Flags().String("user", "", "User ID") + WebhookCreateIncomingCmd.Flags().String("channel", "", "Channel ID (required)") + WebhookCreateIncomingCmd.Flags().String("user", "", "User ID (required)") WebhookCreateIncomingCmd.Flags().String("display-name", "", "Incoming webhook display name") WebhookCreateIncomingCmd.Flags().String("description", "", "Incoming webhook description") WebhookCreateIncomingCmd.Flags().String("icon", "", "Icon URL")