Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e66aa9e
feat(enterprise-teams): add utility functions for enterprise teams
github-actions[bot] Feb 4, 2026
8ceb8a1
feat(enterprise-teams): add github_enterprise_team resource
github-actions[bot] Feb 4, 2026
4a7b62e
feat(enterprise-teams): add github_enterprise_team_membership resource
github-actions[bot] Feb 4, 2026
c4db899
feat(enterprise-teams): add github_enterprise_team_organizations reso…
github-actions[bot] Feb 4, 2026
fe94f98
feat(enterprise-teams): add data sources for enterprise teams
github-actions[bot] Feb 4, 2026
d1d46f2
feat(enterprise-teams): register enterprise team resources and data s…
github-actions[bot] Feb 4, 2026
9a228f2
fix(enterprise-teams): update go-github import to v82
github-actions[bot] Feb 4, 2026
2d9667d
test(enterprise-teams): migrate tests to terraform-plugin-testing and…
vmvarela Feb 17, 2026
4a73edf
fix(enterprise-teams): address review findings
vmvarela Feb 18, 2026
208e6ac
fix(enterprise-teams): update go-github import from v82 to v83
vmvarela Feb 23, 2026
5f5a0ab
fix(enterprise-teams): authoritative Create/Delete for team organizat…
vmvarela Feb 24, 2026
4e775a1
fix: update go-github import to v84 after rebase
vmvarela Mar 18, 2026
3c0288d
fix(enterprise-teams): replace "Github" with "GitHub" in page_title
vmvarela Mar 20, 2026
4e5d0ed
fix(enterprise-teams): fix incomplete error handling in listAllEnterp…
vmvarela Mar 20, 2026
dea4b6c
fix(enterprise-teams): replace "Github" with "GitHub" in page_title (…
vmvarela Mar 20, 2026
a8653b6
fix(enterprise-teams): fix incomplete error handling in listAllEnterp…
vmvarela Mar 20, 2026
e96b6f7
fix(enterprise-teams): move input validation to schema ValidateDiagFunc
vmvarela Mar 20, 2026
95a07c1
fix(enterprise-teams): fix grammar in resource Description fields
vmvarela Mar 20, 2026
8cf0acf
fix(enterprise-teams): use read-only language in data source Descript…
vmvarela Mar 20, 2026
da572ed
fix(teams): omit group_id from Create/Update payload when empty
vmvarela Mar 23, 2026
ca4ea5e
chore(lint): exclude modernize newexpr rule for Ptr calls
vmvarela Mar 23, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ linters:
linters:
- unparam
text: always receives
- linters:
- modernize
text: "newexpr: call of Ptr"
- linters:
- staticcheck
text: "SA1019.*ByID.*deprecated"
Expand Down
135 changes: 135 additions & 0 deletions github/data_source_github_enterprise_team.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
package github

import (
"context"
"strconv"
"strings"

"github.com/google/go-github/v84/github"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceGithubEnterpriseTeam() *schema.Resource {
return &schema.Resource{
Description: "Gets information about a GitHub enterprise team.",
ReadContext: dataSourceGithubEnterpriseTeamRead,

Schema: map[string]*schema.Schema{
"enterprise_slug": {
Type: schema.TypeString,
Required: true,
Description: "The slug of the enterprise.",
ValidateDiagFunc: validation.ToDiagFunc(validation.All(validation.StringIsNotWhiteSpace, validation.StringIsNotEmpty)),
},
"slug": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ExactlyOneOf: []string{"slug", "team_id"},
Description: "The slug of the enterprise team.",
ValidateDiagFunc: validation.ToDiagFunc(validation.All(validation.StringIsNotWhiteSpace, validation.StringIsNotEmpty)),
},
"team_id": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ExactlyOneOf: []string{"slug", "team_id"},
Description: "The numeric ID of the enterprise team.",
ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(1)),
},
"name": {
Type: schema.TypeString,
Computed: true,
Description: "The name of the enterprise team.",
},
"description": {
Type: schema.TypeString,
Computed: true,
Description: "A description of the enterprise team.",
},
"organization_selection_type": {
Type: schema.TypeString,
Computed: true,
Description: "Specifies which organizations in the enterprise should have access to this team.",
},
"group_id": {
Type: schema.TypeString,
Computed: true,
Description: "The ID of the IdP group to assign team membership with.",
},
},
}
}

func dataSourceGithubEnterpriseTeamRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*Owner).v3client
enterpriseSlug := strings.TrimSpace(d.Get("enterprise_slug").(string))

var te *github.EnterpriseTeam
if v, ok := d.GetOk("team_id"); ok {
teamID := int64(v.(int))
found, err := findEnterpriseTeamByID(ctx, client, enterpriseSlug, teamID)
if err != nil {
return diag.FromErr(err)
}
if found == nil {
return diag.Errorf("could not find enterprise team %d in enterprise %s", teamID, enterpriseSlug)
}
te = found
}

if te == nil {
teamSlug := strings.TrimSpace(d.Get("slug").(string))
found, _, err := client.Enterprise.GetTeam(ctx, enterpriseSlug, teamSlug)
if err != nil {
return diag.FromErr(err)
}
te = found
}

