From d5dcac5c484d78fdac67101c65cac9c63a4f38fe Mon Sep 17 00:00:00 2001 From: georgecao Date: Wed, 19 May 2021 10:40:49 +0800 Subject: [PATCH] Add issue label and update gitee api. --- go.mod | 2 +- go.sum | 2 + pkg/cibot/issue.go | 9 + .../openeuler/go-gitee/gitee/api_emails.go | 3 +- .../openeuler/go-gitee/gitee/api_issues.go | 3 +- .../openeuler/go-gitee/gitee/api_labels.go | 54 ++--- .../go-gitee/gitee/api_pull_requests.go | 222 +++++++++++++++++- .../go-gitee/gitee/api_repositories.go | 8 +- .../go-gitee/gitee/hook_event_models.go | 2 +- .../go-gitee/gitee/hook_event_types.go | 2 +- .../go-gitee/gitee/model_complete_branch.go | 10 +- .../go-gitee/gitee/model_git_commit.go | 18 ++ .../go-gitee/gitee/model_git_user.go | 20 ++ .../go-gitee/gitee/model_operate_log.go | 2 +- .../go-gitee/gitee/model_pull_request.go | 2 + .../gitee/model_pull_request_commits.go | 16 +- .../gitee/model_pull_request_file_path.go | 18 +- .../gitee/model_pull_request_files.go | 16 +- .../gitee/model_pull_request_update_param.go | 6 + .../go-gitee/gitee/model_single_commit.go | 2 + vendor/modules.txt | 2 +- 21 files changed, 332 insertions(+), 87 deletions(-) create mode 100644 vendor/gitee.com/openeuler/go-gitee/gitee/model_git_commit.go create mode 100644 vendor/gitee.com/openeuler/go-gitee/gitee/model_git_user.go diff --git a/go.mod b/go.mod index 6a13597..43bbd9b 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-20210201095646-fd9179920723 + gitee.com/openeuler/go-gitee v0.0.0-20210427125813-de0b78ea30e9 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 b395e78..a3dd65e 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ 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= 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/issue.go b/pkg/cibot/issue.go index d78378e..a79ecb4 100644 --- a/pkg/cibot/issue.go +++ b/pkg/cibot/issue.go @@ -35,5 +35,14 @@ func (s *Server) HandleIssueEvent(event *gitee.IssueEvent) { if err != nil { glog.Errorf("unable to add comment in issue: %v", err) } + sigName := s.getSigNameFromRepo(event.Repository.FullName) + if len(sigName) > 0 { + label := []string{fmt.Sprintf("sig/%s", sigName)} + labelops := gitee.PullRequestLabelPostParam{s.Config.GiteeToken, label} + _, _, err = s.GiteeClient.LabelsApi.PostV5ReposOwnerRepoIssuesNumberLabels(s.Context, owner, repo, number, labelops) + if err != nil { + glog.Errorf("unable to add label in issue: %v", err) + } + } } } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/api_emails.go b/vendor/gitee.com/openeuler/go-gitee/gitee/api_emails.go index 57500fb..40878e1 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/api_emails.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/api_emails.go @@ -11,11 +11,12 @@ package gitee import ( "context" - "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" + + "github.com/antihax/optional" ) // Linger please diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/api_issues.go b/vendor/gitee.com/openeuler/go-gitee/gitee/api_issues.go index ddf7b4d..71be47f 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/api_issues.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/api_issues.go @@ -12,11 +12,12 @@ package gitee import ( "context" "fmt" - "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" + + "github.com/antihax/optional" ) // Linger please diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/api_labels.go b/vendor/gitee.com/openeuler/go-gitee/gitee/api_labels.go index 2e42f83..67bee98 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/api_labels.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/api_labels.go @@ -905,25 +905,17 @@ LabelsApiService 创建Issue标签 * @param owner 仓库所属空间地址(企业、组织或个人的地址path) * @param repo 仓库路径(path) * @param number Issue 编号(区分大小写，无需添加 # 号) - * @param optional nil or *PostV5ReposOwnerRepoIssuesNumberLabelsOpts - Optional Parameters: - * @param "AccessToken" (optional.String) - 用户授权码 - * @param "Body" (optional.Interface of []string) - 标签名数组，如: [\"feat\", \"bug\"] + * @param body 必选，标签的内容 -@return Label +@return []Label */ - -type PostV5ReposOwnerRepoIssuesNumberLabelsOpts struct { - AccessToken optional.String - Body optional.Interface -} - -func (a *LabelsApiService) PostV5ReposOwnerRepoIssuesNumberLabels(ctx context.Context, owner string, repo string, number string, localVarOptionals *PostV5ReposOwnerRepoIssuesNumberLabelsOpts) (Label, *http.Response, error) { +func (a *LabelsApiService) PostV5ReposOwnerRepoIssuesNumberLabels(ctx context.Context, owner string, repo string, number string, body PullRequestLabelPostParam) ([]Label, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Post") localVarPostBody interface{} localVarFileName string localVarFileBytes []byte - localVarReturnValue Label + localVarReturnValue []Label ) // create path and map variables @@ -953,12 +945,8 @@ func (a *LabelsApiService) PostV5ReposOwnerRepoIssuesNumberLabels(ctx context.Co if localVarHttpHeaderAccept != "" { localVarHeaderParams["Accept"] = localVarHttpHeaderAccept } - if localVarOptionals != nil && localVarOptionals.AccessToken.IsSet() { - localVarFormParams.Add("access_token", parameterToString(localVarOptionals.AccessToken.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Body.IsSet() { - localVarFormParams.Add("body", parameterToString(localVarOptionals.Body.Value(), "multi")) - } + // body params + localVarPostBody = &body.Body // This should not be &body because the gitee api is not normalized. r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) if err != nil { return localVarReturnValue, nil, err @@ -990,7 +978,7 @@ func (a *LabelsApiService) PostV5ReposOwnerRepoIssuesNumberLabels(ctx context.Co } if localVarHttpResponse.StatusCode == 201 { - var v Label + var v []Label err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() @@ -1107,25 +1095,17 @@ LabelsApiService 替换Issue所有标签 * @param owner 仓库所属空间地址(企业、组织或个人的地址path) * @param repo 仓库路径(path) * @param number Issue 编号(区分大小写，无需添加 # 号) - * @param optional nil or *PutV5ReposOwnerRepoIssuesNumberLabelsOpts - Optional Parameters: - * @param "AccessToken" (optional.String) - 用户授权码 - * @param "Body" (optional.Interface of []string) - 标签名数组，如: [\"feat\", \"bug\"] + * @param body 必选，标签的内容 -@return Label +@return []Label */ - -type PutV5ReposOwnerRepoIssuesNumberLabelsOpts struct { - AccessToken optional.String - Body optional.Interface -} - -func (a *LabelsApiService) PutV5ReposOwnerRepoIssuesNumberLabels(ctx context.Context, owner string, repo string, number string, localVarOptionals *PutV5ReposOwnerRepoIssuesNumberLabelsOpts) (Label, *http.Response, error) { +func (a *LabelsApiService) PutV5ReposOwnerRepoIssuesNumberLabels(ctx context.Context, owner string, repo string, number string, body PullRequestLabelPostParam) ([]Label, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Put") localVarPostBody interface{} localVarFileName string localVarFileBytes []byte - localVarReturnValue Label + localVarReturnValue []Label ) // create path and map variables @@ -1155,12 +1135,8 @@ func (a *LabelsApiService) PutV5ReposOwnerRepoIssuesNumberLabels(ctx context.Con if localVarHttpHeaderAccept != "" { localVarHeaderParams["Accept"] = localVarHttpHeaderAccept } - if localVarOptionals != nil && localVarOptionals.AccessToken.IsSet() { - localVarFormParams.Add("access_token", parameterToString(localVarOptionals.AccessToken.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Body.IsSet() { - localVarFormParams.Add("body", parameterToString(localVarOptionals.Body.Value(), "multi")) - } + // body params + localVarPostBody = &body.Body // This should not be &body because the gitee api is not normalized. r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) if err != nil { return localVarReturnValue, nil, err @@ -1191,8 +1167,8 @@ func (a *LabelsApiService) PutV5ReposOwnerRepoIssuesNumberLabels(ctx context.Con error: localVarHttpResponse.Status, } - if localVarHttpResponse.StatusCode == 200 { - var v Label + if localVarHttpResponse.StatusCode == 202 { + var v []Label err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/api_pull_requests.go b/vendor/gitee.com/openeuler/go-gitee/gitee/api_pull_requests.go index 30fedb8..d67bc75 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/api_pull_requests.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/api_pull_requests.go @@ -12,11 +12,12 @@ package gitee import ( "context" "fmt" - "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" + + "github.com/antihax/optional" ) // Linger please @@ -1201,6 +1202,119 @@ func (a *PullRequestsApiService) GetV5ReposOwnerRepoPullsNumberFiles(ctx context return localVarReturnValue, localVarHttpResponse, nil } +/* +PullRequestsApiService 获取 Pull Request 关联的 issues +获取 Pull Request 关联的 issues + * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param owner 仓库所属空间地址(企业、组织或个人的地址path) + * @param repo 仓库路径(path) + * @param number + * @param optional nil or *GetV5ReposOwnerRepoPullsNumberIssuesOpts - Optional Parameters: + * @param "AccessToken" (optional.String) - 用户授权码 + * @param "Page" (optional.Int32) - 当前的页码 + * @param "PerPage" (optional.Int32) - 每页的数量，最大为 100 + +@return []Issue +*/ + +type GetV5ReposOwnerRepoPullsNumberIssuesOpts struct { + AccessToken optional.String + Page optional.Int32 + PerPage optional.Int32 +} + +func (a *PullRequestsApiService) GetV5ReposOwnerRepoPullsNumberIssues(ctx context.Context, owner string, repo string, number int32, localVarOptionals *GetV5ReposOwnerRepoPullsNumberIssuesOpts) ([]Issue, *http.Response, error) { + var ( + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + localVarReturnValue []Issue + ) + + // create path and map variables + localVarPath := a.client.cfg.BasePath + "/v5/repos/{owner}/{repo}/pulls/{number}/issues" + localVarPath = strings.Replace(localVarPath, "{"+"owner"+"}", fmt.Sprintf("%v", owner), -1) + localVarPath = strings.Replace(localVarPath, "{"+"repo"+"}", fmt.Sprintf("%v", repo), -1) + localVarPath = strings.Replace(localVarPath, "{"+"number"+"}", fmt.Sprintf("%v", number), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + 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{} + + // set Content-Type header + localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) + if localVarHttpContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHttpContentType + } + + // to determine the Accept header + localVarHttpHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) + if localVarHttpHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHttpHeaderAccept + } + r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHttpResponse, err := a.client.callAPI(r) + if err != nil || localVarHttpResponse == nil { + return localVarReturnValue, localVarHttpResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body) + localVarHttpResponse.Body.Close() + if err != nil { + return localVarReturnValue, localVarHttpResponse, err + } + + if localVarHttpResponse.StatusCode < 300 { + // If we succeed, return the data, otherwise pass on to decode error. + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { + return localVarReturnValue, localVarHttpResponse, err + } + } + + if localVarHttpResponse.StatusCode >= 300 { + newErr := GenericSwaggerError{ + body: localVarBody, + error: localVarHttpResponse.Status, + } + + if localVarHttpResponse.StatusCode == 200 { + var v []Issue + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, nil +} + /* PullRequestsApiService 获取某个 Pull Request 的所有标签 获取某个 Pull Request 的所有标签 @@ -1408,7 +1522,7 @@ PullRequestsApiService 获取某个Pull Request的操作日志 * @param "AccessToken" (optional.String) - 用户授权码 * @param "Sort" (optional.String) - 按递增(asc)或递减(desc)排序，默认：递减 -@return OperateLog +@return []OperateLog */ type GetV5ReposOwnerRepoPullsNumberOperateLogsOpts struct { @@ -1416,13 +1530,13 @@ type GetV5ReposOwnerRepoPullsNumberOperateLogsOpts struct { Sort optional.String } -func (a *PullRequestsApiService) GetV5ReposOwnerRepoPullsNumberOperateLogs(ctx context.Context, owner string, repo string, number int32, localVarOptionals *GetV5ReposOwnerRepoPullsNumberOperateLogsOpts) (OperateLog, *http.Response, error) { +func (a *PullRequestsApiService) GetV5ReposOwnerRepoPullsNumberOperateLogs(ctx context.Context, owner string, repo string, number int32, localVarOptionals *GetV5ReposOwnerRepoPullsNumberOperateLogsOpts) ([]OperateLog, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Get") localVarPostBody interface{} localVarFileName string localVarFileBytes []byte - localVarReturnValue OperateLog + localVarReturnValue []OperateLog ) // create path and map variables @@ -1489,7 +1603,7 @@ func (a *PullRequestsApiService) GetV5ReposOwnerRepoPullsNumberOperateLogs(ctx c } if localVarHttpResponse.StatusCode == 200 { - var v OperateLog + var v []OperateLog err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() @@ -2031,7 +2145,7 @@ func (a *PullRequestsApiService) PostV5ReposOwnerRepoPullsNumberLabels(ctx conte localVarHeaderParams["Accept"] = localVarHttpHeaderAccept } // body params - localVarPostBody = &body.Body // This shoud be &body because the gitee api is not normalized. + localVarPostBody = &body.Body // This should not be &body because the gitee api is not normalized. r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) if err != nil { return localVarReturnValue, nil, err @@ -2259,3 +2373,99 @@ func (a *PullRequestsApiService) PutV5ReposOwnerRepoPullsNumberMerge(ctx context return localVarHttpResponse, nil } + +/* +PullRequestsApiService 替换Pull Request 所有标签 +替换Pull Request 所有标签 需要在请求的body里填上数组，元素为标签的名字。如: [\"performance\", \"bug\"] + * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param owner 仓库所属空间地址(企业、组织或个人的地址path) + * @param repo 仓库路径(path) + * @param number 第几个PR，即本仓库PR的序数 + * @param body 必选，标签的内容 + +@return []Label +*/ +func (a *PullRequestsApiService) PutV5ReposOwnerRepoPullsNumberLabels(ctx context.Context, owner string, repo string, number int32, body PullRequestLabelPostParam) ([]Label, *http.Response, error) { + var ( + localVarHttpMethod = strings.ToUpper("Put") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + localVarReturnValue []Label + ) + + // create path and map variables + localVarPath := a.client.cfg.BasePath + "/v5/repos/{owner}/{repo}/pulls/{number}/labels" + localVarPath = strings.Replace(localVarPath, "{"+"owner"+"}", fmt.Sprintf("%v", owner), -1) + localVarPath = strings.Replace(localVarPath, "{"+"repo"+"}", fmt.Sprintf("%v", repo), -1) + localVarPath = strings.Replace(localVarPath, "{"+"number"+"}", fmt.Sprintf("%v", number), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHttpContentTypes := []string{"application/json", "multipart/form-data"} + + // set Content-Type header + localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) + if localVarHttpContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHttpContentType + } + + // to determine the Accept header + localVarHttpHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) + if localVarHttpHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHttpHeaderAccept + } + // body params + localVarPostBody = &body.Body // This should not be &body because the gitee api is not normalized. + r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHttpResponse, err := a.client.callAPI(r) + if err != nil || localVarHttpResponse == nil { + return localVarReturnValue, localVarHttpResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body) + localVarHttpResponse.Body.Close() + if err != nil { + return localVarReturnValue, localVarHttpResponse, err + } + + if localVarHttpResponse.StatusCode < 300 { + // If we succeed, return the data, otherwise pass on to decode error. + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { + return localVarReturnValue, localVarHttpResponse, err + } + } + + if localVarHttpResponse.StatusCode >= 300 { + newErr := GenericSwaggerError{ + body: localVarBody, + error: localVarHttpResponse.Status, + } + + if localVarHttpResponse.StatusCode == 202 { + var v []Label + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, newErr + } + + return localVarReturnValue, localVarHttpResponse, 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 aaad8fc..26ed367 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go @@ -12,11 +12,12 @@ package gitee import ( "context" "fmt" - "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" + + "github.com/antihax/optional" ) // Linger please @@ -5772,7 +5773,6 @@ func (a *RepositoriesApiService) PutV5ReposOwnerRepoReviewer(ctx context.Context localVarPostBody interface{} localVarFileName string localVarFileBytes []byte - ) // create path and map variables @@ -5819,10 +5819,9 @@ func (a *RepositoriesApiService) PutV5ReposOwnerRepoReviewer(ctx context.Context return localVarHttpResponse, err } - if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } @@ -5831,4 +5830,3 @@ func (a *RepositoriesApiService) PutV5ReposOwnerRepoReviewer(ctx context.Context return localVarHttpResponse, nil } - diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_models.go b/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_models.go index 137586f..009440b 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_models.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_models.go @@ -65,7 +65,7 @@ type CommitHook struct { // MilestoneHook : 里程碑信息 type MilestoneHook struct { - Id string `json:"id,omitempty"` + Id int32 `json:"id,omitempty"` HtmlUrl string `json:"html_url,omitempty"` Number int32 `json:"number,omitempty"` Title string `json:"title,omitempty"` diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_types.go b/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_types.go index f6820cb..1fa3dc2 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_types.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/hook_event_types.go @@ -58,7 +58,7 @@ type IssueEvent struct { Title *string `json:"title,omitempty"` Description *string `json:"description,omitempty"` State *string `json:"state,omitempty"` - Milestone *MilestoneHook `json:"milestone,omitempty"` + Milestone *string `json:"milestone,omitempty"` URL *string `json:"url,omitempty"` Enterprise *EnterpriseHook `json:"enterprise,omitempty"` HookName *string `json:"hook_name,omitempty"` diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_complete_branch.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_complete_branch.go index bbe31f0..30b111c 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_complete_branch.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_complete_branch.go @@ -11,9 +11,9 @@ package gitee // 创建分支 type CompleteBranch struct { - Name string `json:"name,omitempty"` - Commit *BranchCommit `json:"commit,omitempty"` - Links string `json:"_links,omitempty"` - Protected string `json:"protected,omitempty"` - ProtectionUrl string `json:"protection_url,omitempty"` + Name string `json:"name,omitempty"` + Commit *BranchCommit `json:"commit,omitempty"` + Links string `json:"_links,omitempty"` + Protected string `json:"protected,omitempty"` + ProtectionUrl string `json:"protection_url,omitempty"` } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_git_commit.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_git_commit.go new file mode 100644 index 0000000..7da5de2 --- /dev/null +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_git_commit.go @@ -0,0 +1,18 @@ +/* + * 码云 Open API + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: 5.3.2 + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package gitee + +type GitCommit struct { + Url string `json:"url,omitempty"` + Author *GitUser `json:"author,omitempty"` + Committer *GitUser `json:"committer,omitempty"` + Message string `json:"message,omitempty"` + CommentCount int32 `json:"comment_count,omitempty"` +} diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_git_user.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_git_user.go new file mode 100644 index 0000000..6e7d2f5 --- /dev/null +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_git_user.go @@ -0,0 +1,20 @@ +/* + * 码云 Open API + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: 5.3.2 + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package gitee + +import ( + "time" +) + +type GitUser struct { + Name string `json:"name,omitempty"` + Email string `json:"email,omitempty"` + Date time.Time `json:"date,omitempty"` +} diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_operate_log.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_operate_log.go index 968c23e..2421e55 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_operate_log.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_operate_log.go @@ -13,7 +13,7 @@ package gitee type OperateLog struct { Id string `json:"id,omitempty"` Icon string `json:"icon,omitempty"` - User string `json:"user,omitempty"` + User *User `json:"user,omitempty"` Content string `json:"content,omitempty"` CreatedAt string `json:"created_at,omitempty"` } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request.go index efb97e2..b832622 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request.go @@ -22,6 +22,8 @@ type PullRequest struct { ReviewCommentUrl string `json:"review_comment_url,omitempty"` CommentsUrl string `json:"comments_url,omitempty"` StatusesUrl string `json:"statuses_url,omitempty"` + AssigneesNumber int32 `json:"assignees_number,omitempty"` + TestersNumber int32 `json:"testers_number,omitempty"` Number int32 `json:"number,omitempty"` State string `json:"state,omitempty"` Title string `json:"title,omitempty"` diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_commits.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_commits.go index ef82c64..891f083 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_commits.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_commits.go @@ -11,12 +11,12 @@ package gitee // 获取某Pull Request的所有Commit信息。最多显示250条Commit type PullRequestCommits struct { - Url string `json:"url,omitempty"` - Sha string `json:"sha,omitempty"` - HtmlUrl string `json:"html_url,omitempty"` - CommentsUrl string `json:"comments_url,omitempty"` - Commit string `json:"commit,omitempty"` - Author string `json:"author,omitempty"` - Committer string `json:"committer,omitempty"` - Parents string `json:"parents,omitempty"` + Url string `json:"url,omitempty"` + Sha string `json:"sha,omitempty"` + HtmlUrl string `json:"html_url,omitempty"` + CommentsUrl string `json:"comments_url,omitempty"` + Commit *GitCommit `json:"commit,omitempty"` + Author *UserBasic `json:"author,omitempty"` + Committer *UserBasic `json:"committer,omitempty"` + Parents *CommitTree `json:"parents,omitempty"` } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_file_path.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_file_path.go index 33b6926..05d554e 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_file_path.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_file_path.go @@ -11,13 +11,13 @@ package gitee // 单个文件的patch信息 type PullRequestFilePath struct { - Diff string `json:"diff,omitempty"` - NewPath string `json:"new_path,omitempty"` - OldPath string `json:"old_path,omitempty"` - AMode string `json:"a_mode,omitempty"` - BMode string `json:"b_mode,omitempty"` - NewFile bool `json:"new_file,omitempty"` - RenamedFile bool `json:"renamed_file,omitempty"` - DeletedFile bool `json:"deleted_file,omitempty"` - TooLarge bool `json:"too_large,omitempty"` + Diff string `json:"diff,omitempty"` + NewPath string `json:"new_path,omitempty"` + OldPath string `json:"old_path,omitempty"` + AMode string `json:"a_mode,omitempty"` + BMode string `json:"b_mode,omitempty"` + NewFile bool `json:"new_file,omitempty"` + RenamedFile bool `json:"renamed_file,omitempty"` + DeletedFile bool `json:"deleted_file,omitempty"` + TooLarge bool `json:"too_large,omitempty"` } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_files.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_files.go index bff3c4e..03d2891 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_files.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_files.go @@ -11,12 +11,12 @@ package gitee // Pull Request Commit文件列表。最多显示300条diff type PullRequestFiles struct { - Sha string `json:"sha,omitempty"` - Filename string `json:"filename,omitempty"` - Status string `json:"status,omitempty"` - Additions string `json:"additions,omitempty"` - Deletions string `json:"deletions,omitempty"` - BlobUrl string `json:"blob_url,omitempty"` - RawUrl string `json:"raw_url,omitempty"` - Patch *PullRequestFilePath `json:"patch,omitempty"` + Sha string `json:"sha,omitempty"` + Filename string `json:"filename,omitempty"` + Status string `json:"status,omitempty"` + Additions string `json:"additions,omitempty"` + Deletions string `json:"deletions,omitempty"` + BlobUrl string `json:"blob_url,omitempty"` + RawUrl string `json:"raw_url,omitempty"` + Patch *PullRequestFilePath `json:"patch,omitempty"` } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_update_param.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_update_param.go index c6e06e3..6111827 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_update_param.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_update_param.go @@ -23,4 +23,10 @@ type PullRequestUpdateParam struct { MilestoneNumber int32 `json:"milestone_number,omitempty"` // 用逗号分开的标签，名称要求长度在 2-20 之间且非特殊字符。如: bug,performance Labels string `json:"labels,omitempty"` + // 最少审查人数 + // change the int32 to *int32 manually, in order to pass 0 + AssigneesNumber *int32 `json:"assignees_number,omitempty"` + // 最少测试人员 + // change the int32 to *int32 manually, in order to pass 0 + TestersNumber *int32 `json:"testers_number,omitempty"` } diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_single_commit.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_single_commit.go index edc8d6d..5270bfc 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_single_commit.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_single_commit.go @@ -10,5 +10,7 @@ package gitee type SingleCommit struct { + Author *GitUser `json:"author,omitempty"` + Committer *GitUser `json:"committer,omitempty"` Tree *CommitTree `json:"tree,omitempty"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index 62bfd29..8c0f3fa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# gitee.com/openeuler/go-gitee v0.0.0-20201111035308-c4384bf8d333 +# gitee.com/openeuler/go-gitee v0.0.0-20210427125813-de0b78ea30e9 gitee.com/openeuler/go-gitee/gitee # github.com/antihax/optional v1.0.0 github.com/antihax/optional -- Gitee