5c092eb0ef
* First stab at a Gitlab migrations interface. * Modify JS to show migration for Gitlab * Properly strip out #gitlab tag from repo name * Working Gitlab migrations! Still need to figure out how to hide tokens/etc from showing up in opts.CloneAddr * Try #2 at trying to hide credentials. CloneAddr was being used as OriginalURL. Now passing OriginalURL through from the form and saving it. * Add go-gitlab dependency * Vendor go-gitlab * Use gitlab.BasicAuthClient Correct CloneURL. This should be functioning! Previous commits fixed "Migrated from" from including the migration credentials. * Replaced repoPath with repoID globally. RepoID is grabbed in NewGitlabDownloader * Logging touchup * Properly set private repo status. Properly set milestone deadline time. Consistently use Gitlab username for 'Name'. * Add go-gitlab vendor cache * Fix PR migrations: - Count of issues is kept to set a non-conflicting PR.ID - Bool is used to tell whether to fetch Issue or PR comments * Ensure merged PRs are closed and set with the proper time * Remove copyright and some commented code * Rip out '#gitlab' based self-hosted Gitlab support * Hide given credentials for migrated repos. CloneAddr was being saved as OriginalURL. Now passing OriginalURL through from the form and saving it in it's place * Use asset.URL directly, no point in parsing. Opened PRs should fall through to false. * Fix importing Milestones. Allow importing using Personal Tokens or anonymous access. * Fix Gitlab Milestone migration if DueDate isn't set * Empty Milestone due dates properly return nil, not zero time * Add GITLAB_READ_TOKEN to drone unit-test step * Add working gitlab_test.go. A Personal Access Token, given in env variable GITLAB_READ_TOKEN is required to run the test. * Fix linting issues * Add modified JS files * Remove pre-build JS files * Only merged PRs are marged as merged/closed * Test topics * Skip test if gitlab is inaccessible * Grab personal token from username, not password. Matches Github migration implementation * Add SetContext() to GitlabDownloader. * Checking Updated field in Issues. * Actually fetch Issue Updated time from Gitlab * Add Gitlab migration GetReviews() stub * Fix Patch and Clone URLs * check Updated too * fix mod * make vendor with go1.14 Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
191 lines
6.9 KiB
Go
191 lines
6.9 KiB
Go
package gitlab
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// MergeRequestApprovalsService handles communication with the merge request
|
|
// approvals related methods of the GitLab API. This includes reading/updating
|
|
// approval settings and approve/unapproving merge requests
|
|
//
|
|
// GitLab API docs: https://docs.gitlab.com/ee/api/merge_request_approvals.html
|
|
type MergeRequestApprovalsService struct {
|
|
client *Client
|
|
}
|
|
|
|
// MergeRequestApprovals represents GitLab merge request approvals.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#merge-request-level-mr-approvals
|
|
type MergeRequestApprovals struct {
|
|
ID int `json:"id"`
|
|
ProjectID int `json:"project_id"`
|
|
Title string `json:"title"`
|
|
Description string `json:"description"`
|
|
State string `json:"state"`
|
|
CreatedAt *time.Time `json:"created_at"`
|
|
UpdatedAt *time.Time `json:"updated_at"`
|
|
MergeStatus string `json:"merge_status"`
|
|
ApprovalsBeforeMerge int `json:"approvals_before_merge"`
|
|
ApprovalsRequired int `json:"approvals_required"`
|
|
ApprovalsLeft int `json:"approvals_left"`
|
|
ApprovedBy []*MergeRequestApproverUser `json:"approved_by"`
|
|
Approvers []*MergeRequestApproverUser `json:"approvers"`
|
|
ApproverGroups []*MergeRequestApproverGroup `json:"approver_groups"`
|
|
SuggestedApprovers []*BasicUser `json:"suggested_approvers"`
|
|
}
|
|
|
|
func (m MergeRequestApprovals) String() string {
|
|
return Stringify(m)
|
|
}
|
|
|
|
// MergeRequestApproverGroup represents GitLab project level merge request approver group.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#project-level-mr-approvals
|
|
type MergeRequestApproverGroup struct {
|
|
Group struct {
|
|
ID int `json:"id"`
|
|
Name string `json:"name"`
|
|
Path string `json:"path"`
|
|
Description string `json:"description"`
|
|
Visibility string `json:"visibility"`
|
|
AvatarURL string `json:"avatar_url"`
|
|
WebURL string `json:"web_url"`
|
|
FullName string `json:"full_name"`
|
|
FullPath string `json:"full_path"`
|
|
LFSEnabled bool `json:"lfs_enabled"`
|
|
RequestAccessEnabled bool `json:"request_access_enabled"`
|
|
}
|
|
}
|
|
|
|
// MergeRequestApproverUser represents GitLab project level merge request approver user.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#project-level-mr-approvals
|
|
type MergeRequestApproverUser struct {
|
|
User *BasicUser
|
|
}
|
|
|
|
// ApproveMergeRequestOptions represents the available ApproveMergeRequest() options.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#approve-merge-request
|
|
type ApproveMergeRequestOptions struct {
|
|
SHA *string `url:"sha,omitempty" json:"sha,omitempty"`
|
|
}
|
|
|
|
// ApproveMergeRequest approves a merge request on GitLab. If a non-empty sha
|
|
// is provided then it must match the sha at the HEAD of the MR.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#approve-merge-request
|
|
func (s *MergeRequestApprovalsService) ApproveMergeRequest(pid interface{}, mr int, opt *ApproveMergeRequestOptions, options ...OptionFunc) (*MergeRequestApprovals, *Response, error) {
|
|
project, err := parseID(pid)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
u := fmt.Sprintf("projects/%s/merge_requests/%d/approve", pathEscape(project), mr)
|
|
|
|
req, err := s.client.NewRequest("POST", u, opt, options)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
m := new(MergeRequestApprovals)
|
|
resp, err := s.client.Do(req, m)
|
|
if err != nil {
|
|
return nil, resp, err
|
|
}
|
|
|
|
return m, resp, err
|
|
}
|
|
|
|
// UnapproveMergeRequest unapproves a previously approved merge request on GitLab.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#unapprove-merge-request
|
|
func (s *MergeRequestApprovalsService) UnapproveMergeRequest(pid interface{}, mr int, options ...OptionFunc) (*Response, error) {
|
|
project, err := parseID(pid)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
u := fmt.Sprintf("projects/%s/merge_requests/%d/unapprove", pathEscape(project), mr)
|
|
|
|
req, err := s.client.NewRequest("POST", u, nil, options)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return s.client.Do(req, nil)
|
|
}
|
|
|
|
// ChangeMergeRequestApprovalConfigurationOptions represents the available
|
|
// ChangeMergeRequestApprovalConfiguration() options.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#change-approval-configuration
|
|
type ChangeMergeRequestApprovalConfigurationOptions struct {
|
|
ApprovalsRequired *int `url:"approvals_required,omitempty" json:"approvals_required,omitempty"`
|
|
}
|
|
|
|
// ChangeApprovalConfiguration updates the approval configuration of a merge request.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#change-approval-configuration
|
|
func (s *MergeRequestApprovalsService) ChangeApprovalConfiguration(pid interface{}, mergeRequestIID int, opt *ChangeMergeRequestApprovalConfigurationOptions, options ...OptionFunc) (*MergeRequest, *Response, error) {
|
|
project, err := parseID(pid)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
u := fmt.Sprintf("projects/%s/merge_requests/%d/approvals", pathEscape(project), mergeRequestIID)
|
|
|
|
req, err := s.client.NewRequest("POST", u, opt, options)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
m := new(MergeRequest)
|
|
resp, err := s.client.Do(req, m)
|
|
if err != nil {
|
|
return nil, resp, err
|
|
}
|
|
|
|
return m, resp, err
|
|
}
|
|
|
|
// ChangeMergeRequestAllowedApproversOptions represents the available
|
|
// ChangeMergeRequestAllowedApprovers() options.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#change-allowed-approvers-for-merge-request
|
|
type ChangeMergeRequestAllowedApproversOptions struct {
|
|
ApproverIDs []int `url:"approver_ids" json:"approver_ids"`
|
|
ApproverGroupIDs []int `url:"approver_group_ids" json:"approver_group_ids"`
|
|
}
|
|
|
|
// ChangeAllowedApprovers updates the approvers for a merge request.
|
|
//
|
|
// GitLab API docs:
|
|
// https://docs.gitlab.com/ee/api/merge_request_approvals.html#change-allowed-approvers-for-merge-request
|
|
func (s *MergeRequestApprovalsService) ChangeAllowedApprovers(pid interface{}, mergeRequestIID int, opt *ChangeMergeRequestAllowedApproversOptions, options ...OptionFunc) (*MergeRequest, *Response, error) {
|
|
project, err := parseID(pid)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
u := fmt.Sprintf("projects/%s/merge_requests/%d/approvers", pathEscape(project), mergeRequestIID)
|
|
|
|
req, err := s.client.NewRequest("PUT", u, opt, options)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
m := new(MergeRequest)
|
|
resp, err := s.client.Do(req, m)
|
|
if err != nil {
|
|
return nil, resp, err
|
|
}
|
|
|
|
return m, resp, err
|
|
}
|