d.SetId(buildTwoPartID(enterpriseSlug, strconv.FormatInt(te.ID, 10)))
if err := d.Set("enterprise_slug", enterpriseSlug); err != nil {
return diag.FromErr(err)
}
if err := d.Set("slug", te.Slug); err != nil {
return diag.FromErr(err)
}
if err := d.Set("team_id", int(te.ID)); err != nil {
return diag.FromErr(err)
}
if err := d.Set("name", te.Name); err != nil {
return diag.FromErr(err)
}
if te.Description != nil {
if err := d.Set("description", *te.Description); err != nil {
return diag.FromErr(err)
}
} else {
if err := d.Set("description", ""); err != nil {
return diag.FromErr(err)
}
}
orgSel := ""
if te.OrganizationSelectionType != nil {
orgSel = *te.OrganizationSelectionType
}
if orgSel == "" {
orgSel = "disabled"
}
if err := d.Set("organization_selection_type", orgSel); err != nil {
return diag.FromErr(err)
}
if te.GroupID != "" {
if err := d.Set("group_id", te.GroupID); err != nil {
return diag.FromErr(err)
}
} else {
if err := d.Set("group_id", ""); err != nil {
return diag.FromErr(err)
}
}

return nil
}
74 changes: 74 additions & 0 deletions github/data_source_github_enterprise_team_membership.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package github

import (
"context"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceGithubEnterpriseTeamMembership() *schema.Resource {
return &schema.Resource{
Description: "Retrieves information about a user's membership in a GitHub enterprise team.",
ReadContext: dataSourceGithubEnterpriseTeamMembershipRead,

Schema: map[string]*schema.Schema{
"enterprise_slug": {
Type: schema.TypeString,
Required: true,
Description: "The slug of the enterprise.",
ValidateDiagFunc: validation.ToDiagFunc(validation.All(validation.StringIsNotWhiteSpace, validation.StringIsNotEmpty)),
},
"team_slug": {
Type: schema.TypeString,
Required: true,
Description: "The slug of the enterprise team.",
ValidateDiagFunc: validation.ToDiagFunc(validation.All(validation.StringIsNotWhiteSpace, validation.StringIsNotEmpty)),
},
"username": {
Type: schema.TypeString,
Required: true,
Description: "The username of the user.",
ValidateDiagFunc: validation.ToDiagFunc(validation.All(validation.StringIsNotWhiteSpace, validation.StringIsNotEmpty)),
},
"user_id": {
Type: schema.TypeInt,
Computed: true,
Description: "The ID of the user.",
},
},
}
}

func dataSourceGithubEnterpriseTeamMembershipRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*Owner).v3client
enterpriseSlug := strings.TrimSpace(d.Get("enterprise_slug").(string))
teamSlug := strings.TrimSpace(d.Get("team_slug").(string))
username := strings.TrimSpace(d.Get("username").(string))

// Get the membership using the SDK
user, _, err := client.Enterprise.GetTeamMembership(ctx, enterpriseSlug, teamSlug, username)
if err != nil {
return diag.FromErr(err)
}

d.SetId(buildEnterpriseTeamMembershipID(enterpriseSlug, teamSlug, username))
if err := d.Set("enterprise_slug", enterpriseSlug); err != nil {
return diag.FromErr(err)
}
if err := d.Set("team_slug", teamSlug); err != nil {
return diag.FromErr(err)
}
if err := d.Set("username", username); err != nil {
return diag.FromErr(err)
}
if user != nil && user.ID != nil {
if err := d.Set("user_id", int(*user.ID)); err != nil {
return diag.FromErr(err)
}
}

return nil
}
68 changes: 68 additions & 0 deletions github/data_source_github_enterprise_team_organizations.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package github

import (
"context"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

func dataSourceGithubEnterpriseTeamOrganizations() *schema.Resource {
return &schema.Resource{
Description: "Retrieves information about organizations assigned to a GitHub enterprise team.",
ReadContext: dataSourceGithubEnterpriseTeamOrganizationsRead,

Schema: map[string]*schema.Schema{
"enterprise_slug": {
Type: schema.TypeString,
Required: true,
Description: "The slug of the enterprise.",
ValidateDiagFunc: validation.ToDiagFunc(validation.All(validation.StringIsNotWhiteSpace, validation.StringIsNotEmpty)),
},
"team_slug": {
Type: schema.TypeString,
Required: true,
Description: "The slug of the enterprise team.",
ValidateDiagFunc: validation.ToDiagFunc(validation.All(validation.StringIsNotWhiteSpace, validation.StringIsNotEmpty)),
},
"organization_slugs": {
Type: schema.TypeSet,
Computed: true,
Description: "Set of organization slugs that the enterprise team is assigned to.",
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},
},
}
}

func dataSourceGithubEnterpriseTeamOrganizationsRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*Owner).v3client
enterpriseSlug := strings.TrimSpace(d.Get("enterprise_slug").(string))
teamSlug := strings.TrimSpace(d.Get("team_slug").(string))
orgs, err := listAllEnterpriseTeamOrganizations(ctx, client, enterpriseSlug, teamSlug)
if err != nil {
return diag.FromErr(err)
}

slugs := make([]string, 0, len(orgs))
for _, org := range orgs {
if org.Login != nil && *org.Login != "" {
slugs = append(slugs, *org.Login)
}
}

d.SetId(buildEnterpriseTeamOrganizationsID(enterpriseSlug, teamSlug))
if err := d.Set("enterprise_slug", enterpriseSlug); err != nil {
return diag.FromErr(err)
}
if err := d.Set("team_slug", teamSlug); err != nil {
return diag.FromErr(err)
}
if err := d.Set("organization_slugs", slugs); err != nil {
return diag.FromErr(err)
}
return nil
}
Loading