From d873c8dca6436f674a765a918e0ef9c610b401ff Mon Sep 17 00:00:00 2001 From: GeorgeCao-hw Date: Mon, 9 Nov 2020 19:11:29 +0800 Subject: [PATCH] update add branch function. --- go.mod | 2 +- go.sum | 2 ++ pkg/cibot/repohandler.go | 9 +++++---- .../go-gitee/gitee/api_pull_requests.go | 15 +++------------ .../go-gitee/gitee/api_repositories.go | 18 +++--------------- .../go-gitee/gitee/hook_event_models.go | 5 +++-- .../go-gitee/gitee/hook_event_types.go | 1 + .../go-gitee/gitee/model_commit_tree.go | 15 +++++++++++++++ .../gitee/model_create_branch_param.go | 19 +++++++++++++++++++ .../model_pull_request_comment_patch_param.go | 18 ++++++++++++++++++ .../go-gitee/gitee/model_repo_commit.go | 18 +++++++++--------- .../go-gitee/gitee/model_single_commit.go | 14 ++++++++++++++ vendor/modules.txt | 2 +- 13 files changed, 94 insertions(+), 44 deletions(-) create mode 100644 vendor/gitee.com/openeuler/go-gitee/gitee/model_commit_tree.go create mode 100644 vendor/gitee.com/openeuler/go-gitee/gitee/model_create_branch_param.go create mode 100644 vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_comment_patch_param.go create mode 100644 vendor/gitee.com/openeuler/go-gitee/gitee/model_single_commit.go diff --git a/go.mod b/go.mod index 92a62c7..b9a9bd8 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-20200424023021-ced5a4d67179 + gitee.com/openeuler/go-gitee v0.0.0-20201109090511-81a247e275be 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 38d5a8c..3c0c714 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-20200424023021-ced5a4d67179 h1:7bHzennVUJlv27Gljny95CyXknEBrfmHL6KdHCuHumM= gitee.com/openeuler/go-gitee v0.0.0-20200424023021-ced5a4d67179/go.mod h1:TQrS/LP/DFXLqM+lVrZd4nL2pbTrqiXABGT9PJepVTA= +gitee.com/openeuler/go-gitee v0.0.0-20201109090511-81a247e275be h1:eh0eMiF5PNuD196nW8DcVNsGNchbeyKk+nlVgKtnBzg= +gitee.com/openeuler/go-gitee v0.0.0-20201109090511-81a247e275be/go.mod h1:TQrS/LP/DFXLqM+lVrZd4nL2pbTrqiXABGT9PJepVTA= 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 e8f4422..fbacea9 100644 --- a/pkg/cibot/repohandler.go +++ b/pkg/cibot/repohandler.go @@ -384,11 +384,12 @@ func (handler *RepoHandler) addRepositoriesinGitee(owner string, repo Repository glog.Infof("end to create repository: %s", *repo.Name) // create branch - getOpts := &gitee.PostV5ReposOwnerRepoBranchesOpts{} - getOpts.AccessToken = optional.NewString(handler.Config.GiteeToken) + repobranchbody := gitee.CreateBranchParam{} + repobranchbody.AccessToken = handler.Config.GiteeToken + repobranchbody.Refs = "master" for _, br := range repo.ProtectedBranches { - _, _, err := handler.GiteeClient.RepositoriesApi.PostV5ReposOwnerRepoBranches(handler.Context, - owner, *repo.Name, "master", br, getOpts) + repobranchbody.BranchName = br + _, _, err := handler.GiteeClient.RepositoriesApi.PostV5ReposOwnerRepoBranches(handler.Context, owner, *repo.Name, repobranchbody) if br == "master" { continue } 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 01845a8..30fedb8 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 @@ -1513,17 +1513,10 @@ PullRequestsApiService 编辑评论 * @param repo 仓库路径(path) * @param id 评论的ID * @param body 必填。评论内容 - * @param optional nil or *PatchV5ReposOwnerRepoPullsCommentsIdOpts - Optional Parameters: - * @param "AccessToken" (optional.String) - 用户授权码 @return PullRequestComments */ - -type PatchV5ReposOwnerRepoPullsCommentsIdOpts struct { - AccessToken optional.String -} - -func (a *PullRequestsApiService) PatchV5ReposOwnerRepoPullsCommentsId(ctx context.Context, owner string, repo string, id int32, body string, localVarOptionals *PatchV5ReposOwnerRepoPullsCommentsIdOpts) (PullRequestComments, *http.Response, error) { +func (a *PullRequestsApiService) PatchV5ReposOwnerRepoPullsCommentsId(ctx context.Context, owner string, repo string, id int32, body PullRequestCommentPatchParam) (PullRequestComments, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Patch") localVarPostBody interface{} @@ -1559,10 +1552,8 @@ func (a *PullRequestsApiService) PatchV5ReposOwnerRepoPullsCommentsId(ctx contex if localVarHttpHeaderAccept != "" { localVarHeaderParams["Accept"] = localVarHttpHeaderAccept } - if localVarOptionals != nil && localVarOptionals.AccessToken.IsSet() { - localVarFormParams.Add("access_token", parameterToString(localVarOptionals.AccessToken.Value(), "")) - } - localVarFormParams.Add("body", parameterToString(body, "")) + // body params + localVarPostBody = &body r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) if err != nil { return localVarReturnValue, nil, err 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 ccdffbb..5cffe97 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/api_repositories.go @@ -4417,19 +4417,11 @@ RepositoriesApiService 创建分支 * @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 refs 起点名称, 默认：master - * @param branchName 新创建的分支名称 - * @param optional nil or *PostV5ReposOwnerRepoBranchesOpts - Optional Parameters: - * @param "AccessToken" (optional.String) - 用户授权码 + * @param body 新建分支内容 @return CompleteBranch */ - -type PostV5ReposOwnerRepoBranchesOpts struct { - AccessToken optional.String -} - -func (a *RepositoriesApiService) PostV5ReposOwnerRepoBranches(ctx context.Context, owner string, repo string, refs string, branchName string, localVarOptionals *PostV5ReposOwnerRepoBranchesOpts) (CompleteBranch, *http.Response, error) { +func (a *RepositoriesApiService) PostV5ReposOwnerRepoBranches(ctx context.Context, owner string, repo string, body CreateBranchParam) (CompleteBranch, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Post") localVarPostBody interface{} @@ -4464,11 +4456,7 @@ func (a *RepositoriesApiService) PostV5ReposOwnerRepoBranches(ctx context.Contex if localVarHttpHeaderAccept != "" { localVarHeaderParams["Accept"] = localVarHttpHeaderAccept } - if localVarOptionals != nil && localVarOptionals.AccessToken.IsSet() { - localVarFormParams.Add("access_token", parameterToString(localVarOptionals.AccessToken.Value(), "")) - } - localVarFormParams.Add("refs", parameterToString(refs, "")) - localVarFormParams.Add("branch_name", parameterToString(branchName, "")) + localVarPostBody = &body r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) if err != nil { return localVarReturnValue, nil, err 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 fbdba51..137586f 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 @@ -158,6 +158,7 @@ type PullRequestHook struct { PatchUrl string `json:"patch_url,omitempty"` Title string `json:"title,omitempty"` Body string `json:"body,omitempty"` + Labels []LabelHook `json:"labels,omitempty"` CreatedAt string `json:"created_at,omitempty"` UpdatedAt string `json:"updated_at,omitempty"` ClosedAt string `json:"closed_at,omitempty"` @@ -170,13 +171,13 @@ type PullRequestHook struct { Tester []UserHook `json:"tester,omitempty"` Testers []UserHook `json:"testers,omitempty"` NeedTest bool `json:"need_test,omitempty"` - need_review bool `json:"need_review,omitempty"` + NeedReview bool `json:"need_review,omitempty"` Milestone *MilestoneHook `json:"milestone,omitempty"` Head *BranchHook `json:"head,omitempty"` Base *BranchHook `json:"base,omitempty"` Merged bool `json:"merged,omitempty"` Mergeable bool `json:"mergeable,omitempty"` - merge_status string `json:"merge_status,omitempty"` + MergeStatus string `json:"merge_status,omitempty"` UpdatedBy *UserHook `json:"updated_by,omitempty"` Comments int32 `json:"comments,omitempty"` Commits int32 `json:"commits,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 2a12e7f..f6820cb 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 @@ -72,6 +72,7 @@ type RepoInfo struct { type PullRequestEvent struct { Action *string `json:"action,omitempty"` + ActionDesc *string `json:"action_desc,omitempty"` PullRequest *PullRequestHook `json:"pull_request,omitempty"` Number int64 `json:"number,omitempty"` IID int64 `json:"iid,omitempty"` diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_commit_tree.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_commit_tree.go new file mode 100644 index 0000000..70c0f39 --- /dev/null +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_commit_tree.go @@ -0,0 +1,15 @@ +/* + * 码云 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 CommitTree struct { + Sha string `json:"sha,omitempty"` + Url string `json:"url,omitempty"` +} diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_create_branch_param.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_create_branch_param.go new file mode 100644 index 0000000..988192c --- /dev/null +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_create_branch_param.go @@ -0,0 +1,19 @@ +/* + * 码云 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 CreateBranchParam struct { + // 用户授权码 + AccessToken string `json:"access_token,omitempty"` + // 分支起点名称，默认master + Refs string `json:"refs,omitempty"` + // 新创建的分支名称 + BranchName string `json:"branch_name,omitempty"` +} diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_comment_patch_param.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_comment_patch_param.go new file mode 100644 index 0000000..2695cb3 --- /dev/null +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_pull_request_comment_patch_param.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 + +// edit pull request comment +type PullRequestCommentPatchParam struct { + // 用户授权码 + AccessToken string `json:"access_token,omitempty"` + // 必填。评论内容 + Body string `json:"body,omitempty"` +} diff --git a/vendor/gitee.com/openeuler/go-gitee/gitee/model_repo_commit.go b/vendor/gitee.com/openeuler/go-gitee/gitee/model_repo_commit.go index c0969ea..3913a6f 100644 --- a/vendor/gitee.com/openeuler/go-gitee/gitee/model_repo_commit.go +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_repo_commit.go @@ -11,13 +11,13 @@ package gitee // 仓库的某个提交 type RepoCommit 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"` - Stats string `json:"stats,omitempty"` + Url string `json:"url,omitempty"` + Sha string `json:"sha,omitempty"` + HtmlUrl string `json:"html_url,omitempty"` + CommentsUrl string `json:"comments_url,omitempty"` + Commit *SingleCommit `json:"commit,omitempty"` + Author string `json:"author,omitempty"` + Committer string `json:"committer,omitempty"` + Parents string `json:"parents,omitempty"` + Stats string `json:"stats,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 new file mode 100644 index 0000000..edc8d6d --- /dev/null +++ b/vendor/gitee.com/openeuler/go-gitee/gitee/model_single_commit.go @@ -0,0 +1,14 @@ +/* + * 码云 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 SingleCommit struct { + Tree *CommitTree `json:"tree,omitempty"` +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 99412ab..7881c08 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# gitee.com/openeuler/go-gitee v0.0.0-20200424023021-ced5a4d67179 +# gitee.com/openeuler/go-gitee v0.0.0-20201109090511-81a247e275be gitee.com/openeuler/go-gitee/gitee # github.com/antihax/optional v1.0.0 github.com/antihax/optional -- Gitee