Fix deprecated team APIs

Author: nickfloyd

github/resource_github_repository_collaborators.go

@@ -407,8 +407,8 @@ func matchUserCollaboratorsAndInvites(repoName string, want []any, hasUsers []us
 
 func matchTeamCollaborators(repoName string, want []any, has []teamCollaborator, meta any) error {
 	client := meta.(*Owner).v3client
-	orgID := meta.(*Owner).id
 	owner := meta.(*Owner).name
+	orgId := meta.(*Owner).id
 	ctx := context.Background()
 
 	remove := make([]teamCollaborator, 0)
@@ -429,9 +429,9 @@ func matchTeamCollaborators(repoName string, want []any, has []teamCollaborator,
 		if wantPerm == "" { // user should NOT have permission
 			remove = append(remove, hasTeam)
 		} else if wantPerm != hasTeam.permission { // permission should be updated
-			log.Printf("[DEBUG] Updating team %d permission from %s to %s for repo: %s.", hasTeam.teamID, hasTeam.permission, wantPerm, repoName)
+			log.Printf("[DEBUG] Updating team %s permission from %s to %s for repo: %s.", hasTeam.teamSlug, hasTeam.permission, wantPerm, repoName)
 			_, err := client.Teams.AddTeamRepoByID(
-				ctx, orgID, hasTeam.teamID, owner, repoName, &github.TeamAddTeamRepoOptions{
+				ctx, orgId, hasTeam.teamID, owner, repoName, &github.TeamAddTeamRepoOptions{
 					Permission: wantPerm,
 				},
 			)
@@ -444,6 +444,10 @@ func matchTeamCollaborators(repoName string, want []any, has []teamCollaborator,
 	for _, t := range want {
 		teamData := t.(map[string]any)
 		teamIDString := teamData["team_id"].(string)
+		teamSlug, err := getTeamSlug(teamIDString, meta)
+		if err != nil {
+			return err
+		}
 		teamID, err := getTeamID(teamIDString, meta)
 		if err != nil {
 			return err
@@ -460,9 +464,9 @@ func matchTeamCollaborators(repoName string, want []any, has []teamCollaborator,
 		}
 		permission := teamData["permission"].(string)
 		// team needs to be added
-		log.Printf("[DEBUG] Adding team %s with permission %s for repo: %s.", teamIDString, permission, repoName)
+		log.Printf("[DEBUG] Adding team %s with permission %s for repo: %s.", teamSlug, permission, repoName)
 		_, err = client.Teams.AddTeamRepoByID(
-			ctx, orgID, teamID, owner, repoName, &github.TeamAddTeamRepoOptions{
+			ctx, orgId, teamID, owner, repoName, &github.TeamAddTeamRepoOptions{
 				Permission: permission,
 			},
 		)
@@ -472,10 +476,10 @@ func matchTeamCollaborators(repoName string, want []any, has []teamCollaborator,
 	}
 
 	for _, team := range remove {
-		log.Printf("[DEBUG] Removing team %d from repo: %s.", team.teamID, repoName)
-		_, err := client.Teams.RemoveTeamRepoByID(ctx, orgID, team.teamID, owner, repoName)
+		log.Printf("[DEBUG] Removing team %s from repo: %s.", team.teamSlug, repoName)
+		_, err := client.Teams.RemoveTeamRepoByID(ctx, orgId, team.teamID, owner, repoName)
 		if err != nil {
-			err = handleArchivedRepoDelete(err, "team repository access", fmt.Sprintf("team %d", team.teamID), owner, repoName)
+			err = handleArchivedRepoDelete(err, "team repository access", fmt.Sprintf("team %s", team.teamSlug), owner, repoName)
 			if err != nil {
 				return err
 			}

github/resource_github_repository_ruleset.go

@@ -689,7 +689,12 @@ func resourceGithubRepositoryRulesetUpdate(d *schema.ResourceData, meta any) err
 	// UpdateRulesetNoBypassActor always includes the field so that bypass actors can actually be removed.
 	// See: https://github.com/google/go-github/blob/b6248e6f6aec019e75ba2c8e189bfe89f36b7d01/github/repos_rules.go#L196
 	if d.HasChange("bypass_actors") {
-		ruleset, _, err = client.Repositories.UpdateRulesetNoBypassActor(ctx, owner, repoName, rulesetID, *rulesetReq)
+		// Clear bypass actors first, then update with new ruleset
+		_, err = client.Repositories.UpdateRulesetClearBypassActor(ctx, owner, repoName, rulesetID)
+		if err != nil {
+			return err
+		}
+		ruleset, _, err = client.Repositories.UpdateRuleset(ctx, owner, repoName, rulesetID, *rulesetReq)
 	} else {
 		ruleset, _, err = client.Repositories.UpdateRuleset(ctx, owner, repoName, rulesetID, *rulesetReq)
 	}

github/resource_github_team.go

@@ -155,7 +155,7 @@ func resourceGithubTeamCreate(d *schema.ResourceData, meta any) error {
 	*/
 	if newTeam.ParentTeamID != nil && githubTeam.Parent == nil {
 		_, _, err := client.Teams.EditTeamByID(ctx,
-			*githubTeam.Organization.ID,
+			meta.(*Owner).id,
 			*githubTeam.ID,
 			newTeam,
 			false)
@@ -267,7 +267,6 @@ func resourceGithubTeamUpdate(d *schema.ResourceData, meta any) error {
 	}
 
 	client := meta.(*Owner).v3client
-	orgId := meta.(*Owner).id
 	var removeParentTeam bool
 
 	editedTeam := github.NewTeam{
@@ -290,9 +289,10 @@ func resourceGithubTeamUpdate(d *schema.ResourceData, meta any) error {
 	if err != nil {
 		return unconvertibleIdErr(d.Id(), err)
 	}
+
 	ctx := context.WithValue(context.Background(), ctxId, d.Id())
 
-	team, _, err := client.Teams.EditTeamByID(ctx, orgId, teamId, editedTeam, removeParentTeam)
+	team, _, err := client.Teams.EditTeamByID(ctx, meta.(*Owner).id, teamId, editedTeam, removeParentTeam)
 	if err != nil {
 		return err
 	}

github/resource_github_team_repository.go

@@ -70,6 +70,7 @@ func resourceGithubTeamRepositoryCreate(d *schema.ResourceData, meta any) error
 
 	client := meta.(*Owner).v3client
 	orgId := meta.(*Owner).id
+	orgName := meta.(*Owner).name
 
 	// The given team id could be an id or a slug
 	givenTeamId := d.Get("team_id").(string)
@@ -78,7 +79,6 @@ func resourceGithubTeamRepositoryCreate(d *schema.ResourceData, meta any) error
 		return err
 	}
 
-	orgName := meta.(*Owner).name
 	repoName := d.Get("repository").(string)
 	permission := d.Get("permission").(string)
 	ctx := context.Background()
@@ -108,23 +108,20 @@ func resourceGithubTeamRepositoryRead(d *schema.ResourceData, meta any) error {
 	}
 
 	client := meta.(*Owner).v3client
-	orgId := meta.(*Owner).id
+	teamSlug := d.Get("slug").(string)
 
 	teamIdString, repoName, err := parseTwoPartID(d.Id(), "team_id", "repository")
 	if err != nil {
 		return err
 	}
-	teamId, err := getTeamID(teamIdString, meta)
-	if err != nil {
-		return err
-	}
+
 	orgName := meta.(*Owner).name
 	ctx := context.WithValue(context.Background(), ctxId, d.Id())
 	if !d.IsNewResource() {
 		ctx = context.WithValue(ctx, ctxEtag, d.Get("etag").(string))
 	}
 
-	repo, resp, repoErr := client.Teams.IsTeamRepoByID(ctx, orgId, teamId, orgName, repoName)
+	repo, resp, repoErr := client.Teams.IsTeamRepoBySlug(ctx, orgName, teamSlug, orgName, repoName)
 	if repoErr != nil {
 		ghErr := &github.ErrorResponse{}
 		if errors.As(repoErr, &ghErr) {