liuzhiguo
/
go-scm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add review ready action for gitlab

Browse Source
pull/270/head
Meet Rathod 8 months ago
parent bec9362d12
commit 84d449ac1a
7 changed files with 217 additions and 7 deletions
Show Stats Download Patch File Download Diff File

10
scm/const.go
Unescape Escape View File

@ -40,7 +40,7 @@ const (
// pull requests
ActionSync
ActionMerge
ActionReadyForReview
ActionReviewReady
// issue comment
ActionEdit
// release
@ -81,8 +81,8 @@ func (a Action) String() (s string) {
return "prereleased"
case ActionRelease:
return "released"
case ActionReadyForReview:
return "ready_for_review"
case ActionReviewReady:
return "review_ready"
default:
return
}
@ -130,8 +130,8 @@ func (a *Action) UnmarshalJSON(data []byte) error {
*a = ActionPrerelease
case "released":
*a = ActionRelease
case "ready_for_review":
*a = ActionReadyForReview
case "review_ready":
*a = ActionReviewReady
}
return nil
}

2
scm/driver/github/testdata/webhooks/pr_ready_for_review.json.golden vendored
Unescape Escape View File

@ -1,5 +1,5 @@
{
"Action": "ready_for_review",
"Action": "review_ready",
"Repo": {
"ID": "498312568",
"Namespace": "wings-software",

2
scm/driver/github/webhook.go
Unescape Escape View File

@ -173,7 +173,7 @@ func (s *webhookService) parsePullRequestHook(data []byte) (scm.Webhook, error)
case "synchronize":
dst.Action = scm.ActionSync
case "ready_for_review":
dst.Action = scm.ActionReadyForReview
dst.Action = scm.ActionReviewReady
case "assigned", "unassigned", "review_requested", "review_request_removed", "locked", "unlocked":
dst.Action = scm.ActionUnknown
default:

154
scm/driver/gitlab/testdata/webhooks/pull_request_review_ready.json vendored
Unescape Escape View File

@ -0,0 +1,154 @@
{
"object_kind": "merge_request",
"event_type": "merge_request",
"user": {
"id": 13900456,
"name": "Meet Rathod",
"username": "rathod.meetsatish",
"avatar_url": "https://secure.gravatar.com/avatar/0e68aaeb6c49dd6ba280370c96280803?s=80&d=identicon",
"email": "[REDACTED]"
},
"project": {
"id": 44067058,
"name": "meet",
"description": null,
"web_url": "https://gitlab.com/rathod.meetsatish/meet",
"avatar_url": null,
"git_ssh_url": "git@gitlab.com:rathod.meetsatish/meet.git",
"git_http_url": "https://gitlab.com/rathod.meetsatish/meet.git",
"namespace": "Meet Rathod",
"visibility_level": 0,
"path_with_namespace": "rathod.meetsatish/meet",
"default_branch": "main",
"ci_config_path": "",
"homepage": "https://gitlab.com/rathod.meetsatish/meet",
"url": "git@gitlab.com:rathod.meetsatish/meet.git",
"ssh_url": "git@gitlab.com:rathod.meetsatish/meet.git",
"http_url": "https://gitlab.com/rathod.meetsatish/meet.git"
},
"object_attributes": {
"assignee_id": null,
"author_id": 13900456,
"created_at": "2023-09-07 19:42:34 UTC",
"description": "",
"draft": true,
"head_pipeline_id": null,
"id": 248466002,
"iid": 3,
"last_edited_at": null,
"last_edited_by_id": null,
"merge_commit_sha": null,
"merge_error": null,
"merge_params": {
"force_remove_source_branch": "1"
},
"merge_status": "can_be_merged",
"merge_user_id": null,
"merge_when_pipeline_succeeds": false,
"milestone_id": null,
"source_branch": "main1234",
"source_project_id": 44067058,
"state_id": 1,
"target_branch": "main",
"target_project_id": 44067058,
"time_estimate": 0,
"title": "Draft: Update README.md",
"updated_at": "2023-09-07 19:42:45 UTC",
"updated_by_id": 13900456,
"url": "https://gitlab.com/rathod.meetsatish/meet/-/merge_requests/3",
"source": {
"id": 44067058,
"name": "meet",
"description": null,
"web_url": "https://gitlab.com/rathod.meetsatish/meet",
"avatar_url": null,
"git_ssh_url": "git@gitlab.com:rathod.meetsatish/meet.git",
"git_http_url": "https://gitlab.com/rathod.meetsatish/meet.git",
"namespace": "Meet Rathod",
"visibility_level": 0,
"path_with_namespace": "rathod.meetsatish/meet",
"default_branch": "main",
"ci_config_path": "",
"homepage": "https://gitlab.com/rathod.meetsatish/meet",
"url": "git@gitlab.com:rathod.meetsatish/meet.git",
"ssh_url": "git@gitlab.com:rathod.meetsatish/meet.git",
"http_url": "https://gitlab.com/rathod.meetsatish/meet.git"
},
"target": {
"id": 44067058,
"name": "meet",
"description": null,
"web_url": "https://gitlab.com/rathod.meetsatish/meet",
"avatar_url": null,
"git_ssh_url": "git@gitlab.com:rathod.meetsatish/meet.git",
"git_http_url": "https://gitlab.com/rathod.meetsatish/meet.git",
"namespace": "Meet Rathod",
"visibility_level": 0,
"path_with_namespace": "rathod.meetsatish/meet",
"default_branch": "main",
"ci_config_path": "",
"homepage": "https://gitlab.com/rathod.meetsatish/meet",
"url": "git@gitlab.com:rathod.meetsatish/meet.git",
"ssh_url": "git@gitlab.com:rathod.meetsatish/meet.git",
"http_url": "https://gitlab.com/rathod.meetsatish/meet.git"
},
"last_commit": {
"id": "ffd71529ecdfb41a530ee13f91b8fdd3e743c754",
"message": "Update README.md",
"title": "Update README.md",
"timestamp": "2023-09-07T19:42:21+00:00",
"url": "https://gitlab.com/rathod.meetsatish/meet/-/commit/ffd71529ecdfb41a530ee13f91b8fdd3e743c754",
"author": {
"name": "Meet Rathod",
"email": "[REDACTED]"
}
},
"work_in_progress": true,
"total_time_spent": 0,
"time_change": 0,
"human_total_time_spent": null,
"human_time_change": null,
"human_time_estimate": null,
"assignee_ids": [
],
"reviewer_ids": [
],
"labels": [
],
"state": "opened",
"blocking_discussions_resolved": true,
"first_contribution": true,
"detailed_merge_status": "draft_status",
"action": "update"
},
"labels": [
],
"changes": {
"draft": {
"previous": false,
"current": true
},
"title": {
"previous": "Update README.md",
"current": "Draft: Update README.md"
},
"updated_at": {
"previous": "2023-09-07 19:42:35 UTC",
"current": "2023-09-07 19:42:45 UTC"
},
"updated_by_id": {
"previous": null,
"current": 13900456
}
},
"repository": {
"name": "meet",
"url": "git@gitlab.com:rathod.meetsatish/meet.git",
"description": null,
"homepage": "https://gitlab.com/rathod.meetsatish/meet"
}
}

43
scm/driver/gitlab/testdata/webhooks/pull_request_review_ready.json.golden vendored
Unescape Escape View File

@ -0,0 +1,43 @@
{
"Action": "review_ready",
"Repo": {
"ID": "44067058",
"Namespace": "rathod.meetsatish",
"Name": "meet",
"Perm": null,
"Branch": "main",
"Private": false,
"Clone": "https://gitlab.com/rathod.meetsatish/meet.git",
"CloneSSH": "git@gitlab.com:rathod.meetsatish/meet.git",
"Link": "https://gitlab.com/rathod.meetsatish/meet",
"Created": "0001-01-01T00:00:00Z",
"Updated": "0001-01-01T00:00:00Z"
},
"PullRequest": {
"Number": 3,
"Title": "Draft: Update README.md",
"Body": "",
"Sha": "ffd71529ecdfb41a530ee13f91b8fdd3e743c754",
"Ref": "refs/merge-requests/3/head",
"Source": "main1234",
"Target": "main",
"Fork": "Meet Rathod/meet",
"Link": "https://gitlab.com/rathod.meetsatish/meet/-/merge_requests/3",
"Closed": false,
"Merged": false,
"Author": {
"Login": "rathod.meetsatish",
"Name": "Meet Rathod",
"Email": "",
"Avatar": "https://secure.gravatar.com/avatar/0e68aaeb6c49dd6ba280370c96280803?s=80&d=identicon"
},
"Created": "0001-01-01T00:00:00Z",
"Updated": "0001-01-01T00:00:00Z"
},
"Sender": {
"Login": "rathod.meetsatish",
"Name": "Meet Rathod",
"Email": "",
"Avatar": "https://secure.gravatar.com/avatar/0e68aaeb6c49dd6ba280370c96280803?s=80&d=identicon"
}
}

7
scm/driver/gitlab/webhook.go
Unescape Escape View File

@ -338,6 +338,9 @@ func convertPullRequestHook(src *pullRequestHook) *scm.PullRequestHook {
action = scm.ActionMerge
case "update":
action = scm.ActionSync
if src.Changes.Draft.Previous.Bool == false {
action = scm.ActionReviewReady
}
}
fork := scm.Join(
src.ObjectAttributes.Source.Namespace,
@ -860,6 +863,10 @@ type (
} `json:"object_attributes"`
Labels []interface{} `json:"labels"`
Changes struct {
Draft struct {
Previous null.Bool `json:"previous"`
Current null.Bool `json:"current"`
} `json:"draft"`
} `json:"changes"`
Repository struct {
Name string `json:"name"`

6
scm/driver/gitlab/webhook_test.go
Unescape Escape View File

@ -97,6 +97,12 @@ func TestWebhooks(t *testing.T) {
after: "testdata/webhooks/pull_request_close.json.golden",
obj: new(scm.PullRequestHook),
},
{
event: "Merge Request Hook",
before: "testdata/webhooks/pull_request_review_ready.json",
after: "testdata/webhooks/pull_request_review_ready.json.golden",
obj: new(scm.PullRequestHook),
},
{
event: "Merge Request Hook",
before: "testdata/webhooks/pull_request_reopen.json",

Write Preview
Loading…
Cancel
Save