fix(sensor): Slack trigger should not join conversation for private c…

…hannel (#1078) * fix: 1077 - JoinConversation for private channel throws method_not_supported_for_channel_type Signed-off-by: Shashwat Rawat <[email protected]> * simplified comparison to bool Signed-off-by: Shashwat Rawat <[email protected]>
argoproj · Feb 23, 2021 · 8b77d27 · 8b77d27
1 parent 01355d7
commit 8b77d27
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/sensors/triggers/slack/slack.go b/sensors/triggers/slack/slack.go
@@ -112,6 +112,7 @@ func (t *SlackTrigger) Execute(ctx context.Context, events map[string]*v1alpha1.
 		Types: []string{"public_channel", "private_channel"},
 	}
 	channelID := ""
+	isPrivateChannel := false
 	for {
 		channels, nextCursor, err := api.GetConversations(params)
 		if err != nil {
@@ -121,6 +122,7 @@ func (t *SlackTrigger) Execute(ctx context.Context, events map[string]*v1alpha1.
 		for _, c := range channels {
 			if c.Name == channel {
 				channelID = c.ID
+				isPrivateChannel = c.IsPrivate
 				break
 			}
 		}
@@ -133,11 +135,14 @@ func (t *SlackTrigger) Execute(ctx context.Context, events map[string]*v1alpha1.
 		return nil, errors.Errorf("failed to get channelID of %s", channel)
 	}
 	// Only join if not joined? Maybe a join API call is easier.
-	c, _, _, err := api.JoinConversation(channelID)
-	t.Logger.Debug("successfully joined channel", zap.Any("channel", c))
-	if err != nil {
-		t.Logger.Error("unable to join channel...", zap.Any("channelName", channel), zap.Any("channelID", channelID), zap.Error(err))
-		return nil, errors.Wrapf(err, "failed to join channel %s", channel)
+	// Not applicable for private channels since bot cannot join private channels
+	if !isPrivateChannel {
+		c, _, _, err := api.JoinConversation(channelID)
+		t.Logger.Debug("successfully joined channel", zap.Any("channel", c))
+		if err != nil {
+			t.Logger.Error("unable to join channel...", zap.Any("channelName", channel), zap.Any("channelID", channelID), zap.Error(err))
+			return nil, errors.Wrapf(err, "failed to join channel %s", channel)
+		}
 	}
 
 	t.Logger.Info("posting to channel...", zap.Any("channelName", channel))