[FEAT] Add support for Enterprise Teams #3008

vmvarela · 2025-12-17T20:06:22Z

Add support for managing GitHub Enterprise Teams (enterprise-level teams):

Resources:

github_enterprise_team: create/update/delete enterprise teams
github_enterprise_team_membership: manage team members
github_enterprise_team_organizations: assign teams to organizations

Data sources:

github_enterprise_team: lookup by slug or ID
github_enterprise_teams: list all enterprise teams
github_enterprise_team_membership: check user membership
github_enterprise_team_organizations: list assigned orgs

Note: These endpoints require GitHub Enterprise Cloud with a classic PAT that has enterprise admin permissions.

Resolves #3001

Before the change?

No support for enterprise teams

After the change?

Added support for managing enterprise teams, memberships and assingments.

Pull request checklist

Schema migrations have been created if needed (example)
Tests for the changes have been added (for bug fixes / features)
Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

Yes
No

github-actions · 2025-12-17T20:06:32Z

👋 Hi! Thank you for this contribution! Just to let you know, our GitHub SDK team does a round of issue and PR reviews twice a week, every Monday and Friday! We have a process in place for prioritizing and responding to your input. Because you are a part of this community please feel free to comment, add to, or pick up any issues/PRs that are labeled with Status: Up for grabs. You & others like you are the reason all of this works! So thank you & happy coding! 🚀

deiga · 2025-12-18T05:24:45Z

Hey @vmvarela 👋

Thank you for your contribution!

We've started migration towards Context-aware provider functions, could you update the CRUD methods to those? So changing Read: to ReadContext: etc.

deiga

Thanks for your contribution!

The Enteprise Teams functionality isn't yet published in the go-github SDK, but it will most likely be coming in v81. I would suggest to refactor this PR to use the upcoming release of the SDK instead of making our own API interactions.

We most likely won't get to merging this before we release v7 of the provider, where we'll hopefully quickly get to latest SDK version.

A few other notes:

Try to leverage ValidateDiagFunc in the Schema as much as possible, instead of failing in the CRUD provider functions on missing information. For more complex validations using a CustomizeDiff function is a good option as well. That will allow the user to get errors on plan instead of apply
Please add top-level Description fields to all Schemata and ensure that all Description fields contain same information as the docs pages. We'll be moving to generated docs pages in the near future

github/data_source_github_enterprise_team.go

github/data_source_github_enterprise_team_membership.go

vmvarela · 2025-12-28T11:36:00Z

Thanks for your contribution!

The Enteprise Teams functionality isn't yet published in the go-github SDK, but it will most likely be coming in v81. I would suggest to refactor this PR to use the upcoming release of the SDK instead of making our own API interactions.

We most likely won't get to merging this before we release v7 of the provider, where we'll hopefully quickly get to latest SDK version.

A few other notes:

Try to leverage ValidateDiagFunc in the Schema as much as possible, instead of failing in the CRUD provider functions on missing information. For more complex validations using a CustomizeDiff function is a good option as well. That will allow the user to get errors on plan instead of apply

Please add top-level Description fields to all Schemata and ensure that all Description fields contain same information as the docs pages. We'll be moving to generated docs pages in the near future

All It is completed @deiga

Copilot

Pull request overview

This pull request adds comprehensive support for managing GitHub Enterprise Teams at the enterprise level, enabling users to create and manage teams, memberships, and organization assignments through Terraform.

Key Changes:

Implementation of 3 new resources for managing enterprise teams, team memberships, and organization assignments
Addition of 4 new data sources for querying enterprise team information
Custom API client utilities to handle enterprise teams endpoints (currently in preview with API version 2022-11-28)

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 14 comments.

Show a summary per file

File	Description
`github/util_enterprise_teams.go`	Core utility functions for interacting with GitHub's Enterprise Teams API, including CRUD operations and custom request handling for the preview API
`github/resource_github_enterprise_team.go`	Resource implementation for creating/updating/deleting enterprise teams with support for organization selection and IdP group mapping
`github/resource_github_enterprise_team_membership.go`	Resource for managing individual user memberships within enterprise teams
`github/resource_github_enterprise_team_organizations.go`	Resource for assigning enterprise teams to specific organizations within the enterprise
`github/data_source_github_enterprise_team.go`	Data source for retrieving enterprise team information by slug or ID
`github/data_source_github_enterprise_teams.go`	Data source for listing all enterprise teams in an enterprise
`github/data_source_github_enterprise_team_membership.go`	Data source for checking user membership status in enterprise teams
`github/data_source_github_enterprise_team_organizations.go`	Data source for listing organizations assigned to an enterprise team
`github/provider.go`	Provider registration for all new resources and data sources
`github/resource_github_enterprise_team_test.go`	Acceptance tests for enterprise team resources
`github/data_source_github_enterprise_team_test.go`	Acceptance tests for enterprise team data sources
`github/data_source_github_enterprise_teams_test.go`	Acceptance tests for enterprise teams listing data source
`website/docs/r/enterprise_team.html.markdown`	Documentation for the enterprise team resource
`website/docs/r/enterprise_team_membership.html.markdown`	Documentation for the enterprise team membership resource
`website/docs/r/enterprise_team_organizations.html.markdown`	Documentation for the enterprise team organizations resource
`website/docs/d/enterprise_team.html.markdown`	Documentation for the enterprise team data source
`website/docs/d/enterprise_teams.html.markdown`	Documentation for the enterprise teams listing data source
`website/docs/d/enterprise_team_membership.html.markdown`	Documentation for the enterprise team membership data source
`website/docs/d/enterprise_team_organizations.html.markdown`	Documentation for the enterprise team organizations data source

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

