[FEAT] Add support for Enterprise Teams by vmvarela · Pull Request #3008 · integrations/terraform-provider-github

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

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!

Co-authored-by: vmvarela <11040851+vmvarela@users.noreply.github.com>

vmvarela · 2026-02-04T08:27:01Z

Commit history reorganized 🔄

Hi @deiga, I've reorganized the commit history as requested. The changes are now split into logical, granular commits:

feat(enterprise-teams): add utility functions for enterprise teams
feat(enterprise-teams): add github_enterprise_team resource (+ test + docs)
feat(enterprise-teams): add github_enterprise_team_membership resource (+ docs)
feat(enterprise-teams): add github_enterprise_team_organizations resource (+ docs)
feat(enterprise-teams): add data sources for enterprise teams (4 data sources + tests + docs)
feat(enterprise-teams): register enterprise team resources and data sources
fix(enterprise-teams): update go-github import to v82

Each commit is self-contained and can be reviewed independently. Going forward, I'll create new commits for any review feedback instead of amending.

Sorry for the confusion with the previous workflow - I appreciate your patience and feedback on improving my contribution process.

Add util_enterprise_teams.go with helper functions for managing enterprise team resources.

Manages GitHub Enterprise team entities (create, read, update, delete). Includes: - Resource implementation with CRUD operations - Acceptance tests - Documentation

Manages membership of users in GitHub Enterprise teams. Includes: - Resource implementation - Documentation

…urce Manages organization assignments to GitHub Enterprise teams. Includes: - Resource implementation - Documentation

Add data sources: - github_enterprise_team: retrieve a team by slug or ID - github_enterprise_teams: list all teams in an enterprise - github_enterprise_team_membership: get team members - github_enterprise_team_organizations: get team organizations Includes: - Data source implementations - Acceptance tests - Documentation

…ources - Register 3 resources in provider.go: - github_enterprise_team - github_enterprise_team_membership - github_enterprise_team_organizations - Register 4 data sources in provider.go: - github_enterprise_team - github_enterprise_teams - github_enterprise_team_membership - github_enterprise_team_organizations

Update import paths from go-github/v81 to go-github/v82 to match the current version in upstream/main.

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

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

Copilot AI mentioned this pull request Jan 16, 2026

Review unresolved PR comments status for upstream PR #3008 vmvarela/terraform-provider-github#7

Closed

5 tasks

Copilot AI added a commit to vmvarela/terraform-provider-github that referenced this pull request Jan 16, 2026

Add comprehensive PR integrations#3008 unresolved comments status report

7291f05

Co-authored-by: vmvarela <11040851+vmvarela@users.noreply.github.com>

vmvarela force-pushed the enterprise-teams branch 2 times, most recently from 1bb8034 to 4d9a880 Compare January 19, 2026 05:13

vmvarela force-pushed the enterprise-teams branch from 4d9a880 to 857e188 Compare January 20, 2026 18:58

vmvarela requested a review from deiga January 20, 2026 19:13

vmvarela force-pushed the enterprise-teams branch 3 times, most recently from 110512d to d1bc71d Compare January 27, 2026 18:10

vmvarela force-pushed the enterprise-teams branch 4 times, most recently from c9670c8 to 855d9bb Compare February 4, 2026 08:25

github-actions bot added 7 commits February 5, 2026 07:06

feat(enterprise-teams): add utility functions for enterprise teams

16d5807

Add util_enterprise_teams.go with helper functions for managing enterprise team resources.

feat(enterprise-teams): add github_enterprise_team resource

b136e8b

Manages GitHub Enterprise team entities (create, read, update, delete). Includes: - Resource implementation with CRUD operations - Acceptance tests - Documentation

feat(enterprise-teams): add github_enterprise_team_membership resource

4d49861

Manages membership of users in GitHub Enterprise teams. Includes: - Resource implementation - Documentation

feat(enterprise-teams): add github_enterprise_team_organizations reso…

774dc52

…urce Manages organization assignments to GitHub Enterprise teams. Includes: - Resource implementation - Documentation

fix(enterprise-teams): update go-github import to v82

3d9ae09

Update import paths from go-github/v81 to go-github/v82 to match the current version in upstream/main.

vmvarela force-pushed the enterprise-teams branch from 855d9bb to 3d9ae09 Compare February 5, 2026 06:06

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!

vmvarela commented Feb 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants