Skip to content

Commit

Permalink
add groupprivileges
Browse files Browse the repository at this point in the history
  • Loading branch information
cgroschupp committed Jun 23, 2021
1 parent a6205c6 commit 86e5b93
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 15 deletions.
20 changes: 11 additions & 9 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ func apiBaseUrl() (*url.URL, error) {
}

type Client struct {
Auth *auth
Users users
User user
Teams teams
Repositories *Repositories
Workspaces *Workspace
Pagelen uint64
MaxDepth uint64
apiBaseURL *url.URL
Auth *auth
Users users
User user
Teams teams
Repositories *Repositories
Workspaces *Workspace
GroupPrivileges *GroupPrivileges
Pagelen uint64
MaxDepth uint64
apiBaseURL *url.URL

HttpClient *http.Client
}
Expand Down Expand Up @@ -156,6 +157,7 @@ func injectClient(a *auth) *Client {
c.User = &User{c: c}
c.Teams = &Teams{c: c}
c.Workspaces = &Workspace{c: c, Repositories: c.Repositories, Permissions: &Permission{c: c}}
c.GroupPrivileges = &GroupPrivileges{c: c}
c.HttpClient = new(http.Client)
return c
}
Expand Down
4 changes: 1 addition & 3 deletions commits.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package bitbucket

import (
"net/url"
"encoding/json"
"net/url"
)

type Commits struct {
Expand Down Expand Up @@ -50,7 +50,6 @@ func (cm *Commits) RemoveApprove(cmo *CommitsOptions) (interface{}, error) {
return cm.c.execute("DELETE", urlStr, "")
}


func (cm *Commits) CreateCommitStatus(cmo *CommitsOptions, cso *CommitStatusOptions) (interface{}, error) {
urlStr := cm.c.requestUrl("/repositories/%s/%s/commit/%s/statuses/build", cmo.Owner, cmo.RepoSlug, cmo.Revision)
data, err := json.Marshal(cso)
Expand All @@ -60,7 +59,6 @@ func (cm *Commits) CreateCommitStatus(cmo *CommitsOptions, cso *CommitStatusOpti
return cm.c.execute("POST", urlStr, string(data))
}


func (cm *Commits) buildCommitsQuery(include, exclude string) string {

p := url.Values{}
Expand Down
112 changes: 112 additions & 0 deletions groupprivileges.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
package bitbucket

import (
"fmt"

"github.com/mitchellh/mapstructure"
)

type GroupPrivileges struct {
c *Client
}

type GroupPrivilegesOptions struct {
Owner string
RepoSlug string
Group string
GroupOwner string
Permission string
}

type GroupPrivilege struct {
Repo string `mapstructure:"repo"`
Privilege string `mapstructure:"privilege"`
Group struct {
Owner struct {
DisplayName string `mapstructure:"display_name"`
UUID string `mapstructure:"uuid"`
IsActive bool `mapstructure:"is_active"`
IsTeam bool `mapstructure:"is_team"`
MentionID string `mapstructure:"mention_id"`
Avatar string `mapstructure:"avatar"`
Nickname string `mapstructure:"nickname"`
AccountID string `mapstructure:"account_id"`
} `mapstructure:"owner"`
Name string `mapstructure:"name"`
Members []interface{} `mapstructure:"members"`
Slug string `mapstructure:"slug"`
} `mapstructure:"group"`
Repository struct {
Owner struct {
DisplayName string `mapstructure:"display_name"`
UUID string `mapstructure:"uuid"`
IsActive bool `mapstructure:"is_active"`
IsTeam bool `mapstructure:"is_team"`
MentionID string `mapstructure:"mention_id"`
Avatar string `mapstructure:"avatar"`
Nickname string `mapstructure:"nickname"`
AccountID string `mapstructure:"account_id"`
} `mapstructure:"owner"`
Name string `mapstructure:"name"`
Slug string `mapstructure:"slug"`
} `mapstructure:"repository"`
}

func (g *GroupPrivileges) List(workspace, repoSlug string) ([]GroupPrivilege, error) {
urlStr := fmt.Sprintf("%s/1.0/group-privileges/%s/%s", g.c.GetApiHostnameURL(), workspace, repoSlug)
data, err := g.c.execute("GET", urlStr, "")
if err != nil {
return nil, err
}

return g.decodeGroupPrivileges(data)
}

func (g *GroupPrivileges) Add(gpo GroupPrivilegesOptions) ([]GroupPrivilege, error) {
groupOwner := gpo.GroupOwner
if gpo.GroupOwner == "" {
groupOwner = gpo.Owner

}
urlStr := fmt.Sprintf("%s/1.0/group-privileges/%s/%s/%s/%s/", g.c.GetApiHostnameURL(), gpo.Owner, gpo.RepoSlug, groupOwner, gpo.Group)
data, err := g.c.executeContentType("PUT", urlStr, gpo.Permission, "application/x-www-form-urlencoded")
if err != nil {
return nil, err
}

return g.decodeGroupPrivileges(data)
}

func (g *GroupPrivileges) Get(gpo GroupPrivilegesOptions) ([]GroupPrivilege, error) {
groupOwner := gpo.GroupOwner
if gpo.GroupOwner == "" {
groupOwner = gpo.Owner

}
urlStr := fmt.Sprintf("%s/1.0/group-privileges/%s/%s/%s/%s/", g.c.GetApiHostnameURL(), gpo.Owner, gpo.RepoSlug, groupOwner, gpo.Group)
data, err := g.c.execute("GET", urlStr, "")
if err != nil {
return nil, err
}

return g.decodeGroupPrivileges(data)
}

func (g *GroupPrivileges) Delete(gpo GroupPrivilegesOptions) (interface{}, error) {
groupOwner := gpo.GroupOwner
if gpo.GroupOwner == "" {
groupOwner = gpo.Owner

}
urlStr := fmt.Sprintf("%s/1.0/group-privileges/%s/%s/%s/%s/", g.c.GetApiHostnameURL(), gpo.Owner, gpo.RepoSlug, groupOwner, gpo.Group)
return g.c.execute("DELETE", urlStr, "")
}

func (g *GroupPrivileges) decodeGroupPrivileges(response interface{}) ([]GroupPrivilege, error) {
var gp []GroupPrivilege
err := mapstructure.Decode(response, &gp)
if err != nil {
return nil, err
}
return gp, nil
}
5 changes: 2 additions & 3 deletions teams.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func (t *Teams) Repositories(teamname string) (interface{}, error) {
}

func (t *Teams) Projects(teamname string) (interface{}, error) {
urlStr := t.c.requestUrl("/teams/%s/projects/", teamname)
return t.c.execute("GET", urlStr, "")
urlStr := t.c.requestUrl("/teams/%s/projects/", teamname)
return t.c.execute("GET", urlStr, "")
}

0 comments on commit 86e5b93

Please sign in to comment.