fixup! feat: Refactor team data sources to latest pattern

Author: stevehipwell

docs/data-sources/organization_repository_role.md

@@ -9,6 +9,8 @@ description: |-
 
 Data source to lookup a custom organization repository role.
 
+~> Custom organization repository roles are currently only available for GitHub Enterprise organizations.
+
 ## Example Usage
 
 ```terraform

docs/data-sources/organization_repository_roles.md

@@ -9,6 +9,8 @@ description: |-
 
 Data source to list all custom repository roles in an organization.
 
+~> Custom organization repository roles are currently only available for GitHub Enterprise organizations.
+
 ## Example Usage
 
 ```terraform

github/data_source_github_organization_teams.go

@@ -188,7 +188,7 @@ func dataSourceGithubOrganizationTeamsRead(ctx context.Context, d *schema.Resour
 			}
 
 			t["parent"] = map[string]any{
-				"id":   strconv.FormatInt(team.Parent.GetID(), 10),
+				"id":   team.Parent.GetNodeID(),
 				"slug": team.Parent.GetSlug(),
 				"name": team.Parent.GetName(),
 			}

github/data_source_github_organization_teams_test.go

@@ -71,7 +71,7 @@ data "github_organization_teams" "test" {
 								"members":      knownvalue.ListSizeExact(0),
 								"repositories": knownvalue.ListSizeExact(0),
 								"parent": knownvalue.MapExact(map[string]knownvalue.Check{
-									"id":   knownvalue.StringExact(strconv.FormatInt(team1.GetID(), 10)),
+									"id":   knownvalue.StringExact(team1.GetNodeID()),
 									"slug": knownvalue.StringExact(team1.GetSlug()),
 									"name": knownvalue.StringExact(team1.GetName()),
 								}),

github/data_source_github_repository_teams.go

@@ -92,9 +92,10 @@ func dataSourceGithubRepositoryTeams() *schema.Resource {
 func dataSourceGithubRepositoryTeamsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	meta, _ := m.(*Owner)
 
-	if ok, diags := checkOrganizationOK(meta); !ok {
-		return diags
-	}
+	// TODO: Reinstate this check for v7 when `full_name` is removed from the schema.
+	// if ok, diags := checkOrganizationOK(meta); !ok {
+	// 	return diags
+	// }
 
 	var owner, repoName string
 	if v, ok := d.GetOk("full_name"); ok {

github/data_source_github_team.go

@@ -19,11 +19,12 @@ func dataSourceGithubTeam() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"team_id": {
-				Description:  "ID of the team.",
-				Type:         schema.TypeInt,
-				Optional:     true,
-				Computed:     true,
-				ExactlyOneOf: []string{"team_id", "slug"},
+				Description:      "ID of the team.",
+				Type:             schema.TypeInt,
+				Optional:         true,
+				Computed:         true,
+				ExactlyOneOf:     []string{"team_id", "slug"},
+				ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(1)),
 			},
 			"slug": {
 				Description:  "Slug of the team name.",

github/data_source_github_team_test.go

@@ -93,24 +93,57 @@ data "github_team" "test" {
 		t.Parallel()
 
 		skipUnlessHasOrgUser1(t)
+		skipUnlessHasOrgUser2(t)
 
 		team := mustCreateTestTeam(t, nil)
-		repo := mustCreateTestRepository(t)
 		mustAddTeamMember(t, team, testAccConf.testOrgUser1)
+		childTeam := mustCreateTestTeam(t, new(team.GetID()))
+		mustAddTeamMember(t, childTeam, testAccConf.testOrgUser2)
+		repo := mustCreateTestRepository(t)
 		mustAddRepositoryTeam(t, repo, team)
 
 		config := fmt.Sprintf(`
 data "github_team" "test" {
-  slug         = "%s"
-  summary_only = false
+  slug            = "%s"
+  summary_only    = false
+  membership_type = "%%v"
 }
 `, team.GetSlug())
 
 		resource.Test(t, resource.TestCase{
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
 				{
-					Config: config,
+					Config: fmt.Sprintf(config, "all"),
+					ConfigStateChecks: []statecheck.StateCheck{
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("team_id"), knownvalue.Int32Exact(int32(team.GetID()))),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("slug"), knownvalue.StringExact(team.GetSlug())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("node_id"), knownvalue.StringExact(team.GetNodeID())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("name"), knownvalue.StringExact(team.GetName())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("description"), knownvalue.StringExact(team.GetDescription())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("type"), knownvalue.StringExact(team.GetType())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("privacy"), knownvalue.StringExact(team.GetPrivacy())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("notification_setting"), knownvalue.StringExact(team.GetNotificationSetting())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("permission"), knownvalue.StringExact(team.GetPermission())),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("parent_team"), knownvalue.Null()),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("members"), knownvalue.ListExact([]knownvalue.Check{
+							knownvalue.StringExact(testAccConf.testOrgUser1),
+							knownvalue.StringExact(testAccConf.testOrgUser2),
+						})),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("repositories"), knownvalue.ListExact([]knownvalue.Check{
+							knownvalue.StringExact(repo.GetName()),
+						})),
+						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("repositories_detailed"), knownvalue.ListExact([]knownvalue.Check{
+							knownvalue.MapExact(map[string]knownvalue.Check{
+								"repo_id":   knownvalue.Int32Exact(int32(repo.GetID())),
+								"repo_name": knownvalue.StringExact(repo.GetName()),
+								"role_name": knownvalue.StringExact("read"),
+							}),
+						})),
+					},
+				},
+				{
+					Config: fmt.Sprintf(config, "immediate"),
 					ConfigStateChecks: []statecheck.StateCheck{
 						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("team_id"), knownvalue.Int32Exact(int32(team.GetID()))),
 						statecheck.ExpectKnownValue("data.github_team.test", tfjsonpath.New("slug"), knownvalue.StringExact(team.GetSlug())),

templates/data-sources/organization_repository_role.md.tmpl

@@ -9,6 +9,8 @@ description: |-
 
 {{ .Description | trimspace }}
 
+~> Custom organization repository roles are currently only available for GitHub Enterprise organizations.
+
 {{ if .HasExamples -}}
 ## Example Usage
 

templates/data-sources/organization_repository_roles.md.tmpl

@@ -9,6 +9,8 @@ description: |-
 
 {{ .Description | trimspace }}
 
+~> Custom organization repository roles are currently only available for GitHub Enterprise organizations.
+
 {{ if .HasExamples -}}
 ## Example Usage