Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions teams.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,21 @@ type TeamsService struct {

// Team represents a buildkite team.
type Team struct {
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Slug string `json:"slug,omitempty"`
Description string `json:"description,omitempty"`
Privacy string `json:"privacy,omitempty"`
Default bool `json:"default"`
CreatedAt *Timestamp `json:"created_at,omitempty"`
CreatedBy *User `json:"created_by,omitempty"`
ID string `json:"id,omitempty"`
GraphQLID string `json:"graphql_id,omitempty"`
Name string `json:"name,omitempty"`
Slug string `json:"slug,omitempty"`
Description string `json:"description,omitempty"`
Privacy string `json:"privacy,omitempty"`
Default bool `json:"default"`
DefaultMemberRole string `json:"default_member_role,omitempty"`
MembersCanCreatePipelines bool `json:"members_can_create_pipelines"`
MembersCanCreateSuites bool `json:"members_can_create_suites"`
MembersCanCreateRegistries bool `json:"members_can_create_registries"`
MembersCanDestroyRegistries bool `json:"members_can_destroy_registries"`
MembersCanDestroyPackages bool `json:"members_can_destroy_packages"`
Comment on lines +30 to +33

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't these also need to be added to the CreateTeam struct?

CreatedAt *Timestamp `json:"created_at,omitempty"`
CreatedBy *User `json:"created_by,omitempty"`
}

// TeamsListOptions specifies the optional parameters to the
Expand All @@ -35,14 +42,18 @@ type TeamsListOptions struct {
UserID string `url:"user_id,omitempty"`
}

// CreateTeam represents a request to create a team.
// CreateTeam represents a request to create or update a team.
type CreateTeam struct {
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
Privacy string `json:"privacy,omitempty"`
IsDefaultTeam bool `json:"is_default_team"`
DefaultMemberRole string `json:"default_member_role,omitempty"`
MembersCanCreatePipelines bool `json:"members_can_create_pipelines"`
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
Privacy string `json:"privacy,omitempty"`
IsDefaultTeam bool `json:"is_default_team"`
DefaultMemberRole string `json:"default_member_role,omitempty"`
MembersCanCreatePipelines bool `json:"members_can_create_pipelines"`
MembersCanCreateSuites bool `json:"members_can_create_suites"`
MembersCanCreateRegistries bool `json:"members_can_create_registries"`
MembersCanDestroyRegistries bool `json:"members_can_destroy_registries"`
MembersCanDestroyPackages bool `json:"members_can_destroy_packages"`
}

// Get the teams for an org.
Expand Down
149 changes: 137 additions & 12 deletions teams_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,39 @@ func TestTeamsService_List(t *testing.T) {

server.HandleFunc("/v2/organizations/my-great-org/teams", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
_, _ = fmt.Fprint(w, `[{"id":"123"},{"id":"1234"}]`)
_, _ = fmt.Fprint(w, `[
{
"id": "123",
"graphql_id": "VGVhbS0tLTEyMw==",
"default_member_role": "member",
"members_can_create_pipelines": true,
"members_can_create_suites": false,
"members_can_create_registries": true,
"members_can_destroy_registries": false,
"members_can_destroy_packages": false
},
{"id": "1234"}
]`)
})

teams, _, err := client.Teams.List(context.Background(), "my-great-org", nil)
if err != nil {
t.Errorf("Teams.List returned error: %v", err)
}

want := []Team{{ID: "123"}, {ID: "1234"}}
want := []Team{
{
ID: "123",
GraphQLID: "VGVhbS0tLTEyMw==",
DefaultMemberRole: "member",
MembersCanCreatePipelines: true,
MembersCanCreateSuites: false,
MembersCanCreateRegistries: true,
MembersCanDestroyRegistries: false,
MembersCanDestroyPackages: false,
},
{ID: "1234"},
}
if diff := cmp.Diff(teams, want); diff != "" {
t.Errorf("Teams.List diff: (-got +want)\n%s", diff)
}
Expand All @@ -42,7 +66,16 @@ func TestTeamsService_ListForUser(t *testing.T) {
testFormValues(t, r, values{
"user_id": "abc",
})
_, _ = fmt.Fprint(w, `[{"id":"123"}]`)
_, _ = fmt.Fprint(w, `[{
"id": "123",
"graphql_id": "VGVhbS0tLTEyMw==",
"default_member_role": "member",
"members_can_create_pipelines": true,
"members_can_create_suites": false,
"members_can_create_registries": false,
"members_can_destroy_registries": false,
"members_can_destroy_packages": false
}]`)
})

opt := &TeamsListOptions{UserID: "abc"}
Expand All @@ -51,7 +84,16 @@ func TestTeamsService_ListForUser(t *testing.T) {
t.Errorf("Teams.List returned error: %v", err)
}

