From e7ea7c0f63f79ce69fe5a76a9e0bea80066649e5 Mon Sep 17 00:00:00 2001 From: georgecao Date: Mon, 26 Jul 2021 16:48:29 +0800 Subject: [PATCH] Add repo reviewer info. --- go.mod | 2 +- go.sum | 6 ++--- pkg/cibot/repohandler.go | 23 +++++++++---------- .../go-gitee/gitee/api_repositories.go | 10 ++++++++ .../gitee/model_issue_update_param.go | 2 ++ .../go-gitee/gitee/model_set_repo_reviewer.go | 4 ++-- vendor/modules.txt | 2 +- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 43bbd9b..7aaa5ac 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module gitee.com/openeuler/ci-bot go 1.13 require ( - gitee.com/openeuler/go-gitee v0.0.0-20210427125813-de0b78ea30e9 + gitee.com/openeuler/go-gitee v0.0.0-20210726120857-9a7ac9bc7ede github.com/antihax/optional v1.0.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/protobuf v1.3.2 // indirect diff --git a/go.sum b/go.sum index a3dd65e..4fbabca 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU= cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= -gitee.com/openeuler/go-gitee v0.0.0-20210201095646-fd9179920723 h1:awXn0FlbiQ9Ohj96FrWM1r16tB//D+eTyC2wainPX80= -gitee.com/openeuler/go-gitee v0.0.0-20210201095646-fd9179920723/go.mod h1:TQrS/LP/DFXLqM+lVrZd4nL2pbTrqiXABGT9PJepVTA= -gitee.com/openeuler/go-gitee v0.0.0-20210427125813-de0b78ea30e9 h1:zrCFMUPnf4k7k0ACmg54IcU3jXD1zwSACAxU4GXWJXY= -gitee.com/openeuler/go-gitee v0.0.0-20210427125813-de0b78ea30e9/go.mod h1:qGJhn1KxC5UE4BUmxCE/hTpFfuKbd3U3V9fNROrspfE= +gitee.com/openeuler/go-gitee v0.0.0-20210726120857-9a7ac9bc7ede h1:Pmq/veFuVwgwX4bGYqtsGD+N0Q9dKzPIQvJAp8PtPwQ= +gitee.com/openeuler/go-gitee v0.0.0-20210726120857-9a7ac9bc7ede/go.mod h1:qGJhn1KxC5UE4BUmxCE/hTpFfuKbd3U3V9fNROrspfE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= diff --git a/pkg/cibot/repohandler.go b/pkg/cibot/repohandler.go index 1db37fa..8c51844 100644 --- a/pkg/cibot/repohandler.go +++ b/pkg/cibot/repohandler.go @@ -630,18 +630,17 @@ func (handler *RepoHandler) handleRepositorySetting(community string, r Reposito // set none reviewer but not ci-bot(default) - // reviewerBody := gitee.SetRepoReviewer{} - // reviewerBody.AccessToken = handler.Config.GiteeToken - // reviewerBody.Assignees = " " - // reviewerBody.Testers = " " - // reviewerBody.AssigneesNumber = 0 - // reviewerBody.TestersNumber = 0 - // response, errex := handler.GiteeClient.RepositoriesApi.PutV5ReposOwnerRepoReviewer(handler.Context, community, *r.Name, reviewerBody) - // if errex != nil { - // glog.Errorf("Set repository reviewer info failed: %v, %s", errex, response.Status) - // glog.Errorf("requestURL:%s, %s", response.Request.RequestURI, response.Request.Host) - // return errex - // } + reviewerBody := gitee.SetRepoReviewer{} + reviewerBody.AccessToken = handler.Config.GiteeToken + reviewerBody.Assignees = " " + reviewerBody.Testers = " " + reviewerBody.AssigneesNumber = 0 + reviewerBody.TestersNumber = 0 + response, errex := handler.GiteeClient.RepositoriesApi.PutV5ReposOwnerRepoReviewer(handler.Context, community, *r.Name, reviewerBody) + if errex != nil { + glog.Errorf("Set repository reviewer info failed: %v, %s", errex, response.Status) + return errex + } return nil } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go b/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go index 26ed367..1b5ab7e 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go @@ -1284,12 +1284,16 @@ RepositoriesApiService 获取仓库的所有成员 * @param repo 仓库路径(path) * @param optional nil or *GetV5ReposOwnerRepoCollaboratorsOpts - Optional Parameters: * @param "AccessToken" (optional.String) - 用户授权码 + * @param "Page" (optional.Int32) - 当前的页码 + * @param "PerPage" (optional.Int32) - 每页的数量，最大为 100 @return []ProjectMember */ type GetV5ReposOwnerRepoCollaboratorsOpts struct { AccessToken optional.String + Page optional.Int32 + PerPage optional.Int32 } func (a *RepositoriesApiService) GetV5ReposOwnerRepoCollaborators(ctx context.Context, owner string, repo string, localVarOptionals *GetV5ReposOwnerRepoCollaboratorsOpts) ([]ProjectMember, *http.Response, error) { @@ -1313,6 +1317,12 @@ func (a *RepositoriesApiService) GetV5ReposOwnerRepoCollaborators(ctx context.Co if localVarOptionals != nil && localVarOptionals.AccessToken.IsSet() { localVarQueryParams.Add("access_token", parameterToString(localVarOptionals.AccessToken.Value(), "")) } + if localVarOptionals != nil && localVarOptionals.Page.IsSet() { + localVarQueryParams.Add("page", parameterToString(localVarOptionals.Page.Value(), "")) + } + if localVarOptionals != nil && localVarOptionals.PerPage.IsSet() { + localVarQueryParams.Add("per_page", parameterToString(localVarOptionals.PerPage.Value(), "")) + } // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "multipart/form-data"} diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_issue_update_param.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_issue_update_param.go index 3f682fa..90f0cc9 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_issue_update_param.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_issue_update_param.go @@ -29,4 +29,6 @@ type IssueUpdateParam struct { Labels string `json:"labels,omitempty"` // 项目ID Program string `json:"program,omitempty"` + // Issue协助者的个人空间地址, 以 , 分隔 + Collaborators string `json:"collaborators,omitempty"` } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_set_repo_reviewer.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_set_repo_reviewer.go index a7c052b..eb2c133 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_set_repo_reviewer.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_set_repo_reviewer.go @@ -17,7 +17,7 @@ type SetRepoReviewer struct { // 测试人员 Testers string `json:"testers,omitempty"` // 最少审查人数 - AssigneesNumber int32 `json:"assignees_number,omitempty"` + AssigneesNumber int32 `json:"assignees_number"` // 最少测试人员 - TestersNumber int32 `json:"testers_number,omitempty"` + TestersNumber int32 `json:"testers_number"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index 8c0f3fa..db00ad2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# gitee.com/openeuler/go-gitee v0.0.0-20210427125813-de0b78ea30e9 +# gitee.com/openeuler/go-gitee v0.0.0-20210726120857-9a7ac9bc7ede gitee.com/openeuler/go-gitee/gitee # github.com/antihax/optional v1.0.0 github.com/antihax/optional -- Gitee