-
Notifications
You must be signed in to change notification settings - Fork 136
fix(gitlab): discard label removal events on merge requests #2785
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
zakisk
wants to merge
1
commit into
tektoncd:main
Choose a base branch
from
zakisk:SRVKP-12428-discard-label-removal-events-gitlab
base: main
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.
+56
β1
Open
Changes from all commits
Commits
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,12 @@ import ( | |
|
|
||
| const largeComment = "/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s" | ||
|
|
||
| func mrEventWithChanges(sample thelp.TEvent, changesJSON string) string { | ||
| base := sample.MREventAsJSON("update", "") | ||
| idx := strings.LastIndex(base, "}") | ||
| return base[:idx] + `,"changes": {` + changesJSON + `}}` | ||
| } | ||
|
|
||
| func TestProviderDetect(t *testing.T) { | ||
| sample := thelp.TEvent{ | ||
| Username: "foo", | ||
|
|
@@ -173,6 +179,37 @@ func TestProviderDetect(t *testing.T) { | |
| isGL: true, | ||
| processReq: true, | ||
| }, | ||
| { | ||
| name: "good/mergeRequest update Event with label addition", | ||
| event: mrEventWithChanges(sample, `"labels": {"previous": [], "current": [{"id": 1, "title": "bug"}]}`), | ||
| eventType: gitlab.EventTypeMergeRequest, | ||
| isGL: true, | ||
| processReq: true, | ||
| }, | ||
|
Comment on lines
+183
to
+188
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a test case to verify that simultaneous label addition and removal (where the total label count remains unchanged) is correctly processed as a valid label addition event. {
name: "good/mergeRequest update Event with label addition",
event: mrEventWithChanges(sample, "\"labels\": {\"previous\": [], \"current\": [{\"id\": 1, \"title\": \"bug\"}]}"),
eventType: gitlab.EventTypeMergeRequest,
isGL: true,
processReq: true,
},
{
name: "good/mergeRequest update Event with label addition and removal simultaneously",
event: mrEventWithChanges(sample, "\"labels\": {\"previous\": [{\"id\": 2, \"title\": \"feature\"}], \"current\": [{\"id\": 1, \"title\": \"bug\"}]}"),
eventType: gitlab.EventTypeMergeRequest,
isGL: true,
processReq: true,
}, |
||
| { | ||
| name: "bad/mergeRequest update Event with label removal", | ||
| event: mrEventWithChanges(sample, `"labels": {"previous": [{"id": 1, "title": "bug"}], "current": []}`), | ||
| eventType: gitlab.EventTypeMergeRequest, | ||
| isGL: true, | ||
| processReq: false, | ||
| wantReason: "this 'Merge Request' update event changes are not supported", | ||
| }, | ||
| { | ||
| name: "bad/mergeRequest update Event with label removal partial", | ||
| event: mrEventWithChanges(sample, `"labels": {"previous": [{"id": 1, "title": "bug"}, {"id": 2, "title": "feature"}], "current": [{"id": 1, "title": "bug"}]}`), | ||
| eventType: gitlab.EventTypeMergeRequest, | ||
| isGL: true, | ||
| processReq: false, | ||
| wantReason: "this 'Merge Request' update event changes are not supported", | ||
| }, | ||
| { | ||
| name: "bad/mergeRequest update Event with label addition and description change", | ||
| event: mrEventWithChanges(sample, `"labels": {"previous": [], "current": [{"id": 1, "title": "bug"}]}, "description": {"previous": "old", "current": "new"}`), | ||
| eventType: gitlab.EventTypeMergeRequest, | ||
| isGL: true, | ||
| processReq: false, | ||
| wantReason: "this 'Merge Request' update event changes are not supported", | ||
| }, | ||
| { | ||
| name: "good/commit comment /retest command", | ||
| event: sample.CommitNoteEventAsJSON("/retest", "create", "null"), | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can return early after the first new label found, no need to keep the total count.