want := []Team{{ID: "123"}}
want := []Team{{
ID: "123",
GraphQLID: "VGVhbS0tLTEyMw==",
DefaultMemberRole: "member",
MembersCanCreatePipelines: true,
MembersCanCreateSuites: false,
MembersCanCreateRegistries: false,
MembersCanDestroyRegistries: false,
MembersCanDestroyPackages: false,
}}
if diff := cmp.Diff(teams, want); diff != "" {
t.Errorf("Teams.List diff: (-got +want)\n%s", diff)
}
Expand All @@ -65,15 +107,43 @@ func TestTeamsService_GetTeam(t *testing.T) {

server.HandleFunc("/v2/organizations/my-great-org/teams/123", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
_, _ = fmt.Fprint(w, `{"id":"123"}`)
_, _ = fmt.Fprint(w, `{
"id": "123",
"graphql_id": "VGVhbS0tLTEyMw==",
"name": "my-team",
"slug": "my-team",
"description": "A test team",
"privacy": "visible",
"default": true,
"default_member_role": "maintainer",
"members_can_create_pipelines": true,
"members_can_create_suites": true,
"members_can_create_registries": false,
"members_can_destroy_registries": false,
"members_can_destroy_packages": true
}`)
})

team, err := client.Teams.GetTeam(context.Background(), "my-great-org", "123")
if err != nil {
t.Errorf("Teams.GetTeam returned error: %v", err)
}

want := Team{ID: "123"}
want := Team{
ID: "123",
GraphQLID: "VGVhbS0tLTEyMw==",
Name: "my-team",
Slug: "my-team",
Description: "A test team",
Privacy: "visible",
Default: true,
DefaultMemberRole: "maintainer",
MembersCanCreatePipelines: true,
MembersCanCreateSuites: true,
MembersCanCreateRegistries: false,
MembersCanDestroyRegistries: false,
MembersCanDestroyPackages: true,
}
if diff := cmp.Diff(team, want); diff != "" {
t.Errorf("Teams.GetTeam diff: (-got +want)\n%s", diff)
}
Expand All @@ -87,15 +157,40 @@ func TestTeamsService_CreateTeam(t *testing.T) {

server.HandleFunc("/v2/organizations/my-great-org/teams", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "POST")
_, _ = fmt.Fprint(w, `{"id":"123"}`)
_, _ = fmt.Fprint(w, `{
"id": "123",
"graphql_id": "VGVhbS0tLTEyMw==",
"name": "new-team",
"slug": "new-team",
"privacy": "visible",
"default": false,
"default_member_role": "member",
"members_can_create_pipelines": true,
"members_can_create_suites": false,
"members_can_create_registries": false,
"members_can_destroy_registries": false,
"members_can_destroy_packages": false
}`)
})

team, _, err := client.Teams.CreateTeam(context.Background(), "my-great-org", CreateTeam{})
team, _, err := client.Teams.CreateTeam(context.Background(), "my-great-org", CreateTeam{
Name: "new-team",
Privacy: "visible",
MembersCanCreatePipelines: true,
})
if err != nil {
t.Errorf("Teams.CreateTeam returned error: %v", err)
}

want := Team{ID: "123"}
want := Team{
ID: "123",
GraphQLID: "VGVhbS0tLTEyMw==",
Name: "new-team",
Slug: "new-team",
Privacy: "visible",
DefaultMemberRole: "member",
MembersCanCreatePipelines: true,
}
if diff := cmp.Diff(team, want); diff != "" {
t.Errorf("Teams.CreateTeam diff: (-got +want)\n%s", diff)
}
Expand All @@ -109,15 +204,45 @@ func TestTeamsService_UpdateTeam(t *testing.T) {

server.HandleFunc("/v2/organizations/my-great-org/teams/123", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "PATCH")
_, _ = fmt.Fprint(w, `{"id":"123"}`)
_, _ = fmt.Fprint(w, `{
"id": "123",
"graphql_id": "VGVhbS0tLTEyMw==",
"name": "updated-team",
"slug": "updated-team",
"description": "Updated description",
"privacy": "secret",
"default": false,
"default_member_role": "maintainer",
"members_can_create_pipelines": true,
"members_can_create_suites": true,
"members_can_create_registries": false,
"members_can_destroy_registries": false,
"members_can_destroy_packages": false
}`)
})

team, _, err := client.Teams.UpdateTeam(context.Background(), "my-great-org", "123", CreateTeam{})
team, _, err := client.Teams.UpdateTeam(context.Background(), "my-great-org", "123", CreateTeam{
Name: "updated-team",
Description: "Updated description",
Privacy: "secret",
DefaultMemberRole: "maintainer",
MembersCanCreatePipelines: true,
})
if err != nil {
t.Errorf("Teams.UpdateTeam returned error: %v", err)
}

want := Team{ID: "123"}
want := Team{
ID: "123",
GraphQLID: "VGVhbS0tLTEyMw==",
Name: "updated-team",
Slug: "updated-team",
Description: "Updated description",
Privacy: "secret",
DefaultMemberRole: "maintainer",
MembersCanCreatePipelines: true,
MembersCanCreateSuites: true,
}
if diff := cmp.Diff(team, want); diff != "" {
t.Errorf("Teams.UpdateTeam diff: (-got +want)\n%s", diff)
}
Expand Down