From aee9164cb7bdc495fdb842b68d935a1d57699369 Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Mon, 30 Aug 2021 06:36:53 +0000 Subject: [PATCH 1/3] update pkg/cibot/pullrequest.go. --- pkg/cibot/pullrequest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go index cfa30fd..9b1dcd2 100644 --- a/pkg/cibot/pullrequest.go +++ b/pkg/cibot/pullrequest.go @@ -242,7 +242,7 @@ func (s *Server) UpdateLabelsBySourceBranchChange(delLabels, updateLabels []stri cBody := gitee.PullRequestCommentPostParam{} cBody.AccessToken = s.Config.GiteeToken cBody.Body = fmt.Sprintf(commentContent, strDelLabel, s.Config.BotName) - _, _, err = s.GiteeClient.PullRequestsApi.PostV5ReposOwnerRepoPullsNumberComments(s.Context, owner, repo, prNumber, cBody) + _, _, err := s.GiteeClient.PullRequestsApi.PostV5ReposOwnerRepoPullsNumberComments(s.Context, owner, repo, prNumber, cBody) if err != nil { glog.Errorf("unable to add comment in pull request: %v", err) return err -- Gitee From 6178f32303ae472433e43abfa61368f04a394a18 Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Mon, 30 Aug 2021 06:45:10 +0000 Subject: [PATCH 2/3] update pkg/cibot/pullrequest.go. --- pkg/cibot/pullrequest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go index 9b1dcd2..c83e84b 100644 --- a/pkg/cibot/pullrequest.go +++ b/pkg/cibot/pullrequest.go @@ -224,7 +224,7 @@ func (s *Server) UpdateLabelsBySourceBranchChange(delLabels, updateLabels []stri body.AccessToken = optional.NewString(s.Config.GiteeToken) glog.Infof("invoke api to remove labels: %v", strLabel) //update pr - for _, dellalbe := range strDelLabel { + for _, dellalbe := range delLabels { response, err := s.GiteeClient.PullRequestsApi.DeleteV5ReposOwnerRepoPullsLabel(s.Context, owner, repo, prNumber, dellalbe, &body) if err != nil { if response != nil && response.StatusCode == 400 { -- Gitee From 09f42dedf28d69998db167a5fcce7af4c025db08 Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Thu, 28 Oct 2021 02:36:48 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!127?= =?UTF-8?q?=20:=20update=20ownerhanlder.go=20to=20resolve=20log=20informat?= =?UTF-8?q?ion:=20fail=20to=20remove=20privileges:=20404=20NOT=20FOUND'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/cibot/ownerhandler.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkg/cibot/ownerhandler.go b/pkg/cibot/ownerhandler.go index 4d57d6b..8602f54 100644 --- a/pkg/cibot/ownerhandler.go +++ b/pkg/cibot/ownerhandler.go @@ -193,21 +193,14 @@ func (handler *OwnerHandler) removeOwners(repo database.Repositories, expectedMe glog.Infof("list of remove privileges: %v", listOfRemove) memberbody := &gitee.DeleteV5ReposOwnerRepoCollaboratorsUsernameOpts{} memberbody.AccessToken = optional.NewString(handler.Config.GiteeToken) - checkBody := &gitee.GetV5ReposOwnerRepoCollaboratorsUsernameOpts{} - checkBody.AccessToken = optional.NewString(handler.Config.GiteeToken) glog.Infof("begin to remove privileges for %s/%s", repo.Owner, repo.Repo) for _, v := range listOfRemove { - _,err := handler.GiteeClient.RepositoriesApi.GetV5ReposOwnerRepoCollaboratorsUsername(handler.Context, repo.Owner, repo.Repo, v, checkBody) + _, err := handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername( + handler.Context, repo.Owner, repo.Repo, v, memberbody) if err != nil { - glog.Infof("%s is not in %s/%s", v, repo.Owner, repo.Repo) - }else{ - _, err = handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername( - handler.Context, repo.Owner, repo.Repo, v, memberbody) - if err != nil { - glog.Errorf("fail to remove privileges: %v", err) - continue - } + glog.Errorf("fail to remove privileges: %v", err) + continue } // remove from DB -- Gitee