website/docs/r/enterprise_team_membership.html.markdown

website/docs/r/enterprise_team.html.markdown

website/docs/d/enterprise_teams.html.markdown

website/docs/d/enterprise_team_membership.html.markdown

website/docs/d/enterprise_team_organizations.html.markdown

github/util_enterprise_teams.go

github/data_source_github_enterprise_team.go

github/resource_github_enterprise_team.go

github/resource_github_enterprise_team_membership.go

deiga

Half-way though. Looking good!

github/data_source_github_enterprise_team.go

github/data_source_github_enterprise_team_organizations.go

github/data_source_github_enterprise_team_test.go

github/data_source_github_enterprise_teams.go

github/data_source_github_enterprise_teams_test.go

vmvarela · 2026-01-09T19:52:08Z

Half-way though. Looking good!

Thanks for your support, @deiga .

github/resource_github_enterprise_team_test.go

github/resource_github_enterprise_team_organizations.go

github/resource_github_enterprise_team.go

Add support for managing GitHub Enterprise Teams (enterprise-level teams): Resources: - github_enterprise_team: create/update/delete enterprise teams - github_enterprise_team_membership: manage team members - github_enterprise_team_organizations: assign teams to organizations Data sources: - github_enterprise_team: lookup by slug or ID - github_enterprise_teams: list all enterprise teams - github_enterprise_team_membership: check user membership - github_enterprise_team_organizations: list assigned orgs Note: These endpoints require GitHub Enterprise Cloud with a classic PAT that has enterprise admin permissions.

- Add ValidateDiagFunc to required schema fields for early validation in plan phase - Add validation import to resource_github_enterprise_team_membership - This allows users to get validation errors during plan instead of apply

- Add Description field to github_enterprise_team resource schema - Add Description field to github_enterprise_team_membership resource schema - Descriptions match the documentation pages and will be used for generated docs

- try EnterpriseService.GetTeam via reflection to stay forward-compatible with upcoming SDK release - keep REST fallback when SDK method is missing - no behavior change; builds with current v67 while ready for v81

- move required field emptiness checks into ValidateDiagFunc - remove redundant runtime empty checks in Read - keep behavior unchanged, but surface errors during plan

…rg data sources/resources - add top-level Description to enterprise team org data source and resource - add ValidateDiagFunc to required fields and drop runtime empty checks - add Description and validation to enterprise teams listing data source

- Replace custom API implementations with go-github v81 SDK functions - Use EnterpriseService methods: CreateTeam, GetTeam, UpdateTeam, DeleteTeam, ListTeams, ListAssignments, AddMultipleAssignments, RemoveMultipleAssignments, GetTeamMembership, AddTeamMember, RemoveTeamMember - Change ID separator from '/' to ':' to reuse existing util.go functions - Move single-use helper functions to their respective files - Simplify util_enterprise_teams.go to only findEnterpriseTeamByID - Update test files to use testAccConf patterns

Co-authored-by: Copilot <[email protected]>

- Add top-level Description field to data source - Remove redundant ConflictsWith from team_id (ExactlyOneOf on slug is sufficient)

@deiga

…ality Address code review feedback from @deiga and improve enterprise team resources. ## Changes ### Schema improvements - Separate enterprise_team field into team_slug and team_id with ExactlyOneOf validation for membership and organizations resources - Align data source naming with resources (enterprise_team → team_slug) - Fix ExactlyOneOf in data_source_github_enterprise_team (must include both fields) - Add validation for slug field in data source ### Code quality - Remove Read-after-Create/Update pattern, set computed fields directly from API response - Remove unused findEnterpriseTeamBySlugOrID function - Move shared helpers to util_enterprise_teams.go - Use "/" as ID separator instead of ":" (team slugs contain ":") - Handle errors properly in Import function ### Bug fixes - Add 404 handling in Delete for membership and organizations resources - Fix group_id clearing (now sends empty string to API) - Preserve team_id in state when user configures via team_id - Fix Read drift when user configures team_id instead of team_slug ### Testing - Eliminate redundant testCase wrapper pattern in tests - Add MinItems validation test for organization_slugs - All 8 acceptance tests passing ### Documentation - Update docs for new team_slug/team_id schema

vmvarela · 2026-01-10T11:23:52Z

Hi @deiga, thanks for the review! I've addressed your feedback and made a comprehensive refactor:

