From f503b711f6e051ea62d9853401b96913fc661588 Mon Sep 17 00:00:00 2001 From: Luka Skugor Date: Thu, 16 May 2019 12:17:42 +0200 Subject: [PATCH 1/5] Add some missing API calls --- admin_org.go | 28 ++++++++++++++++++++++++++++ repo.go | 5 +++++ 2 files changed, 33 insertions(+) diff --git a/admin_org.go b/admin_org.go index be14062..13aa372 100644 --- a/admin_org.go +++ b/admin_org.go @@ -19,3 +19,31 @@ func (c *Client) AdminCreateOrg(user string, opt CreateOrgOption) (*Organization return org, c.getParsedResponse("POST", fmt.Sprintf("/admin/users/%s/orgs", user), jsonHeader, bytes.NewReader(body), org) } + +func (c *Client) AdminCreateTeam(user string, opt CreateTeamOption) (*Team, error) { + body, err := json.Marshal(&opt) + if err != nil { + return nil, err + } + org := new(Team) + return org, c.getParsedResponse("POST", fmt.Sprintf("/admin/orgs/%s/teams", user), + jsonHeader, bytes.NewReader(body), org) +} + +func (c *Client) AdminAddTeamMembership(teamID int64, user string) error { + _, err := c.getResponse("PUT", fmt.Sprintf("/admin/teams/%s/members/%s", teamID, user), + jsonHeader, nil) + return err +} + +func (c *Client) AdminAddTeamRepository(teamID int64, repo string) error { + _, err := c.getResponse("PUT", fmt.Sprintf("/admin/teams/%s/repos/%s", teamID, repo), + jsonHeader, nil) + return err +} + +// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/users/${ADMIN_USER}/orgs; +// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/orgs/${org}/teams; +// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/users +// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/teams/2/members/${username} +// http://gogs.${POD_NAMESPACE}.svc/api/v1/users/${ADMIN_USER}/tokens diff --git a/repo.go b/repo.go index ddcea99..38e5c15 100644 --- a/repo.go +++ b/repo.go @@ -145,3 +145,8 @@ func (c *Client) EditIssueTracker(owner, repo string, opt EditIssueTrackerOption _, err = c.getResponse("PATCH", fmt.Sprintf("/repos/%s/%s/issue-tracker", owner, repo), jsonHeader, bytes.NewReader(body)) return err } + +func (c *Client) MirrorSync(owner, repo string) error { + _, err := c.getResponse("POST", fmt.Sprintf("/repos/%s/%s/mirror-sync", owner, repo), jsonHeader, nil) + return err +} From 925d4600fcebe50bfd7c6291e90c8702ad3fd748 Mon Sep 17 00:00:00 2001 From: Luka Skugor Date: Thu, 16 May 2019 12:37:15 +0200 Subject: [PATCH 2/5] Fix add member to team --- admin_org.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_org.go b/admin_org.go index 13aa372..ce47d85 100644 --- a/admin_org.go +++ b/admin_org.go @@ -31,13 +31,13 @@ func (c *Client) AdminCreateTeam(user string, opt CreateTeamOption) (*Team, erro } func (c *Client) AdminAddTeamMembership(teamID int64, user string) error { - _, err := c.getResponse("PUT", fmt.Sprintf("/admin/teams/%s/members/%s", teamID, user), + _, err := c.getResponse("PUT", fmt.Sprintf("/admin/teams/%d/members/%s", teamID, user), jsonHeader, nil) return err } func (c *Client) AdminAddTeamRepository(teamID int64, repo string) error { - _, err := c.getResponse("PUT", fmt.Sprintf("/admin/teams/%s/repos/%s", teamID, repo), + _, err := c.getResponse("PUT", fmt.Sprintf("/admin/teams/%d/repos/%s", teamID, repo), jsonHeader, nil) return err } From a3233ef1ea651723d4e09eee3ce9295d322c1988 Mon Sep 17 00:00:00 2001 From: Luka Skugor Date: Thu, 16 May 2019 13:37:16 +0200 Subject: [PATCH 3/5] Add list teams --- org_team.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org_team.go b/org_team.go index 89f09e3..e47f644 100644 --- a/org_team.go +++ b/org_team.go @@ -4,6 +4,8 @@ package gogs +import "fmt" + type Team struct { ID int64 `json:"id"` Name string `json:"name"` @@ -16,3 +18,8 @@ type CreateTeamOption struct { Description string `json:"description" binding:"MaxSize(255)"` Permission string `json:"permission"` } + +func (c *Client) ListTeams(name string) ([]*Team, error) { + teams := make([]*Team, 0, 5) + return teams, c.getParsedResponse("GET", fmt.Sprintf("/orgs/%s/teams", name), nil, nil, &teams) +} From 0221d98e81452b1697a41ad8a8876bc35a181279 Mon Sep 17 00:00:00 2001 From: Luka Skugor Date: Fri, 17 May 2019 15:51:56 +0200 Subject: [PATCH 4/5] Remove comments --- admin_org.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/admin_org.go b/admin_org.go index ce47d85..0050008 100644 --- a/admin_org.go +++ b/admin_org.go @@ -41,9 +41,3 @@ func (c *Client) AdminAddTeamRepository(teamID int64, repo string) error { jsonHeader, nil) return err } - -// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/users/${ADMIN_USER}/orgs; -// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/orgs/${org}/teams; -// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/users -// http://gogs.${POD_NAMESPACE}.svc/api/v1/admin/teams/2/members/${username} -// http://gogs.${POD_NAMESPACE}.svc/api/v1/users/${ADMIN_USER}/tokens From 8e44ecf988079db877389c921799c2a502d5242c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E9=97=BB?= Date: Sun, 16 Jun 2019 15:36:29 -0400 Subject: [PATCH 5/5] admin_org: use better variable name --- admin_org.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin_org.go b/admin_org.go index 0050008..28ba8f1 100644 --- a/admin_org.go +++ b/admin_org.go @@ -25,9 +25,9 @@ func (c *Client) AdminCreateTeam(user string, opt CreateTeamOption) (*Team, erro if err != nil { return nil, err } - org := new(Team) - return org, c.getParsedResponse("POST", fmt.Sprintf("/admin/orgs/%s/teams", user), - jsonHeader, bytes.NewReader(body), org) + team := new(Team) + return team, c.getParsedResponse("POST", fmt.Sprintf("/admin/orgs/%s/teams", user), + jsonHeader, bytes.NewReader(body), team) } func (c *Client) AdminAddTeamMembership(teamID int64, user string) error {