Fix enterprise teams tests and docs

Author: github-actions[bot]

github/acc_test.go

@@ -43,7 +43,9 @@ type testAccConfig struct {
 	token    string
 
 	// Enterprise configuration
-	enterpriseSlug string
+	enterpriseSlug             string
+	enterpriseTestOrganization string
+	enterpriseTestUsers        string
 
 	// Global test configuration
 	testPublicRepository              string
@@ -144,6 +146,8 @@ func TestMain(m *testing.M) {
 
 	if config.authMode == enterprise {
 		config.enterpriseSlug = os.Getenv("GITHUB_ENTERPRISE_SLUG")
+		config.enterpriseTestOrganization = os.Getenv("ENTERPRISE_TEST_ORGANIZATION")
+		config.enterpriseTestUsers = os.Getenv("ENTERPRISE_TEST_USERS")
 
 		if len(config.enterpriseSlug) == 0 {
 			fmt.Println("GITHUB_ENTERPRISE_SLUG environment variable not set")
@@ -178,6 +182,19 @@ func getTestMeta() (*Owner, error) {
 	return meta.(*Owner), nil
 }
 
+func splitCommaSeparated(v string) []string {
+	parts := strings.Split(v, ",")
+	out := make([]string, 0, len(parts))
+	for _, p := range parts {
+		p = strings.TrimSpace(p)
+		if p == "" {
+			continue
+		}
+		out = append(out, p)
+	}
+	return out
+}
+
 func configureSweepers() {
 	resource.AddTestSweepers("repositories", &resource.Sweeper{
 		Name: "repositories",

github/data_source_github_enterprise_team_membership.go

@@ -11,7 +11,7 @@ import (
 
 func dataSourceGithubEnterpriseTeamMembership() *schema.Resource {
 	return &schema.Resource{
-		Description: "Gets information about a user's membership in a GitHub enterprise team.",
+		Description: "Retrieves information about a user's membership in a GitHub enterprise team.",
 		ReadContext: dataSourceGithubEnterpriseTeamMembershipRead,
 
 		Schema: map[string]*schema.Schema{

github/data_source_github_enterprise_team_test.go

@@ -55,6 +55,10 @@ func TestAccGithubEnterpriseTeamDataSource(t *testing.T) {
 func TestAccGithubEnterpriseTeamOrganizationsDataSource(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 
+	if testAccConf.enterpriseTestOrganization == "" {
+		t.Skip("Skipping because `ENTERPRISE_TEST_ORGANIZATION` is not set")
+	}
+
 	config := fmt.Sprintf(`
 		data "github_enterprise" "enterprise" {
 			slug = "%s"
@@ -77,7 +81,7 @@ func TestAccGithubEnterpriseTeamOrganizationsDataSource(t *testing.T) {
 			team_slug       = github_enterprise_team.test.slug
 			depends_on      = [github_enterprise_team_organizations.assign]
 		}
-	`, testAccConf.enterpriseSlug, testResourcePrefix, randomID, testAccConf.owner)
+	`, testAccConf.enterpriseSlug, testResourcePrefix, randomID, testAccConf.enterpriseTestOrganization)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { skipUnlessMode(t, enterprise) },
@@ -88,7 +92,7 @@ func TestAccGithubEnterpriseTeamOrganizationsDataSource(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.github_enterprise_team_organizations.test", "id"),
 					resource.TestCheckResourceAttr("data.github_enterprise_team_organizations.test", "organization_slugs.#", "1"),
-					resource.TestCheckTypeSetElemAttr("data.github_enterprise_team_organizations.test", "organization_slugs.*", testAccConf.owner),
+					resource.TestCheckTypeSetElemAttr("data.github_enterprise_team_organizations.test", "organization_slugs.*", testAccConf.enterpriseTestOrganization),
 				),
 			},
 		},
@@ -97,7 +101,16 @@ func TestAccGithubEnterpriseTeamOrganizationsDataSource(t *testing.T) {
 
 func TestAccGithubEnterpriseTeamMembershipDataSource(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
-	username := testAccConf.username
+
+	if testAccConf.enterpriseTestUsers == "" {
+		t.Skip("Skipping because `ENTERPRISE_TEST_USERS` is not set")
+	}
+
+	users := splitCommaSeparated(testAccConf.enterpriseTestUsers)
+	if len(users) == 0 {
+		t.Skip("Skipping because `ENTERPRISE_TEST_USERS` must contain at least one username")
+	}
+	username := users[0]
 
 	config := fmt.Sprintf(`
 		data "github_enterprise" "enterprise" {

github/resource_github_enterprise_team.go

@@ -90,10 +90,12 @@ func resourceGithubEnterpriseTeamCreate(ctx context.Context, d *schema.ResourceD
 
 	req := github.EnterpriseTeamCreateOrUpdateRequest{
 		Name:                      name,
-		Description:               github.Ptr(description),
 		OrganizationSelectionType: github.Ptr(orgSelection),
 		GroupID:                   github.Ptr(groupID), // Empty string is valid for no group
 	}
+	if description != "" {
+		req.Description = github.Ptr(description)
+	}
 
 	ctx = context.WithValue(ctx, ctxId, d.Id())
 	te, _, err := client.Enterprise.CreateTeam(ctx, enterpriseSlug, req)
@@ -210,10 +212,12 @@ func resourceGithubEnterpriseTeamUpdate(ctx context.Context, d *schema.ResourceD
 
 	req := github.EnterpriseTeamCreateOrUpdateRequest{
 		Name:                      name,
-		Description:               github.Ptr(description),
 		OrganizationSelectionType: github.Ptr(orgSelection),
 		GroupID:                   github.Ptr(groupID), // Empty string clears the group
 	}
+	if description != "" {
+		req.Description = github.Ptr(description)
+	}
 
 	ctx = context.WithValue(ctx, ctxId, d.Id())
 	te, _, err := client.Enterprise.UpdateTeam(ctx, enterpriseSlug, teamSlug, req)

github/resource_github_enterprise_team_membership.go

@@ -114,6 +114,20 @@ func resourceGithubEnterpriseTeamMembershipRead(ctx context.Context, d *schema.R
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	if v, ok := d.GetOk("team_id"); ok {
+		teamID := int64(v.(int))
+		if teamID > 0 {
+			team, findErr := findEnterpriseTeamByID(ctx, client, enterpriseSlug, teamID)
+			if findErr != nil {
+				return diag.FromErr(findErr)
+			}
+			if team == nil {
+				d.SetId("")
+				return nil
+			}
+			teamSlug = team.Slug
+		}
+	}
 
 	// Get the membership using the SDK
 	user, resp, err := client.Enterprise.GetTeamMembership(ctx, enterpriseSlug, teamSlug, username)
@@ -158,6 +172,19 @@ func resourceGithubEnterpriseTeamMembershipDelete(ctx context.Context, d *schema
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	if v, ok := d.GetOk("team_id"); ok {
+		teamID := int64(v.(int))
+		if teamID > 0 {
+			team, findErr := findEnterpriseTeamByID(ctx, client, enterpriseSlug, teamID)
+			if findErr != nil {
+				return diag.FromErr(findErr)
+			}
+			if team == nil {
+				return nil
+			}
+			teamSlug = team.Slug
+		}
+	}
 
 	// Remove the user from the team using the SDK
 	resp, err := client.Enterprise.RemoveTeamMember(ctx, enterpriseSlug, teamSlug, username)

github/resource_github_enterprise_team_test.go

@@ -67,6 +67,10 @@ func TestAccGithubEnterpriseTeam(t *testing.T) {
 func TestAccGithubEnterpriseTeamOrganizations(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 
+	if testAccConf.enterpriseTestOrganization == "" {
+		t.Skip("Skipping because `ENTERPRISE_TEST_ORGANIZATION` is not set")
+	}
+
 	config1 := fmt.Sprintf(`
 		data "github_enterprise" "enterprise" {
 			slug = "%s"
@@ -83,11 +87,11 @@ func TestAccGithubEnterpriseTeamOrganizations(t *testing.T) {
 			team_slug       = github_enterprise_team.test.slug
 			organization_slugs = ["%s"]
 		}
-	`, testAccConf.enterpriseSlug, randomID, testAccConf.owner)
+	`, testAccConf.enterpriseSlug, randomID, testAccConf.enterpriseTestOrganization)
 
 	check1 := resource.ComposeAggregateTestCheckFunc(
 		resource.TestCheckResourceAttr("github_enterprise_team_organizations.test", "organization_slugs.#", "1"),
-		resource.TestCheckTypeSetElemAttr("github_enterprise_team_organizations.test", "organization_slugs.*", testAccConf.owner),
+		resource.TestCheckTypeSetElemAttr("github_enterprise_team_organizations.test", "organization_slugs.*", testAccConf.enterpriseTestOrganization),
 	)
 
 	resource.Test(t, resource.TestCase{
@@ -139,7 +143,16 @@ func TestAccGithubEnterpriseTeamOrganizations_emptyOrganizations(t *testing.T) {
 
 func TestAccGithubEnterpriseTeamMembership(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
-	username := testAccConf.username
+
+	if testAccConf.enterpriseTestUsers == "" {
+		t.Skip("Skipping because `ENTERPRISE_TEST_USERS` is not set")
+	}
+
+	users := splitCommaSeparated(testAccConf.enterpriseTestUsers)
+	if len(users) == 0 {
+		t.Skip("Skipping because `ENTERPRISE_TEST_USERS` must contain at least one username")
+	}
+	username := users[0]
 
 	config := fmt.Sprintf(`
 		data "github_enterprise" "enterprise" {

website/docs/d/enterprise_team_membership.html.markdown

@@ -1,6 +1,6 @@
 ---
 layout: "github"
-page_title: "Github: github_enterprise_team_membership"
+page_title: "GitHub: github_enterprise_team_membership"
 description: |-
   Check if a user is a member of a GitHub enterprise team.
 ---

website/docs/d/enterprise_team_organizations.html.markdown

@@ -1,6 +1,6 @@
 ---
 layout: "github"
-page_title: "Github: github_enterprise_team_organizations"
+page_title: "GitHub: github_enterprise_team_organizations"
 description: |-
   Get organizations assigned to a GitHub enterprise team.
 ---

website/docs/r/enterprise_team_membership.html.markdown

@@ -1,6 +1,6 @@
 ---
 layout: "github"
-page_title: "Github: github_enterprise_team_membership"
+page_title: "GitHub: github_enterprise_team_membership"
 description: |-
   Manages membership in a GitHub enterprise team.
 ---

website/docs/r/enterprise_team_organizations.html.markdown

@@ -1,6 +1,6 @@
 ---
 layout: "github"
-page_title: "Github: github_enterprise_team_organizations"
+page_title: "GitHub: github_enterprise_team_organizations"
 description: |-
   Manages organization assignments for a GitHub enterprise team.
 ---