Separated enterprise_team into team_slug and team_id with ExactlyOneOf validation
Removed the Read-after-Create/Update pattern
Moved shared helpers to util_enterprise_teams.go
Added 404 handling in Delete operations
Fixed group_id clearing (now properly sends empty string to API)
Changed ID separator from : to / since team slugs contain :
Aligned data source naming with resources (enterprise_team → team_slug)
All 8 acceptance tests passing

Ready for another look when you have time!

vmvarela force-pushed the enterprise-teams branch from 4e6cb30 to 17ba121 Compare December 18, 2025 17:40

vmvarela marked this pull request as draft December 18, 2025 17:41

vmvarela marked this pull request as ready for review December 18, 2025 17:54

vmvarela force-pushed the enterprise-teams branch from b070f07 to a586037 Compare December 19, 2025 17:20

deiga reviewed Dec 20, 2025

View reviewed changes

vmvarela closed this Dec 21, 2025

vmvarela force-pushed the enterprise-teams branch from 2997703 to 9fc330c Compare December 21, 2025 07:13

vmvarela reopened this Dec 22, 2025

vmvarela force-pushed the enterprise-teams branch from 35c1022 to c830136 Compare December 22, 2025 06:31

Copilot AI review requested due to automatic review settings January 6, 2026 18:14

vmvarela force-pushed the enterprise-teams branch from c830136 to 82f05fe Compare January 6, 2026 18:14

Copilot started reviewing on behalf of vmvarela January 6, 2026 18:15 View session

Copilot AI reviewed Jan 6, 2026

View reviewed changes

vmvarela force-pushed the enterprise-teams branch 2 times, most recently from 1443050 to e8c1079 Compare January 8, 2026 16:35

vmvarela requested a review from deiga January 8, 2026 16:39

vmvarela changed the title ~~feat: Add support for Enterprise Teams~~ [FEAT] Add support for Enterprise Teams Jan 8, 2026

deiga reviewed Jan 8, 2026

View reviewed changes

vmvarela force-pushed the enterprise-teams branch from 746f7b0 to 3334713 Compare January 9, 2026 09:28

deiga suggested changes Jan 9, 2026

View reviewed changes

github-actions bot added 6 commits January 10, 2026 12:10

feat: migrate enterprise teams to context-aware CRUD

cdb5e93

fix: linting

f81c8ce

chore: add schema validations

a96dab4

- Add ValidateDiagFunc to required schema fields for early validation in plan phase - Add validation import to resource_github_enterprise_team_membership - This allows users to get validation errors during plan instead of apply

refactor: prefer go-github enterprise team SDK when available

0a39091

- try EnterpriseService.GetTeam via reflection to stay forward-compatible with upcoming SDK release - keep REST fallback when SDK method is missing - no behavior change; builds with current v67 while ready for v81

github-actions bot and others added 18 commits January 10, 2026 12:10

docs: validate enterprise team membership fields at plan time

00828cb

- move required field emptiness checks into ValidateDiagFunc - remove redundant runtime empty checks in Read - keep behavior unchanged, but surface errors during plan

docs: add description to enterprise team membership data source

469df33

Apply suggestion from @Copilot

8aa784f

Co-authored-by: Copilot <[email protected]>

Apply suggestion from @Copilot

70b47e0

Co-authored-by: Copilot <[email protected]>

Apply suggestion from @Copilot

6993d4b

Co-authored-by: Copilot <[email protected]>

Apply suggestion from @Copilot

fa90600

Co-authored-by: Copilot <[email protected]>

Apply suggestion from @Copilot

cf6682f

Co-authored-by: Copilot <[email protected]>

Apply suggestion from @Copilot

80f7bb4

Co-authored-by: Copilot <[email protected]>

Apply suggestion from @Copilot

f6c7cf0

Co-authored-by: Copilot <[email protected]>

Apply suggestion from @Copilot

c6fd72a

Co-authored-by: Copilot <[email protected]>

fix: address PR review comments for enterprise team data source

5fc8bfb

- Add top-level Description field to data source - Remove redundant ConflictsWith from team_id (ExactlyOneOf on slug is sufficient)

fix: use diag.Errorf instead of diag.FromErr(fmt.Errorf)

033b274

fix: use diag.Errorf for slug validation error

f55f0f4

refactor: use constants for field names and testResourcePrefix in tests

b94a53c

test: use testResourcePrefix in enterprise teams data source test

4103e9d

vmvarela force-pushed the enterprise-teams branch from 9eddee1 to 9969a2f Compare January 10, 2026 11:10

[FEAT] Add support for Enterprise Teams #3008

Are you sure you want to change the base?

[FEAT] Add support for Enterprise Teams #3008

Uh oh!

Conversation

vmvarela commented Dec 17, 2025

Before the change?

After the change?

Pull request checklist

Does this introduce a breaking change?

Uh oh!

github-actions bot commented Dec 17, 2025

Uh oh!

deiga commented Dec 18, 2025

Uh oh!

deiga left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vmvarela commented Dec 28, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

deiga left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vmvarela commented Jan 9, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vmvarela commented Jan 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants