From 5820785f1b5b3f91a94695200b179404f64b5c4f Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Thu, 28 Oct 2021 03:38:24 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!127=20:?= =?UTF-8?q?=20update=20ownerhanlder.go=20to=20resolve=20log=20information:?= =?UTF-8?q?=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