diff --git a/github/data_source_github_team.go b/github/data_source_github_team.go index 5848c4bb50..06f358da2e 100644 --- a/github/data_source_github_team.go +++ b/github/data_source_github_team.go @@ -56,7 +56,7 @@ func dataSourceGithubTeamRead(d *schema.ResourceData, meta interface{}) error { return err } - member, _, err := client.Organizations.ListTeamMembers(ctx, team.GetID(), nil) + member, _, err := client.Teams.ListTeamMembers(ctx, team.GetID(), nil) if err != nil { return err } @@ -79,7 +79,7 @@ func dataSourceGithubTeamRead(d *schema.ResourceData, meta interface{}) error { func getGithubTeamBySlug(client *github.Client, org string, slug string) (team *github.Team, err error) { opt := &github.ListOptions{PerPage: 10} for { - teams, resp, err := client.Organizations.ListTeams(context.TODO(), org, opt) + teams, resp, err := client.Teams.ListTeams(context.TODO(), org, opt) if err != nil { return team, err } diff --git a/github/resource_github_team.go b/github/resource_github_team.go index b18a74a3d1..4b26c41801 100644 --- a/github/resource_github_team.go +++ b/github/resource_github_team.go @@ -60,7 +60,7 @@ func resourceGithubTeamCreate(d *schema.ResourceData, meta interface{}) error { orgName := meta.(*Organization).name name := d.Get("name").(string) - newTeam := &github.NewTeam{ + newTeam := github.NewTeam{ Name: name, Description: github.String(d.Get("description").(string)), Privacy: github.String(d.Get("privacy").(string)), @@ -72,7 +72,7 @@ func resourceGithubTeamCreate(d *schema.ResourceData, meta interface{}) error { ctx := context.Background() log.Printf("[DEBUG] Creating team: %s (%s)", name, orgName) - githubTeam, _, err := client.Organizations.CreateTeam(ctx, + githubTeam, _, err := client.Teams.CreateTeam(ctx, orgName, newTeam) if err != nil { return err @@ -105,7 +105,7 @@ func resourceGithubTeamRead(d *schema.ResourceData, meta interface{}) error { } log.Printf("[DEBUG] Reading team: %s", d.Id()) - team, resp, err := client.Organizations.GetTeam(ctx, id) + team, resp, err := client.Teams.GetTeam(ctx, id) if err != nil { if ghErr, ok := err.(*github.ErrorResponse); ok { if ghErr.Response.StatusCode == http.StatusNotModified { @@ -139,7 +139,7 @@ func resourceGithubTeamRead(d *schema.ResourceData, meta interface{}) error { func resourceGithubTeamUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*Organization).client - editedTeam := &github.NewTeam{ + editedTeam := github.NewTeam{ Name: d.Get("name").(string), Description: github.String(d.Get("description").(string)), Privacy: github.String(d.Get("privacy").(string)), @@ -156,7 +156,7 @@ func resourceGithubTeamUpdate(d *schema.ResourceData, meta interface{}) error { ctx := context.WithValue(context.Background(), ctxId, d.Id()) log.Printf("[DEBUG] Updating team: %s", d.Id()) - team, _, err := client.Organizations.EditTeam(ctx, teamId, editedTeam) + team, _, err := client.Teams.EditTeam(ctx, teamId, editedTeam) if err != nil { return err } @@ -186,6 +186,6 @@ func resourceGithubTeamDelete(d *schema.ResourceData, meta interface{}) error { ctx := context.WithValue(context.Background(), ctxId, d.Id()) log.Printf("[DEBUG] Deleting team: %s", d.Id()) - _, err = client.Organizations.DeleteTeam(ctx, id) + _, err = client.Teams.DeleteTeam(ctx, id) return err } diff --git a/github/resource_github_team_membership.go b/github/resource_github_team_membership.go index 15593c950f..2d2620a270 100644 --- a/github/resource_github_team_membership.go +++ b/github/resource_github_team_membership.go @@ -61,10 +61,10 @@ func resourceGithubTeamMembershipCreateOrUpdate(d *schema.ResourceData, meta int role := d.Get("role").(string) log.Printf("[DEBUG] Creating team membership: %s/%s (%s)", teamIdString, username, role) - _, _, err = client.Organizations.AddTeamMembership(ctx, + _, _, err = client.Teams.AddTeamMembership(ctx, teamId, username, - &github.OrganizationAddTeamMembershipOptions{ + &github.TeamAddTeamMembershipOptions{ Role: role, }, ) @@ -94,7 +94,7 @@ func resourceGithubTeamMembershipRead(d *schema.ResourceData, meta interface{}) } log.Printf("[DEBUG] Reading team membership: %s/%s", teamIdString, username) - membership, resp, err := client.Organizations.GetTeamMembership(ctx, + membership, resp, err := client.Teams.GetTeamMembership(ctx, teamId, username) if err != nil { if ghErr, ok := err.(*github.ErrorResponse); ok { @@ -133,7 +133,7 @@ func resourceGithubTeamMembershipDelete(d *schema.ResourceData, meta interface{} ctx := context.WithValue(context.Background(), ctxId, d.Id()) log.Printf("[DEBUG] Deleting team membership: %s/%s", teamIdString, username) - _, err = client.Organizations.RemoveTeamMembership(ctx, teamId, username) + _, err = client.Teams.RemoveTeamMembership(ctx, teamId, username) return err } diff --git a/github/resource_github_team_membership_test.go b/github/resource_github_team_membership_test.go index bd32767e10..b72a1968d3 100644 --- a/github/resource_github_team_membership_test.go +++ b/github/resource_github_team_membership_test.go @@ -77,7 +77,7 @@ func testAccCheckGithubTeamMembershipDestroy(s *terraform.State) error { return unconvertibleIdErr(teamIdString, err) } - membership, resp, err := conn.Organizations.GetTeamMembership(context.TODO(), + membership, resp, err := conn.Teams.GetTeamMembership(context.TODO(), teamId, username) if err == nil { if membership != nil { @@ -114,7 +114,7 @@ func testAccCheckGithubTeamMembershipExists(n string, membership *github.Members return unconvertibleIdErr(teamIdString, err) } - teamMembership, _, err := conn.Organizations.GetTeamMembership(context.TODO(), teamId, username) + teamMembership, _, err := conn.Teams.GetTeamMembership(context.TODO(), teamId, username) if err != nil { return err @@ -145,7 +145,7 @@ func testAccCheckGithubTeamMembershipRoleState(n, expected string, membership *g return unconvertibleIdErr(teamIdString, err) } - teamMembership, _, err := conn.Organizations.GetTeamMembership(context.TODO(), + teamMembership, _, err := conn.Teams.GetTeamMembership(context.TODO(), teamId, username) if err != nil { return err diff --git a/github/resource_github_team_repository.go b/github/resource_github_team_repository.go index 48634ea010..3624159a34 100644 --- a/github/resource_github_team_repository.go +++ b/github/resource_github_team_repository.go @@ -60,11 +60,11 @@ func resourceGithubTeamRepositoryCreate(d *schema.ResourceData, meta interface{} log.Printf("[DEBUG] Creating team repository association: %s:%s (%s/%s)", teamIdString, permission, orgName, repoName) - _, err = client.Organizations.AddTeamRepo(ctx, + _, err = client.Teams.AddTeamRepo(ctx, teamId, orgName, repoName, - &github.OrganizationAddTeamRepoOptions{ + &github.TeamAddTeamRepoOptions{ Permission: permission, }, ) @@ -98,7 +98,7 @@ func resourceGithubTeamRepositoryRead(d *schema.ResourceData, meta interface{}) log.Printf("[DEBUG] Reading team repository association: %s (%s/%s)", teamIdString, orgName, repoName) - repo, resp, repoErr := client.Organizations.IsTeamRepo(ctx, + repo, resp, repoErr := client.Teams.IsTeamRepo(ctx, teamId, orgName, repoName) if repoErr != nil { if ghErr, ok := err.(*github.ErrorResponse); ok { @@ -145,11 +145,11 @@ func resourceGithubTeamRepositoryUpdate(d *schema.ResourceData, meta interface{} log.Printf("[DEBUG] Updating team repository association: %s:%s (%s/%s)", teamIdString, permission, orgName, repoName) // the go-github library's AddTeamRepo method uses the add/update endpoint from Github API - _, err = client.Organizations.AddTeamRepo(ctx, + _, err = client.Teams.AddTeamRepo(ctx, teamId, orgName, repoName, - &github.OrganizationAddTeamRepoOptions{ + &github.TeamAddTeamRepoOptions{ Permission: permission, }, ) @@ -177,7 +177,7 @@ func resourceGithubTeamRepositoryDelete(d *schema.ResourceData, meta interface{} log.Printf("[DEBUG] Deleting team repository association: %s (%s/%s)", teamIdString, orgName, repoName) - _, err = client.Organizations.RemoveTeamRepo(ctx, + _, err = client.Teams.RemoveTeamRepo(ctx, teamId, orgName, repoName) return err } diff --git a/github/resource_github_team_repository_test.go b/github/resource_github_team_repository_test.go index ef48ba0bcc..efa7ad6430 100644 --- a/github/resource_github_team_repository_test.go +++ b/github/resource_github_team_repository_test.go @@ -125,7 +125,7 @@ func testAccCheckGithubTeamRepositoryExists(n string, repository *github.Reposit return unconvertibleIdErr(teamIdString, err) } - repo, _, err := conn.Organizations.IsTeamRepo(context.TODO(), + repo, _, err := conn.Teams.IsTeamRepo(context.TODO(), teamId, testAccProvider.Meta().(*Organization).name, repoName) @@ -155,7 +155,7 @@ func testAccCheckGithubTeamRepositoryDestroy(s *terraform.State) error { return unconvertibleIdErr(teamIdString, err) } - repo, resp, err := conn.Organizations.IsTeamRepo(context.TODO(), + repo, resp, err := conn.Teams.IsTeamRepo(context.TODO(), teamId, testAccProvider.Meta().(*Organization).name, repoName) diff --git a/github/resource_github_team_test.go b/github/resource_github_team_test.go index e485389d05..fe24d79247 100644 --- a/github/resource_github_team_test.go +++ b/github/resource_github_team_test.go @@ -146,7 +146,7 @@ func testAccCheckGithubTeamExists(n string, team *github.Team) resource.TestChec return unconvertibleIdErr(rs.Primary.ID, err) } - githubTeam, _, err := conn.Organizations.GetTeam(context.TODO(), id) + githubTeam, _, err := conn.Teams.GetTeam(context.TODO(), id) if err != nil { return err } @@ -190,7 +190,7 @@ func testAccCheckGithubTeamDestroy(s *terraform.State) error { return unconvertibleIdErr(rs.Primary.ID, err) } - team, resp, err := conn.Organizations.GetTeam(context.TODO(), id) + team, resp, err := conn.Teams.GetTeam(context.TODO(), id) if err == nil { teamId := strconv.FormatInt(*team.ID, 10) if team != nil && teamId == rs.Primary.ID {