-
Notifications
You must be signed in to change notification settings - Fork 201
feat(slack): add support for thread replies and message updates (#187) #410
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
willianpaixao
wants to merge
2
commits into
argoproj:master
Choose a base branch
from
willianpaixao:willianpaixao-issue-187
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -99,6 +99,171 @@ func TestThreadedClient(t *testing.T) { | |
| ts2 string = "2" | ||
| ) | ||
|
|
||
| tests := map[string]struct { | ||
| threadTSs timestampMap | ||
| groupingKey string | ||
| policy DeliveryPolicy | ||
| wantPostType1 gomock.Matcher | ||
| wantPostType2 gomock.Matcher | ||
| wantthreadTSs timestampMap | ||
| }{ | ||
| "Post, basic": { | ||
| threadTSs: timestampMap{}, | ||
| groupingKey: "", | ||
| policy: Post, | ||
| wantPostType1: EqChatPost(), | ||
| wantthreadTSs: timestampMap{}, | ||
| }, | ||
| "Post, no parent, with grouping": { | ||
| threadTSs: timestampMap{}, | ||
| groupingKey: groupingKey, | ||
| policy: Post, | ||
| wantPostType1: EqChatPost(), | ||
| wantthreadTSs: timestampMap{channel: {groupingKey: ts1}}, | ||
| }, | ||
| "Post, with parent, with grouping": { | ||
| threadTSs: timestampMap{channel: {groupingKey: ts2}}, | ||
| groupingKey: groupingKey, | ||
| policy: Post, | ||
| wantPostType1: EqChatPost(), | ||
| wantthreadTSs: timestampMap{channel: {groupingKey: ts2}}, | ||
| }, | ||
| "PostAndUpdate, no parent. First post should not be updated": { | ||
| threadTSs: timestampMap{}, | ||
| groupingKey: groupingKey, | ||
| policy: PostAndUpdate, | ||
| wantPostType1: EqChatPost(), | ||
| wantthreadTSs: timestampMap{channel: {groupingKey: ts1}}, | ||
| }, | ||
| "PostAndUpdate, with parent. First post should be updated": { | ||
| threadTSs: timestampMap{channel: {groupingKey: ts2}}, | ||
| groupingKey: groupingKey, | ||
| policy: PostAndUpdate, | ||
| wantPostType1: EqChatPost(), | ||
| wantPostType2: EqChatUpdate(), | ||
| wantthreadTSs: timestampMap{channel: {groupingKey: ts2}}, | ||
| }, | ||
| "Update, no parent. Only call should be post": { | ||
| threadTSs: timestampMap{}, | ||
| groupingKey: groupingKey, | ||
| policy: Update, | ||
| wantPostType1: EqChatPost(), | ||
| wantthreadTSs: timestampMap{channel: {groupingKey: ts1}}, | ||
| }, | ||
| "Update, with parent. Only call should be update": { | ||
| threadTSs: timestampMap{channel: {groupingKey: ts2}}, | ||
| groupingKey: groupingKey, | ||
| policy: Update, | ||
| wantPostType1: EqChatUpdate(), | ||
| wantthreadTSs: timestampMap{channel: {groupingKey: ts2}}, | ||
| }, | ||
| } | ||
|
|
||
| // Test the existing behavior with empty threadTS and updateTS | ||
| for name, tc := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| ctrl := gomock.NewController(t) | ||
| defer ctrl.Finish() | ||
| m := mocks.NewMockSlackClient(ctrl) | ||
|
|
||
| m.EXPECT(). | ||
| SendMessageContext(gomock.Any(), gomock.Eq(channel), tc.wantPostType1). | ||
| Return(channelID, ts1, "", nil) | ||
|
|
||
| if tc.wantPostType2 != nil { | ||
| m.EXPECT(). | ||
| SendMessageContext(gomock.Any(), gomock.Eq(channelID), tc.wantPostType2) | ||
| } | ||
|
|
||
| client := NewThreadedClient( | ||
| m, | ||
| &state{ | ||
| Limiter: rate.NewLimiter(rate.Inf, 1), | ||
| ThreadTSs: tc.threadTSs, | ||
| ChannelIDs: channelMap{}, | ||
| }, | ||
| ) | ||
| err := client.SendMessage(context.TODO(), channel, tc.groupingKey, false, tc.policy, "", "", []slack.MsgOption{}) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, tc.wantthreadTSs, client.ThreadTSs) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestThreadedClient_ExplicitThreadTS(t *testing.T) { | ||
| const ( | ||
| channel string = "channel" | ||
| channelID string = "channel-ID" | ||
| threadTS string = "1234567890.123456" | ||
| ts1 string = "1" | ||
| ) | ||
|
|
||
| t.Run("Explicit threadTS should reply in thread", func(t *testing.T) { | ||
| ctrl := gomock.NewController(t) | ||
| defer ctrl.Finish() | ||
| m := mocks.NewMockSlackClient(ctrl) | ||
|
|
||
| // Expect a post message with the thread_ts option | ||
| m.EXPECT(). | ||
| SendMessageContext(gomock.Any(), gomock.Eq(channel), EqChatPost()). | ||
| Return(channelID, ts1, "", nil) | ||
|
|
||
| client := NewThreadedClient( | ||
| m, | ||
| &state{ | ||
| Limiter: rate.NewLimiter(rate.Inf, 1), | ||
| ThreadTSs: timestampMap{}, | ||
| ChannelIDs: channelMap{}, | ||
| }, | ||
| ) | ||
|
|
||
| // Send message with explicit threadTS | ||
| err := client.SendMessage(context.TODO(), channel, "", false, Post, threadTS, "", []slack.MsgOption{}) | ||
| require.NoError(t, err) | ||
| }) | ||
| } | ||
|
|
||
| func TestThreadedClient_ExplicitUpdateTS(t *testing.T) { | ||
| const ( | ||
| channel string = "channel" | ||
| channelID string = "channel-ID" | ||
| updateTS string = "1234567890.123456" | ||
| ) | ||
|
|
||
| t.Run("Explicit updateTS should update specific message", func(t *testing.T) { | ||
| ctrl := gomock.NewController(t) | ||
| defer ctrl.Finish() | ||
| m := mocks.NewMockSlackClient(ctrl) | ||
|
|
||
| // Expect an update call with channelID | ||
| m.EXPECT(). | ||
| SendMessageContext(gomock.Any(), gomock.Eq(channelID), EqChatUpdate()). | ||
| Return("", "", "", nil) | ||
|
|
||
| client := NewThreadedClient( | ||
| m, | ||
| &state{ | ||
| Limiter: rate.NewLimiter(rate.Inf, 1), | ||
| ThreadTSs: timestampMap{}, | ||
| ChannelIDs: channelMap{channel: channelID}, | ||
| }, | ||
| ) | ||
|
|
||
| // Send message with explicit updateTS | ||
| err := client.SendMessage(context.TODO(), channel, "", false, Post, "", updateTS, []slack.MsgOption{}) | ||
| require.NoError(t, err) | ||
| }) | ||
| } | ||
|
Comment on lines
+226
to
+256
|
||
|
|
||
| func TestThreadedClient_Backward_Compatibility(t *testing.T) { | ||
| const ( | ||
| groupingKey string = "group" | ||
| channel string = "channel" | ||
| channelID string = "channel-ID" | ||
| ts1 string = "1" | ||
| ts2 string = "2" | ||
| ) | ||
|
|
||
| tests := map[string]struct { | ||
| threadTSs timestampMap | ||
| groupingKey string | ||
|
|
@@ -181,7 +346,7 @@ func TestThreadedClient(t *testing.T) { | |
| ChannelIDs: channelMap{}, | ||
| }, | ||
| ) | ||
| err := client.SendMessage(context.TODO(), channel, tc.groupingKey, false, tc.policy, []slack.MsgOption{}) | ||
| err := client.SendMessage(context.TODO(), channel, tc.groupingKey, false, tc.policy, "", "", []slack.MsgOption{}) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, tc.wantthreadTSs, client.ThreadTSs) | ||
| }) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.