From 60ff3760e1151f40c8c4efcea3173c14e08355ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 12:51:06 +0000 Subject: [PATCH] Bump github.com/xanzy/go-gitlab from 0.83.0 to 0.84.0 Bumps [github.com/xanzy/go-gitlab](https://github.com/xanzy/go-gitlab) from 0.83.0 to 0.84.0. - [Changelog](https://github.com/xanzy/go-gitlab/blob/master/releases_test.go) - [Commits](https://github.com/xanzy/go-gitlab/compare/v0.83.0...v0.84.0) --- updated-dependencies: - dependency-name: github.com/xanzy/go-gitlab dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +- .../xanzy/go-gitlab/access_requests.go | 12 ++-- .../xanzy/go-gitlab/applications.go | 4 +- .../xanzy/go-gitlab/audit_events.go | 12 ++-- .../xanzy/go-gitlab/award_emojis.go | 12 ++-- vendor/github.com/xanzy/go-gitlab/boards.go | 16 ++--- vendor/github.com/xanzy/go-gitlab/branches.go | 10 +-- .../xanzy/go-gitlab/broadcast_messages.go | 8 +-- .../xanzy/go-gitlab/ci_yml_templates.go | 4 +- .../xanzy/go-gitlab/cluster_agents.go | 12 ++-- vendor/github.com/xanzy/go-gitlab/commits.go | 26 +++---- .../xanzy/go-gitlab/container_registry.go | 10 +-- .../xanzy/go-gitlab/custom_attributes.go | 6 +- .../github.com/xanzy/go-gitlab/deploy_keys.go | 12 ++-- .../xanzy/go-gitlab/deploy_tokens.go | 14 ++-- .../github.com/xanzy/go-gitlab/deployments.go | 8 +-- .../go-gitlab/deployments_merge_requests.go | 2 +- .../github.com/xanzy/go-gitlab/discussions.go | 52 +++++++------- .../xanzy/go-gitlab/dockerfile_templates.go | 4 +- .../xanzy/go-gitlab/environments.go | 22 +++--- .../github.com/xanzy/go-gitlab/epic_issues.go | 8 +-- vendor/github.com/xanzy/go-gitlab/epics.go | 12 ++-- .../xanzy/go-gitlab/error_tracking.go | 8 +-- .../xanzy/go-gitlab/event_webhook_types.go | 42 ++++++++--- vendor/github.com/xanzy/go-gitlab/events.go | 15 ++-- .../xanzy/go-gitlab/external_status_checks.go | 4 +- .../xanzy/go-gitlab/feature_flags.go | 4 +- .../xanzy/go-gitlab/freeze_periods.go | 8 +-- .../xanzy/go-gitlab/generic_packages.go | 2 +- .../github.com/xanzy/go-gitlab/geo_nodes.go | 14 ++-- .../xanzy/go-gitlab/gitignore_templates.go | 4 +- vendor/github.com/xanzy/go-gitlab/gitlab.go | 2 +- .../xanzy/go-gitlab/group_access_tokens.go | 6 +- .../xanzy/go-gitlab/group_badges.go | 10 +-- .../xanzy/go-gitlab/group_boards.go | 16 ++--- .../xanzy/go-gitlab/group_clusters.go | 8 +-- .../github.com/xanzy/go-gitlab/group_hooks.go | 8 +-- .../xanzy/go-gitlab/group_iterations.go | 2 +- .../xanzy/go-gitlab/group_labels.go | 10 +-- .../xanzy/go-gitlab/group_members.go | 14 ++-- .../xanzy/go-gitlab/group_milestones.go | 14 ++-- .../xanzy/go-gitlab/group_variables.go | 8 +-- .../github.com/xanzy/go-gitlab/group_wikis.go | 8 +-- vendor/github.com/xanzy/go-gitlab/groups.go | 36 +++++----- .../xanzy/go-gitlab/instance_clusters.go | 8 +-- .../xanzy/go-gitlab/instance_variables.go | 8 +-- vendor/github.com/xanzy/go-gitlab/invites.go | 8 +-- .../github.com/xanzy/go-gitlab/issue_links.go | 8 +-- vendor/github.com/xanzy/go-gitlab/issues.go | 28 ++++---- .../xanzy/go-gitlab/issues_statistics.go | 6 +- vendor/github.com/xanzy/go-gitlab/jobs.go | 24 ++++--- vendor/github.com/xanzy/go-gitlab/keys.go | 2 +- vendor/github.com/xanzy/go-gitlab/labels.go | 10 +-- vendor/github.com/xanzy/go-gitlab/license.go | 4 +- .../xanzy/go-gitlab/license_templates.go | 4 +- .../go-gitlab/merge_request_approvals.go | 16 ++--- .../xanzy/go-gitlab/merge_requests.go | 40 +++++------ vendor/github.com/xanzy/go-gitlab/metadata.go | 2 +- .../github.com/xanzy/go-gitlab/milestones.go | 12 ++-- .../github.com/xanzy/go-gitlab/namespaces.go | 8 +-- vendor/github.com/xanzy/go-gitlab/notes.go | 32 ++++----- .../xanzy/go-gitlab/notifications.go | 12 ++-- vendor/github.com/xanzy/go-gitlab/packages.go | 6 +- .../xanzy/go-gitlab/pages_domains.go | 10 +-- .../xanzy/go-gitlab/personal_access_tokens.go | 6 +- .../xanzy/go-gitlab/pipeline_schedules.go | 56 ++++++++------- .../xanzy/go-gitlab/pipeline_triggers.go | 12 ++-- .../github.com/xanzy/go-gitlab/pipelines.go | 16 ++--- .../github.com/xanzy/go-gitlab/plan_limits.go | 4 +- .../xanzy/go-gitlab/project_access_tokens.go | 6 +- .../xanzy/go-gitlab/project_badges.go | 10 +-- .../xanzy/go-gitlab/project_clusters.go | 8 +-- .../xanzy/go-gitlab/project_feature_flags.go | 8 +-- .../xanzy/go-gitlab/project_import_export.go | 6 +- .../xanzy/go-gitlab/project_iterations.go | 2 +- .../go-gitlab/project_managed_licenses.go | 8 +-- .../xanzy/go-gitlab/project_members.go | 12 ++-- .../xanzy/go-gitlab/project_mirror.go | 8 +-- .../xanzy/go-gitlab/project_snippets.go | 8 +-- .../xanzy/go-gitlab/project_templates.go | 4 +- .../xanzy/go-gitlab/project_variables.go | 8 +-- .../go-gitlab/project_vulnerabilities.go | 4 +- vendor/github.com/xanzy/go-gitlab/projects.go | 72 +++++++++---------- .../xanzy/go-gitlab/protected_branches.go | 8 +-- .../xanzy/go-gitlab/protected_environments.go | 44 ++++++++++-- .../xanzy/go-gitlab/protected_tags.go | 6 +- .../xanzy/go-gitlab/releaselinks.go | 10 +-- vendor/github.com/xanzy/go-gitlab/releases.go | 10 +-- .../xanzy/go-gitlab/repositories.go | 10 +-- .../xanzy/go-gitlab/repository_files.go | 10 +-- .../xanzy/go-gitlab/repository_submodules.go | 2 +- .../xanzy/go-gitlab/resource_label_events.go | 12 ++-- .../go-gitlab/resource_milestone_events.go | 8 +-- .../xanzy/go-gitlab/resource_state_events.go | 8 +-- .../xanzy/go-gitlab/resource_weight_events.go | 2 +- vendor/github.com/xanzy/go-gitlab/runners.go | 26 +++---- vendor/github.com/xanzy/go-gitlab/search.go | 2 +- vendor/github.com/xanzy/go-gitlab/services.go | 32 ++++----- vendor/github.com/xanzy/go-gitlab/settings.go | 4 +- .../xanzy/go-gitlab/sidekiq_metrics.go | 8 +-- vendor/github.com/xanzy/go-gitlab/snippets.go | 10 +-- .../xanzy/go-gitlab/system_hooks.go | 8 +-- vendor/github.com/xanzy/go-gitlab/tags.go | 10 +-- .../github.com/xanzy/go-gitlab/time_stats.go | 10 +-- vendor/github.com/xanzy/go-gitlab/todos.go | 2 +- vendor/github.com/xanzy/go-gitlab/topics.go | 8 +-- vendor/github.com/xanzy/go-gitlab/types.go | 41 ++++++----- vendor/github.com/xanzy/go-gitlab/users.go | 62 ++++++++-------- vendor/github.com/xanzy/go-gitlab/validate.go | 13 ++-- vendor/github.com/xanzy/go-gitlab/version.go | 2 +- vendor/github.com/xanzy/go-gitlab/wikis.go | 8 +-- vendor/modules.txt | 2 +- 113 files changed, 744 insertions(+), 655 deletions(-) diff --git a/go.mod b/go.mod index 2a5b92d..752816d 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/sj14/review-bot require ( github.com/google/go-github/v25 v25.1.3 github.com/stretchr/testify v1.8.4 - github.com/xanzy/go-gitlab v0.83.0 + github.com/xanzy/go-gitlab v0.84.0 golang.org/x/oauth2 v0.8.0 ) diff --git a/go.sum b/go.sum index 8ce4704..1024deb 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/xanzy/go-gitlab v0.83.0 h1:37p0MpTPNbsTMKX/JnmJtY8Ch1sFiJzVF342+RvZEGw= -github.com/xanzy/go-gitlab v0.83.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw= +github.com/xanzy/go-gitlab v0.84.0 h1:PdpCaskQSgcVDsx21c6ikf8Rfyo7SNtFAJwP9PrbCFE= +github.com/xanzy/go-gitlab v0.84.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= diff --git a/vendor/github.com/xanzy/go-gitlab/access_requests.go b/vendor/github.com/xanzy/go-gitlab/access_requests.go index a38f7ec..2e07187 100644 --- a/vendor/github.com/xanzy/go-gitlab/access_requests.go +++ b/vendor/github.com/xanzy/go-gitlab/access_requests.go @@ -74,7 +74,7 @@ func (s *AccessRequestsService) ListProjectAccessRequests(pid interface{}, opt * return nil, resp, err } - return ars, resp, err + return ars, resp, nil } // ListGroupAccessRequests gets a list of access requests @@ -100,7 +100,7 @@ func (s *AccessRequestsService) ListGroupAccessRequests(gid interface{}, opt *Li return nil, resp, err } - return ars, resp, err + return ars, resp, nil } // RequestProjectAccess requests access for the authenticated user @@ -126,7 +126,7 @@ func (s *AccessRequestsService) RequestProjectAccess(pid interface{}, options .. return nil, resp, err } - return ar, resp, err + return ar, resp, nil } // RequestGroupAccess requests access for the authenticated user @@ -152,7 +152,7 @@ func (s *AccessRequestsService) RequestGroupAccess(gid interface{}, options ...R return nil, resp, err } - return ar, resp, err + return ar, resp, nil } // ApproveAccessRequestOptions represents the available @@ -186,7 +186,7 @@ func (s *AccessRequestsService) ApproveProjectAccessRequest(pid interface{}, use return nil, resp, err } - return ar, resp, err + return ar, resp, nil } // ApproveGroupAccessRequest approves an access request for the given user. @@ -211,7 +211,7 @@ func (s *AccessRequestsService) ApproveGroupAccessRequest(gid interface{}, user return nil, resp, err } - return ar, resp, err + return ar, resp, nil } // DenyProjectAccessRequest denies an access request for the given user. diff --git a/vendor/github.com/xanzy/go-gitlab/applications.go b/vendor/github.com/xanzy/go-gitlab/applications.go index cae0ca5..5335f6c 100644 --- a/vendor/github.com/xanzy/go-gitlab/applications.go +++ b/vendor/github.com/xanzy/go-gitlab/applications.go @@ -65,7 +65,7 @@ func (s *ApplicationsService) CreateApplication(opt *CreateApplicationOptions, o return nil, resp, err } - return a, resp, err + return a, resp, nil } // ListApplicationsOptions represents the available @@ -87,7 +87,7 @@ func (s *ApplicationsService) ListApplications(opt *ListApplicationsOptions, opt return nil, resp, err } - return as, resp, err + return as, resp, nil } // DeleteApplication removes a specific application. diff --git a/vendor/github.com/xanzy/go-gitlab/audit_events.go b/vendor/github.com/xanzy/go-gitlab/audit_events.go index 7473ecc..95227c4 100644 --- a/vendor/github.com/xanzy/go-gitlab/audit_events.go +++ b/vendor/github.com/xanzy/go-gitlab/audit_events.go @@ -75,7 +75,7 @@ func (s *AuditEventsService) ListInstanceAuditEvents(opt *ListAuditEventsOptions return nil, resp, err } - return aes, resp, err + return aes, resp, nil } // GetInstanceAuditEvent gets a specific instance audit event. @@ -96,7 +96,7 @@ func (s *AuditEventsService) GetInstanceAuditEvent(event int, options ...Request return nil, resp, err } - return ae, resp, err + return ae, resp, nil } // ListGroupAuditEvents gets a list of audit events for the specified group @@ -121,7 +121,7 @@ func (s *AuditEventsService) ListGroupAuditEvents(gid interface{}, opt *ListAudi return nil, resp, err } - return aes, resp, err + return aes, resp, nil } // GetGroupAuditEvent gets a specific group audit event. @@ -145,7 +145,7 @@ func (s *AuditEventsService) GetGroupAuditEvent(gid interface{}, event int, opti return nil, resp, err } - return ae, resp, err + return ae, resp, nil } // ListProjectAuditEvents gets a list of audit events for the specified project @@ -170,7 +170,7 @@ func (s *AuditEventsService) ListProjectAuditEvents(pid interface{}, opt *ListAu return nil, resp, err } - return aes, resp, err + return aes, resp, nil } // GetProjectAuditEvent gets a specific project audit event. @@ -195,5 +195,5 @@ func (s *AuditEventsService) GetProjectAuditEvent(pid interface{}, event int, op return nil, resp, err } - return ae, resp, err + return ae, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/award_emojis.go b/vendor/github.com/xanzy/go-gitlab/award_emojis.go index 8847537..f7673a3 100644 --- a/vendor/github.com/xanzy/go-gitlab/award_emojis.go +++ b/vendor/github.com/xanzy/go-gitlab/award_emojis.go @@ -109,7 +109,7 @@ func (s *AwardEmojiService) listAwardEmoji(pid interface{}, resource string, res return nil, resp, err } - return as, resp, err + return as, resp, nil } // GetMergeRequestAwardEmoji get an award emoji from merge request. @@ -159,7 +159,7 @@ func (s *AwardEmojiService) getAwardEmoji(pid interface{}, resource string, reso return nil, resp, err } - return a, resp, err + return a, resp, nil } // CreateAwardEmojiOptions represents the available options for awarding emoji @@ -217,7 +217,7 @@ func (s *AwardEmojiService) createAwardEmoji(pid interface{}, resource string, r return nil, resp, err } - return a, resp, err + return a, resp, nil } // DeleteIssueAwardEmoji delete award emoji on an issue. @@ -309,7 +309,7 @@ func (s *AwardEmojiService) listAwardEmojiOnNote(pid interface{}, resources stri return nil, resp, err } - return as, resp, err + return as, resp, nil } // GetIssuesAwardEmojiOnNote gets an award emoji on a note from an issue. @@ -362,7 +362,7 @@ func (s *AwardEmojiService) getSingleNoteAwardEmoji(pid interface{}, ressource s return nil, resp, err } - return a, resp, err + return a, resp, nil } // CreateIssuesAwardEmojiOnNote gets an award emoji on a note from an issue. @@ -417,7 +417,7 @@ func (s *AwardEmojiService) createAwardEmojiOnNote(pid interface{}, resource str return nil, resp, err } - return a, resp, err + return a, resp, nil } // DeleteIssuesAwardEmojiOnNote deletes an award emoji on a note from an issue. diff --git a/vendor/github.com/xanzy/go-gitlab/boards.go b/vendor/github.com/xanzy/go-gitlab/boards.go index d8ce457..8b5eb79 100644 --- a/vendor/github.com/xanzy/go-gitlab/boards.go +++ b/vendor/github.com/xanzy/go-gitlab/boards.go @@ -104,7 +104,7 @@ func (s *IssueBoardsService) CreateIssueBoard(pid interface{}, opt *CreateIssueB return nil, resp, err } - return board, resp, err + return board, resp, nil } // UpdateIssueBoardOptions represents the available UpdateIssueBoard() options. @@ -139,7 +139,7 @@ func (s *IssueBoardsService) UpdateIssueBoard(pid interface{}, board int, opt *U return nil, resp, err } - return is, resp, err + return is, resp, nil } // DeleteIssueBoard deletes an issue board. @@ -186,7 +186,7 @@ func (s *IssueBoardsService) ListIssueBoards(pid interface{}, opt *ListIssueBoar return nil, resp, err } - return is, resp, err + return is, resp, nil } // GetIssueBoard gets a single issue board of a project. @@ -210,7 +210,7 @@ func (s *IssueBoardsService) GetIssueBoard(pid interface{}, board int, options . return nil, resp, err } - return ib, resp, err + return ib, resp, nil } // GetIssueBoardListsOptions represents the available GetIssueBoardLists() options. @@ -240,7 +240,7 @@ func (s *IssueBoardsService) GetIssueBoardLists(pid interface{}, board int, opt return nil, resp, err } - return bl, resp, err + return bl, resp, nil } // GetIssueBoardList gets a single issue board list. @@ -268,7 +268,7 @@ func (s *IssueBoardsService) GetIssueBoardList(pid interface{}, board, list int, return nil, resp, err } - return bl, resp, err + return bl, resp, nil } // CreateIssueBoardListOptions represents the available CreateIssueBoardList() @@ -303,7 +303,7 @@ func (s *IssueBoardsService) CreateIssueBoardList(pid interface{}, board int, op return nil, resp, err } - return bl, resp, err + return bl, resp, nil } // UpdateIssueBoardListOptions represents the available UpdateIssueBoardList() @@ -339,7 +339,7 @@ func (s *IssueBoardsService) UpdateIssueBoardList(pid interface{}, board, list i return nil, resp, err } - return bl, resp, err + return bl, resp, nil } // DeleteIssueBoardList soft deletes an issue board list. Only for admins and diff --git a/vendor/github.com/xanzy/go-gitlab/branches.go b/vendor/github.com/xanzy/go-gitlab/branches.go index 57ccdc0..725ec0c 100644 --- a/vendor/github.com/xanzy/go-gitlab/branches.go +++ b/vendor/github.com/xanzy/go-gitlab/branches.go @@ -81,7 +81,7 @@ func (s *BranchesService) ListBranches(pid interface{}, opts *ListBranchesOption return nil, resp, err } - return b, resp, err + return b, resp, nil } // GetBranch gets a single project repository branch. @@ -106,7 +106,7 @@ func (s *BranchesService) GetBranch(pid interface{}, branch string, options ...R return nil, resp, err } - return b, resp, err + return b, resp, nil } // ProtectBranchOptions represents the available ProtectBranch() options. @@ -145,7 +145,7 @@ func (s *BranchesService) ProtectBranch(pid interface{}, branch string, opts *Pr return nil, resp, err } - return b, resp, err + return b, resp, nil } // UnprotectBranch unprotects a single project repository branch. This is an @@ -175,7 +175,7 @@ func (s *BranchesService) UnprotectBranch(pid interface{}, branch string, option return nil, resp, err } - return b, resp, err + return b, resp, nil } // CreateBranchOptions represents the available CreateBranch() options. @@ -209,7 +209,7 @@ func (s *BranchesService) CreateBranch(pid interface{}, opt *CreateBranchOptions return nil, resp, err } - return b, resp, err + return b, resp, nil } // DeleteBranch deletes an existing branch. diff --git a/vendor/github.com/xanzy/go-gitlab/broadcast_messages.go b/vendor/github.com/xanzy/go-gitlab/broadcast_messages.go index 029f939..3d0c61d 100644 --- a/vendor/github.com/xanzy/go-gitlab/broadcast_messages.go +++ b/vendor/github.com/xanzy/go-gitlab/broadcast_messages.go @@ -73,7 +73,7 @@ func (s *BroadcastMessagesService) ListBroadcastMessages(opt *ListBroadcastMessa return nil, resp, err } - return bs, resp, err + return bs, resp, nil } // GetBroadcastMessage gets a single broadcast message. @@ -94,7 +94,7 @@ func (s *BroadcastMessagesService) GetBroadcastMessage(broadcast int, options .. return nil, resp, err } - return b, resp, err + return b, resp, nil } // CreateBroadcastMessageOptions represents the available CreateBroadcastMessage() @@ -132,7 +132,7 @@ func (s *BroadcastMessagesService) CreateBroadcastMessage(opt *CreateBroadcastMe return nil, resp, err } - return b, resp, err + return b, resp, nil } // UpdateBroadcastMessageOptions represents the available CreateBroadcastMessage() @@ -172,7 +172,7 @@ func (s *BroadcastMessagesService) UpdateBroadcastMessage(broadcast int, opt *Up return nil, resp, err } - return b, resp, err + return b, resp, nil } // DeleteBroadcastMessage deletes a broadcasted message. diff --git a/vendor/github.com/xanzy/go-gitlab/ci_yml_templates.go b/vendor/github.com/xanzy/go-gitlab/ci_yml_templates.go index 974ab7d..992fe11 100644 --- a/vendor/github.com/xanzy/go-gitlab/ci_yml_templates.go +++ b/vendor/github.com/xanzy/go-gitlab/ci_yml_templates.go @@ -70,7 +70,7 @@ func (s *CIYMLTemplatesService) ListAllTemplates(opt *ListCIYMLTemplatesOptions, return nil, resp, err } - return cts, resp, err + return cts, resp, nil } // GetTemplate get a single GitLab CI YML template. @@ -91,5 +91,5 @@ func (s *CIYMLTemplatesService) GetTemplate(key string, options ...RequestOption return nil, resp, err } - return ct, resp, err + return ct, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/cluster_agents.go b/vendor/github.com/xanzy/go-gitlab/cluster_agents.go index 907f753..1153fea 100644 --- a/vendor/github.com/xanzy/go-gitlab/cluster_agents.go +++ b/vendor/github.com/xanzy/go-gitlab/cluster_agents.go @@ -103,7 +103,7 @@ func (s *ClusterAgentsService) ListAgents(pid interface{}, opt *ListAgentsOption return nil, resp, err } - return as, resp, err + return as, resp, nil } // GetAgent gets a single agent details. @@ -128,7 +128,7 @@ func (s *ClusterAgentsService) GetAgent(pid interface{}, id int, options ...Requ return nil, resp, err } - return a, resp, err + return a, resp, nil } // RegisterAgentOptions represents the available RegisterAgent() @@ -162,7 +162,7 @@ func (s *ClusterAgentsService) RegisterAgent(pid interface{}, opt *RegisterAgent return nil, resp, err } - return a, resp, err + return a, resp, nil } // DeleteAgent deletes an existing agent registration. @@ -212,7 +212,7 @@ func (s *ClusterAgentsService) ListAgentTokens(pid interface{}, aid int, opt *Li return nil, resp, err } - return ats, resp, err + return ats, resp, nil } // GetAgentToken gets a single agent token. @@ -237,7 +237,7 @@ func (s *ClusterAgentsService) GetAgentToken(pid interface{}, aid int, id int, o return nil, resp, err } - return at, resp, err + return at, resp, nil } // CreateAgentTokenOptions represents the available CreateAgentToken() options. @@ -271,7 +271,7 @@ func (s *ClusterAgentsService) CreateAgentToken(pid interface{}, aid int, opt *C return nil, resp, err } - return at, resp, err + return at, resp, nil } // RevokeAgentToken revokes an agent token. diff --git a/vendor/github.com/xanzy/go-gitlab/commits.go b/vendor/github.com/xanzy/go-gitlab/commits.go index e6d64c4..7c724c2 100644 --- a/vendor/github.com/xanzy/go-gitlab/commits.go +++ b/vendor/github.com/xanzy/go-gitlab/commits.go @@ -104,7 +104,7 @@ func (s *CommitsService) ListCommits(pid interface{}, opt *ListCommitsOptions, o return nil, resp, err } - return c, resp, err + return c, resp, nil } // CommitRef represents the reference of branches/tags in a commit. @@ -147,7 +147,7 @@ func (s *CommitsService) GetCommitRefs(pid interface{}, sha string, opt *GetComm return nil, resp, err } - return cs, resp, err + return cs, resp, nil } // GetCommit gets a specific commit identified by the commit hash or name of a @@ -175,7 +175,7 @@ func (s *CommitsService) GetCommit(pid interface{}, sha string, options ...Reque return nil, resp, err } - return c, resp, err + return c, resp, nil } // CreateCommitOptions represents the available options for a new commit. @@ -229,7 +229,7 @@ func (s *CommitsService) CreateCommit(pid interface{}, opt *CreateCommitOptions, return nil, resp, err } - return c, resp, err + return c, resp, nil } // Diff represents a GitLab diff. @@ -278,7 +278,7 @@ func (s *CommitsService) GetCommitDiff(pid interface{}, sha string, opt *GetComm return nil, resp, err } - return d, resp, err + return d, resp, nil } // CommitComment represents a GitLab commit comment. @@ -335,7 +335,7 @@ func (s *CommitsService) GetCommitComments(pid interface{}, sha string, opt *Get return nil, resp, err } - return c, resp, err + return c, resp, nil } // PostCommitCommentOptions represents the available PostCommitComment() @@ -374,7 +374,7 @@ func (s *CommitsService) PostCommitComment(pid interface{}, sha string, opt *Pos return nil, resp, err } - return c, resp, err + return c, resp, nil } // GetCommitStatusesOptions represents the available GetCommitStatuses() options. @@ -428,7 +428,7 @@ func (s *CommitsService) GetCommitStatuses(pid interface{}, sha string, opt *Get return nil, resp, err } - return cs, resp, err + return cs, resp, nil } // SetCommitStatusOptions represents the available SetCommitStatus() options. @@ -466,7 +466,7 @@ func (s *CommitsService) SetCommitStatus(pid interface{}, sha string, opt *SetCo return nil, resp, err } - return cs, resp, err + return cs, resp, nil } // ListMergeRequestsByCommit gets merge request associated with a commit. @@ -491,7 +491,7 @@ func (s *CommitsService) ListMergeRequestsByCommit(pid interface{}, sha string, return nil, resp, err } - return mrs, resp, err + return mrs, resp, nil } // CherryPickCommitOptions represents the available CherryPickCommit() options. @@ -524,7 +524,7 @@ func (s *CommitsService) CherryPickCommit(pid interface{}, sha string, opt *Cher return nil, resp, err } - return c, resp, err + return c, resp, nil } // RevertCommitOptions represents the available RevertCommit() options. @@ -555,7 +555,7 @@ func (s *CommitsService) RevertCommit(pid interface{}, sha string, opt *RevertCo return nil, resp, err } - return c, resp, err + return c, resp, nil } // GPGSignature represents a Gitlab commit's GPG Signature. @@ -592,5 +592,5 @@ func (s *CommitsService) GetGPGSiganature(pid interface{}, sha string, options . return nil, resp, err } - return sig, resp, err + return sig, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/container_registry.go b/vendor/github.com/xanzy/go-gitlab/container_registry.go index a85e0cb..eaf0e34 100644 --- a/vendor/github.com/xanzy/go-gitlab/container_registry.go +++ b/vendor/github.com/xanzy/go-gitlab/container_registry.go @@ -102,7 +102,7 @@ func (s *ContainerRegistryService) ListProjectRegistryRepositories(pid interface return nil, resp, err } - return repos, resp, err + return repos, resp, nil } // ListGroupRegistryRepositories gets a list of registry repositories in a group. @@ -127,7 +127,7 @@ func (s *ContainerRegistryService) ListGroupRegistryRepositories(gid interface{} return nil, resp, err } - return repos, resp, err + return repos, resp, nil } // GetSingleRegistryRepositoryOptions represents the available @@ -162,7 +162,7 @@ func (s *ContainerRegistryService) GetSingleRegistryRepository(pid interface{}, return nil, resp, err } - return repo, resp, err + return repo, resp, nil } // DeleteRegistryRepository deletes a repository in a registry. @@ -216,7 +216,7 @@ func (s *ContainerRegistryService) ListRegistryRepositoryTags(pid interface{}, r return nil, resp, err } - return tags, resp, err + return tags, resp, nil } // GetRegistryRepositoryTagDetail get details of a registry repository tag @@ -245,7 +245,7 @@ func (s *ContainerRegistryService) GetRegistryRepositoryTagDetail(pid interface{ return nil, resp, err } - return tag, resp, err + return tag, resp, nil } // DeleteRegistryRepositoryTag deletes a registry repository tag. diff --git a/vendor/github.com/xanzy/go-gitlab/custom_attributes.go b/vendor/github.com/xanzy/go-gitlab/custom_attributes.go index 54f61ce..244059d 100644 --- a/vendor/github.com/xanzy/go-gitlab/custom_attributes.go +++ b/vendor/github.com/xanzy/go-gitlab/custom_attributes.go @@ -73,7 +73,7 @@ func (s *CustomAttributesService) listCustomAttributes(resource string, id int, if err != nil { return nil, resp, err } - return cas, resp, err + return cas, resp, nil } // GetCustomUserAttribute returns the user attribute with a speciifc key. @@ -112,7 +112,7 @@ func (s *CustomAttributesService) getCustomAttribute(resource string, id int, ke if err != nil { return nil, resp, err } - return ca, resp, err + return ca, resp, nil } // SetCustomUserAttribute sets the custom attributes of the specified user. @@ -151,7 +151,7 @@ func (s *CustomAttributesService) setCustomAttribute(resource string, id int, c if err != nil { return nil, resp, err } - return ca, resp, err + return ca, resp, nil } // DeleteCustomUserAttribute removes the custom attribute of the specified user. diff --git a/vendor/github.com/xanzy/go-gitlab/deploy_keys.go b/vendor/github.com/xanzy/go-gitlab/deploy_keys.go index 6e1cafb..e343bef 100644 --- a/vendor/github.com/xanzy/go-gitlab/deploy_keys.go +++ b/vendor/github.com/xanzy/go-gitlab/deploy_keys.go @@ -99,7 +99,7 @@ func (s *DeployKeysService) ListAllDeployKeys(opt *ListInstanceDeployKeysOptions return nil, resp, err } - return ks, resp, err + return ks, resp, nil } // ListProjectDeployKeysOptions represents the available ListProjectDeployKeys() @@ -131,7 +131,7 @@ func (s *DeployKeysService) ListProjectDeployKeys(pid interface{}, opt *ListProj return nil, resp, err } - return ks, resp, err + return ks, resp, nil } // GetDeployKey gets a single deploy key. @@ -156,7 +156,7 @@ func (s *DeployKeysService) GetDeployKey(pid interface{}, deployKey int, options return nil, resp, err } - return k, resp, err + return k, resp, nil } // AddDeployKeyOptions represents the available ADDDeployKey() options. @@ -193,7 +193,7 @@ func (s *DeployKeysService) AddDeployKey(pid interface{}, opt *AddDeployKeyOptio return nil, resp, err } - return k, resp, err + return k, resp, nil } // DeleteDeployKey deletes a deploy key from a project. @@ -237,7 +237,7 @@ func (s *DeployKeysService) EnableDeployKey(pid interface{}, deployKey int, opti return nil, resp, err } - return k, resp, err + return k, resp, nil } // UpdateDeployKeyOptions represents the available UpdateDeployKey() options. @@ -271,5 +271,5 @@ func (s *DeployKeysService) UpdateDeployKey(pid interface{}, deployKey int, opt return nil, resp, err } - return k, resp, err + return k, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go b/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go index 07c53cc..f744b0e 100644 --- a/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go +++ b/vendor/github.com/xanzy/go-gitlab/deploy_tokens.go @@ -62,7 +62,7 @@ func (s *DeployTokensService) ListAllDeployTokens(options ...RequestOptionFunc) return nil, resp, err } - return ts, resp, err + return ts, resp, nil } // ListProjectDeployTokensOptions represents the available ListProjectDeployTokens() @@ -94,7 +94,7 @@ func (s *DeployTokensService) ListProjectDeployTokens(pid interface{}, opt *List return nil, resp, err } - return ts, resp, err + return ts, resp, nil } // GetProjectDeployToken gets a single deploy token. @@ -119,7 +119,7 @@ func (s *DeployTokensService) GetProjectDeployToken(pid interface{}, deployToken return nil, resp, err } - return t, resp, err + return t, resp, nil } // CreateProjectDeployTokenOptions represents the available CreateProjectDeployToken() options. @@ -155,7 +155,7 @@ func (s *DeployTokensService) CreateProjectDeployToken(pid interface{}, opt *Cre return nil, resp, err } - return t, resp, err + return t, resp, nil } // DeleteProjectDeployToken removes a deploy token from the project. @@ -206,7 +206,7 @@ func (s *DeployTokensService) ListGroupDeployTokens(gid interface{}, opt *ListGr return nil, resp, err } - return ts, resp, err + return ts, resp, nil } // GetGroupDeployToken gets a single deploy token. @@ -231,7 +231,7 @@ func (s *DeployTokensService) GetGroupDeployToken(gid interface{}, deployToken i return nil, resp, err } - return t, resp, err + return t, resp, nil } // CreateGroupDeployTokenOptions represents the available CreateGroupDeployToken() options. @@ -267,7 +267,7 @@ func (s *DeployTokensService) CreateGroupDeployToken(gid interface{}, opt *Creat return nil, resp, err } - return t, resp, err + return t, resp, nil } // DeleteGroupDeployToken removes a deploy token from the group. diff --git a/vendor/github.com/xanzy/go-gitlab/deployments.go b/vendor/github.com/xanzy/go-gitlab/deployments.go index 251dd2f..40ac4ed 100644 --- a/vendor/github.com/xanzy/go-gitlab/deployments.go +++ b/vendor/github.com/xanzy/go-gitlab/deployments.go @@ -107,7 +107,7 @@ func (s *DeploymentsService) ListProjectDeployments(pid interface{}, opts *ListP return nil, resp, err } - return ds, resp, err + return ds, resp, nil } // GetProjectDeployment get a deployment for a project. @@ -131,7 +131,7 @@ func (s *DeploymentsService) GetProjectDeployment(pid interface{}, deployment in return nil, resp, err } - return d, resp, err + return d, resp, nil } // CreateProjectDeploymentOptions represents the available @@ -167,7 +167,7 @@ func (s *DeploymentsService) CreateProjectDeployment(pid interface{}, opt *Creat return nil, resp, err } - return d, resp, err + return d, resp, nil } // UpdateProjectDeploymentOptions represents the available @@ -199,5 +199,5 @@ func (s *DeploymentsService) UpdateProjectDeployment(pid interface{}, deployment return nil, resp, err } - return d, resp, err + return d, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/deployments_merge_requests.go b/vendor/github.com/xanzy/go-gitlab/deployments_merge_requests.go index 1958f0e..8417f91 100644 --- a/vendor/github.com/xanzy/go-gitlab/deployments_merge_requests.go +++ b/vendor/github.com/xanzy/go-gitlab/deployments_merge_requests.go @@ -49,5 +49,5 @@ func (s *DeploymentMergeRequestsService) ListDeploymentMergeRequests(pid interfa return nil, resp, err } - return mrs, resp, err + return mrs, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/discussions.go b/vendor/github.com/xanzy/go-gitlab/discussions.go index 9b673e2..b4d7f24 100644 --- a/vendor/github.com/xanzy/go-gitlab/discussions.go +++ b/vendor/github.com/xanzy/go-gitlab/discussions.go @@ -73,7 +73,7 @@ func (s *DiscussionsService) ListIssueDiscussions(pid interface{}, issue int, op return nil, resp, err } - return ds, resp, err + return ds, resp, nil } // GetIssueDiscussion returns a single discussion for a specific project issue. @@ -102,7 +102,7 @@ func (s *DiscussionsService) GetIssueDiscussion(pid interface{}, issue int, disc return nil, resp, err } - return d, resp, err + return d, resp, nil } // CreateIssueDiscussionOptions represents the available CreateIssueDiscussion() @@ -137,7 +137,7 @@ func (s *DiscussionsService) CreateIssueDiscussion(pid interface{}, issue int, o return nil, resp, err } - return d, resp, err + return d, resp, nil } // AddIssueDiscussionNoteOptions represents the available AddIssueDiscussionNote() @@ -176,7 +176,7 @@ func (s *DiscussionsService) AddIssueDiscussionNote(pid interface{}, issue int, return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateIssueDiscussionNoteOptions represents the available @@ -216,7 +216,7 @@ func (s *DiscussionsService) UpdateIssueDiscussionNote(pid interface{}, issue in return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteIssueDiscussionNote deletes an existing discussion of an issue. @@ -273,7 +273,7 @@ func (s *DiscussionsService) ListSnippetDiscussions(pid interface{}, snippet int return nil, resp, err } - return ds, resp, err + return ds, resp, nil } // GetSnippetDiscussion returns a single discussion for a given snippet. @@ -302,7 +302,7 @@ func (s *DiscussionsService) GetSnippetDiscussion(pid interface{}, snippet int, return nil, resp, err } - return d, resp, err + return d, resp, nil } // CreateSnippetDiscussionOptions represents the available @@ -338,7 +338,7 @@ func (s *DiscussionsService) CreateSnippetDiscussion(pid interface{}, snippet in return nil, resp, err } - return d, resp, err + return d, resp, nil } // AddSnippetDiscussionNoteOptions represents the available @@ -378,7 +378,7 @@ func (s *DiscussionsService) AddSnippetDiscussionNote(pid interface{}, snippet i return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateSnippetDiscussionNoteOptions represents the available @@ -418,7 +418,7 @@ func (s *DiscussionsService) UpdateSnippetDiscussionNote(pid interface{}, snippe return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteSnippetDiscussionNote deletes an existing discussion of a snippet. @@ -478,7 +478,7 @@ func (s *DiscussionsService) ListGroupEpicDiscussions(gid interface{}, epic int, return nil, resp, err } - return ds, resp, err + return ds, resp, nil } // GetEpicDiscussion returns a single discussion for a given epic. @@ -507,7 +507,7 @@ func (s *DiscussionsService) GetEpicDiscussion(gid interface{}, epic int, discus return nil, resp, err } - return d, resp, err + return d, resp, nil } // CreateEpicDiscussionOptions represents the available CreateEpicDiscussion() @@ -546,7 +546,7 @@ func (s *DiscussionsService) CreateEpicDiscussion(gid interface{}, epic int, opt return nil, resp, err } - return d, resp, err + return d, resp, nil } // AddEpicDiscussionNoteOptions represents the available @@ -585,7 +585,7 @@ func (s *DiscussionsService) AddEpicDiscussionNote(gid interface{}, epic int, di return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateEpicDiscussionNoteOptions represents the available UpdateEpicDiscussion() @@ -625,7 +625,7 @@ func (s *DiscussionsService) UpdateEpicDiscussionNote(gid interface{}, epic int, return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteEpicDiscussionNote deletes an existing discussion of a epic. @@ -685,7 +685,7 @@ func (s *DiscussionsService) ListMergeRequestDiscussions(pid interface{}, mergeR return nil, resp, err } - return ds, resp, err + return ds, resp, nil } // GetMergeRequestDiscussion returns a single discussion for a given merge @@ -715,7 +715,7 @@ func (s *DiscussionsService) GetMergeRequestDiscussion(pid interface{}, mergeReq return nil, resp, err } - return d, resp, err + return d, resp, nil } // CreateMergeRequestDiscussionOptions represents the available @@ -756,7 +756,7 @@ func (s *DiscussionsService) CreateMergeRequestDiscussion(pid interface{}, merge return nil, resp, err } - return d, resp, err + return d, resp, nil } // ResolveMergeRequestDiscussionOptions represents the available @@ -795,7 +795,7 @@ func (s *DiscussionsService) ResolveMergeRequestDiscussion(pid interface{}, merg return nil, resp, err } - return d, resp, err + return d, resp, nil } // AddMergeRequestDiscussionNoteOptions represents the available @@ -835,7 +835,7 @@ func (s *DiscussionsService) AddMergeRequestDiscussionNote(pid interface{}, merg return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateMergeRequestDiscussionNoteOptions represents the available @@ -877,7 +877,7 @@ func (s *DiscussionsService) UpdateMergeRequestDiscussionNote(pid interface{}, m return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteMergeRequestDiscussionNote deletes an existing discussion of a merge @@ -938,7 +938,7 @@ func (s *DiscussionsService) ListCommitDiscussions(pid interface{}, commit strin return nil, resp, err } - return ds, resp, err + return ds, resp, nil } // GetCommitDiscussion returns a single discussion for a specific project @@ -968,7 +968,7 @@ func (s *DiscussionsService) GetCommitDiscussion(pid interface{}, commit string, return nil, resp, err } - return d, resp, err + return d, resp, nil } // CreateCommitDiscussionOptions represents the available @@ -1007,7 +1007,7 @@ func (s *DiscussionsService) CreateCommitDiscussion(pid interface{}, commit stri return nil, resp, err } - return d, resp, err + return d, resp, nil } // AddCommitDiscussionNoteOptions represents the available @@ -1046,7 +1046,7 @@ func (s *DiscussionsService) AddCommitDiscussionNote(pid interface{}, commit str return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateCommitDiscussionNoteOptions represents the available @@ -1086,7 +1086,7 @@ func (s *DiscussionsService) UpdateCommitDiscussionNote(pid interface{}, commit return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteCommitDiscussionNote deletes an existing discussion of an commit. diff --git a/vendor/github.com/xanzy/go-gitlab/dockerfile_templates.go b/vendor/github.com/xanzy/go-gitlab/dockerfile_templates.go index ba91342..3608c5a 100644 --- a/vendor/github.com/xanzy/go-gitlab/dockerfile_templates.go +++ b/vendor/github.com/xanzy/go-gitlab/dockerfile_templates.go @@ -68,7 +68,7 @@ func (s *DockerfileTemplatesService) ListTemplates(opt *ListDockerfileTemplatesO return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // GetTemplate get a single Dockerfile template. @@ -89,5 +89,5 @@ func (s *DockerfileTemplatesService) GetTemplate(key string, options ...RequestO return nil, resp, err } - return g, resp, err + return g, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/environments.go b/vendor/github.com/xanzy/go-gitlab/environments.go index 119111f..cee6aaf 100644 --- a/vendor/github.com/xanzy/go-gitlab/environments.go +++ b/vendor/github.com/xanzy/go-gitlab/environments.go @@ -84,7 +84,7 @@ func (s *EnvironmentsService) ListEnvironments(pid interface{}, opts *ListEnviro return nil, resp, err } - return envs, resp, err + return envs, resp, nil } // GetEnvironment gets a specific environment from a project. @@ -109,7 +109,7 @@ func (s *EnvironmentsService) GetEnvironment(pid interface{}, environment int, o return nil, resp, err } - return env, resp, err + return env, resp, nil } // CreateEnvironmentOptions represents the available CreateEnvironment() options. @@ -147,7 +147,7 @@ func (s *EnvironmentsService) CreateEnvironment(pid interface{}, opt *CreateEnvi return nil, resp, err } - return env, resp, err + return env, resp, nil } // EditEnvironmentOptions represents the available EditEnvironment() options. @@ -182,7 +182,7 @@ func (s *EnvironmentsService) EditEnvironment(pid interface{}, environment int, return nil, resp, err } - return env, resp, err + return env, resp, nil } // DeleteEnvironment removes an environment from a project team. @@ -208,17 +208,23 @@ func (s *EnvironmentsService) DeleteEnvironment(pid interface{}, environment int // // GitLab API docs: // https://docs.gitlab.com/ee/api/environments.html#stop-an-environment -func (s *EnvironmentsService) StopEnvironment(pid interface{}, environmentID int, options ...RequestOptionFunc) (*Response, error) { +func (s *EnvironmentsService) StopEnvironment(pid interface{}, environmentID int, options ...RequestOptionFunc) (*Environment, *Response, error) { project, err := parseID(pid) if err != nil { - return nil, err + return nil, nil, err } u := fmt.Sprintf("projects/%s/environments/%d/stop", PathEscape(project), environmentID) req, err := s.client.NewRequest(http.MethodPost, u, nil, options) if err != nil { - return nil, err + return nil, nil, err } - return s.client.Do(req, nil) + env := new(Environment) + resp, err := s.client.Do(req, env) + if err != nil { + return nil, resp, err + } + + return env, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/epic_issues.go b/vendor/github.com/xanzy/go-gitlab/epic_issues.go index 9064c89..545357b 100644 --- a/vendor/github.com/xanzy/go-gitlab/epic_issues.go +++ b/vendor/github.com/xanzy/go-gitlab/epic_issues.go @@ -61,7 +61,7 @@ func (s *EpicIssuesService) ListEpicIssues(gid interface{}, epic int, opt *ListO return nil, resp, err } - return is, resp, err + return is, resp, nil } // AssignEpicIssue assigns an existing issue to an epic. @@ -86,7 +86,7 @@ func (s *EpicIssuesService) AssignEpicIssue(gid interface{}, epic, issue int, op return nil, resp, err } - return a, resp, err + return a, resp, nil } // RemoveEpicIssue removes an issue from an epic. @@ -111,7 +111,7 @@ func (s *EpicIssuesService) RemoveEpicIssue(gid interface{}, epic, epicIssue int return nil, resp, err } - return a, resp, err + return a, resp, nil } // UpdateEpicIsssueAssignmentOptions describes the UpdateEpicIssueAssignment() @@ -148,5 +148,5 @@ func (s *EpicIssuesService) UpdateEpicIssueAssignment(gid interface{}, epic, epi return nil, resp, err } - return is, resp, err + return is, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/epics.go b/vendor/github.com/xanzy/go-gitlab/epics.go index cff3354..553ea8d 100644 --- a/vendor/github.com/xanzy/go-gitlab/epics.go +++ b/vendor/github.com/xanzy/go-gitlab/epics.go @@ -51,7 +51,7 @@ type Epic struct { Title string `json:"title"` Description string `json:"description"` State string `json:"state"` - Confidential bool `json:"confidential"` + Confidential bool `json:"confidential"` WebURL string `json:"web_url"` Author *EpicAuthor `json:"author"` StartDate *ISOTime `json:"start_date"` @@ -119,7 +119,7 @@ func (s *EpicsService) ListGroupEpics(gid interface{}, opt *ListGroupEpicsOption return nil, resp, err } - return es, resp, err + return es, resp, nil } // GetEpic gets a single group epic. @@ -143,7 +143,7 @@ func (s *EpicsService) GetEpic(gid interface{}, epic int, options ...RequestOpti return nil, resp, err } - return e, resp, err + return e, resp, nil } // GetEpicLinks gets all child epics of an epic. @@ -167,7 +167,7 @@ func (s *EpicsService) GetEpicLinks(gid interface{}, epic int, options ...Reques return nil, resp, err } - return e, resp, err + return e, resp, nil } // CreateEpicOptions represents the available CreateEpic() options. @@ -204,7 +204,7 @@ func (s *EpicsService) CreateEpic(gid interface{}, opt *CreateEpicOptions, optio return nil, resp, err } - return e, resp, err + return e, resp, nil } // UpdateEpicOptions represents the available UpdateEpic() options. @@ -244,7 +244,7 @@ func (s *EpicsService) UpdateEpic(gid interface{}, epic int, opt *UpdateEpicOpti return nil, resp, err } - return e, resp, err + return e, resp, nil } // DeleteEpic deletes a single group epic. diff --git a/vendor/github.com/xanzy/go-gitlab/error_tracking.go b/vendor/github.com/xanzy/go-gitlab/error_tracking.go index afa6be4..fed334a 100644 --- a/vendor/github.com/xanzy/go-gitlab/error_tracking.go +++ b/vendor/github.com/xanzy/go-gitlab/error_tracking.go @@ -81,7 +81,7 @@ func (s *ErrorTrackingService) GetErrorTrackingSettings(pid interface{}, options return nil, resp, err } - return ets, resp, err + return ets, resp, nil } // EnableDisableErrorTrackingOptions represents the available @@ -117,7 +117,7 @@ func (s *ErrorTrackingService) EnableDisableErrorTracking(pid interface{}, opt * return nil, resp, err } - return ets, resp, err + return ets, resp, nil } // ListClientKeysOptions represents the available ListClientKeys() options. @@ -148,7 +148,7 @@ func (s *ErrorTrackingService) ListClientKeys(pid interface{}, opt *ListClientKe return nil, resp, err } - return cks, resp, err + return cks, resp, nil } // CreateClientKey creates a new client key for a project. @@ -173,7 +173,7 @@ func (s *ErrorTrackingService) CreateClientKey(pid interface{}, options ...Reque return nil, resp, err } - return ck, resp, err + return ck, resp, nil } // DeleteClientKey removes a client key from the project. diff --git a/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go b/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go index b3eebf9..b90f4fa 100644 --- a/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go +++ b/vendor/github.com/xanzy/go-gitlab/event_webhook_types.go @@ -333,7 +333,7 @@ type IssueEvent struct { HumanTotalTimeSpent string `json:"human_total_time_spent"` HumanTimeEstimate string `json:"human_time_estimate"` HumanTimeChange string `json:"human_time_change"` - Weight string `json:"weight"` + Weight int `json:"weight"` IID int `json:"iid"` URL string `json:"url"` State string `json:"state"` @@ -437,7 +437,11 @@ type JobEvent struct { Description string `json:"description"` Tags []string `json:"tags"` } `json:"runner"` - Environment string `json:"environment"` + Environment struct { + Name string `json:"name"` + Action string `json:"action"` + DeploymentTier string `json:"deployment_tier"` + } `json:"environment"` } // MemberEvent represents a member event. @@ -575,6 +579,7 @@ type MergeCommentEvent struct { // https://docs.gitlab.com/ee/user/project/integrations/webhook_events.html#merge-request-events type MergeEvent struct { ObjectKind string `json:"object_kind"` + EventType string `json:"event_type"` User *EventUser `json:"user"` Project struct { ID int `json:"id"` @@ -586,6 +591,7 @@ type MergeEvent struct { Namespace string `json:"namespace"` PathWithNamespace string `json:"path_with_namespace"` DefaultBranch string `json:"default_branch"` + CIConfigPath string `json:"ci_config_path"` Homepage string `json:"homepage"` URL string `json:"url"` SSHURL string `json:"ssh_url"` @@ -607,7 +613,10 @@ type MergeEvent struct { UpdatedAt string `json:"updated_at"` // Should be *time.Time (see Gitlab issue #21468) StCommits []*Commit `json:"st_commits"` StDiffs []*Diff `json:"st_diffs"` + LastEditedAt string `json:"last_edited_at"` + LastEditedByID int `json:"last_edited_by_id"` MilestoneID int `json:"milestone_id"` + StateID StateID `json:"state_id"` State string `json:"state"` MergeStatus string `json:"merge_status"` TargetProjectID int `json:"target_project_id"` @@ -633,6 +642,7 @@ type MergeEvent struct { LastCommit struct { ID string `json:"id"` Message string `json:"message"` + Title string `json:"title"` Timestamp *time.Time `json:"timestamp"` URL string `json:"url"` Author struct { @@ -642,18 +652,19 @@ type MergeEvent struct { } `json:"last_commit"` BlockingDiscussionsResolved bool `json:"blocking_discussions_resolved"` WorkInProgress bool `json:"work_in_progress"` + TotalTimeSpent int `json:"total_time_spent"` + TimeChange int `json:"time_change"` + HumanTotalTimeSpent string `json:"human_total_time_spent"` + HumanTimeChange string `json:"human_time_change"` + HumanTimeEstimate string `json:"human_time_estimate"` FirstContribution bool `json:"first_contribution"` URL string `json:"url"` Labels []*EventLabel `json:"labels"` Action string `json:"action"` DetailedMergeStatus string `json:"detailed_merge_status"` OldRev string `json:"oldrev"` - Assignee *EventUser `json:"assignee"` } `json:"object_attributes"` Repository *Repository `json:"repository"` - Assignee *EventUser `json:"assignee"` - Assignees []*EventUser `json:"assignees"` - Reviewers []*EventUser `json:"reviewers"` Labels []*EventLabel `json:"labels"` Changes struct { Assignees struct { @@ -672,6 +683,18 @@ type MergeEvent struct { Previous []*EventLabel `json:"previous"` Current []*EventLabel `json:"current"` } `json:"labels"` + LastEditedAt struct { + Previous string `json:"previous"` + Current string `json:"current"` + } `json:"last_edited_at"` + LastEditedByID struct { + Previous int `json:"previous"` + Current int `json:"current"` + } `json:"last_edited_by_id"` + MilestoneID struct { + Previous int `json:"previous"` + Current int `json:"current"` + } `json:"milestone_id"` SourceBranch struct { Previous string `json:"previous"` Current string `json:"current"` @@ -704,11 +727,9 @@ type MergeEvent struct { Previous int `json:"previous"` Current int `json:"current"` } `json:"updated_by_id"` - MilestoneID struct { - Previous int `json:"previous"` - Current int `json:"current"` - } `json:"milestone_id"` } `json:"changes"` + Assignees []*EventUser `json:"assignees"` + Reviewers []*EventUser `json:"reviewers"` } // EventUser represents a user record in an event and is used as an even initiator or a merge assignee. @@ -767,6 +788,7 @@ type PipelineEvent struct { ObjectKind string `json:"object_kind"` ObjectAttributes struct { ID int `json:"id"` + IID int `json:"iid"` Ref string `json:"ref"` Tag bool `json:"tag"` SHA string `json:"sha"` diff --git a/vendor/github.com/xanzy/go-gitlab/events.go b/vendor/github.com/xanzy/go-gitlab/events.go index fb77219..504db65 100644 --- a/vendor/github.com/xanzy/go-gitlab/events.go +++ b/vendor/github.com/xanzy/go-gitlab/events.go @@ -102,7 +102,7 @@ func (s *UsersService) ListUserContributionEvents(uid interface{}, opt *ListCont return nil, resp, err } - return cs, resp, err + return cs, resp, nil } // ListCurrentUserContributionEvents gets a list currently authenticated user's events @@ -120,7 +120,7 @@ func (s *EventsService) ListCurrentUserContributionEvents(opt *ListContributionE return nil, resp, err } - return cs, resp, err + return cs, resp, nil } // ProjectEvent represents a GitLab project event. @@ -196,7 +196,14 @@ func (s ProjectEvent) String() string { // // GitLab API docs: // https://docs.gitlab.com/ee/api/events.html#list-a-projects-visible-events -type ListProjectVisibleEventsOptions ListOptions +type ListProjectVisibleEventsOptions struct { + ListOptions + Action *EventTypeValue `url:"action,omitempty" json:"action,omitempty"` + TargetType *EventTargetTypeValue `url:"target_type,omitempty" json:"target_type,omitempty"` + Before *ISOTime `url:"before,omitempty" json:"before,omitempty"` + After *ISOTime `url:"after,omitempty" json:"after,omitempty"` + Sort *string `url:"sort,omitempty" json:"sort,omitempty"` +} // ListProjectVisibleEvents gets the events for the specified project. // @@ -220,5 +227,5 @@ func (s *EventsService) ListProjectVisibleEvents(pid interface{}, opt *ListProje return nil, resp, err } - return p, resp, err + return p, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/external_status_checks.go b/vendor/github.com/xanzy/go-gitlab/external_status_checks.go index cc2d667..dc8e95b 100644 --- a/vendor/github.com/xanzy/go-gitlab/external_status_checks.go +++ b/vendor/github.com/xanzy/go-gitlab/external_status_checks.go @@ -61,7 +61,7 @@ func (s *ExternalStatusChecksService) ListMergeStatusChecks(pid interface{}, mr return nil, resp, err } - return mscs, resp, err + return mscs, resp, nil } // SetExternalStatusCheckStatusOptions represents the available @@ -116,7 +116,7 @@ func (s *ExternalStatusChecksService) ListProjectStatusChecks(pid interface{}, o return nil, resp, err } - return pscs, resp, err + return pscs, resp, nil } // CreateExternalStatusCheckOptions represents the available diff --git a/vendor/github.com/xanzy/go-gitlab/feature_flags.go b/vendor/github.com/xanzy/go-gitlab/feature_flags.go index 180f453..8bb847e 100644 --- a/vendor/github.com/xanzy/go-gitlab/feature_flags.go +++ b/vendor/github.com/xanzy/go-gitlab/feature_flags.go @@ -66,7 +66,7 @@ func (s *FeaturesService) ListFeatures(options ...RequestOptionFunc) ([]*Feature if err != nil { return nil, resp, err } - return f, resp, err + return f, resp, nil } // SetFeatureFlag sets or creates a feature flag gate @@ -92,5 +92,5 @@ func (s *FeaturesService) SetFeatureFlag(name string, value interface{}, options if err != nil { return nil, resp, err } - return f, resp, err + return f, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/freeze_periods.go b/vendor/github.com/xanzy/go-gitlab/freeze_periods.go index 8e1a64d..3cbfba8 100644 --- a/vendor/github.com/xanzy/go-gitlab/freeze_periods.go +++ b/vendor/github.com/xanzy/go-gitlab/freeze_periods.go @@ -72,7 +72,7 @@ func (s *FreezePeriodsService) ListFreezePeriods(pid interface{}, opt *ListFreez return nil, resp, err } - return fp, resp, err + return fp, resp, nil } // GetFreezePeriod gets a specific freeze period for a project. @@ -97,7 +97,7 @@ func (s *FreezePeriodsService) GetFreezePeriod(pid interface{}, freezePeriod int return nil, resp, err } - return fp, resp, err + return fp, resp, nil } // CreateFreezePeriodOptions represents the available CreateFreezePeriodOptions() @@ -133,7 +133,7 @@ func (s *FreezePeriodsService) CreateFreezePeriodOptions(pid interface{}, opt *C return nil, resp, err } - return fp, resp, err + return fp, resp, nil } // UpdateFreezePeriodOptions represents the available UpdateFreezePeriodOptions() @@ -169,7 +169,7 @@ func (s *FreezePeriodsService) UpdateFreezePeriodOptions(pid interface{}, freeze return nil, resp, err } - return fp, resp, err + return fp, resp, nil } // DeleteFreezePeriod removes a freeze period from a project. This is an diff --git a/vendor/github.com/xanzy/go-gitlab/generic_packages.go b/vendor/github.com/xanzy/go-gitlab/generic_packages.go index 95f382a..4c32eed 100644 --- a/vendor/github.com/xanzy/go-gitlab/generic_packages.go +++ b/vendor/github.com/xanzy/go-gitlab/generic_packages.go @@ -123,7 +123,7 @@ func (s *GenericPackagesService) PublishPackageFile(pid interface{}, packageName return nil, resp, err } - return f, resp, err + return f, resp, nil } // DownloadPackageFile allows you to download the package file. diff --git a/vendor/github.com/xanzy/go-gitlab/geo_nodes.go b/vendor/github.com/xanzy/go-gitlab/geo_nodes.go index fa7c254..47ac583 100644 --- a/vendor/github.com/xanzy/go-gitlab/geo_nodes.go +++ b/vendor/github.com/xanzy/go-gitlab/geo_nodes.go @@ -101,7 +101,7 @@ func (s *GeoNodesService) CreateGeoNode(opt *CreateGeoNodesOptions, options ...R return nil, resp, err } - return g, resp, err + return g, resp, nil } // ListGeoNodesOptions represents the available ListGeoNodes() options. @@ -126,7 +126,7 @@ func (s *GeoNodesService) ListGeoNodes(opt *ListGeoNodesOptions, options ...Requ return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // GetGeoNode gets a specific geo node. @@ -147,7 +147,7 @@ func (s *GeoNodesService) GetGeoNode(id int, options ...RequestOptionFunc) (*Geo return nil, resp, err } - return g, resp, err + return g, resp, nil } // UpdateGeoNodesOptions represents the available EditGeoNode() options. @@ -189,7 +189,7 @@ func (s *GeoNodesService) EditGeoNode(id int, opt *UpdateGeoNodesOptions, option return nil, resp, err } - return g, resp, err + return g, resp, nil } // DeleteGeoNode removes the Geo node. @@ -225,7 +225,7 @@ func (s *GeoNodesService) RepairGeoNode(id int, options ...RequestOptionFunc) (* return nil, resp, err } - return g, resp, err + return g, resp, nil } // GeoNodeStatus represents the status of Geo Node. @@ -408,7 +408,7 @@ func (s *GeoNodesService) RetrieveStatusOfAllGeoNodes(options ...RequestOptionFu return nil, resp, err } - return gnss, resp, err + return gnss, resp, nil } // RetrieveStatusOfGeoNode get the of status of a specific Geo Nodes. @@ -429,5 +429,5 @@ func (s *GeoNodesService) RetrieveStatusOfGeoNode(id int, options ...RequestOpti return nil, resp, err } - return gns, resp, err + return gns, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/gitignore_templates.go b/vendor/github.com/xanzy/go-gitlab/gitignore_templates.go index 36b1399..83d5872 100644 --- a/vendor/github.com/xanzy/go-gitlab/gitignore_templates.go +++ b/vendor/github.com/xanzy/go-gitlab/gitignore_templates.go @@ -68,7 +68,7 @@ func (s *GitIgnoreTemplatesService) ListTemplates(opt *ListTemplatesOptions, opt return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // GetTemplate get a git ignore template @@ -89,5 +89,5 @@ func (s *GitIgnoreTemplatesService) GetTemplate(key string, options ...RequestOp return nil, resp, err } - return g, resp, err + return g, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/gitlab.go b/vendor/github.com/xanzy/go-gitlab/gitlab.go index 81cf3ff..dbd18ef 100644 --- a/vendor/github.com/xanzy/go-gitlab/gitlab.go +++ b/vendor/github.com/xanzy/go-gitlab/gitlab.go @@ -821,7 +821,7 @@ func (c *Client) Do(req *retryablehttp.Request, v interface{}) (*Response, error } } - return response, err + return response, nil } func (c *Client) requestOAuthToken(ctx context.Context, token string) (string, error) { diff --git a/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go b/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go index 94c53fd..3d42ab5 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go +++ b/vendor/github.com/xanzy/go-gitlab/group_access_tokens.go @@ -80,7 +80,7 @@ func (s *GroupAccessTokensService) ListGroupAccessTokens(gid interface{}, opt *L return nil, resp, err } - return gats, resp, err + return gats, resp, nil } // GetGroupAccessToken gets a single group access tokens in a group. @@ -105,7 +105,7 @@ func (s *GroupAccessTokensService) GetGroupAccessToken(gid interface{}, id int, return nil, resp, err } - return gat, resp, err + return gat, resp, nil } // CreateGroupAccessTokenOptions represents the available CreateVariable() @@ -142,7 +142,7 @@ func (s *GroupAccessTokensService) CreateGroupAccessToken(gid interface{}, opt * return nil, resp, err } - return pat, resp, err + return pat, resp, nil } // RevokeGroupAccessToken revokes a group access token. diff --git a/vendor/github.com/xanzy/go-gitlab/group_badges.go b/vendor/github.com/xanzy/go-gitlab/group_badges.go index 7207fe7..1ae3ebc 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_badges.go +++ b/vendor/github.com/xanzy/go-gitlab/group_badges.go @@ -79,7 +79,7 @@ func (s *GroupBadgesService) ListGroupBadges(gid interface{}, opt *ListGroupBadg return nil, resp, err } - return gb, resp, err + return gb, resp, nil } // GetGroupBadge gets a group badge. @@ -104,7 +104,7 @@ func (s *GroupBadgesService) GetGroupBadge(gid interface{}, badge int, options . return nil, resp, err } - return gb, resp, err + return gb, resp, nil } // AddGroupBadgeOptions represents the available AddGroupBadge() options. @@ -138,7 +138,7 @@ func (s *GroupBadgesService) AddGroupBadge(gid interface{}, opt *AddGroupBadgeOp return nil, resp, err } - return gb, resp, err + return gb, resp, nil } // EditGroupBadgeOptions represents the available EditGroupBadge() options. @@ -172,7 +172,7 @@ func (s *GroupBadgesService) EditGroupBadge(gid interface{}, badge int, opt *Edi return nil, resp, err } - return gb, resp, err + return gb, resp, nil } // DeleteGroupBadge removes a badge from a group. @@ -226,5 +226,5 @@ func (s *GroupBadgesService) PreviewGroupBadge(gid interface{}, opt *GroupBadgeP return nil, resp, err } - return gb, resp, err + return gb, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/group_boards.go b/vendor/github.com/xanzy/go-gitlab/group_boards.go index b751086..645e7ee 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_boards.go +++ b/vendor/github.com/xanzy/go-gitlab/group_boards.go @@ -75,7 +75,7 @@ func (s *GroupIssueBoardsService) ListGroupIssueBoards(gid interface{}, opt *Lis return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // CreateGroupIssueBoardOptions represents the available @@ -109,7 +109,7 @@ func (s *GroupIssueBoardsService) CreateGroupIssueBoard(gid interface{}, opt *Cr return nil, resp, err } - return gib, resp, err + return gib, resp, nil } // GetGroupIssueBoard gets a single issue board of a group. @@ -134,7 +134,7 @@ func (s *GroupIssueBoardsService) GetGroupIssueBoard(gid interface{}, board int, return nil, resp, err } - return gib, resp, err + return gib, resp, nil } // UpdateGroupIssueBoardOptions represents a group issue board. @@ -171,7 +171,7 @@ func (s *GroupIssueBoardsService) UpdateIssueBoard(gid interface{}, board int, o return nil, resp, err } - return gib, resp, err + return gib, resp, nil } // DeleteIssueBoard delete a single issue board of a group. @@ -222,7 +222,7 @@ func (s *GroupIssueBoardsService) ListGroupIssueBoardLists(gid interface{}, boar return nil, resp, err } - return gbl, resp, err + return gbl, resp, nil } // GetGroupIssueBoardList gets a single issue board list. @@ -251,7 +251,7 @@ func (s *GroupIssueBoardsService) GetGroupIssueBoardList(gid interface{}, board, return nil, resp, err } - return gbl, resp, err + return gbl, resp, nil } // CreateGroupIssueBoardListOptions represents the available @@ -285,7 +285,7 @@ func (s *GroupIssueBoardsService) CreateGroupIssueBoardList(gid interface{}, boa return nil, resp, err } - return gbl, resp, err + return gbl, resp, nil } // UpdateGroupIssueBoardListOptions represents the available @@ -324,7 +324,7 @@ func (s *GroupIssueBoardsService) UpdateIssueBoardList(gid interface{}, board, l return nil, resp, err } - return gbl, resp, err + return gbl, resp, nil } // DeleteGroupIssueBoardList soft deletes a group issue board list. diff --git a/vendor/github.com/xanzy/go-gitlab/group_clusters.go b/vendor/github.com/xanzy/go-gitlab/group_clusters.go index f2b9e2a..f459e1c 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_clusters.go +++ b/vendor/github.com/xanzy/go-gitlab/group_clusters.go @@ -77,7 +77,7 @@ func (s *GroupClustersService) ListClusters(pid interface{}, options ...RequestO return nil, resp, err } - return pcs, resp, err + return pcs, resp, nil } // GetCluster gets a cluster. @@ -102,7 +102,7 @@ func (s *GroupClustersService) GetCluster(pid interface{}, cluster int, options return nil, resp, err } - return gc, resp, err + return gc, resp, nil } // AddGroupClusterOptions represents the available AddCluster() options. @@ -150,7 +150,7 @@ func (s *GroupClustersService) AddCluster(pid interface{}, opt *AddGroupClusterO return nil, resp, err } - return gc, resp, err + return gc, resp, nil } // EditGroupClusterOptions represents the available EditCluster() options. @@ -194,7 +194,7 @@ func (s *GroupClustersService) EditCluster(pid interface{}, cluster int, opt *Ed return nil, resp, err } - return gc, resp, err + return gc, resp, nil } // DeleteCluster deletes an existing group cluster. diff --git a/vendor/github.com/xanzy/go-gitlab/group_hooks.go b/vendor/github.com/xanzy/go-gitlab/group_hooks.go index a408948..ccfed12 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_hooks.go +++ b/vendor/github.com/xanzy/go-gitlab/group_hooks.go @@ -73,7 +73,7 @@ func (s *GroupsService) ListGroupHooks(gid interface{}, opt *ListGroupHooksOptio return nil, resp, err } - return gh, resp, err + return gh, resp, nil } // GetGroupHook gets a specific hook for a group. @@ -98,7 +98,7 @@ func (s *GroupsService) GetGroupHook(pid interface{}, hook int, options ...Reque return nil, resp, err } - return gh, resp, err + return gh, resp, nil } // AddGroupHookOptions represents the available AddGroupHook() options. @@ -145,7 +145,7 @@ func (s *GroupsService) AddGroupHook(gid interface{}, opt *AddGroupHookOptions, return nil, resp, err } - return gh, resp, err + return gh, resp, nil } // EditGroupHookOptions represents the available EditGroupHook() options. @@ -194,7 +194,7 @@ func (s *GroupsService) EditGroupHook(pid interface{}, hook int, opt *EditGroupH return nil, resp, err } - return gh, resp, err + return gh, resp, nil } // DeleteGroupHook removes a hook from a group. This is an idempotent diff --git a/vendor/github.com/xanzy/go-gitlab/group_iterations.go b/vendor/github.com/xanzy/go-gitlab/group_iterations.go index a642091..c77d633 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_iterations.go +++ b/vendor/github.com/xanzy/go-gitlab/group_iterations.go @@ -86,5 +86,5 @@ func (s *GroupIterationsService) ListGroupIterations(gid interface{}, opt *ListG return nil, nil, err } - return gis, resp, err + return gis, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/group_labels.go b/vendor/github.com/xanzy/go-gitlab/group_labels.go index d7ccd44..d19e3ed 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_labels.go +++ b/vendor/github.com/xanzy/go-gitlab/group_labels.go @@ -72,7 +72,7 @@ func (s *GroupLabelsService) ListGroupLabels(gid interface{}, opt *ListGroupLabe return nil, resp, err } - return l, resp, err + return l, resp, nil } // GetGroupLabel get a single label for a given group. @@ -101,7 +101,7 @@ func (s *GroupLabelsService) GetGroupLabel(gid interface{}, labelID interface{}, return nil, resp, err } - return l, resp, err + return l, resp, nil } // CreateGroupLabelOptions represents the available CreateGroupLabel() options. @@ -133,7 +133,7 @@ func (s *GroupLabelsService) CreateGroupLabel(gid interface{}, opt *CreateGroupL return nil, resp, err } - return l, resp, err + return l, resp, nil } // DeleteGroupLabelOptions represents the available DeleteGroupLabel() options. @@ -189,7 +189,7 @@ func (s *GroupLabelsService) UpdateGroupLabel(gid interface{}, opt *UpdateGroupL return nil, resp, err } - return l, resp, err + return l, resp, nil } // SubscribeToGroupLabel subscribes the authenticated user to a label to receive @@ -220,7 +220,7 @@ func (s *GroupLabelsService) SubscribeToGroupLabel(gid interface{}, labelID inte return nil, resp, err } - return l, resp, err + return l, resp, nil } // UnsubscribeFromGroupLabel unsubscribes the authenticated user from a label to not diff --git a/vendor/github.com/xanzy/go-gitlab/group_members.go b/vendor/github.com/xanzy/go-gitlab/group_members.go index 4a169cd..c508adb 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_members.go +++ b/vendor/github.com/xanzy/go-gitlab/group_members.go @@ -92,7 +92,7 @@ func (s *GroupsService) ListGroupMembers(gid interface{}, opt *ListGroupMembersO return nil, resp, err } - return gm, resp, err + return gm, resp, nil } // ListAllGroupMembers get a list of group members viewable by the authenticated @@ -118,7 +118,7 @@ func (s *GroupsService) ListAllGroupMembers(gid interface{}, opt *ListGroupMembe return nil, resp, err } - return gm, resp, err + return gm, resp, nil } // AddGroupMemberOptions represents the available AddGroupMember() options. @@ -153,7 +153,7 @@ func (s *GroupMembersService) GetGroupMember(gid interface{}, user int, options return nil, resp, err } - return gm, resp, err + return gm, resp, nil } // BillableGroupMember represents a GitLab billable group member. @@ -208,7 +208,7 @@ func (s *GroupsService) ListBillableGroupMembers(gid interface{}, opt *ListBilla return nil, resp, err } - return bgm, resp, err + return bgm, resp, nil } // RemoveBillableGroupMember removes a given group members that count as billable. @@ -252,7 +252,7 @@ func (s *GroupMembersService) AddGroupMember(gid interface{}, opt *AddGroupMembe return nil, resp, err } - return gm, resp, err + return gm, resp, nil } // ShareWithGroup shares a group with the group. @@ -277,7 +277,7 @@ func (s *GroupMembersService) ShareWithGroup(gid interface{}, opt *ShareWithGrou return nil, resp, err } - return g, resp, err + return g, resp, nil } // DeleteShareWithGroup allows to unshare a group from a group. @@ -331,7 +331,7 @@ func (s *GroupMembersService) EditGroupMember(gid interface{}, user int, opt *Ed return nil, resp, err } - return gm, resp, err + return gm, resp, nil } // RemoveGroupMemberOptions represents the available options to remove a group member. diff --git a/vendor/github.com/xanzy/go-gitlab/group_milestones.go b/vendor/github.com/xanzy/go-gitlab/group_milestones.go index 0f64fca..60aa2e9 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_milestones.go +++ b/vendor/github.com/xanzy/go-gitlab/group_milestones.go @@ -87,7 +87,7 @@ func (s *GroupMilestonesService) ListGroupMilestones(gid interface{}, opt *ListG return nil, resp, err } - return m, resp, err + return m, resp, nil } // GetGroupMilestone gets a single group milestone. @@ -112,7 +112,7 @@ func (s *GroupMilestonesService) GetGroupMilestone(gid interface{}, milestone in return nil, resp, err } - return m, resp, err + return m, resp, nil } // CreateGroupMilestoneOptions represents the available CreateGroupMilestone() options. @@ -148,7 +148,7 @@ func (s *GroupMilestonesService) CreateGroupMilestone(gid interface{}, opt *Crea return nil, resp, err } - return m, resp, err + return m, resp, nil } // UpdateGroupMilestoneOptions represents the available UpdateGroupMilestone() options. @@ -185,7 +185,7 @@ func (s *GroupMilestonesService) UpdateGroupMilestone(gid interface{}, milestone return nil, resp, err } - return m, resp, err + return m, resp, nil } // GetGroupMilestoneIssuesOptions represents the available GetGroupMilestoneIssues() options. @@ -216,7 +216,7 @@ func (s *GroupMilestonesService) GetGroupMilestoneIssues(gid interface{}, milest return nil, resp, err } - return i, resp, err + return i, resp, nil } // GetGroupMilestoneMergeRequestsOptions represents the available @@ -249,7 +249,7 @@ func (s *GroupMilestonesService) GetGroupMilestoneMergeRequests(gid interface{}, return nil, resp, err } - return mr, resp, err + return mr, resp, nil } // BurndownChartEvent reprensents a burnout chart event @@ -292,5 +292,5 @@ func (s *GroupMilestonesService) GetGroupMilestoneBurndownChartEvents(gid interf return nil, resp, err } - return be, resp, err + return be, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/group_variables.go b/vendor/github.com/xanzy/go-gitlab/group_variables.go index 1d2c69f..ead4d0a 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_variables.go +++ b/vendor/github.com/xanzy/go-gitlab/group_variables.go @@ -78,7 +78,7 @@ func (s *GroupVariablesService) ListVariables(gid interface{}, opt *ListGroupVar return nil, resp, err } - return vs, resp, err + return vs, resp, nil } // GetVariable gets a variable. @@ -103,7 +103,7 @@ func (s *GroupVariablesService) GetVariable(gid interface{}, key string, options return nil, resp, err } - return v, resp, err + return v, resp, nil } // CreateGroupVariableOptions represents the available CreateVariable() @@ -143,7 +143,7 @@ func (s *GroupVariablesService) CreateVariable(gid interface{}, opt *CreateGroup return nil, resp, err } - return v, resp, err + return v, resp, nil } // UpdateGroupVariableOptions represents the available UpdateVariable() @@ -183,7 +183,7 @@ func (s *GroupVariablesService) UpdateVariable(gid interface{}, key string, opt return nil, resp, err } - return v, resp, err + return v, resp, nil } // RemoveVariable removes a group's variable. diff --git a/vendor/github.com/xanzy/go-gitlab/group_wikis.go b/vendor/github.com/xanzy/go-gitlab/group_wikis.go index ecf9c27..4693965 100644 --- a/vendor/github.com/xanzy/go-gitlab/group_wikis.go +++ b/vendor/github.com/xanzy/go-gitlab/group_wikis.go @@ -75,7 +75,7 @@ func (s *GroupWikisService) ListGroupWikis(gid interface{}, opt *ListGroupWikisO return nil, resp, err } - return gws, resp, err + return gws, resp, nil } // GetGroupWikiPageOptions represents options to GetGroupWikiPage @@ -109,7 +109,7 @@ func (s *GroupWikisService) GetGroupWikiPage(gid interface{}, slug string, opt * return nil, resp, err } - return gw, resp, err + return gw, resp, nil } // CreateGroupWikiPageOptions represents options to CreateGroupWikiPage. @@ -145,7 +145,7 @@ func (s *GroupWikisService) CreateGroupWikiPage(gid interface{}, opt *CreateGrou return nil, resp, err } - return w, resp, err + return w, resp, nil } // EditGroupWikiPageOptions represents options to EditGroupWikiPage. @@ -181,7 +181,7 @@ func (s *GroupWikisService) EditGroupWikiPage(gid interface{}, slug string, opt return nil, resp, err } - return w, resp, err + return w, resp, nil } // DeleteGroupWikiPage deletes a wiki page with a given slug. diff --git a/vendor/github.com/xanzy/go-gitlab/groups.go b/vendor/github.com/xanzy/go-gitlab/groups.go index 7532387..ceff074 100644 --- a/vendor/github.com/xanzy/go-gitlab/groups.go +++ b/vendor/github.com/xanzy/go-gitlab/groups.go @@ -155,7 +155,7 @@ func (s *GroupsService) ListGroups(opt *ListGroupsOptions, options ...RequestOpt return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // ListSubGroupsOptions represents the available ListSubGroups() options. @@ -186,7 +186,7 @@ func (s *GroupsService) ListSubGroups(gid interface{}, opt *ListSubGroupsOptions return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // ListDescendantGroupsOptions represents the available ListDescendantGroups() @@ -218,7 +218,7 @@ func (s *GroupsService) ListDescendantGroups(gid interface{}, opt *ListDescendan return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // ListGroupProjectsOptions represents the available ListGroup() options. @@ -267,7 +267,7 @@ func (s *GroupsService) ListGroupProjects(gid interface{}, opt *ListGroupProject return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // GetGroupOptions represents the available GetGroup() options. @@ -300,7 +300,7 @@ func (s *GroupsService) GetGroup(gid interface{}, opt *GetGroupOptions, options return nil, resp, err } - return g, resp, err + return g, resp, nil } // DownloadAvatar downloads a group avatar. @@ -386,7 +386,7 @@ func (s *GroupsService) CreateGroup(opt *CreateGroupOptions, options ...RequestO return nil, resp, err } - return g, resp, err + return g, resp, nil } // TransferGroup transfers a project to the Group namespace. Available only @@ -416,7 +416,7 @@ func (s *GroupsService) TransferGroup(gid interface{}, pid interface{}, options return nil, resp, err } - return g, resp, err + return g, resp, nil } // TransferSubGroupOptions represents the available TransferSubGroup() options. @@ -450,7 +450,7 @@ func (s *GroupsService) TransferSubGroup(gid interface{}, opt *TransferSubGroupO return nil, resp, err } - return g, resp, err + return g, resp, nil } // UpdateGroupOptions represents the available UpdateGroup() options. @@ -519,7 +519,7 @@ func (s *GroupsService) UpdateGroup(gid interface{}, opt *UpdateGroupOptions, op return nil, resp, err } - return g, resp, err + return g, resp, nil } // UploadAvatar uploads a group avatar. @@ -552,7 +552,7 @@ func (s *GroupsService) UploadAvatar(gid interface{}, avatar io.Reader, filename return nil, resp, err } - return g, resp, err + return g, resp, nil } // DeleteGroup removes group with all projects inside. @@ -618,7 +618,7 @@ func (s *GroupsService) SearchGroup(query string, options ...RequestOptionFunc) return nil, resp, err } - return gs, resp, err + return gs, resp, nil } // ListProvisionedUsersOptions represents the available ListProvisionedUsers() @@ -658,7 +658,7 @@ func (s *GroupsService) ListProvisionedUsers(gid interface{}, opt *ListProvision return nil, resp, err } - return us, resp, err + return us, resp, nil } // ListGroupLDAPLinks lists the group's LDAP links. Available only for users who @@ -731,7 +731,7 @@ func (s *GroupsService) AddGroupLDAPLink(gid interface{}, opt *AddGroupLDAPLinkO return nil, resp, err } - return gl, resp, err + return gl, resp, nil } // DeleteGroupLDAPLink deletes a group LDAP link. Available only for users who @@ -883,7 +883,7 @@ func (s *GroupsService) AddGroupSAMLLink(gid interface{}, opt *AddGroupSAMLLinkO return nil, resp, err } - return gl, resp, err + return gl, resp, nil } // DeleteGroupSAMLLink deletes a group SAML link. Available only for users who @@ -938,7 +938,7 @@ func (s *GroupsService) ShareGroupWithGroup(gid interface{}, opt *ShareGroupWith return nil, resp, err } - return g, resp, err + return g, resp, nil } // UnshareGroupFromGroup unshares a group from another group. @@ -1002,7 +1002,7 @@ func (s *GroupsService) GetGroupPushRules(gid interface{}, options ...RequestOpt return nil, resp, err } - return gpr, resp, err + return gpr, resp, nil } // AddGroupPushRuleOptions represents the available AddGroupPushRule() @@ -1046,7 +1046,7 @@ func (s *GroupsService) AddGroupPushRule(gid interface{}, opt *AddGroupPushRuleO return nil, resp, err } - return gpr, resp, err + return gpr, resp, nil } // EditGroupPushRuleOptions represents the available EditGroupPushRule() @@ -1090,7 +1090,7 @@ func (s *GroupsService) EditGroupPushRule(gid interface{}, opt *EditGroupPushRul return nil, resp, err } - return gpr, resp, err + return gpr, resp, nil } // DeleteGroupPushRule deletes the push rules of a group. diff --git a/vendor/github.com/xanzy/go-gitlab/instance_clusters.go b/vendor/github.com/xanzy/go-gitlab/instance_clusters.go index 0014653..0760d11 100644 --- a/vendor/github.com/xanzy/go-gitlab/instance_clusters.go +++ b/vendor/github.com/xanzy/go-gitlab/instance_clusters.go @@ -71,7 +71,7 @@ func (s *InstanceClustersService) ListClusters(options ...RequestOptionFunc) ([] return nil, resp, err } - return ics, resp, err + return ics, resp, nil } // GetCluster gets an instance cluster. @@ -92,7 +92,7 @@ func (s *InstanceClustersService) GetCluster(cluster int, options ...RequestOpti return nil, resp, err } - return ic, resp, err + return ic, resp, nil } // AddCluster adds an existing cluster to the instance. @@ -113,7 +113,7 @@ func (s *InstanceClustersService) AddCluster(opt *AddClusterOptions, options ... return nil, resp, err } - return ic, resp, err + return ic, resp, nil } // EditCluster updates an existing instance cluster. @@ -134,7 +134,7 @@ func (s *InstanceClustersService) EditCluster(cluster int, opt *EditClusterOptio return nil, resp, err } - return ic, resp, err + return ic, resp, nil } // DeleteCluster deletes an existing instance cluster. diff --git a/vendor/github.com/xanzy/go-gitlab/instance_variables.go b/vendor/github.com/xanzy/go-gitlab/instance_variables.go index 79b6304..c376fd5 100644 --- a/vendor/github.com/xanzy/go-gitlab/instance_variables.go +++ b/vendor/github.com/xanzy/go-gitlab/instance_variables.go @@ -73,7 +73,7 @@ func (s *InstanceVariablesService) ListVariables(opt *ListInstanceVariablesOptio return nil, resp, err } - return vs, resp, err + return vs, resp, nil } // GetVariable gets a variable. @@ -94,7 +94,7 @@ func (s *InstanceVariablesService) GetVariable(key string, options ...RequestOpt return nil, resp, err } - return v, resp, err + return v, resp, nil } // CreateInstanceVariableOptions represents the available CreateVariable() @@ -129,7 +129,7 @@ func (s *InstanceVariablesService) CreateVariable(opt *CreateInstanceVariableOpt return nil, resp, err } - return v, resp, err + return v, resp, nil } // UpdateInstanceVariableOptions represents the available UpdateVariable() @@ -164,7 +164,7 @@ func (s *InstanceVariablesService) UpdateVariable(key string, opt *UpdateInstanc return nil, resp, err } - return v, resp, err + return v, resp, nil } // RemoveVariable removes an instance level CI variable. diff --git a/vendor/github.com/xanzy/go-gitlab/invites.go b/vendor/github.com/xanzy/go-gitlab/invites.go index c261fde..62bad26 100644 --- a/vendor/github.com/xanzy/go-gitlab/invites.go +++ b/vendor/github.com/xanzy/go-gitlab/invites.go @@ -75,7 +75,7 @@ func (s *InvitesService) ListPendingGroupInvitations(gid interface{}, opt *ListP return nil, resp, err } - return pis, resp, err + return pis, resp, nil } // ListPendingProjectInvitations gets a list of invited project members. @@ -100,7 +100,7 @@ func (s *InvitesService) ListPendingProjectInvitations(pid interface{}, opt *Lis return nil, resp, err } - return pis, resp, err + return pis, resp, nil } // InvitesOptions represents the available GroupInvites() and ProjectInvites() @@ -147,7 +147,7 @@ func (s *InvitesService) GroupInvites(gid interface{}, opt *InvitesOptions, opti return nil, resp, err } - return ir, resp, err + return ir, resp, nil } // ProjectInvites invites new users by email to join a project. @@ -172,5 +172,5 @@ func (s *InvitesService) ProjectInvites(pid interface{}, opt *InvitesOptions, op return nil, resp, err } - return ir, resp, err + return ir, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/issue_links.go b/vendor/github.com/xanzy/go-gitlab/issue_links.go index d155cc1..d5fcae0 100644 --- a/vendor/github.com/xanzy/go-gitlab/issue_links.go +++ b/vendor/github.com/xanzy/go-gitlab/issue_links.go @@ -94,7 +94,7 @@ func (s *IssueLinksService) ListIssueRelations(pid interface{}, issue int, optio return nil, resp, err } - return is, resp, err + return is, resp, nil } // GetIssueLink gets a specific issue link. @@ -119,7 +119,7 @@ func (s *IssueLinksService) GetIssueLink(pid interface{}, issue, issueLink int, return nil, resp, err } - return il, resp, err + return il, resp, nil } // CreateIssueLinkOptions represents the available CreateIssueLink() options. @@ -154,7 +154,7 @@ func (s *IssueLinksService) CreateIssueLink(pid interface{}, issue int, opt *Cre return nil, resp, err } - return i, resp, err + return i, resp, nil } // DeleteIssueLink deletes an issue link, thus removes the two-way relationship. @@ -182,5 +182,5 @@ func (s *IssueLinksService) DeleteIssueLink(pid interface{}, issue, issueLink in return nil, resp, err } - return il, resp, err + return il, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/issues.go b/vendor/github.com/xanzy/go-gitlab/issues.go index 4d06fd3..4584929 100644 --- a/vendor/github.com/xanzy/go-gitlab/issues.go +++ b/vendor/github.com/xanzy/go-gitlab/issues.go @@ -258,7 +258,7 @@ func (s *IssuesService) ListIssues(opt *ListIssuesOptions, options ...RequestOpt return nil, resp, err } - return i, resp, err + return i, resp, nil } // ListGroupIssuesOptions represents the available ListGroupIssues() options. @@ -322,7 +322,7 @@ func (s *IssuesService) ListGroupIssues(pid interface{}, opt *ListGroupIssuesOpt return nil, resp, err } - return i, resp, err + return i, resp, nil } // ListProjectIssuesOptions represents the available ListProjectIssues() options. @@ -385,7 +385,7 @@ func (s *IssuesService) ListProjectIssues(pid interface{}, opt *ListProjectIssue return nil, resp, err } - return i, resp, err + return i, resp, nil } // GetIssueByID gets a single issue. @@ -405,7 +405,7 @@ func (s *IssuesService) GetIssueByID(issue int, options ...RequestOptionFunc) (* return nil, resp, err } - return i, resp, err + return i, resp, nil } // GetIssue gets a single project issue. @@ -429,7 +429,7 @@ func (s *IssuesService) GetIssue(pid interface{}, issue int, options ...RequestO return nil, resp, err } - return i, resp, err + return i, resp, nil } // CreateIssueOptions represents the available CreateIssue() options. @@ -472,7 +472,7 @@ func (s *IssuesService) CreateIssue(pid interface{}, opt *CreateIssueOptions, op return nil, resp, err } - return i, resp, err + return i, resp, nil } // UpdateIssueOptions represents the available UpdateIssue() options. @@ -517,7 +517,7 @@ func (s *IssuesService) UpdateIssue(pid interface{}, issue int, opt *UpdateIssue return nil, resp, err } - return i, resp, err + return i, resp, nil } // DeleteIssue deletes a single project issue. @@ -567,7 +567,7 @@ func (s *IssuesService) MoveIssue(pid interface{}, issue int, opt *MoveIssueOpti return nil, resp, err } - return i, resp, err + return i, resp, nil } // SubscribeToIssue subscribes the authenticated user to the given issue to @@ -594,7 +594,7 @@ func (s *IssuesService) SubscribeToIssue(pid interface{}, issue int, options ... return nil, resp, err } - return i, resp, err + return i, resp, nil } // UnsubscribeFromIssue unsubscribes the authenticated user from the given @@ -621,7 +621,7 @@ func (s *IssuesService) UnsubscribeFromIssue(pid interface{}, issue int, options return nil, resp, err } - return i, resp, err + return i, resp, nil } // CreateTodo creates a todo for the current user for an issue. @@ -648,7 +648,7 @@ func (s *IssuesService) CreateTodo(pid interface{}, issue int, options ...Reques return nil, resp, err } - return t, resp, err + return t, resp, nil } // ListMergeRequestsClosingIssueOptions represents the available @@ -681,7 +681,7 @@ func (s *IssuesService) ListMergeRequestsClosingIssue(pid interface{}, issue int return nil, resp, err } - return m, resp, err + return m, resp, nil } // ListMergeRequestsRelatedToIssueOptions represents the available @@ -717,7 +717,7 @@ func (s *IssuesService) ListMergeRequestsRelatedToIssue(pid interface{}, issue i return nil, resp, err } - return m, resp, err + return m, resp, nil } // SetTimeEstimate sets the time estimate for a single project issue. @@ -782,5 +782,5 @@ func (s *IssuesService) GetParticipants(pid interface{}, issue int, options ...R return nil, resp, err } - return bu, resp, err + return bu, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/issues_statistics.go b/vendor/github.com/xanzy/go-gitlab/issues_statistics.go index 16b9fce..3574733 100644 --- a/vendor/github.com/xanzy/go-gitlab/issues_statistics.go +++ b/vendor/github.com/xanzy/go-gitlab/issues_statistics.go @@ -87,7 +87,7 @@ func (s *IssuesStatisticsService) GetIssuesStatistics(opt *GetIssuesStatisticsOp return nil, resp, err } - return is, resp, err + return is, resp, nil } // GetGroupIssuesStatisticsOptions represents the available GetGroupIssuesStatistics() @@ -135,7 +135,7 @@ func (s *IssuesStatisticsService) GetGroupIssuesStatistics(gid interface{}, opt return nil, resp, err } - return is, resp, err + return is, resp, nil } // GetProjectIssuesStatisticsOptions represents the available @@ -183,5 +183,5 @@ func (s *IssuesStatisticsService) GetProjectIssuesStatistics(pid interface{}, op return nil, resp, err } - return is, resp, err + return is, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/jobs.go b/vendor/github.com/xanzy/go-gitlab/jobs.go index ba1b6f4..0feaee9 100644 --- a/vendor/github.com/xanzy/go-gitlab/jobs.go +++ b/vendor/github.com/xanzy/go-gitlab/jobs.go @@ -41,6 +41,7 @@ type Job struct { CreatedAt *time.Time `json:"created_at"` StartedAt *time.Time `json:"started_at"` FinishedAt *time.Time `json:"finished_at"` + ErasedAt *time.Time `json:"erased_at"` Duration float64 `json:"duration"` QueuedDuration float64 `json:"queued_duration"` ArtifactsExpireAt *time.Time `json:"artifacts_expire_at"` @@ -91,13 +92,16 @@ type Bridge struct { CreatedAt *time.Time `json:"created_at"` StartedAt *time.Time `json:"started_at"` FinishedAt *time.Time `json:"finished_at"` + ErasedAt *time.Time `json:"erased_at"` Duration float64 `json:"duration"` + QueuedDuration float64 `json:"queued_duration"` ID int `json:"id"` Name string `json:"name"` Pipeline PipelineInfo `json:"pipeline"` Ref string `json:"ref"` Stage string `json:"stage"` Status string `json:"status"` + FailureReason string `json:"failure_reason"` Tag bool `json:"tag"` WebURL string `json:"web_url"` User *User `json:"user"` @@ -139,7 +143,7 @@ func (s *JobsService) ListProjectJobs(pid interface{}, opts *ListJobsOptions, op return nil, resp, err } - return jobs, resp, err + return jobs, resp, nil } // ListPipelineJobs gets a list of jobs for specific pipeline in a @@ -165,7 +169,7 @@ func (s *JobsService) ListPipelineJobs(pid interface{}, pipelineID int, opts *Li return nil, resp, err } - return jobs, resp, err + return jobs, resp, nil } // ListPipelineBridges gets a list of bridges for specific pipeline in a @@ -191,7 +195,7 @@ func (s *JobsService) ListPipelineBridges(pid interface{}, pipelineID int, opts return nil, resp, err } - return bridges, resp, err + return bridges, resp, nil } // GetJobTokensJobOptions represents the available GetJobTokensJob() options. @@ -216,7 +220,7 @@ func (s *JobsService) GetJobTokensJob(opts *GetJobTokensJobOptions, options ...R return nil, resp, err } - return job, resp, err + return job, resp, nil } // GetJob gets a single job of a project. @@ -241,7 +245,7 @@ func (s *JobsService) GetJob(pid interface{}, jobID int, options ...RequestOptio return nil, resp, err } - return job, resp, err + return job, resp, nil } // GetJobArtifacts get jobs artifacts of a project @@ -419,7 +423,7 @@ func (s *JobsService) CancelJob(pid interface{}, jobID int, options ...RequestOp return nil, resp, err } - return job, resp, err + return job, resp, nil } // RetryJob retries a single job of a project @@ -444,7 +448,7 @@ func (s *JobsService) RetryJob(pid interface{}, jobID int, options ...RequestOpt return nil, resp, err } - return job, resp, err + return job, resp, nil } // EraseJob erases a single job of a project, removes a job @@ -470,7 +474,7 @@ func (s *JobsService) EraseJob(pid interface{}, jobID int, options ...RequestOpt return nil, resp, err } - return job, resp, err + return job, resp, nil } // KeepArtifacts prevents artifacts from being deleted when @@ -496,7 +500,7 @@ func (s *JobsService) KeepArtifacts(pid interface{}, jobID int, options ...Reque return nil, resp, err } - return job, resp, err + return job, resp, nil } // PlayJobOptions represents the available PlayJob() options. @@ -539,7 +543,7 @@ func (s *JobsService) PlayJob(pid interface{}, jobID int, opt *PlayJobOptions, o return nil, resp, err } - return job, resp, err + return job, resp, nil } // DeleteArtifacts delete artifacts of a job diff --git a/vendor/github.com/xanzy/go-gitlab/keys.go b/vendor/github.com/xanzy/go-gitlab/keys.go index 29f2541..0c03f5d 100644 --- a/vendor/github.com/xanzy/go-gitlab/keys.go +++ b/vendor/github.com/xanzy/go-gitlab/keys.go @@ -62,5 +62,5 @@ func (s *KeysService) GetKeyWithUser(key int, options ...RequestOptionFunc) (*Ke return nil, resp, err } - return k, resp, err + return k, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/labels.go b/vendor/github.com/xanzy/go-gitlab/labels.go index d4c8b44..42fc778 100644 --- a/vendor/github.com/xanzy/go-gitlab/labels.go +++ b/vendor/github.com/xanzy/go-gitlab/labels.go @@ -102,7 +102,7 @@ func (s *LabelsService) ListLabels(pid interface{}, opt *ListLabelsOptions, opti return nil, resp, err } - return l, resp, err + return l, resp, nil } // GetLabel get a single label for a given project. @@ -130,7 +130,7 @@ func (s *LabelsService) GetLabel(pid interface{}, labelID interface{}, options . return nil, resp, err } - return l, resp, err + return l, resp, nil } // CreateLabelOptions represents the available CreateLabel() options. @@ -165,7 +165,7 @@ func (s *LabelsService) CreateLabel(pid interface{}, opt *CreateLabelOptions, op return nil, resp, err } - return l, resp, err + return l, resp, nil } // DeleteLabelOptions represents the available DeleteLabel() options. @@ -226,7 +226,7 @@ func (s *LabelsService) UpdateLabel(pid interface{}, opt *UpdateLabelOptions, op return nil, resp, err } - return l, resp, err + return l, resp, nil } // SubscribeToLabel subscribes the authenticated user to a label to receive @@ -257,7 +257,7 @@ func (s *LabelsService) SubscribeToLabel(pid interface{}, labelID interface{}, o return nil, resp, err } - return l, resp, err + return l, resp, nil } // UnsubscribeFromLabel unsubscribes the authenticated user from a label to not diff --git a/vendor/github.com/xanzy/go-gitlab/license.go b/vendor/github.com/xanzy/go-gitlab/license.go index 1c73996..4882f90 100644 --- a/vendor/github.com/xanzy/go-gitlab/license.go +++ b/vendor/github.com/xanzy/go-gitlab/license.go @@ -83,7 +83,7 @@ func (s *LicenseService) GetLicense(options ...RequestOptionFunc) (*License, *Re return nil, resp, err } - return l, resp, err + return l, resp, nil } // AddLicenseOptions represents the available AddLicense() options. @@ -109,7 +109,7 @@ func (s *LicenseService) AddLicense(opt *AddLicenseOptions, options ...RequestOp return nil, resp, err } - return l, resp, err + return l, resp, nil } // DeleteLicense deletes an existing license. diff --git a/vendor/github.com/xanzy/go-gitlab/license_templates.go b/vendor/github.com/xanzy/go-gitlab/license_templates.go index 70e050e..7eea05f 100644 --- a/vendor/github.com/xanzy/go-gitlab/license_templates.go +++ b/vendor/github.com/xanzy/go-gitlab/license_templates.go @@ -73,7 +73,7 @@ func (s *LicenseTemplatesService) ListLicenseTemplates(opt *ListLicenseTemplates return nil, resp, err } - return lts, resp, err + return lts, resp, nil } // GetLicenseTemplateOptions represents the available @@ -105,5 +105,5 @@ func (s *LicenseTemplatesService) GetLicenseTemplate(template string, opt *GetLi return nil, resp, err } - return lt, resp, err + return lt, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go b/vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go index 09b7d8d..0da0af3 100644 --- a/vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go +++ b/vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go @@ -158,7 +158,7 @@ func (s *MergeRequestApprovalsService) ApproveMergeRequest(pid interface{}, mr i return nil, resp, err } - return m, resp, err + return m, resp, nil } // UnapproveMergeRequest unapproves a previously approved merge request on GitLab. @@ -211,7 +211,7 @@ func (s *MergeRequestApprovalsService) GetConfiguration(pid interface{}, mr int, return nil, resp, err } - return m, resp, err + return m, resp, nil } // ChangeApprovalConfiguration updates the approval configuration of a merge request. @@ -236,7 +236,7 @@ func (s *MergeRequestApprovalsService) ChangeApprovalConfiguration(pid interface return nil, resp, err } - return m, resp, err + return m, resp, nil } // ChangeMergeRequestAllowedApproversOptions represents the available @@ -271,7 +271,7 @@ func (s *MergeRequestApprovalsService) ChangeAllowedApprovers(pid interface{}, m return nil, resp, err } - return m, resp, err + return m, resp, nil } // GetApprovalRules requests information about a merge request’s approval rules @@ -296,7 +296,7 @@ func (s *MergeRequestApprovalsService) GetApprovalRules(pid interface{}, mergeRe return nil, resp, err } - return par, resp, err + return par, resp, nil } // GetApprovalState requests information about a merge request’s approval state @@ -321,7 +321,7 @@ func (s *MergeRequestApprovalsService) GetApprovalState(pid interface{}, mergeRe return nil, resp, err } - return pas, resp, err + return pas, resp, nil } // CreateMergeRequestApprovalRuleOptions represents the available CreateApprovalRule() @@ -359,7 +359,7 @@ func (s *MergeRequestApprovalsService) CreateApprovalRule(pid interface{}, merge return nil, resp, err } - return par, resp, err + return par, resp, nil } // UpdateMergeRequestApprovalRuleOptions represents the available UpdateApprovalRule() @@ -396,7 +396,7 @@ func (s *MergeRequestApprovalsService) UpdateApprovalRule(pid interface{}, merge return nil, resp, err } - return par, resp, err + return par, resp, nil } // DeleteApprovalRule deletes a mr level approval rule. diff --git a/vendor/github.com/xanzy/go-gitlab/merge_requests.go b/vendor/github.com/xanzy/go-gitlab/merge_requests.go index 0aaed1c..34a244a 100644 --- a/vendor/github.com/xanzy/go-gitlab/merge_requests.go +++ b/vendor/github.com/xanzy/go-gitlab/merge_requests.go @@ -193,7 +193,7 @@ func (s *MergeRequestsService) ListMergeRequests(opt *ListMergeRequestsOptions, return nil, resp, err } - return m, resp, err + return m, resp, nil } // ListProjectMergeRequestsOptions represents the available ListMergeRequests() @@ -255,7 +255,7 @@ func (s *MergeRequestsService) ListProjectMergeRequests(pid interface{}, opt *Li return nil, resp, err } - return m, resp, err + return m, resp, nil } // ListGroupMergeRequestsOptions represents the available ListGroupMergeRequests() @@ -317,7 +317,7 @@ func (s *MergeRequestsService) ListGroupMergeRequests(gid interface{}, opt *List return nil, resp, err } - return m, resp, err + return m, resp, nil } // GetMergeRequestsOptions represents the available GetMergeRequests() @@ -353,7 +353,7 @@ func (s *MergeRequestsService) GetMergeRequest(pid interface{}, mergeRequest int return nil, resp, err } - return m, resp, err + return m, resp, nil } // GetMergeRequestApprovals gets information about a merge requests approvals @@ -378,7 +378,7 @@ func (s *MergeRequestsService) GetMergeRequestApprovals(pid interface{}, mergeRe return nil, resp, err } - return a, resp, err + return a, resp, nil } // GetMergeRequestCommitsOptions represents the available GetMergeRequestCommits() @@ -410,7 +410,7 @@ func (s *MergeRequestsService) GetMergeRequestCommits(pid interface{}, mergeRequ return nil, resp, err } - return c, resp, err + return c, resp, nil } // GetMergeRequestChangesOptions represents the available GetMergeRequestChanges() @@ -445,7 +445,7 @@ func (s *MergeRequestsService) GetMergeRequestChanges(pid interface{}, mergeRequ return nil, resp, err } - return m, resp, err + return m, resp, nil } // GetMergeRequestParticipants gets a list of merge request participants. @@ -470,7 +470,7 @@ func (s *MergeRequestsService) GetMergeRequestParticipants(pid interface{}, merg return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // ListMergeRequestPipelines gets all pipelines for the provided merge request. @@ -495,7 +495,7 @@ func (s *MergeRequestsService) ListMergeRequestPipelines(pid interface{}, mergeR return nil, resp, err } - return p, resp, err + return p, resp, nil } // CreateMergeRequestPipeline creates a new pipeline for a merge request. @@ -520,7 +520,7 @@ func (s *MergeRequestsService) CreateMergeRequestPipeline(pid interface{}, merge return nil, resp, err } - return p, resp, err + return p, resp, nil } // GetIssuesClosedOnMergeOptions represents the available GetIssuesClosedOnMerge() @@ -553,7 +553,7 @@ func (s *MergeRequestsService) GetIssuesClosedOnMerge(pid interface{}, mergeRequ return nil, resp, err } - return i, resp, err + return i, resp, nil } // CreateMergeRequestOptions represents the available CreateMergeRequest() @@ -599,7 +599,7 @@ func (s *MergeRequestsService) CreateMergeRequest(pid interface{}, opt *CreateMe return nil, resp, err } - return m, resp, err + return m, resp, nil } // UpdateMergeRequestOptions represents the available UpdateMergeRequest() @@ -647,7 +647,7 @@ func (s *MergeRequestsService) UpdateMergeRequest(pid interface{}, mergeRequest return nil, resp, err } - return m, resp, err + return m, resp, nil } // DeleteMergeRequest deletes a merge request. @@ -708,7 +708,7 @@ func (s *MergeRequestsService) AcceptMergeRequest(pid interface{}, mergeRequest return nil, resp, err } - return m, resp, err + return m, resp, nil } // CancelMergeWhenPipelineSucceeds cancels a merge when pipeline succeeds. If @@ -737,7 +737,7 @@ func (s *MergeRequestsService) CancelMergeWhenPipelineSucceeds(pid interface{}, return nil, resp, err } - return m, resp, err + return m, resp, nil } // RebaseMergeRequest automatically rebases the source_branch of the merge @@ -790,7 +790,7 @@ func (s *MergeRequestsService) GetMergeRequestDiffVersions(pid interface{}, merg return nil, resp, err } - return v, resp, err + return v, resp, nil } // GetSingleMergeRequestDiffVersion get a single MR diff version @@ -815,7 +815,7 @@ func (s *MergeRequestsService) GetSingleMergeRequestDiffVersion(pid interface{}, return nil, resp, err } - return v, resp, err + return v, resp, nil } // SubscribeToMergeRequest subscribes the authenticated user to the given merge @@ -842,7 +842,7 @@ func (s *MergeRequestsService) SubscribeToMergeRequest(pid interface{}, mergeReq return nil, resp, err } - return m, resp, err + return m, resp, nil } // UnsubscribeFromMergeRequest unsubscribes the authenticated user from the @@ -870,7 +870,7 @@ func (s *MergeRequestsService) UnsubscribeFromMergeRequest(pid interface{}, merg return nil, resp, err } - return m, resp, err + return m, resp, nil } // CreateTodo manually creates a todo for the current user on a merge request. @@ -897,7 +897,7 @@ func (s *MergeRequestsService) CreateTodo(pid interface{}, mergeRequest int, opt return nil, resp, err } - return t, resp, err + return t, resp, nil } // SetTimeEstimate sets the time estimate for a single project merge request. diff --git a/vendor/github.com/xanzy/go-gitlab/metadata.go b/vendor/github.com/xanzy/go-gitlab/metadata.go index 1713f3c..db23a81 100644 --- a/vendor/github.com/xanzy/go-gitlab/metadata.go +++ b/vendor/github.com/xanzy/go-gitlab/metadata.go @@ -59,5 +59,5 @@ func (s *MetadataService) GetMetadata(options ...RequestOptionFunc) (*Metadata, return nil, resp, err } - return v, resp, err + return v, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/milestones.go b/vendor/github.com/xanzy/go-gitlab/milestones.go index cba00f5..095c913 100644 --- a/vendor/github.com/xanzy/go-gitlab/milestones.go +++ b/vendor/github.com/xanzy/go-gitlab/milestones.go @@ -87,7 +87,7 @@ func (s *MilestonesService) ListMilestones(pid interface{}, opt *ListMilestonesO return nil, resp, err } - return m, resp, err + return m, resp, nil } // GetMilestone gets a single project milestone. @@ -112,7 +112,7 @@ func (s *MilestonesService) GetMilestone(pid interface{}, milestone int, options return nil, resp, err } - return m, resp, err + return m, resp, nil } // CreateMilestoneOptions represents the available CreateMilestone() options. @@ -148,7 +148,7 @@ func (s *MilestonesService) CreateMilestone(pid interface{}, opt *CreateMileston return nil, resp, err } - return m, resp, err + return m, resp, nil } // UpdateMilestoneOptions represents the available UpdateMilestone() options. @@ -185,7 +185,7 @@ func (s *MilestonesService) UpdateMilestone(pid interface{}, milestone int, opt return nil, resp, err } - return m, resp, err + return m, resp, nil } // DeleteMilestone deletes a specified project milestone. @@ -234,7 +234,7 @@ func (s *MilestonesService) GetMilestoneIssues(pid interface{}, milestone int, o return nil, resp, err } - return i, resp, err + return i, resp, nil } // GetMilestoneMergeRequestsOptions represents the available @@ -267,5 +267,5 @@ func (s *MilestonesService) GetMilestoneMergeRequests(pid interface{}, milestone return nil, resp, err } - return mr, resp, err + return mr, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/namespaces.go b/vendor/github.com/xanzy/go-gitlab/namespaces.go index 26a0cca..da82a0c 100644 --- a/vendor/github.com/xanzy/go-gitlab/namespaces.go +++ b/vendor/github.com/xanzy/go-gitlab/namespaces.go @@ -78,7 +78,7 @@ func (s *NamespacesService) ListNamespaces(opt *ListNamespacesOptions, options . return nil, resp, err } - return n, resp, err + return n, resp, nil } // SearchNamespace gets all namespaces that match your string in their name @@ -103,7 +103,7 @@ func (s *NamespacesService) SearchNamespace(query string, options ...RequestOpti return nil, resp, err } - return n, resp, err + return n, resp, nil } // GetNamespace gets a namespace by id. @@ -128,7 +128,7 @@ func (s *NamespacesService) GetNamespace(id interface{}, options ...RequestOptio return nil, resp, err } - return n, resp, err + return n, resp, nil } // NamespaceExistance represents a namespace exists result. @@ -170,5 +170,5 @@ func (s *NamespacesService) NamespaceExists(id interface{}, opt *NamespaceExists return nil, resp, err } - return n, resp, err + return n, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/notes.go b/vendor/github.com/xanzy/go-gitlab/notes.go index a71a947..5e80f14 100644 --- a/vendor/github.com/xanzy/go-gitlab/notes.go +++ b/vendor/github.com/xanzy/go-gitlab/notes.go @@ -135,7 +135,7 @@ func (s *NotesService) ListIssueNotes(pid interface{}, issue int, opt *ListIssue return nil, resp, err } - return n, resp, err + return n, resp, nil } // GetIssueNote returns a single note for a specific project issue. @@ -160,7 +160,7 @@ func (s *NotesService) GetIssueNote(pid interface{}, issue, note int, options .. return nil, resp, err } - return n, resp, err + return n, resp, nil } // CreateIssueNoteOptions represents the available CreateIssueNote() @@ -195,7 +195,7 @@ func (s *NotesService) CreateIssueNote(pid interface{}, issue int, opt *CreateIs return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateIssueNoteOptions represents the available UpdateIssueNote() @@ -229,7 +229,7 @@ func (s *NotesService) UpdateIssueNote(pid interface{}, issue, note int, opt *Up return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteIssueNote deletes an existing note of an issue. @@ -284,7 +284,7 @@ func (s *NotesService) ListSnippetNotes(pid interface{}, snippet int, opt *ListS return nil, resp, err } - return n, resp, err + return n, resp, nil } // GetSnippetNote returns a single note for a given snippet. @@ -309,7 +309,7 @@ func (s *NotesService) GetSnippetNote(pid interface{}, snippet, note int, option return nil, resp, err } - return n, resp, err + return n, resp, nil } // CreateSnippetNoteOptions represents the available CreateSnippetNote() @@ -344,7 +344,7 @@ func (s *NotesService) CreateSnippetNote(pid interface{}, snippet int, opt *Crea return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateSnippetNoteOptions represents the available UpdateSnippetNote() @@ -378,7 +378,7 @@ func (s *NotesService) UpdateSnippetNote(pid interface{}, snippet, note int, opt return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteSnippetNote deletes an existing note of a snippet. @@ -433,7 +433,7 @@ func (s *NotesService) ListMergeRequestNotes(pid interface{}, mergeRequest int, return nil, resp, err } - return n, resp, err + return n, resp, nil } // GetMergeRequestNote returns a single note for a given merge request. @@ -458,7 +458,7 @@ func (s *NotesService) GetMergeRequestNote(pid interface{}, mergeRequest, note i return nil, resp, err } - return n, resp, err + return n, resp, nil } // CreateMergeRequestNoteOptions represents the available @@ -492,7 +492,7 @@ func (s *NotesService) CreateMergeRequestNote(pid interface{}, mergeRequest int, return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateMergeRequestNoteOptions represents the available @@ -526,7 +526,7 @@ func (s *NotesService) UpdateMergeRequestNote(pid interface{}, mergeRequest, not return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteMergeRequestNote deletes an existing note of a merge request. @@ -581,7 +581,7 @@ func (s *NotesService) ListEpicNotes(gid interface{}, epic int, opt *ListEpicNot return nil, resp, err } - return n, resp, err + return n, resp, nil } // GetEpicNote returns a single note for an epic. @@ -606,7 +606,7 @@ func (s *NotesService) GetEpicNote(gid interface{}, epic, note int, options ...R return nil, resp, err } - return n, resp, err + return n, resp, nil } // CreateEpicNoteOptions represents the available CreateEpicNote() options. @@ -639,7 +639,7 @@ func (s *NotesService) CreateEpicNote(gid interface{}, epic int, opt *CreateEpic return nil, resp, err } - return n, resp, err + return n, resp, nil } // UpdateEpicNoteOptions represents the available UpdateEpicNote() options. @@ -671,7 +671,7 @@ func (s *NotesService) UpdateEpicNote(gid interface{}, epic, note int, opt *Upda return nil, resp, err } - return n, resp, err + return n, resp, nil } // DeleteEpicNote deletes an existing note of a merge request. diff --git a/vendor/github.com/xanzy/go-gitlab/notifications.go b/vendor/github.com/xanzy/go-gitlab/notifications.go index 13b9aa6..da02415 100644 --- a/vendor/github.com/xanzy/go-gitlab/notifications.go +++ b/vendor/github.com/xanzy/go-gitlab/notifications.go @@ -81,7 +81,7 @@ func (s *NotificationSettingsService) GetGlobalSettings(options ...RequestOption return nil, resp, err } - return ns, resp, err + return ns, resp, nil } // NotificationSettingsOptions represents the available options that can be passed @@ -126,7 +126,7 @@ func (s *NotificationSettingsService) UpdateGlobalSettings(opt *NotificationSett return nil, resp, err } - return ns, resp, err + return ns, resp, nil } // GetSettingsForGroup returns current group notification settings. @@ -151,7 +151,7 @@ func (s *NotificationSettingsService) GetSettingsForGroup(gid interface{}, optio return nil, resp, err } - return ns, resp, err + return ns, resp, nil } // GetSettingsForProject returns current project notification settings. @@ -176,7 +176,7 @@ func (s *NotificationSettingsService) GetSettingsForProject(pid interface{}, opt return nil, resp, err } - return ns, resp, err + return ns, resp, nil } // UpdateSettingsForGroup updates current group notification settings. @@ -201,7 +201,7 @@ func (s *NotificationSettingsService) UpdateSettingsForGroup(gid interface{}, op return nil, resp, err } - return ns, resp, err + return ns, resp, nil } // UpdateSettingsForProject updates current project notification settings. @@ -226,5 +226,5 @@ func (s *NotificationSettingsService) UpdateSettingsForProject(pid interface{}, return nil, resp, err } - return ns, resp, err + return ns, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/packages.go b/vendor/github.com/xanzy/go-gitlab/packages.go index e309ebd..a63cdc4 100644 --- a/vendor/github.com/xanzy/go-gitlab/packages.go +++ b/vendor/github.com/xanzy/go-gitlab/packages.go @@ -140,7 +140,7 @@ func (s *PackagesService) ListProjectPackages(pid interface{}, opt *ListProjectP return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // ListGroupPackagesOptions represents the available ListGroupPackages() @@ -181,7 +181,7 @@ func (s *PackagesService) ListGroupPackages(gid interface{}, opt *ListGroupPacka return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // ListPackageFilesOptions represents the available ListPackageFiles() @@ -217,7 +217,7 @@ func (s *PackagesService) ListPackageFiles(pid interface{}, pkg int, opt *ListPa return nil, resp, err } - return pfs, resp, err + return pfs, resp, nil } // DeleteProjectPackage deletes a package in a project. diff --git a/vendor/github.com/xanzy/go-gitlab/pages_domains.go b/vendor/github.com/xanzy/go-gitlab/pages_domains.go index c3b9aba..07d985d 100644 --- a/vendor/github.com/xanzy/go-gitlab/pages_domains.go +++ b/vendor/github.com/xanzy/go-gitlab/pages_domains.go @@ -78,7 +78,7 @@ func (s *PagesDomainsService) ListPagesDomains(pid interface{}, opt *ListPagesDo return nil, resp, err } - return pd, resp, err + return pd, resp, nil } // ListAllPagesDomains gets a list of all pages domains. @@ -97,7 +97,7 @@ func (s *PagesDomainsService) ListAllPagesDomains(options ...RequestOptionFunc) return nil, resp, err } - return pd, resp, err + return pd, resp, nil } // GetPagesDomain get a specific pages domain for a project. @@ -122,7 +122,7 @@ func (s *PagesDomainsService) GetPagesDomain(pid interface{}, domain string, opt return nil, resp, err } - return pd, resp, err + return pd, resp, nil } // CreatePagesDomainOptions represents the available CreatePagesDomain() options. @@ -158,7 +158,7 @@ func (s *PagesDomainsService) CreatePagesDomain(pid interface{}, opt *CreatePage return nil, resp, err } - return pd, resp, err + return pd, resp, nil } // UpdatePagesDomainOptions represents the available UpdatePagesDomain() options. @@ -193,7 +193,7 @@ func (s *PagesDomainsService) UpdatePagesDomain(pid interface{}, domain string, return nil, resp, err } - return pd, resp, err + return pd, resp, nil } // DeletePagesDomain deletes an existing prject pages domain. diff --git a/vendor/github.com/xanzy/go-gitlab/personal_access_tokens.go b/vendor/github.com/xanzy/go-gitlab/personal_access_tokens.go index 07d6de2..bb27c77 100644 --- a/vendor/github.com/xanzy/go-gitlab/personal_access_tokens.go +++ b/vendor/github.com/xanzy/go-gitlab/personal_access_tokens.go @@ -76,7 +76,7 @@ func (s *PersonalAccessTokensService) ListPersonalAccessTokens(opt *ListPersonal return nil, resp, err } - return pats, resp, err + return pats, resp, nil } // GetSinglePersonalAccessTokenByID get a single personal access token by its ID. @@ -96,7 +96,7 @@ func (s *PersonalAccessTokensService) GetSinglePersonalAccessTokenByID(user int, return nil, resp, err } - return pat, resp, err + return pat, resp, nil } // GetSinglePersonalAccessToken get a single personal access token by using @@ -117,7 +117,7 @@ func (s *PersonalAccessTokensService) GetSinglePersonalAccessToken(options ...Re return nil, resp, err } - return pat, resp, err + return pat, resp, nil } // RevokePersonalAccessToken revokes a personal access token. diff --git a/vendor/github.com/xanzy/go-gitlab/pipeline_schedules.go b/vendor/github.com/xanzy/go-gitlab/pipeline_schedules.go index 0f307cb..d7c85df 100644 --- a/vendor/github.com/xanzy/go-gitlab/pipeline_schedules.go +++ b/vendor/github.com/xanzy/go-gitlab/pipeline_schedules.go @@ -35,23 +35,27 @@ type PipelineSchedulesService struct { // GitLab API docs: // https://docs.gitlab.com/ee/api/pipeline_schedules.html type PipelineSchedule struct { - ID int `json:"id"` - Description string `json:"description"` - Ref string `json:"ref"` - Cron string `json:"cron"` - CronTimezone string `json:"cron_timezone"` - NextRunAt *time.Time `json:"next_run_at"` - Active bool `json:"active"` - CreatedAt *time.Time `json:"created_at"` - UpdatedAt *time.Time `json:"updated_at"` - Owner *User `json:"owner"` - LastPipeline struct { - ID int `json:"id"` - SHA string `json:"sha"` - Ref string `json:"ref"` - Status string `json:"status"` - } `json:"last_pipeline"` - Variables []*PipelineVariable `json:"variables"` + ID int `json:"id"` + Description string `json:"description"` + Ref string `json:"ref"` + Cron string `json:"cron"` + CronTimezone string `json:"cron_timezone"` + NextRunAt *time.Time `json:"next_run_at"` + Active bool `json:"active"` + CreatedAt *time.Time `json:"created_at"` + UpdatedAt *time.Time `json:"updated_at"` + Owner *User `json:"owner"` + LastPipeline *LastPipeline `json:"last_pipeline"` + Variables []*PipelineVariable `json:"variables"` +} + +// LastPipeline represents the last pipeline ran by schedule +// this will be returned only for individual schedule get operation +type LastPipeline struct { + ID int `json:"id"` + SHA string `json:"sha"` + Ref string `json:"ref"` + Status string `json:"status"` } // ListPipelineSchedulesOptions represents the available ListPipelineTriggers() options. @@ -82,7 +86,7 @@ func (s *PipelineSchedulesService) ListPipelineSchedules(pid interface{}, opt *L return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // GetPipelineSchedule gets a pipeline schedule. @@ -107,7 +111,7 @@ func (s *PipelineSchedulesService) GetPipelineSchedule(pid interface{}, schedule return nil, resp, err } - return p, resp, err + return p, resp, nil } // ListPipelinesTriggeredByScheduleOptions represents the available @@ -140,7 +144,7 @@ func (s *PipelineSchedulesService) ListPipelinesTriggeredBySchedule(pid interfac return nil, resp, err } - return p, resp, err + return p, resp, nil } // CreatePipelineScheduleOptions represents the available @@ -178,7 +182,7 @@ func (s *PipelineSchedulesService) CreatePipelineSchedule(pid interface{}, opt * return nil, resp, err } - return p, resp, err + return p, resp, nil } // EditPipelineScheduleOptions represents the available @@ -216,7 +220,7 @@ func (s *PipelineSchedulesService) EditPipelineSchedule(pid interface{}, schedul return nil, resp, err } - return p, resp, err + return p, resp, nil } // TakeOwnershipOfPipelineSchedule sets the owner of the specified @@ -242,7 +246,7 @@ func (s *PipelineSchedulesService) TakeOwnershipOfPipelineSchedule(pid interface return nil, resp, err } - return p, resp, err + return p, resp, nil } // DeletePipelineSchedule deletes a pipeline schedule. @@ -316,7 +320,7 @@ func (s *PipelineSchedulesService) CreatePipelineScheduleVariable(pid interface{ return nil, resp, err } - return p, resp, err + return p, resp, nil } // EditPipelineScheduleVariableOptions represents the available @@ -351,7 +355,7 @@ func (s *PipelineSchedulesService) EditPipelineScheduleVariable(pid interface{}, return nil, resp, err } - return p, resp, err + return p, resp, nil } // DeletePipelineScheduleVariable creates a pipeline schedule variable. @@ -376,5 +380,5 @@ func (s *PipelineSchedulesService) DeletePipelineScheduleVariable(pid interface{ return nil, resp, err } - return p, resp, err + return p, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/pipeline_triggers.go b/vendor/github.com/xanzy/go-gitlab/pipeline_triggers.go index 01b3f6b..39269a3 100644 --- a/vendor/github.com/xanzy/go-gitlab/pipeline_triggers.go +++ b/vendor/github.com/xanzy/go-gitlab/pipeline_triggers.go @@ -73,7 +73,7 @@ func (s *PipelineTriggersService) ListPipelineTriggers(pid interface{}, opt *Lis return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // GetPipelineTrigger gets a specific pipeline trigger for a project. @@ -98,7 +98,7 @@ func (s *PipelineTriggersService) GetPipelineTrigger(pid interface{}, trigger in return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // AddPipelineTriggerOptions represents the available AddPipelineTrigger() options. @@ -131,7 +131,7 @@ func (s *PipelineTriggersService) AddPipelineTrigger(pid interface{}, opt *AddPi return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // EditPipelineTriggerOptions represents the available EditPipelineTrigger() options. @@ -164,7 +164,7 @@ func (s *PipelineTriggersService) EditPipelineTrigger(pid interface{}, trigger i return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // TakeOwnershipOfPipelineTrigger sets the owner of the specified @@ -190,7 +190,7 @@ func (s *PipelineTriggersService) TakeOwnershipOfPipelineTrigger(pid interface{} return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // DeletePipelineTrigger removes a trigger from a project. @@ -244,5 +244,5 @@ func (s *PipelineTriggersService) RunPipelineTrigger(pid interface{}, opt *RunPi return nil, resp, err } - return pt, resp, err + return pt, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/pipelines.go b/vendor/github.com/xanzy/go-gitlab/pipelines.go index df77edf..5b01e49 100644 --- a/vendor/github.com/xanzy/go-gitlab/pipelines.go +++ b/vendor/github.com/xanzy/go-gitlab/pipelines.go @@ -195,7 +195,7 @@ func (s *PipelinesService) ListProjectPipelines(pid interface{}, opt *ListProjec return nil, resp, err } - return p, resp, err + return p, resp, nil } // GetPipeline gets a single project pipeline. @@ -219,7 +219,7 @@ func (s *PipelinesService) GetPipeline(pid interface{}, pipeline int, options .. return nil, resp, err } - return p, resp, err + return p, resp, nil } // GetPipelineVariables gets the variables of a single project pipeline. @@ -243,7 +243,7 @@ func (s *PipelinesService) GetPipelineVariables(pid interface{}, pipeline int, o return nil, resp, err } - return p, resp, err + return p, resp, nil } // GetPipelineTestReport gets the test report of a single project pipeline. @@ -267,7 +267,7 @@ func (s *PipelinesService) GetPipelineTestReport(pid interface{}, pipeline int, return nil, resp, err } - return p, resp, err + return p, resp, nil } // GetLatestPipelineOptions represents the available GetLatestPipeline() options. @@ -298,7 +298,7 @@ func (s *PipelinesService) GetLatestPipeline(pid interface{}, opt *GetLatestPipe return nil, resp, err } - return p, resp, err + return p, resp, nil } // CreatePipelineOptions represents the available CreatePipeline() options. @@ -339,7 +339,7 @@ func (s *PipelinesService) CreatePipeline(pid interface{}, opt *CreatePipelineOp return nil, resp, err } - return p, resp, err + return p, resp, nil } // RetryPipelineBuild retries failed builds in a pipeline @@ -364,7 +364,7 @@ func (s *PipelinesService) RetryPipelineBuild(pid interface{}, pipeline int, opt return nil, resp, err } - return p, resp, err + return p, resp, nil } // CancelPipelineBuild cancels a pipeline builds @@ -389,7 +389,7 @@ func (s *PipelinesService) CancelPipelineBuild(pid interface{}, pipeline int, op return nil, resp, err } - return p, resp, err + return p, resp, nil } // DeletePipeline deletes an existing pipeline. diff --git a/vendor/github.com/xanzy/go-gitlab/plan_limits.go b/vendor/github.com/xanzy/go-gitlab/plan_limits.go index e6be78f..893ae75 100644 --- a/vendor/github.com/xanzy/go-gitlab/plan_limits.go +++ b/vendor/github.com/xanzy/go-gitlab/plan_limits.go @@ -65,7 +65,7 @@ func (s *PlanLimitsService) GetCurrentPlanLimits(opt *GetCurrentPlanLimitsOption return nil, resp, err } - return pl, resp, err + return pl, resp, nil } // ChangePlanLimitOptions represents the available ChangePlanLimits() options. @@ -100,5 +100,5 @@ func (s *PlanLimitsService) ChangePlanLimits(opt *ChangePlanLimitOptions, option return nil, resp, err } - return pl, resp, err + return pl, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/project_access_tokens.go b/vendor/github.com/xanzy/go-gitlab/project_access_tokens.go index 1c0d3c7..9fa510d 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_access_tokens.go +++ b/vendor/github.com/xanzy/go-gitlab/project_access_tokens.go @@ -81,7 +81,7 @@ func (s *ProjectAccessTokensService) ListProjectAccessTokens(pid interface{}, op return nil, resp, err } - return pats, resp, err + return pats, resp, nil } // GetProjectAccessToken gets a single project access tokens in a project. @@ -106,7 +106,7 @@ func (s *ProjectAccessTokensService) GetProjectAccessToken(pid interface{}, id i return nil, resp, err } - return pat, resp, err + return pat, resp, nil } // CreateProjectAccessTokenOptions represents the available CreateVariable() @@ -143,7 +143,7 @@ func (s *ProjectAccessTokensService) CreateProjectAccessToken(pid interface{}, o return nil, resp, err } - return pat, resp, err + return pat, resp, nil } // RevokeProjectAccessToken revokes a project access token. diff --git a/vendor/github.com/xanzy/go-gitlab/project_badges.go b/vendor/github.com/xanzy/go-gitlab/project_badges.go index aa62a1f..d5afe1e 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_badges.go +++ b/vendor/github.com/xanzy/go-gitlab/project_badges.go @@ -76,7 +76,7 @@ func (s *ProjectBadgesService) ListProjectBadges(pid interface{}, opt *ListProje return nil, resp, err } - return pb, resp, err + return pb, resp, nil } // GetProjectBadge gets a project badge. @@ -101,7 +101,7 @@ func (s *ProjectBadgesService) GetProjectBadge(pid interface{}, badge int, optio return nil, resp, err } - return pb, resp, err + return pb, resp, nil } // AddProjectBadgeOptions represents the available AddProjectBadge() options. @@ -136,7 +136,7 @@ func (s *ProjectBadgesService) AddProjectBadge(pid interface{}, opt *AddProjectB return nil, resp, err } - return pb, resp, err + return pb, resp, nil } // EditProjectBadgeOptions represents the available EditProjectBadge() options. @@ -171,7 +171,7 @@ func (s *ProjectBadgesService) EditProjectBadge(pid interface{}, badge int, opt return nil, resp, err } - return pb, resp, err + return pb, resp, nil } // DeleteProjectBadge removes a badge from a project. Only project's @@ -226,5 +226,5 @@ func (s *ProjectBadgesService) PreviewProjectBadge(pid interface{}, opt *Project return nil, resp, err } - return pb, resp, err + return pb, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/project_clusters.go b/vendor/github.com/xanzy/go-gitlab/project_clusters.go index f515821..792a69b 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_clusters.go +++ b/vendor/github.com/xanzy/go-gitlab/project_clusters.go @@ -95,7 +95,7 @@ func (s *ProjectClustersService) ListClusters(pid interface{}, options ...Reques return nil, resp, err } - return pcs, resp, err + return pcs, resp, nil } // GetCluster gets a cluster. @@ -120,7 +120,7 @@ func (s *ProjectClustersService) GetCluster(pid interface{}, cluster int, option return nil, resp, err } - return pc, resp, err + return pc, resp, nil } // AddClusterOptions represents the available AddCluster() options. @@ -168,7 +168,7 @@ func (s *ProjectClustersService) AddCluster(pid interface{}, opt *AddClusterOpti return nil, resp, err } - return pc, resp, err + return pc, resp, nil } // EditClusterOptions represents the available EditCluster() options. @@ -213,7 +213,7 @@ func (s *ProjectClustersService) EditCluster(pid interface{}, cluster int, opt * return nil, resp, err } - return pc, resp, err + return pc, resp, nil } // DeleteCluster deletes an existing project cluster. diff --git a/vendor/github.com/xanzy/go-gitlab/project_feature_flags.go b/vendor/github.com/xanzy/go-gitlab/project_feature_flags.go index 79aaf8b..9f75611 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_feature_flags.go +++ b/vendor/github.com/xanzy/go-gitlab/project_feature_flags.go @@ -90,7 +90,7 @@ func (s *ProjectFeatureFlagService) ListProjectFeatureFlags(pid interface{}, opt return nil, resp, err } - return pffs, resp, err + return pffs, resp, nil } // GetProjectFeatureFlag gets a single feature flag for the specified project. @@ -115,7 +115,7 @@ func (s *ProjectFeatureFlagService) GetProjectFeatureFlag(pid interface{}, name return nil, resp, err } - return flag, resp, err + return flag, resp, nil } // CreateProjectFeatureFlagOptions represents the available @@ -177,7 +177,7 @@ func (s *ProjectFeatureFlagService) CreateProjectFeatureFlag(pid interface{}, op return flag, resp, err } - return flag, resp, err + return flag, resp, nil } // UpdateProjectFeatureFlagOptions represents the available @@ -217,7 +217,7 @@ func (s *ProjectFeatureFlagService) UpdateProjectFeatureFlag(pid interface{}, na return flag, resp, err } - return flag, resp, err + return flag, resp, nil } // DeleteProjectFeatureFlag deletes a feature flag diff --git a/vendor/github.com/xanzy/go-gitlab/project_import_export.go b/vendor/github.com/xanzy/go-gitlab/project_import_export.go index ffd4ace..266be83 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_import_export.go +++ b/vendor/github.com/xanzy/go-gitlab/project_import_export.go @@ -132,7 +132,7 @@ func (s *ProjectImportExportService) ExportStatus(pid interface{}, options ...Re return nil, resp, err } - return es, resp, err + return es, resp, nil } // ExportDownload download the finished export. @@ -196,7 +196,7 @@ func (s *ProjectImportExportService) ImportFromFile(archive io.Reader, opt *Impo return nil, resp, err } - return is, resp, err + return is, resp, nil } // ImportStatus get the status of an import. @@ -221,5 +221,5 @@ func (s *ProjectImportExportService) ImportStatus(pid interface{}, options ...Re return nil, resp, err } - return is, resp, err + return is, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/project_iterations.go b/vendor/github.com/xanzy/go-gitlab/project_iterations.go index 12c42db..1fe0ddf 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_iterations.go +++ b/vendor/github.com/xanzy/go-gitlab/project_iterations.go @@ -86,5 +86,5 @@ func (i *ProjectIterationsService) ListProjectIterations(pid interface{}, opt *L return nil, resp, err } - return pis, resp, err + return pis, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/project_managed_licenses.go b/vendor/github.com/xanzy/go-gitlab/project_managed_licenses.go index 25c8ef6..d6f23f2 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_managed_licenses.go +++ b/vendor/github.com/xanzy/go-gitlab/project_managed_licenses.go @@ -60,7 +60,7 @@ func (s *ManagedLicensesService) ListManagedLicenses(pid interface{}, options .. return nil, resp, err } - return mls, resp, err + return mls, resp, nil } // GetManagedLicense returns an existing managed license. @@ -89,7 +89,7 @@ func (s *ManagedLicensesService) GetManagedLicense(pid, mlid interface{}, option return nil, resp, err } - return ml, resp, err + return ml, resp, nil } // AddManagedLicenseOptions represents the available AddManagedLicense() options. @@ -123,7 +123,7 @@ func (s *ManagedLicensesService) AddManagedLicense(pid interface{}, opt *AddMana return nil, resp, err } - return ml, resp, err + return ml, resp, nil } // DeleteManagedLicense deletes a managed license with a given ID. @@ -184,5 +184,5 @@ func (s *ManagedLicensesService) EditManagedLicense(pid, mlid interface{}, opt * return nil, resp, err } - return ml, resp, err + return ml, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/project_members.go b/vendor/github.com/xanzy/go-gitlab/project_members.go index 7042dfb..810fd36 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_members.go +++ b/vendor/github.com/xanzy/go-gitlab/project_members.go @@ -64,7 +64,7 @@ func (s *ProjectMembersService) ListProjectMembers(pid interface{}, opt *ListPro return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // ListAllProjectMembers gets a list of a project's team members viewable by the @@ -91,7 +91,7 @@ func (s *ProjectMembersService) ListAllProjectMembers(pid interface{}, opt *List return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // GetProjectMember gets a project team member. @@ -116,7 +116,7 @@ func (s *ProjectMembersService) GetProjectMember(pid interface{}, user int, opti return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // GetInheritedProjectMember gets a project team member, including inherited @@ -141,7 +141,7 @@ func (s *ProjectMembersService) GetInheritedProjectMember(pid interface{}, user return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // AddProjectMemberOptions represents the available AddProjectMember() options. @@ -179,7 +179,7 @@ func (s *ProjectMembersService) AddProjectMember(pid interface{}, opt *AddProjec return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // EditProjectMemberOptions represents the available EditProjectMember() options. @@ -213,7 +213,7 @@ func (s *ProjectMembersService) EditProjectMember(pid interface{}, user int, opt return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // DeleteProjectMember removes a user from a project team. diff --git a/vendor/github.com/xanzy/go-gitlab/project_mirror.go b/vendor/github.com/xanzy/go-gitlab/project_mirror.go index a8c1ad2..129040c 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_mirror.go +++ b/vendor/github.com/xanzy/go-gitlab/project_mirror.go @@ -71,7 +71,7 @@ func (s *ProjectMirrorService) ListProjectMirror(pid interface{}, opt *ListProje return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // GetProjectMirror gets a single mirror configured on the project. @@ -96,7 +96,7 @@ func (s *ProjectMirrorService) GetProjectMirror(pid interface{}, mirror int, opt return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // AddProjectMirrorOptions contains the properties requires to create @@ -133,7 +133,7 @@ func (s *ProjectMirrorService) AddProjectMirror(pid interface{}, opt *AddProject return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // EditProjectMirrorOptions contains the properties requires to edit @@ -169,7 +169,7 @@ func (s *ProjectMirrorService) EditProjectMirror(pid interface{}, mirror int, op return nil, resp, err } - return pm, resp, err + return pm, resp, nil } // DeleteProjectMirror deletes a project mirror. diff --git a/vendor/github.com/xanzy/go-gitlab/project_snippets.go b/vendor/github.com/xanzy/go-gitlab/project_snippets.go index b3616be..fe8e46a 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_snippets.go +++ b/vendor/github.com/xanzy/go-gitlab/project_snippets.go @@ -56,7 +56,7 @@ func (s *ProjectSnippetsService) ListSnippets(pid interface{}, opt *ListProjectS return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // GetSnippet gets a single project snippet @@ -81,7 +81,7 @@ func (s *ProjectSnippetsService) GetSnippet(pid interface{}, snippet int, option return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // CreateProjectSnippetOptions represents the available CreateSnippet() options. @@ -120,7 +120,7 @@ func (s *ProjectSnippetsService) CreateSnippet(pid interface{}, opt *CreateProje return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // UpdateProjectSnippetOptions represents the available UpdateSnippet() options. @@ -159,7 +159,7 @@ func (s *ProjectSnippetsService) UpdateSnippet(pid interface{}, snippet int, opt return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // DeleteSnippet deletes an existing project snippet. This is an idempotent diff --git a/vendor/github.com/xanzy/go-gitlab/project_templates.go b/vendor/github.com/xanzy/go-gitlab/project_templates.go index 0501660..86010bd 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_templates.go +++ b/vendor/github.com/xanzy/go-gitlab/project_templates.go @@ -81,7 +81,7 @@ func (s *ProjectTemplatesService) ListTemplates(pid interface{}, templateType st return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // GetProjectTemplate gets a single project template. @@ -106,5 +106,5 @@ func (s *ProjectTemplatesService) GetProjectTemplate(pid interface{}, templateTy return nil, resp, err } - return ptd, resp, err + return ptd, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/project_variables.go b/vendor/github.com/xanzy/go-gitlab/project_variables.go index 693a0f7..2a16f5a 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_variables.go +++ b/vendor/github.com/xanzy/go-gitlab/project_variables.go @@ -83,7 +83,7 @@ func (s *ProjectVariablesService) ListVariables(pid interface{}, opt *ListProjec return nil, resp, err } - return vs, resp, err + return vs, resp, nil } // GetProjectVariableOptions represents the available GetVariable() @@ -117,7 +117,7 @@ func (s *ProjectVariablesService) GetVariable(pid interface{}, key string, opt * return nil, resp, err } - return v, resp, err + return v, resp, nil } // CreateProjectVariableOptions represents the available CreateVariable() @@ -157,7 +157,7 @@ func (s *ProjectVariablesService) CreateVariable(pid interface{}, opt *CreatePro return nil, resp, err } - return v, resp, err + return v, resp, nil } // UpdateProjectVariableOptions represents the available UpdateVariable() @@ -197,7 +197,7 @@ func (s *ProjectVariablesService) UpdateVariable(pid interface{}, key string, op return nil, resp, err } - return v, resp, err + return v, resp, nil } // RemoveProjectVariableOptions represents the available RemoveVariable() diff --git a/vendor/github.com/xanzy/go-gitlab/project_vulnerabilities.go b/vendor/github.com/xanzy/go-gitlab/project_vulnerabilities.go index 168ee1a..f46f36f 100644 --- a/vendor/github.com/xanzy/go-gitlab/project_vulnerabilities.go +++ b/vendor/github.com/xanzy/go-gitlab/project_vulnerabilities.go @@ -112,7 +112,7 @@ func (s *ProjectVulnerabilitiesService) ListProjectVulnerabilities(pid interface return nil, resp, err } - return p, resp, err + return p, resp, nil } // CreateVulnerabilityOptions represents the available CreateVulnerability() @@ -146,5 +146,5 @@ func (s *ProjectVulnerabilitiesService) CreateVulnerability(pid interface{}, opt return nil, resp, err } - return p, resp, err + return p, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/projects.go b/vendor/github.com/xanzy/go-gitlab/projects.go index 662a67c..cbe6763 100644 --- a/vendor/github.com/xanzy/go-gitlab/projects.go +++ b/vendor/github.com/xanzy/go-gitlab/projects.go @@ -360,7 +360,7 @@ func (s *ProjectsService) ListProjects(opt *ListProjectsOptions, options ...Requ return nil, resp, err } - return p, resp, err + return p, resp, nil } // ListUserProjects gets a list of projects for the given user. @@ -385,7 +385,7 @@ func (s *ProjectsService) ListUserProjects(uid interface{}, opt *ListProjectsOpt return nil, resp, err } - return p, resp, err + return p, resp, nil } // ListUserStarredProjects gets a list of projects starred by the given user. @@ -410,7 +410,7 @@ func (s *ProjectsService) ListUserStarredProjects(uid interface{}, opt *ListProj return nil, resp, err } - return p, resp, err + return p, resp, nil } // ProjectUser represents a GitLab project user. @@ -453,7 +453,7 @@ func (s *ProjectsService) ListProjectsUsers(pid interface{}, opt *ListProjectUse return nil, resp, err } - return p, resp, err + return p, resp, nil } // ProjectGroup represents a GitLab project group. @@ -500,7 +500,7 @@ func (s *ProjectsService) ListProjectsGroups(pid interface{}, opt *ListProjectGr return nil, resp, err } - return p, resp, err + return p, resp, nil } // ProjectLanguages is a map of strings because the response is arbitrary @@ -529,7 +529,7 @@ func (s *ProjectsService) GetProjectLanguages(pid interface{}, options ...Reques return nil, resp, err } - return p, resp, err + return p, resp, nil } // GetProjectOptions represents the available GetProject() options. @@ -564,7 +564,7 @@ func (s *ProjectsService) GetProject(pid interface{}, opt *GetProjectOptions, op return nil, resp, err } - return p, resp, err + return p, resp, nil } // CreateProjectOptions represents the available CreateProject() options. @@ -735,7 +735,7 @@ func (s *ProjectsService) CreateProject(opt *CreateProjectOptions, options ...Re return nil, resp, err } - return p, resp, err + return p, resp, nil } // CreateProjectForUserOptions represents the available CreateProjectForUser() @@ -784,7 +784,7 @@ func (s *ProjectsService) CreateProjectForUser(user int, opt *CreateProjectForUs return nil, resp, err } - return p, resp, err + return p, resp, nil } // EditProjectOptions represents the available EditProject() options. @@ -925,7 +925,7 @@ func (s *ProjectsService) EditProject(pid interface{}, opt *EditProjectOptions, return nil, resp, err } - return p, resp, err + return p, resp, nil } // ForkProjectOptions represents the available ForkProject() options. @@ -966,7 +966,7 @@ func (s *ProjectsService) ForkProject(pid interface{}, opt *ForkProjectOptions, return nil, resp, err } - return p, resp, err + return p, resp, nil } // StarProject stars a given the project. @@ -991,7 +991,7 @@ func (s *ProjectsService) StarProject(pid interface{}, options ...RequestOptionF return nil, resp, err } - return p, resp, err + return p, resp, nil } // UnstarProject unstars a given project. @@ -1016,7 +1016,7 @@ func (s *ProjectsService) UnstarProject(pid interface{}, options ...RequestOptio return nil, resp, err } - return p, resp, err + return p, resp, nil } // ArchiveProject archives the project if the user is either admin or the @@ -1042,7 +1042,7 @@ func (s *ProjectsService) ArchiveProject(pid interface{}, options ...RequestOpti return nil, resp, err } - return p, resp, err + return p, resp, nil } // UnarchiveProject unarchives the project if the user is either admin or @@ -1068,7 +1068,7 @@ func (s *ProjectsService) UnarchiveProject(pid interface{}, options ...RequestOp return nil, resp, err } - return p, resp, err + return p, resp, nil } // DeleteProject removes a project including all associated resources @@ -1204,7 +1204,7 @@ func (s *ProjectsService) ListProjectHooks(pid interface{}, opt *ListProjectHook return nil, resp, err } - return ph, resp, err + return ph, resp, nil } // GetProjectHook gets a specific hook for a project. @@ -1229,7 +1229,7 @@ func (s *ProjectsService) GetProjectHook(pid interface{}, hook int, options ...R return nil, resp, err } - return ph, resp, err + return ph, resp, nil } // AddProjectHookOptions represents the available AddProjectHook() options. @@ -1277,7 +1277,7 @@ func (s *ProjectsService) AddProjectHook(pid interface{}, opt *AddProjectHookOpt return nil, resp, err } - return ph, resp, err + return ph, resp, nil } // EditProjectHookOptions represents the available EditProjectHook() options. @@ -1325,7 +1325,7 @@ func (s *ProjectsService) EditProjectHook(pid interface{}, hook int, opt *EditPr return nil, resp, err } - return ph, resp, err + return ph, resp, nil } // DeleteProjectHook removes a hook from a project. This is an idempotent @@ -1383,7 +1383,7 @@ func (s *ProjectsService) CreateProjectForkRelation(pid interface{}, fork int, o return nil, resp, err } - return pfr, resp, err + return pfr, resp, nil } // DeleteProjectForkRelation deletes an existing forked from relationship. @@ -1476,7 +1476,7 @@ func (s *ProjectsService) UploadAvatar(pid interface{}, avatar io.Reader, filena return nil, resp, err } - return p, resp, err + return p, resp, nil } // ListProjectForks gets a list of project forks. @@ -1501,7 +1501,7 @@ func (s *ProjectsService) ListProjectForks(pid interface{}, opt *ListProjectsOpt return nil, resp, err } - return forks, resp, err + return forks, resp, nil } // ProjectPushRules represents a project push rule. @@ -1547,7 +1547,7 @@ func (s *ProjectsService) GetProjectPushRules(pid interface{}, options ...Reques return nil, resp, err } - return ppr, resp, err + return ppr, resp, nil } // AddProjectPushRuleOptions represents the available AddProjectPushRule() @@ -1591,7 +1591,7 @@ func (s *ProjectsService) AddProjectPushRule(pid interface{}, opt *AddProjectPus return nil, resp, err } - return ppr, resp, err + return ppr, resp, nil } // EditProjectPushRuleOptions represents the available EditProjectPushRule() @@ -1635,7 +1635,7 @@ func (s *ProjectsService) EditProjectPushRule(pid interface{}, opt *EditProjectP return nil, resp, err } - return ppr, resp, err + return ppr, resp, nil } // DeleteProjectPushRule removes a push rule from a project. This is an @@ -1697,7 +1697,7 @@ func (s *ProjectsService) GetApprovalConfiguration(pid interface{}, options ...R return nil, resp, err } - return pa, resp, err + return pa, resp, nil } // ChangeApprovalConfigurationOptions represents the available @@ -1737,7 +1737,7 @@ func (s *ProjectsService) ChangeApprovalConfiguration(pid interface{}, opt *Chan return nil, resp, err } - return pa, resp, err + return pa, resp, nil } // GetProjectApprovalRulesListsOptions represents the available GetProjectApprovalRules() options. @@ -1767,7 +1767,7 @@ func (s *ProjectsService) GetProjectApprovalRules(pid interface{}, opt *GetProje return nil, resp, err } - return par, resp, err + return par, resp, nil } // GetProjectApprovalRule gets the project level approvers. @@ -1792,7 +1792,7 @@ func (s *ProjectsService) GetProjectApprovalRule(pid interface{}, ruleID int, op return nil, resp, err } - return par, resp, err + return par, resp, nil } // CreateProjectLevelRuleOptions represents the available CreateProjectApprovalRule() @@ -1832,7 +1832,7 @@ func (s *ProjectsService) CreateProjectApprovalRule(pid interface{}, opt *Create return nil, resp, err } - return par, resp, err + return par, resp, nil } // UpdateProjectLevelRuleOptions represents the available UpdateProjectApprovalRule() @@ -1871,7 +1871,7 @@ func (s *ProjectsService) UpdateProjectApprovalRule(pid interface{}, approvalRul return nil, resp, err } - return par, resp, err + return par, resp, nil } // DeleteProjectApprovalRule deletes a project-level approval rule. @@ -1925,7 +1925,7 @@ func (s *ProjectsService) ChangeAllowedApprovers(pid interface{}, opt *ChangeAll return nil, resp, err } - return pa, resp, err + return pa, resp, nil } // ProjectPullMirrorDetails represent the details of the configuration pull @@ -1965,7 +1965,7 @@ func (s *ProjectsService) GetProjectPullMirrorDetails(pid interface{}, options . return nil, resp, err } - return pmd, resp, err + return pmd, resp, nil } // StartMirroringProject start the pull mirroring process for a project. @@ -1989,7 +1989,7 @@ func (s *ProjectsService) StartMirroringProject(pid interface{}, options ...Requ return resp, err } - return resp, err + return resp, nil } // TransferProjectOptions represents the available TransferProject() options. @@ -2020,7 +2020,7 @@ func (s *ProjectsService) TransferProject(pid interface{}, opt *TransferProjectO return nil, resp, err } - return p, resp, err + return p, resp, nil } // StartHousekeepingProject start the Housekeeping task for a project. @@ -2071,5 +2071,5 @@ func (s *ProjectsService) GetRepositoryStorage(pid interface{}, options ...Reque return nil, resp, err } - return prs, resp, err + return prs, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/protected_branches.go b/vendor/github.com/xanzy/go-gitlab/protected_branches.go index b398bdb..d13f57a 100644 --- a/vendor/github.com/xanzy/go-gitlab/protected_branches.go +++ b/vendor/github.com/xanzy/go-gitlab/protected_branches.go @@ -90,7 +90,7 @@ func (s *ProtectedBranchesService) ListProtectedBranches(pid interface{}, opt *L return nil, resp, err } - return p, resp, err + return p, resp, nil } // GetProtectedBranch gets a single protected branch or wildcard protected branch. @@ -115,7 +115,7 @@ func (s *ProtectedBranchesService) GetProtectedBranch(pid interface{}, branch st return nil, resp, err } - return p, resp, err + return p, resp, nil } // ProtectRepositoryBranchesOptions represents the available @@ -171,7 +171,7 @@ func (s *ProtectedBranchesService) ProtectRepositoryBranches(pid interface{}, op return nil, resp, err } - return p, resp, err + return p, resp, nil } // UnprotectRepositoryBranches unprotects the given protected branch or wildcard @@ -230,7 +230,7 @@ func (s *ProtectedBranchesService) UpdateProtectedBranch(pid interface{}, branch return nil, resp, err } - return p, resp, err + return p, resp, nil } // RequireCodeOwnerApprovalsOptions represents the available diff --git a/vendor/github.com/xanzy/go-gitlab/protected_environments.go b/vendor/github.com/xanzy/go-gitlab/protected_environments.go index 70affe1..21820ab 100644 --- a/vendor/github.com/xanzy/go-gitlab/protected_environments.go +++ b/vendor/github.com/xanzy/go-gitlab/protected_environments.go @@ -38,6 +38,7 @@ type ProtectedEnvironment struct { Name string `json:"name"` DeployAccessLevels []*EnvironmentAccessDescription `json:"deploy_access_levels"` RequiredApprovalCount int `json:"required_approval_count"` + ApprovalRules []*EnvironmentApprovalRule `json:"approval_rules"` } // EnvironmentAccessDescription represents the access decription for a protected @@ -46,12 +47,28 @@ type ProtectedEnvironment struct { // GitLab API docs: // https://docs.gitlab.com/ee/api/protected_environments.html type EnvironmentAccessDescription struct { + ID int `json:"id"` AccessLevel AccessLevelValue `json:"access_level"` AccessLevelDescription string `json:"access_level_description"` UserID int `json:"user_id"` GroupID int `json:"group_id"` } +// EnvironmentApprovalRule represents the approval rules for a protected +// environment. +// +// GitLab API docs: +// https://docs.gitlab.com/ee/api/protected_environments.html#protect-a-single-environment +type EnvironmentApprovalRule struct { + ID int `json:"id"` + UserID int `json:"user_id"` + GroupID int `json:"group_id"` + AccessLevel AccessLevelValue `json:"access_level"` + AccessLevelDescription string `json:"access_level_description"` + RequiredApprovalCount int `json:"required_approvals"` + GroupInheritanceType int `json:"group_inheritance_type"` +} + // ListProtectedEnvironmentsOptions represents the available // ListProtectedEnvironments() options. // @@ -82,7 +99,7 @@ func (s *ProtectedEnvironmentsService) ListProtectedEnvironments(pid interface{} return nil, resp, err } - return pes, resp, err + return pes, resp, nil } // GetProtectedEnvironment returns a single protected environment or wildcard @@ -108,7 +125,7 @@ func (s *ProtectedEnvironmentsService) GetProtectedEnvironment(pid interface{}, return nil, resp, err } - return pe, resp, err + return pe, resp, nil } // ProtectRepositoryEnvironmentsOptions represents the available @@ -117,9 +134,10 @@ func (s *ProtectedEnvironmentsService) GetProtectedEnvironment(pid interface{}, // GitLab API docs: // https://docs.gitlab.com/ee/api/protected_environments.html#protect-a-single-environment type ProtectRepositoryEnvironmentsOptions struct { - Name *string `url:"name,omitempty" json:"name,omitempty"` - DeployAccessLevels *[]*EnvironmentAccessOptions `url:"deploy_access_levels,omitempty" json:"deploy_access_levels,omitempty"` - RequiredApprovalCount *int `url:"required_approval_count,omitempty" json:"required_approval_count,omitempty"` + Name *string `url:"name,omitempty" json:"name,omitempty"` + DeployAccessLevels *[]*EnvironmentAccessOptions `url:"deploy_access_levels,omitempty" json:"deploy_access_levels,omitempty"` + RequiredApprovalCount *int `url:"required_approval_count,omitempty" json:"required_approval_count,omitempty"` + ApprovalRules *[]*EnvironmentApprovalRuleOptions `url:"approval_rules,omitempty" json:"approval_rules,omitempty"` } // EnvironmentAccessOptions represents the options for an access decription for @@ -133,6 +151,20 @@ type EnvironmentAccessOptions struct { GroupID *int `url:"group_id,omitempty" json:"group_id,omitempty"` } +// EnvironmentApprovalRuleOptions represents the approval rules for a protected +// environment. +// +// GitLab API docs: +// https://docs.gitlab.com/ee/api/protected_environments.html#protect-a-single-environment +type EnvironmentApprovalRuleOptions struct { + UserID *int `url:"user_id,omitempty" json:"user_id,omitempty"` + GroupID *int `url:"group_id,omitempty" json:"group_id,omitempty"` + AccessLevel *AccessLevelValue `url:"access_level,omitempty" json:"access_level,omitempty"` + AccessLevelDescription *string `url:"access_level_description,omitempty" json:"access_level_description,omitempty"` + RequiredApprovalCount *int `url:"required_approvals,omitempty" json:"required_approvals,omitempty"` + GroupInheritanceType *int `url:"group_inheritance_type,omitempty" json:"group_inheritance_type,omitempty"` +} + // ProtectRepositoryEnvironments protects a single repository environment or // several project repository environments using wildcard protected environment. // @@ -156,7 +188,7 @@ func (s *ProtectedEnvironmentsService) ProtectRepositoryEnvironments(pid interfa return nil, resp, err } - return pe, resp, err + return pe, resp, nil } // UnprotectEnvironment unprotects the given protected environment or wildcard diff --git a/vendor/github.com/xanzy/go-gitlab/protected_tags.go b/vendor/github.com/xanzy/go-gitlab/protected_tags.go index 4f8fb4e..62da5c4 100644 --- a/vendor/github.com/xanzy/go-gitlab/protected_tags.go +++ b/vendor/github.com/xanzy/go-gitlab/protected_tags.go @@ -79,7 +79,7 @@ func (s *ProtectedTagsService) ListProtectedTags(pid interface{}, opt *ListProte return nil, resp, err } - return pts, resp, err + return pts, resp, nil } // GetProtectedTag returns a single protected tag or wildcard protected tag. @@ -104,7 +104,7 @@ func (s *ProtectedTagsService) GetProtectedTag(pid interface{}, tag string, opti return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // ProtectRepositoryTagsOptions represents the available ProtectRepositoryTags() @@ -151,7 +151,7 @@ func (s *ProtectedTagsService) ProtectRepositoryTags(pid interface{}, opt *Prote return nil, resp, err } - return pt, resp, err + return pt, resp, nil } // UnprotectRepositoryTags unprotects the given protected tag or wildcard diff --git a/vendor/github.com/xanzy/go-gitlab/releaselinks.go b/vendor/github.com/xanzy/go-gitlab/releaselinks.go index d85e493..f7dd05f 100644 --- a/vendor/github.com/xanzy/go-gitlab/releaselinks.go +++ b/vendor/github.com/xanzy/go-gitlab/releaselinks.go @@ -67,7 +67,7 @@ func (s *ReleaseLinksService) ListReleaseLinks(pid interface{}, tagName string, return nil, resp, err } - return rls, resp, err + return rls, resp, nil } // GetReleaseLink returns a link from release assets. @@ -94,7 +94,7 @@ func (s *ReleaseLinksService) GetReleaseLink(pid interface{}, tagName string, li return nil, resp, err } - return rl, resp, err + return rl, resp, nil } // CreateReleaseLinkOptions represents CreateReleaseLink() options. @@ -128,7 +128,7 @@ func (s *ReleaseLinksService) CreateReleaseLink(pid interface{}, tagName string, return nil, resp, err } - return rl, resp, err + return rl, resp, nil } // UpdateReleaseLinkOptions represents UpdateReleaseLink() options. @@ -167,7 +167,7 @@ func (s *ReleaseLinksService) UpdateReleaseLink(pid interface{}, tagName string, return nil, resp, err } - return rl, resp, err + return rl, resp, nil } // DeleteReleaseLink deletes a link from release. @@ -195,5 +195,5 @@ func (s *ReleaseLinksService) DeleteReleaseLink(pid interface{}, tagName string, return nil, resp, err } - return rl, resp, err + return rl, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/releases.go b/vendor/github.com/xanzy/go-gitlab/releases.go index ef3efa2..86308c5 100644 --- a/vendor/github.com/xanzy/go-gitlab/releases.go +++ b/vendor/github.com/xanzy/go-gitlab/releases.go @@ -105,7 +105,7 @@ func (s *ReleasesService) ListReleases(pid interface{}, opt *ListReleasesOptions return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // GetRelease returns a single release, identified by a tag name. @@ -130,7 +130,7 @@ func (s *ReleasesService) GetRelease(pid interface{}, tagName string, options .. return nil, resp, err } - return r, resp, err + return r, resp, nil } // CreateReleaseOptions represents CreateRelease() options. @@ -190,7 +190,7 @@ func (s *ReleasesService) CreateRelease(pid interface{}, opts *CreateReleaseOpti return nil, resp, err } - return r, resp, err + return r, resp, nil } // UpdateReleaseOptions represents UpdateRelease() options. @@ -226,7 +226,7 @@ func (s *ReleasesService) UpdateRelease(pid interface{}, tagName string, opts *U return nil, resp, err } - return r, resp, err + return r, resp, nil } // DeleteRelease deletes a release. @@ -251,5 +251,5 @@ func (s *ReleasesService) DeleteRelease(pid interface{}, tagName string, options return nil, resp, err } - return r, resp, err + return r, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/repositories.go b/vendor/github.com/xanzy/go-gitlab/repositories.go index 2dc5d9e..b89efc0 100644 --- a/vendor/github.com/xanzy/go-gitlab/repositories.go +++ b/vendor/github.com/xanzy/go-gitlab/repositories.go @@ -80,7 +80,7 @@ func (s *RepositoriesService) ListTree(pid interface{}, opt *ListTreeOptions, op return nil, resp, err } - return t, resp, err + return t, resp, nil } // Blob gets information about blob in repository like size and content. Note @@ -246,7 +246,7 @@ func (s *RepositoriesService) Compare(pid interface{}, opt *CompareOptions, opti return nil, resp, err } - return c, resp, err + return c, resp, nil } // Contributor represents a GitLap contributor. @@ -294,7 +294,7 @@ func (s *RepositoriesService) Contributors(pid interface{}, opt *ListContributor return nil, resp, err } - return c, resp, err + return c, resp, nil } // MergeBaseOptions represents the available MergeBase() options. @@ -328,7 +328,7 @@ func (s *RepositoriesService) MergeBase(pid interface{}, opt *MergeBaseOptions, return nil, resp, err } - return c, resp, err + return c, resp, nil } // AddChangelogOptions represents the available AddChangelog() options. @@ -415,5 +415,5 @@ func (s *RepositoriesService) GenerateChangelogData(pid interface{}, opt Generat return nil, resp, err } - return cd, resp, err + return cd, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/repository_files.go b/vendor/github.com/xanzy/go-gitlab/repository_files.go index 390b22e..fd96fa4 100644 --- a/vendor/github.com/xanzy/go-gitlab/repository_files.go +++ b/vendor/github.com/xanzy/go-gitlab/repository_files.go @@ -88,7 +88,7 @@ func (s *RepositoryFilesService) GetFile(pid interface{}, fileName string, opt * return nil, resp, err } - return f, resp, err + return f, resp, nil } // GetFileMetaDataOptions represents the available GetFileMetaData() options. @@ -144,7 +144,7 @@ func (s *RepositoryFilesService) GetFileMetaData(pid interface{}, fileName strin } } - return f, resp, err + return f, resp, nil } // FileBlameRange represents one item of blame information. @@ -204,7 +204,7 @@ func (s *RepositoryFilesService) GetFileBlame(pid interface{}, file string, opt return nil, resp, err } - return br, resp, err + return br, resp, nil } // GetRawFileOptions represents the available GetRawFile() options. @@ -297,7 +297,7 @@ func (s *RepositoryFilesService) CreateFile(pid interface{}, fileName string, op return nil, resp, err } - return f, resp, err + return f, resp, nil } // UpdateFileOptions represents the available UpdateFile() options. @@ -342,7 +342,7 @@ func (s *RepositoryFilesService) UpdateFile(pid interface{}, fileName string, op return nil, resp, err } - return f, resp, err + return f, resp, nil } // DeleteFileOptions represents the available DeleteFile() options. diff --git a/vendor/github.com/xanzy/go-gitlab/repository_submodules.go b/vendor/github.com/xanzy/go-gitlab/repository_submodules.go index 70ac05e..7022a45 100644 --- a/vendor/github.com/xanzy/go-gitlab/repository_submodules.go +++ b/vendor/github.com/xanzy/go-gitlab/repository_submodules.go @@ -89,5 +89,5 @@ func (s *RepositorySubmodulesService) UpdateSubmodule(pid interface{}, submodule return nil, resp, err } - return sc, resp, err + return sc, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/resource_label_events.go b/vendor/github.com/xanzy/go-gitlab/resource_label_events.go index 37da156..46c96fc 100644 --- a/vendor/github.com/xanzy/go-gitlab/resource_label_events.go +++ b/vendor/github.com/xanzy/go-gitlab/resource_label_events.go @@ -89,7 +89,7 @@ func (s *ResourceLabelEventsService) ListIssueLabelEvents(pid interface{}, issue return nil, resp, err } - return ls, resp, err + return ls, resp, nil } // GetIssueLabelEvent gets a single issue-label-event. @@ -114,7 +114,7 @@ func (s *ResourceLabelEventsService) GetIssueLabelEvent(pid interface{}, issue i return nil, resp, err } - return l, resp, err + return l, resp, nil } // ListGroupEpicLabelEvents retrieves resource label events for the specified @@ -140,7 +140,7 @@ func (s *ResourceLabelEventsService) ListGroupEpicLabelEvents(gid interface{}, e return nil, resp, err } - return ls, resp, err + return ls, resp, nil } // GetGroupEpicLabelEvent gets a single group epic label event. @@ -165,7 +165,7 @@ func (s *ResourceLabelEventsService) GetGroupEpicLabelEvent(gid interface{}, epi return nil, resp, err } - return l, resp, err + return l, resp, nil } // ListMergeRequestsLabelEvents retrieves resource label events for the specified @@ -191,7 +191,7 @@ func (s *ResourceLabelEventsService) ListMergeRequestsLabelEvents(pid interface{ return nil, resp, err } - return ls, resp, err + return ls, resp, nil } // GetMergeRequestLabelEvent gets a single merge request label event. @@ -216,5 +216,5 @@ func (s *ResourceLabelEventsService) GetMergeRequestLabelEvent(pid interface{}, return nil, resp, err } - return l, resp, err + return l, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/resource_milestone_events.go b/vendor/github.com/xanzy/go-gitlab/resource_milestone_events.go index 9c08830..22925bb 100644 --- a/vendor/github.com/xanzy/go-gitlab/resource_milestone_events.go +++ b/vendor/github.com/xanzy/go-gitlab/resource_milestone_events.go @@ -75,7 +75,7 @@ func (s *ResourceMilestoneEventsService) ListIssueMilestoneEvents(pid interface{ return nil, resp, err } - return mes, resp, err + return mes, resp, nil } // GetIssueMilestoneEvent gets a single issue milestone event. @@ -100,7 +100,7 @@ func (s *ResourceMilestoneEventsService) GetIssueMilestoneEvent(pid interface{}, return nil, resp, err } - return me, resp, err + return me, resp, nil } // ListMergeMilestoneEvents retrieves resource milestone events for the specified @@ -126,7 +126,7 @@ func (s *ResourceMilestoneEventsService) ListMergeMilestoneEvents(pid interface{ return nil, resp, err } - return mes, resp, err + return mes, resp, nil } // GetMergeRequestMilestoneEvent gets a single merge request milestone event. @@ -151,5 +151,5 @@ func (s *ResourceMilestoneEventsService) GetMergeRequestMilestoneEvent(pid inter return nil, resp, err } - return me, resp, err + return me, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/resource_state_events.go b/vendor/github.com/xanzy/go-gitlab/resource_state_events.go index e73ef77..867fd6d 100644 --- a/vendor/github.com/xanzy/go-gitlab/resource_state_events.go +++ b/vendor/github.com/xanzy/go-gitlab/resource_state_events.go @@ -74,7 +74,7 @@ func (s *ResourceStateEventsService) ListIssueStateEvents(pid interface{}, issue return nil, resp, err } - return ses, resp, err + return ses, resp, nil } // GetIssueStateEvent gets a single issue-state-event. @@ -99,7 +99,7 @@ func (s *ResourceStateEventsService) GetIssueStateEvent(pid interface{}, issue i return nil, resp, err } - return se, resp, err + return se, resp, nil } // ListMergeStateEvents retrieves resource state events for the specified @@ -125,7 +125,7 @@ func (s *ResourceStateEventsService) ListMergeStateEvents(pid interface{}, reque return nil, resp, err } - return ses, resp, err + return ses, resp, nil } // GetMergeRequestStateEvent gets a single merge request state event. @@ -150,5 +150,5 @@ func (s *ResourceStateEventsService) GetMergeRequestStateEvent(pid interface{}, return nil, resp, err } - return se, resp, err + return se, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/resource_weight_events.go b/vendor/github.com/xanzy/go-gitlab/resource_weight_events.go index e1a4bf5..1251836 100644 --- a/vendor/github.com/xanzy/go-gitlab/resource_weight_events.go +++ b/vendor/github.com/xanzy/go-gitlab/resource_weight_events.go @@ -76,5 +76,5 @@ func (s *ResourceWeightEventsService) ListIssueWeightEvents(pid interface{}, iss return nil, resp, err } - return wes, resp, err + return wes, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/runners.go b/vendor/github.com/xanzy/go-gitlab/runners.go index bb083d4..5224cf9 100644 --- a/vendor/github.com/xanzy/go-gitlab/runners.go +++ b/vendor/github.com/xanzy/go-gitlab/runners.go @@ -120,7 +120,7 @@ func (s *RunnersService) ListRunners(opt *ListRunnersOptions, options ...Request return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // ListAllRunners gets a list of all runners in the GitLab instance. Access is @@ -140,7 +140,7 @@ func (s *RunnersService) ListAllRunners(opt *ListRunnersOptions, options ...Requ return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // GetRunnerDetails returns details for given runner. @@ -165,7 +165,7 @@ func (s *RunnersService) GetRunnerDetails(rid interface{}, options ...RequestOpt return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // UpdateRunnerDetailsOptions represents the available UpdateRunnerDetails() options. @@ -207,7 +207,7 @@ func (s *RunnersService) UpdateRunnerDetails(rid interface{}, opt *UpdateRunnerD return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // RemoveRunner removes a runner. @@ -263,7 +263,7 @@ func (s *RunnersService) ListRunnerJobs(rid interface{}, opt *ListRunnerJobsOpti return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // ListProjectRunnersOptions represents the available ListProjectRunners() @@ -295,7 +295,7 @@ func (s *RunnersService) ListProjectRunners(pid interface{}, opt *ListProjectRun return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // EnableProjectRunnerOptions represents the available EnableProjectRunner() @@ -329,7 +329,7 @@ func (s *RunnersService) EnableProjectRunner(pid interface{}, opt *EnableProject return nil, resp, err } - return r, resp, err + return r, resp, nil } // DisableProjectRunner disables a specific runner from project. @@ -386,7 +386,7 @@ func (s *RunnersService) ListGroupsRunners(gid interface{}, opt *ListGroupsRunne return nil, resp, err } - return rs, resp, err + return rs, resp, nil } // RegisterNewRunnerOptions represents the available RegisterNewRunner() @@ -437,7 +437,7 @@ func (s *RunnersService) RegisterNewRunner(opt *RegisterNewRunnerOptions, option return nil, resp, err } - return r, resp, err + return r, resp, nil } // DeleteRegisteredRunnerOptions represents the available @@ -519,7 +519,7 @@ func (s *RunnersService) ResetInstanceRunnerRegistrationToken(options ...Request return nil, resp, err } - return r, resp, err + return r, resp, nil } // ResetGroupRunnerRegistrationToken resets a group's runner registration token. @@ -544,7 +544,7 @@ func (s *RunnersService) ResetGroupRunnerRegistrationToken(gid interface{}, opti return nil, resp, err } - return r, resp, err + return r, resp, nil } // ResetGroupRunnerRegistrationToken resets a projects's runner registration token. @@ -568,7 +568,7 @@ func (s *RunnersService) ResetProjectRunnerRegistrationToken(pid interface{}, op return nil, resp, err } - return r, resp, err + return r, resp, nil } type RunnerAuthenticationToken struct { @@ -593,5 +593,5 @@ func (s *RunnersService) ResetRunnerAuthenticationToken(rid int, options ...Requ return nil, resp, err } - return r, resp, err + return r, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/search.go b/vendor/github.com/xanzy/go-gitlab/search.go index e755951..ce5657c 100644 --- a/vendor/github.com/xanzy/go-gitlab/search.go +++ b/vendor/github.com/xanzy/go-gitlab/search.go @@ -248,7 +248,7 @@ type Blob struct { Basename string `json:"basename"` Data string `json:"data"` Filename string `json:"filename"` - ID int `json:"id"` + ID string `json:"id"` Ref string `json:"ref"` Startline int `json:"startline"` ProjectID int `json:"project_id"` diff --git a/vendor/github.com/xanzy/go-gitlab/services.go b/vendor/github.com/xanzy/go-gitlab/services.go index 9b25201..6d2d26b 100644 --- a/vendor/github.com/xanzy/go-gitlab/services.go +++ b/vendor/github.com/xanzy/go-gitlab/services.go @@ -78,7 +78,7 @@ func (s *ServicesService) ListServices(pid interface{}, options ...RequestOption return nil, resp, err } - return svcs, resp, err + return svcs, resp, nil } // CustomIssueTrackerService represents Custom Issue Tracker service settings. @@ -122,7 +122,7 @@ func (s *ServicesService) GetCustomIssueTrackerService(pid interface{}, options return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetCustomIssueTrackerServiceOptions represents the available SetCustomIssueTrackerService() @@ -218,7 +218,7 @@ func (s *ServicesService) GetDroneCIService(pid interface{}, options ...RequestO return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetDroneCIServiceOptions represents the available SetDroneCIService() @@ -314,7 +314,7 @@ func (s *ServicesService) GetEmailsOnPushService(pid interface{}, options ...Req return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetEmailsOnPushServiceOptions represents the available SetEmailsOnPushService() @@ -408,7 +408,7 @@ func (s *ServicesService) GetExternalWikiService(pid interface{}, options ...Req return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetExternalWikiServiceOptions represents the available SetExternalWikiService() @@ -498,7 +498,7 @@ func (s *ServicesService) GetGithubService(pid interface{}, options ...RequestOp return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetGithubServiceOptions represents the available SetGithubService() @@ -687,7 +687,7 @@ func (s *ServicesService) GetJenkinsCIService(pid interface{}, options ...Reques return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetJenkinsCIServiceOptions represents the available SetJenkinsCIService() @@ -817,7 +817,7 @@ func (s *ServicesService) GetJiraService(pid interface{}, options ...RequestOpti return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetJiraServiceOptions represents the available SetJiraService() @@ -928,7 +928,7 @@ func (s *ServicesService) GetMattermostService(pid interface{}, options ...Reque return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetMattermostServiceOptions represents the available SetMattermostService() @@ -1049,7 +1049,7 @@ func (s *ServicesService) GetMicrosoftTeamsService(pid interface{}, options ...R return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetMicrosoftTeamsServiceOptions represents the available SetMicrosoftTeamsService() @@ -1151,7 +1151,7 @@ func (s *ServicesService) GetPipelinesEmailService(pid interface{}, options ...R return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetPipelinesEmailServiceOptions represents the available @@ -1247,7 +1247,7 @@ func (s *ServicesService) GetPrometheusService(pid interface{}, options ...Reque return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetPrometheusServiceOptions represents the available SetPrometheusService() @@ -1353,7 +1353,7 @@ func (s *ServicesService) GetSlackService(pid interface{}, options ...RequestOpt return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetSlackServiceOptions represents the available SetSlackService() @@ -1470,7 +1470,7 @@ func (s *ServicesService) GetSlackSlashCommandsService(pid interface{}, options return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetSlackSlashCommandsServiceOptions represents the available SetSlackSlashCommandsService() @@ -1560,7 +1560,7 @@ func (s *ServicesService) GetMattermostSlashCommandsService(pid interface{}, opt return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetMattermostSlashCommandsServiceOptions represents the available SetSlackSlashCommandsService() @@ -1653,7 +1653,7 @@ func (s *ServicesService) GetYouTrackService(pid interface{}, options ...Request return nil, resp, err } - return svc, resp, err + return svc, resp, nil } // SetYouTrackServiceOptions represents the available SetYouTrackService() diff --git a/vendor/github.com/xanzy/go-gitlab/settings.go b/vendor/github.com/xanzy/go-gitlab/settings.go index deddf49..3ac4ead 100644 --- a/vendor/github.com/xanzy/go-gitlab/settings.go +++ b/vendor/github.com/xanzy/go-gitlab/settings.go @@ -411,7 +411,7 @@ func (s *SettingsService) GetSettings(options ...RequestOptionFunc) (*Settings, return nil, resp, err } - return as, resp, err + return as, resp, nil } // UpdateSettingsOptions represents the available UpdateSettings() options. @@ -773,5 +773,5 @@ func (s *SettingsService) UpdateSettings(opt *UpdateSettingsOptions, options ... return nil, resp, err } - return as, resp, err + return as, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/sidekiq_metrics.go b/vendor/github.com/xanzy/go-gitlab/sidekiq_metrics.go index 9b111c8..d7a7834 100644 --- a/vendor/github.com/xanzy/go-gitlab/sidekiq_metrics.go +++ b/vendor/github.com/xanzy/go-gitlab/sidekiq_metrics.go @@ -56,7 +56,7 @@ func (s *SidekiqService) GetQueueMetrics(options ...RequestOptionFunc) (*QueueMe return nil, resp, err } - return q, resp, err + return q, resp, nil } // ProcessMetrics represents the GitLab sidekiq process metrics. @@ -93,7 +93,7 @@ func (s *SidekiqService) GetProcessMetrics(options ...RequestOptionFunc) (*Proce return nil, resp, err } - return p, resp, err + return p, resp, nil } // JobStats represents the GitLab sidekiq job stats. @@ -124,7 +124,7 @@ func (s *SidekiqService) GetJobStats(options ...RequestOptionFunc) (*JobStats, * return nil, resp, err } - return j, resp, err + return j, resp, nil } // CompoundMetrics represents the GitLab sidekiq compounded stats. @@ -153,5 +153,5 @@ func (s *SidekiqService) GetCompoundMetrics(options ...RequestOptionFunc) (*Comp return nil, resp, err } - return c, resp, err + return c, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/snippets.go b/vendor/github.com/xanzy/go-gitlab/snippets.go index 77ca094..12687c3 100644 --- a/vendor/github.com/xanzy/go-gitlab/snippets.go +++ b/vendor/github.com/xanzy/go-gitlab/snippets.go @@ -85,7 +85,7 @@ func (s *SnippetsService) ListSnippets(opt *ListSnippetsOptions, options ...Requ return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // GetSnippet gets a single snippet @@ -106,7 +106,7 @@ func (s *SnippetsService) GetSnippet(snippet int, options ...RequestOptionFunc) return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // SnippetContent gets a single snippet’s raw contents. @@ -191,7 +191,7 @@ func (s *SnippetsService) CreateSnippet(opt *CreateSnippetOptions, options ...Re return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // UpdateSnippetFileOptions represents the update snippet file options. @@ -237,7 +237,7 @@ func (s *SnippetsService) UpdateSnippet(snippet int, opt *UpdateSnippetOptions, return nil, resp, err } - return ps, resp, err + return ps, resp, nil } // DeleteSnippet deletes an existing snippet. This is an idempotent @@ -279,5 +279,5 @@ func (s *SnippetsService) ExploreSnippets(opt *ExploreSnippetsOptions, options . return nil, resp, err } - return ps, resp, err + return ps, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/system_hooks.go b/vendor/github.com/xanzy/go-gitlab/system_hooks.go index d11dceb..1f151fa 100644 --- a/vendor/github.com/xanzy/go-gitlab/system_hooks.go +++ b/vendor/github.com/xanzy/go-gitlab/system_hooks.go @@ -64,7 +64,7 @@ func (s *SystemHooksService) ListHooks(options ...RequestOptionFunc) ([]*Hook, * return nil, resp, err } - return h, resp, err + return h, resp, nil } // GetHook get a single system hook. @@ -85,7 +85,7 @@ func (s *SystemHooksService) GetHook(hook int, options ...RequestOptionFunc) (*H return nil, resp, err } - return h, resp, err + return h, resp, nil } // AddHookOptions represents the available AddHook() options. @@ -118,7 +118,7 @@ func (s *SystemHooksService) AddHook(opt *AddHookOptions, options ...RequestOpti return nil, resp, err } - return h, resp, err + return h, resp, nil } // HookEvent represents an event trigger by a GitLab system hook. @@ -155,7 +155,7 @@ func (s *SystemHooksService) TestHook(hook int, options ...RequestOptionFunc) (* return nil, resp, err } - return h, resp, err + return h, resp, nil } // DeleteHook deletes a system hook. This is an idempotent API function and diff --git a/vendor/github.com/xanzy/go-gitlab/tags.go b/vendor/github.com/xanzy/go-gitlab/tags.go index cfb58a8..18a710d 100644 --- a/vendor/github.com/xanzy/go-gitlab/tags.go +++ b/vendor/github.com/xanzy/go-gitlab/tags.go @@ -88,7 +88,7 @@ func (s *TagsService) ListTags(pid interface{}, opt *ListTagsOptions, options .. return nil, resp, err } - return t, resp, err + return t, resp, nil } // GetTag a specific repository tag determined by its name. It returns 200 together @@ -114,7 +114,7 @@ func (s *TagsService) GetTag(pid interface{}, tag string, options ...RequestOpti return nil, resp, err } - return t, resp, err + return t, resp, nil } // CreateTagOptions represents the available CreateTag() options. @@ -152,7 +152,7 @@ func (s *TagsService) CreateTag(pid interface{}, opt *CreateTagOptions, options return nil, resp, err } - return t, resp, err + return t, resp, nil } // DeleteTag deletes a tag of a repository with given name. @@ -209,7 +209,7 @@ func (s *TagsService) CreateReleaseNote(pid interface{}, tag string, opt *Create return nil, resp, err } - return r, resp, err + return r, resp, nil } // UpdateReleaseNoteOptions represents the available UpdateReleaseNote() options. @@ -244,5 +244,5 @@ func (s *TagsService) UpdateReleaseNote(pid interface{}, tag string, opt *Update return nil, resp, err } - return r, resp, err + return r, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/time_stats.go b/vendor/github.com/xanzy/go-gitlab/time_stats.go index 4cf1b10..c1256b9 100644 --- a/vendor/github.com/xanzy/go-gitlab/time_stats.go +++ b/vendor/github.com/xanzy/go-gitlab/time_stats.go @@ -72,7 +72,7 @@ func (s *timeStatsService) setTimeEstimate(pid interface{}, entity string, issue return nil, resp, err } - return t, resp, err + return t, resp, nil } // resetTimeEstimate resets the time estimate for a single project issue. @@ -96,7 +96,7 @@ func (s *timeStatsService) resetTimeEstimate(pid interface{}, entity string, iss return nil, resp, err } - return t, resp, err + return t, resp, nil } // AddSpentTimeOptions represents the available AddSpentTime() options. @@ -127,7 +127,7 @@ func (s *timeStatsService) addSpentTime(pid interface{}, entity string, issue in return nil, resp, err } - return t, resp, err + return t, resp, nil } // resetSpentTime resets the spent time for a single project issue. @@ -151,7 +151,7 @@ func (s *timeStatsService) resetSpentTime(pid interface{}, entity string, issue return nil, resp, err } - return t, resp, err + return t, resp, nil } // getTimeSpent gets the spent time for a single project issue. @@ -175,5 +175,5 @@ func (s *timeStatsService) getTimeSpent(pid interface{}, entity string, issue in return nil, resp, err } - return t, resp, err + return t, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/todos.go b/vendor/github.com/xanzy/go-gitlab/todos.go index 32d2b0a..4e3c58d 100644 --- a/vendor/github.com/xanzy/go-gitlab/todos.go +++ b/vendor/github.com/xanzy/go-gitlab/todos.go @@ -132,7 +132,7 @@ func (s *TodosService) ListTodos(opt *ListTodosOptions, options ...RequestOption return nil, resp, err } - return t, resp, err + return t, resp, nil } // MarkTodoAsDone marks a single pending todo given by its ID for the current user as done. diff --git a/vendor/github.com/xanzy/go-gitlab/topics.go b/vendor/github.com/xanzy/go-gitlab/topics.go index c9d8e5e..719589f 100644 --- a/vendor/github.com/xanzy/go-gitlab/topics.go +++ b/vendor/github.com/xanzy/go-gitlab/topics.go @@ -73,7 +73,7 @@ func (s *TopicsService) ListTopics(opt *ListTopicsOptions, options ...RequestOpt return nil, resp, err } - return t, resp, err + return t, resp, nil } // GetTopic gets a project topic by ID. @@ -93,7 +93,7 @@ func (s *TopicsService) GetTopic(topic int, options ...RequestOptionFunc) (*Topi return nil, resp, err } - return t, resp, err + return t, resp, nil } // CreateTopicOptions represents the available CreateTopic() options. @@ -153,7 +153,7 @@ func (s *TopicsService) CreateTopic(opt *CreateTopicOptions, options ...RequestO return nil, resp, err } - return t, resp, err + return t, resp, nil } // UpdateTopicOptions represents the available UpdateTopic() options. @@ -203,7 +203,7 @@ func (s *TopicsService) UpdateTopic(topic int, opt *UpdateTopicOptions, options return nil, resp, err } - return t, resp, err + return t, resp, nil } // DeleteTopic deletes a project topic. Only available to administrators. diff --git a/vendor/github.com/xanzy/go-gitlab/types.go b/vendor/github.com/xanzy/go-gitlab/types.go index 640f68c..785ead6 100644 --- a/vendor/github.com/xanzy/go-gitlab/types.go +++ b/vendor/github.com/xanzy/go-gitlab/types.go @@ -227,14 +227,17 @@ type BuildStateValue string // These constants represent all valid build states. const ( - Pending BuildStateValue = "pending" - Created BuildStateValue = "created" - Running BuildStateValue = "running" - Success BuildStateValue = "success" - Failed BuildStateValue = "failed" - Canceled BuildStateValue = "canceled" - Skipped BuildStateValue = "skipped" - Manual BuildStateValue = "manual" + Created BuildStateValue = "created" + WaitingForResource BuildStateValue = "waiting_for_resource" + Preparing BuildStateValue = "preparing" + Pending BuildStateValue = "pending" + Running BuildStateValue = "running" + Success BuildStateValue = "success" + Failed BuildStateValue = "failed" + Canceled BuildStateValue = "canceled" + Skipped BuildStateValue = "skipped" + Manual BuildStateValue = "manual" + Scheduled BuildStateValue = "scheduled" ) // BuildState is a helper routine that allocates a new BuildStateValue @@ -356,20 +359,26 @@ func GenericPackageStatus(v GenericPackageStatusValue) *GenericPackageStatusValu return p } -// ISOTime represents an ISO 8601 formatted date +// ISOTime represents an ISO 8601 formatted date. type ISOTime time.Time // ISO 8601 date format const iso8601 = "2006-01-02" -// MarshalJSON implements the json.Marshaler interface +// ParseISOTime parses an ISO 8601 formatted date. +func ParseISOTime(s string) (ISOTime, error) { + t, err := time.Parse(iso8601, s) + return ISOTime(t), err +} + +// MarshalJSON implements the json.Marshaler interface. func (t ISOTime) MarshalJSON() ([]byte, error) { if reflect.ValueOf(t).IsZero() { return []byte(`null`), nil } if y := time.Time(t).Year(); y < 0 || y >= 10000 { - // ISO 8901 uses 4 digits for the years + // ISO 8901 uses 4 digits for the years. return nil, errors.New("json: ISOTime year outside of range [0,9999]") } @@ -381,9 +390,9 @@ func (t ISOTime) MarshalJSON() ([]byte, error) { return b, nil } -// UnmarshalJSON implements the json.Unmarshaler interface +// UnmarshalJSON implements the json.Unmarshaler interface. func (t *ISOTime) UnmarshalJSON(data []byte) error { - // Ignore null, like in the main JSON package + // Ignore null, like in the main JSON package. if string(data) == "null" { return nil } @@ -394,7 +403,7 @@ func (t *ISOTime) UnmarshalJSON(data []byte) error { return err } -// EncodeValues implements the query.Encoder interface +// EncodeValues implements the query.Encoder interface. func (t *ISOTime) EncodeValues(key string, v *url.Values) error { if t == nil || (time.Time(*t)).IsZero() { return nil @@ -403,7 +412,7 @@ func (t *ISOTime) EncodeValues(key string, v *url.Values) error { return nil } -// String implements the Stringer interface +// String implements the Stringer interface. func (t ISOTime) String() string { return time.Time(t).Format(iso8601) } @@ -411,7 +420,7 @@ func (t ISOTime) String() string { // LinkTypeValue represents a release link type. type LinkTypeValue string -// List of available release link types +// List of available release link types. // // GitLab API docs: // https://docs.gitlab.com/ee/api/releases/links.html#create-a-release-link diff --git a/vendor/github.com/xanzy/go-gitlab/users.go b/vendor/github.com/xanzy/go-gitlab/users.go index c189e35..68ddd6b 100644 --- a/vendor/github.com/xanzy/go-gitlab/users.go +++ b/vendor/github.com/xanzy/go-gitlab/users.go @@ -153,7 +153,7 @@ func (s *UsersService) ListUsers(opt *ListUsersOptions, options ...RequestOption return nil, resp, err } - return usr, resp, err + return usr, resp, nil } // GetUsersOptions represents the available GetUser() options. @@ -180,7 +180,7 @@ func (s *UsersService) GetUser(user int, opt GetUsersOptions, options ...Request return nil, resp, err } - return usr, resp, err + return usr, resp, nil } // CreateUserOptions represents the available CreateUser() options. @@ -228,7 +228,7 @@ func (s *UsersService) CreateUser(opt *CreateUserOptions, options ...RequestOpti return nil, resp, err } - return usr, resp, err + return usr, resp, nil } // ModifyUserOptions represents the available ModifyUser() options. @@ -279,7 +279,7 @@ func (s *UsersService) ModifyUser(user int, opt *ModifyUserOptions, options ...R return nil, resp, err } - return usr, resp, err + return usr, resp, nil } // DeleteUser deletes a user. Available only for administrators. This is an @@ -315,7 +315,7 @@ func (s *UsersService) CurrentUser(options ...RequestOptionFunc) (*User, *Respon return nil, resp, err } - return usr, resp, err + return usr, resp, nil } // UserStatus represents the current status of a user @@ -345,7 +345,7 @@ func (s *UsersService) CurrentUserStatus(options ...RequestOptionFunc) (*UserSta return nil, resp, err } - return status, resp, err + return status, resp, nil } // GetUserStatus retrieves a user's status @@ -366,7 +366,7 @@ func (s *UsersService) GetUserStatus(user int, options ...RequestOptionFunc) (*U return nil, resp, err } - return status, resp, err + return status, resp, nil } // UserStatusOptions represents the options required to set the status @@ -395,7 +395,7 @@ func (s *UsersService) SetUserStatus(opt *UserStatusOptions, options ...RequestO return nil, resp, err } - return status, resp, err + return status, resp, nil } // SSHKey represents a SSH key. @@ -424,7 +424,7 @@ func (s *UsersService) ListSSHKeys(options ...RequestOptionFunc) ([]*SSHKey, *Re return nil, resp, err } - return k, resp, err + return k, resp, nil } // ListSSHKeysForUserOptions represents the available ListSSHKeysForUser() options. @@ -455,7 +455,7 @@ func (s *UsersService) ListSSHKeysForUser(uid interface{}, opt *ListSSHKeysForUs return nil, resp, err } - return k, resp, err + return k, resp, nil } // GetSSHKey gets a single key. @@ -475,7 +475,7 @@ func (s *UsersService) GetSSHKey(key int, options ...RequestOptionFunc) (*SSHKey return nil, resp, err } - return k, resp, err + return k, resp, nil } // GetSSHKeyForUser gets a single key for a given user. @@ -495,7 +495,7 @@ func (s *UsersService) GetSSHKeyForUser(user int, key int, options ...RequestOpt return nil, resp, err } - return k, resp, err + return k, resp, nil } // AddSSHKeyOptions represents the available AddSSHKey() options. @@ -522,7 +522,7 @@ func (s *UsersService) AddSSHKey(opt *AddSSHKeyOptions, options ...RequestOption return nil, resp, err } - return k, resp, err + return k, resp, nil } // AddSSHKeyForUser creates new key owned by specified user. Available only for @@ -543,7 +543,7 @@ func (s *UsersService) AddSSHKeyForUser(user int, opt *AddSSHKeyOptions, options return nil, resp, err } - return k, resp, err + return k, resp, nil } // DeleteSSHKey deletes key owned by currently authenticated user. This is an @@ -603,7 +603,7 @@ func (s *UsersService) ListGPGKeys(options ...RequestOptionFunc) ([]*GPGKey, *Re return nil, resp, err } - return ks, resp, err + return ks, resp, nil } // GetGPGKey gets a specific GPG key of currently authenticated user. @@ -623,7 +623,7 @@ func (s *UsersService) GetGPGKey(key int, options ...RequestOptionFunc) (*GPGKey return nil, resp, err } - return k, resp, err + return k, resp, nil } // AddGPGKeyOptions represents the available AddGPGKey() options. @@ -648,7 +648,7 @@ func (s *UsersService) AddGPGKey(opt *AddGPGKeyOptions, options ...RequestOption return nil, resp, err } - return k, resp, err + return k, resp, nil } // DeleteGPGKey deletes a GPG key owned by currently authenticated user. @@ -683,7 +683,7 @@ func (s *UsersService) ListGPGKeysForUser(user int, options ...RequestOptionFunc return nil, resp, err } - return ks, resp, err + return ks, resp, nil } // GetGPGKeyForUser gets a specific GPG key for a given user. @@ -703,7 +703,7 @@ func (s *UsersService) GetGPGKeyForUser(user, key int, options ...RequestOptionF return nil, resp, err } - return k, resp, err + return k, resp, nil } // AddGPGKeyForUser creates new GPG key owned by the specified user. @@ -724,7 +724,7 @@ func (s *UsersService) AddGPGKeyForUser(user int, opt *AddGPGKeyOptions, options return nil, resp, err } - return k, resp, err + return k, resp, nil } // DeleteGPGKeyForUser deletes a GPG key owned by a specified user. @@ -766,7 +766,7 @@ func (s *UsersService) ListEmails(options ...RequestOptionFunc) ([]*Email, *Resp return nil, resp, err } - return e, resp, err + return e, resp, nil } // ListEmailsForUserOptions represents the available ListEmailsForUser() options. @@ -794,7 +794,7 @@ func (s *UsersService) ListEmailsForUser(user int, opt *ListEmailsForUserOptions return nil, resp, err } - return e, resp, err + return e, resp, nil } // GetEmail gets a single email. @@ -814,7 +814,7 @@ func (s *UsersService) GetEmail(email int, options ...RequestOptionFunc) (*Email return nil, resp, err } - return e, resp, err + return e, resp, nil } // AddEmailOptions represents the available AddEmail() options. @@ -840,7 +840,7 @@ func (s *UsersService) AddEmail(opt *AddEmailOptions, options ...RequestOptionFu return nil, resp, err } - return e, resp, err + return e, resp, nil } // AddEmailForUser creates new email owned by specified user. Available only for @@ -861,7 +861,7 @@ func (s *UsersService) AddEmailForUser(user int, opt *AddEmailOptions, options . return nil, resp, err } - return e, resp, err + return e, resp, nil } // DeleteEmail deletes email owned by currently authenticated user. This is an @@ -1162,7 +1162,7 @@ func (s *UsersService) GetAllImpersonationTokens(user int, opt *GetAllImpersonat return nil, resp, err } - return ts, resp, err + return ts, resp, nil } // GetImpersonationToken retrieves an impersonation token of a user. @@ -1183,7 +1183,7 @@ func (s *UsersService) GetImpersonationToken(user, token int, options ...Request return nil, resp, err } - return t, resp, err + return t, resp, nil } // CreateImpersonationTokenOptions represents the available @@ -1215,7 +1215,7 @@ func (s *UsersService) CreateImpersonationToken(user int, opt *CreateImpersonati return nil, resp, err } - return t, resp, err + return t, resp, nil } // RevokeImpersonationToken revokes an impersonation token. @@ -1262,7 +1262,7 @@ func (s *UsersService) CreatePersonalAccessToken(user int, opt *CreatePersonalAc return nil, resp, err } - return t, resp, err + return t, resp, nil } // UserActivity represents an entry in the user/activities response @@ -1299,7 +1299,7 @@ func (s *UsersService) GetUserActivities(opt *GetUserActivitiesOptions, options return nil, resp, err } - return t, resp, err + return t, resp, nil } // UserMembership represents a membership of the user in a namespace or project. @@ -1340,7 +1340,7 @@ func (s *UsersService) GetUserMemberships(user int, opt *GetUserMembershipOption return nil, resp, err } - return m, resp, err + return m, resp, nil } // DisableTwoFactor disables two factor authentication for the specified user. diff --git a/vendor/github.com/xanzy/go-gitlab/validate.go b/vendor/github.com/xanzy/go-gitlab/validate.go index b17ee75..1a0f56a 100644 --- a/vendor/github.com/xanzy/go-gitlab/validate.go +++ b/vendor/github.com/xanzy/go-gitlab/validate.go @@ -61,9 +61,10 @@ type LintOptions struct { } // Lint validates .gitlab-ci.yml content. +// Deprecated: This endpoint was removed in GitLab 16.0. // // Gitlab API docs: -// https://docs.gitlab.com/ee/api/lint.html#validate-the-ci-yaml-configuration +// https://docs.gitlab.com/ee/api/lint.html#validate-the-ci-yaml-configuration-deprecated func (s *ValidateService) Lint(opts *LintOptions, options ...RequestOptionFunc) (*LintResult, *Response, error) { req, err := s.client.NewRequest(http.MethodPost, "ci/lint", &opts, options) if err != nil { @@ -84,8 +85,10 @@ func (s *ValidateService) Lint(opts *LintOptions, options ...RequestOptionFunc) // GitLab API docs: // https://docs.gitlab.com/ee/api/lint.html#validate-a-ci-yaml-configuration-with-a-namespace type ProjectNamespaceLintOptions struct { - Content *string `url:"content,omitempty" json:"content,omitempty"` - DryRun *bool `url:"dry_run,omitempty" json:"dry_run,omitempty"` + Content *string `url:"content,omitempty" json:"content,omitempty"` + DryRun *bool `url:"dry_run,omitempty" json:"dry_run,omitempty"` + IncludeJobs *bool `url:"include_jobs,omitempty" json:"include_jobs,omitempty"` + Ref *string `url:"ref,omitempty" json:"ref,omitempty"` } // ProjectNamespaceLint validates .gitlab-ci.yml content by project. @@ -118,7 +121,9 @@ func (s *ValidateService) ProjectNamespaceLint(pid interface{}, opt *ProjectName // GitLab API docs: // https://docs.gitlab.com/ee/api/lint.html#validate-a-projects-ci-configuration type ProjectLintOptions struct { - DryRun *bool `url:"dry_run,omitempty" json:"dry_run,omitempty"` + DryRun *bool `url:"dry_run,omitempty" json:"dry_run,omitempty"` + IncludeJobs *bool `url:"include_jobs,omitempty" json:"include_jobs,omitempty"` + Ref *string `url:"ref,omitempty" json:"ref,omitempty"` } // ProjectLint validates .gitlab-ci.yml content by project. diff --git a/vendor/github.com/xanzy/go-gitlab/version.go b/vendor/github.com/xanzy/go-gitlab/version.go index e7331d5..0d30b90 100644 --- a/vendor/github.com/xanzy/go-gitlab/version.go +++ b/vendor/github.com/xanzy/go-gitlab/version.go @@ -54,5 +54,5 @@ func (s *VersionService) GetVersion(options ...RequestOptionFunc) (*Version, *Re return nil, resp, err } - return v, resp, err + return v, resp, nil } diff --git a/vendor/github.com/xanzy/go-gitlab/wikis.go b/vendor/github.com/xanzy/go-gitlab/wikis.go index 73de1af..39847ef 100644 --- a/vendor/github.com/xanzy/go-gitlab/wikis.go +++ b/vendor/github.com/xanzy/go-gitlab/wikis.go @@ -75,7 +75,7 @@ func (s *WikisService) ListWikis(pid interface{}, opt *ListWikisOptions, options return nil, resp, err } - return ws, resp, err + return ws, resp, nil } // GetWikiPageOptions represents options to GetWikiPage @@ -109,7 +109,7 @@ func (s *WikisService) GetWikiPage(pid interface{}, slug string, opt *GetWikiPag return nil, resp, err } - return w, resp, err + return w, resp, nil } // CreateWikiPageOptions represents options to CreateWikiPage. @@ -145,7 +145,7 @@ func (s *WikisService) CreateWikiPage(pid interface{}, opt *CreateWikiPageOption return nil, resp, err } - return w, resp, err + return w, resp, nil } // EditWikiPageOptions represents options to EditWikiPage. @@ -181,7 +181,7 @@ func (s *WikisService) EditWikiPage(pid interface{}, slug string, opt *EditWikiP return nil, resp, err } - return w, resp, err + return w, resp, nil } // DeleteWikiPage deletes a wiki page with a given slug. diff --git a/vendor/modules.txt b/vendor/modules.txt index 109e34e..c50104a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -23,7 +23,7 @@ github.com/pmezard/go-difflib/difflib ## explicit; go 1.20 github.com/stretchr/testify/assert github.com/stretchr/testify/require -# github.com/xanzy/go-gitlab v0.83.0 +# github.com/xanzy/go-gitlab v0.84.0 ## explicit; go 1.18 github.com/xanzy/go-gitlab # golang.org/x/net v0.10.0