feat: Refactor to use team slug in api

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>

Author: stevehipwell

.golangci.yml

@@ -42,9 +42,6 @@ linters:
         linters:
           - unparam
         text: always receives
-      - linters:
-          - staticcheck
-        text: "SA1019.*ByID.*deprecated"
 
 issues:
   max-issues-per-linter: 0

github/data_source_github_organization_repository_role.go

@@ -2,10 +2,8 @@ package github
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 
-	"github.com/google/go-github/v81/github"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -53,28 +51,11 @@ func dataSourceGithubOrganizationRepositoryRoleRead(ctx context.Context, d *sche
 
 	roleId := int64(d.Get("role_id").(int))
 
-	// TODO: Use this code when go-github is at v68+
-	// role, _, err := client.Organizations.GetCustomRepoRole(ctx, orgName, roleId)
-	// if err != nil {
-	// 	return diag.FromErr(err)
-	// }
-
-	roles, _, err := client.Organizations.ListCustomRepoRoles(ctx, orgName)
+	role, _, err := client.Organizations.GetCustomRepoRole(ctx, orgName, roleId)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	var role *github.CustomRepoRoles
-	for _, r := range roles.CustomRepoRoles {
-		if r.GetID() == roleId {
-			role = r
-			break
-		}
-	}
-	if role == nil {
-		return diag.FromErr(fmt.Errorf("custom organization repo role with ID %d not found", roleId))
-	}
-
 	r := map[string]any{
 		"role_id":     role.GetID(),
 		"name":        role.GetName(),

github/data_source_github_organization_role_teams.go

@@ -48,23 +48,21 @@ func dataSourceGithubOrganizationRoleTeams() *schema.Resource {
 							Type:        schema.TypeString,
 							Computed:    true,
 						},
-						// TODO: Add these fields when go-github is v68+
-						// See https://github.com/google/go-github/issues/3364
-						// "assignment": {
-						// 	Description: "Determines if the team has a direct, indirect, or mixed relationship to a role.",
-						// 	Type:        schema.TypeString,
-						// 	Computed:    true,
-						// },
-						// "parent_team_id": {
-						// 	Description: "The ID of the parent team if this is an indirect assignment.",
-						// 	Type:        schema.TypeString,
-						// 	Computed:    true,
-						// },
-						// "parent_team_slug": {
-						// 	Description: "The slug of the parent team if this is an indirect assignment.",
-						// 	Type:        schema.TypeString,
-						// 	Computed:    true,
-						// },
+						"assignment": {
+							Description: "Determines if the team has a direct, indirect, or mixed relationship to a role.",
+							Type:        schema.TypeString,
+							Computed:    true,
+						},
+						"parent_team_id": {
+							Description: "The ID of the parent team if this is an indirect assignment.",
+							Type:        schema.TypeString,
+							Computed:    true,
+						},
+						"parent_team_slug": {
+							Description: "The slug of the parent team if this is an indirect assignment.",
+							Type:        schema.TypeString,
+							Computed:    true,
+						},
 					},
 				},
 			},

github/data_source_github_organization_role_users.go

@@ -38,23 +38,21 @@ func dataSourceGithubOrganizationRoleUsers() *schema.Resource {
 							Type:        schema.TypeString,
 							Computed:    true,
 						},
-						// TODO: Add these fields when go-github is v68+
-						// See https://github.com/google/go-github/issues/3364
-						// "assignment": {
-						// 	Description: "Determines if the team has a direct, indirect, or mixed relationship to a role.",
-						// 	Type:        schema.TypeString,
-						// 	Computed:    true,
-						// },
-						// "parent_team_id": {
-						// 	Description: "The ID of the parent team if this is an indirect assignment.",
-						// 	Type:        schema.TypeString,
-						// 	Computed:    true,
-						// },
-						// "parent_team_slug": {
-						// 	Description: "The slug of the parent team if this is an indirect assignment.",
-						// 	Type:        schema.TypeString,
-						// 	Computed:    true,
-						// },
+						"assignment": {
+							Description: "Determines if the team has a direct, indirect, or mixed relationship to a role.",
+							Type:        schema.TypeString,
+							Computed:    true,
+						},
+						"parent_team_id": {
+							Description: "The ID of the parent team if this is an indirect assignment.",
+							Type:        schema.TypeString,
+							Computed:    true,
+						},
+						"parent_team_slug": {
+							Description: "The slug of the parent team if this is an indirect assignment.",
+							Type:        schema.TypeString,
+							Computed:    true,
+						},
 					},
 				},
 			},

github/resource_github_organization_repository_role.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/http"
 	"strconv"
 
 	"github.com/google/go-github/v81/github"
@@ -99,36 +100,16 @@ func resourceGithubOrganizationRepositoryRoleRead(ctx context.Context, d *schema
 		return diag.FromErr(err)
 	}
 
-	// TODO: Use this code when go-github is v68+
-	// role, _, err := client.Organizations.GetCustomRepoRole(ctx, orgName, roleId)
-	// if err != nil {
-	// 	if ghErr, ok := err.(*github.ErrorResponse); ok {
-	// 		if ghErr.Response.StatusCode == http.StatusNotFound {
-	// 			log.Printf("[WARN] GitHub organization repository role (%s/%d) not found, removing from state", orgName, roleId)
-	// 			d.SetId("")
-	// 			return nil
-	// 		}
-	// 	}
-	// 	return err
-	// }
-
-	roles, _, err := client.Organizations.ListCustomRepoRoles(ctx, orgName)
+	role, _, err := client.Organizations.GetCustomRepoRole(ctx, orgName, roleId)
 	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	var role *github.CustomRepoRoles
-	for _, r := range roles.CustomRepoRoles {
-		if r.GetID() == roleId {
-			role = r
-			break
+		if ghErr, ok := err.(*github.ErrorResponse); ok {
+			if ghErr.Response.StatusCode == http.StatusNotFound {
+				log.Printf("[WARN] GitHub organization repository role (%s/%d) not found, removing from state", orgName, roleId)
+				d.SetId("")
+				return nil
+			}
 		}
-	}
-
-	if role == nil {
-		log.Printf("[WARN] GitHub organization repository role (%s/%d) not found, removing from state", orgName, roleId)
-		d.SetId("")
-		return nil
+		return diag.FromErr(err)
 	}
 
 	if err = d.Set("role_id", role.GetID()); err != nil {