k-space/dex
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

fix: Replace teams endpoint for bitbucket connector

Browse Source 
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
This commit is contained in:
m.nabokikh
2020-10-03 12:50:10 +03:00
parent d4c3a3505d
commit 4b94469547
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
connector/bitbucketcloud/bitbucketcloud.go
View File

@@ -362,10 +362,14 @@ func (b *bitbucketConnector) getGroups(ctx context.Context, client *http.Client,
return nil, nil
}
type team struct {
type teamName struct {
Name string `json:"username"` // The "username" from Bitbucket Cloud is actually the team name here
}
type team struct {
Team teamName `json:"team"`
}
type userTeamsResponse struct {
pagedResponse
Values []team
@@ -373,18 +377,18 @@ type userTeamsResponse struct {
func (b *bitbucketConnector) userTeams(ctx context.Context, client *http.Client) ([]string, error) {
var teams []string
apiURL := b.apiURL + "/teams?role=member"
apiURL := b.apiURL + "/user/permissions/teams"
for {
// https://developer.atlassian.com/bitbucket/api/2/reference/resource/teams
// https://developer.atlassian.com/bitbucket/api/2/reference/resource/user/permissions/teams
var response userTeamsResponse
if err := get(ctx, client, apiURL, &response); err != nil {
return nil, fmt.Errorf("bitbucket: get user teams: %v", err)
}
for _, team := range response.Values {
teams = append(teams, team.Name)
for _, value := range response.Values {
teams = append(teams, value.Team.Name)
}
if response.Next == nil {