Skip to content

Commit 51b3fc5

Browse files
committed
fix(gitlab): use TargetProjectID for merge request comments
Signed-off-by: Shubham Bhardwaj <[email protected]>
1 parent fdd6549 commit 51b3fc5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pkg/provider/gitlab/gitlab.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (v *Provider) CreateComment(_ context.Context, event *info.Event, commit, u
9595

9696
// List comments of the merge request
9797
if updateMarker != "" {
98-
comments, _, err := v.Client().Notes.ListMergeRequestNotes(v.sourceProjectID, event.PullRequestNumber, &gitlab.ListMergeRequestNotesOptions{
98+
comments, _, err := v.Client().Notes.ListMergeRequestNotes(event.TargetProjectID, event.PullRequestNumber, &gitlab.ListMergeRequestNotesOptions{
9999
ListOptions: gitlab.ListOptions{
100100
Page: 1,
101101
PerPage: 100,
@@ -108,15 +108,15 @@ func (v *Provider) CreateComment(_ context.Context, event *info.Event, commit, u
108108
re := regexp.MustCompile(updateMarker)
109109
for _, comment := range comments {
110110
if re.MatchString(comment.Body) {
111-
_, _, err := v.Client().Notes.UpdateMergeRequestNote(v.sourceProjectID, event.PullRequestNumber, comment.ID, &gitlab.UpdateMergeRequestNoteOptions{
111+
_, _, err := v.Client().Notes.UpdateMergeRequestNote(event.TargetProjectID, event.PullRequestNumber, comment.ID, &gitlab.UpdateMergeRequestNoteOptions{
112112
Body: &commit,
113113
})
114114
return err
115115
}
116116
}
117117
}
118118

119-
_, _, err := v.Client().Notes.CreateMergeRequestNote(v.sourceProjectID, event.PullRequestNumber, &gitlab.CreateMergeRequestNoteOptions{
119+
_, _, err := v.Client().Notes.CreateMergeRequestNote(event.TargetProjectID, event.PullRequestNumber, &gitlab.CreateMergeRequestNoteOptions{
120120
Body: &commit,
121121
})
122122

pkg/provider/gitlab/gitlab_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ func TestGitLabCreateComment(t *testing.T) {
991991
},
992992
{
993993
name: "create new comment",
994-
event: &info.Event{PullRequestNumber: 123},
994+
event: &info.Event{PullRequestNumber: 123, TargetProjectID: 666},
995995
commit: "New Comment",
996996
updateMarker: "",
997997
mockResponses: map[string]func(rw http.ResponseWriter, _ *http.Request){
@@ -1004,7 +1004,7 @@ func TestGitLabCreateComment(t *testing.T) {
10041004
},
10051005
{
10061006
name: "update existing comment",
1007-
event: &info.Event{PullRequestNumber: 123},
1007+
event: &info.Event{PullRequestNumber: 123, TargetProjectID: 666},
10081008
commit: "Updated Comment",
10091009
updateMarker: "MARKER",
10101010
mockResponses: map[string]func(rw http.ResponseWriter, _ *http.Request){
@@ -1023,7 +1023,7 @@ func TestGitLabCreateComment(t *testing.T) {
10231023
},
10241024
{
10251025
name: "no matching comment creates new",
1026-
event: &info.Event{PullRequestNumber: 123},
1026+
event: &info.Event{PullRequestNumber: 123, TargetProjectID: 666},
10271027
commit: "New Comment",
10281028
updateMarker: "MARKER",
10291029
mockResponses: map[string]func(rw http.ResponseWriter, _ *http.Request){

0 commit comments

Comments
 (0)