Skip to content
This repository was archived by the owner on Apr 15, 2026. It is now read-only.

Commit 2c29d16

Browse files
committed
fix(teams): omit group_id from Create/Update payload when empty
Closes #56
1 parent 3daa680 commit 2c29d16

3 files changed

Lines changed: 26 additions & 10 deletions

File tree

github/provider.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ func Provider() *schema.Provider {
213213
"github_user_invitation_accepter": resourceGithubUserInvitationAccepter(),
214214
"github_user_ssh_key": resourceGithubUserSshKey(),
215215
"github_enterprise_organization": resourceGithubEnterpriseOrganization(),
216+
"github_enterprise_team": resourceGithubEnterpriseTeam(),
217+
"github_enterprise_team_membership": resourceGithubEnterpriseTeamMembership(),
218+
"github_enterprise_team_organizations": resourceGithubEnterpriseTeamOrganizations(),
216219
"github_enterprise_actions_runner_group": resourceGithubActionsEnterpriseRunnerGroup(),
217220
"github_enterprise_actions_workflow_permissions": resourceGithubEnterpriseActionsWorkflowPermissions(),
218221
"github_actions_organization_workflow_permissions": resourceGithubActionsOrganizationWorkflowPermissions(),
@@ -294,10 +297,10 @@ func Provider() *schema.Provider {
294297
"github_user_external_identity": dataSourceGithubUserExternalIdentity(),
295298
"github_users": dataSourceGithubUsers(),
296299
"github_enterprise": dataSourceGithubEnterprise(),
297-
"github_enterprise_scim_groups": dataSourceGithubEnterpriseSCIMGroups(),
298-
"github_enterprise_scim_group": dataSourceGithubEnterpriseSCIMGroup(),
299-
"github_enterprise_scim_users": dataSourceGithubEnterpriseSCIMUsers(),
300-
"github_enterprise_scim_user": dataSourceGithubEnterpriseSCIMUser(),
300+
"github_enterprise_team": dataSourceGithubEnterpriseTeam(),
301+
"github_enterprise_teams": dataSourceGithubEnterpriseTeams(),
302+
"github_enterprise_team_membership": dataSourceGithubEnterpriseTeamMembership(),
303+
"github_enterprise_team_organizations": dataSourceGithubEnterpriseTeamOrganizations(),
301304
"github_repository_environment_deployment_policies": dataSourceGithubRepositoryEnvironmentDeploymentPolicies(),
302305
},
303306
}

github/resource_github_enterprise_team.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,13 @@ func resourceGithubEnterpriseTeamCreate(ctx context.Context, d *schema.ResourceD
8888
req := github.EnterpriseTeamCreateOrUpdateRequest{
8989
Name: name,
9090
OrganizationSelectionType: github.Ptr(orgSelection),
91-
GroupID: github.Ptr(groupID), // Empty string is valid for no group
9291
}
9392
if description != "" {
9493
req.Description = github.Ptr(description)
9594
}
95+
if groupID != "" {
96+
req.GroupID = github.Ptr(groupID)
97+
}
9698

9799
ctx = context.WithValue(ctx, ctxId, d.Id())
98100
te, _, err := client.Enterprise.CreateTeam(ctx, enterpriseSlug, req)
@@ -210,11 +212,13 @@ func resourceGithubEnterpriseTeamUpdate(ctx context.Context, d *schema.ResourceD
210212
req := github.EnterpriseTeamCreateOrUpdateRequest{
211213
Name: name,
212214
OrganizationSelectionType: github.Ptr(orgSelection),
213-
GroupID: github.Ptr(groupID), // Empty string clears the group
214215
}
215216
if description != "" {
216217
req.Description = github.Ptr(description)
217218
}
219+
if groupID != "" {
220+
req.GroupID = github.Ptr(groupID)
221+
}
218222

219223
ctx = context.WithValue(ctx, ctxId, d.Id())
220224
te, _, err := client.Enterprise.UpdateTeam(ctx, enterpriseSlug, teamSlug, req)

website/github.erb

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,16 @@
101101
<a href="/docs/providers/github/d/enterprise.html">github_enterprise</a>
102102
</li>
103103
<li>
104-
<a href="/docs/providers/github/d/enterprise_scim_group.html">github_enterprise_scim_group</a>
104+
<a href="/docs/providers/github/d/enterprise_team.html">github_enterprise_team</a>
105105
</li>
106106
<li>
107-
<a href="/docs/providers/github/d/enterprise_scim_groups.html">github_enterprise_scim_groups</a>
107+
<a href="/docs/providers/github/d/enterprise_team_membership.html">github_enterprise_team_membership</a>
108108
</li>
109109
<li>
110-
<a href="/docs/providers/github/d/enterprise_scim_user.html">github_enterprise_scim_user</a>
110+
<a href="/docs/providers/github/d/enterprise_team_organizations.html">github_enterprise_team_organizations</a>
111111
</li>
112112
<li>
113-
<a href="/docs/providers/github/d/enterprise_scim_users.html">github_enterprise_scim_users</a>
113+
<a href="/docs/providers/github/d/enterprise_teams.html">github_enterprise_teams</a>
114114
</li>
115115
<li>
116116
<a href="/docs/providers/github/d/external_groups.html">github_external_groups</a>
@@ -325,6 +325,15 @@
325325
<li>
326326
<a href="/docs/providers/github/r/enterprise_security_analysis_settings.html">github_enterprise_security_analysis_settings</a>
327327
</li>
328+
<li>
329+
<a href="/docs/providers/github/r/enterprise_team.html">github_enterprise_team</a>
330+
</li>
331+
<li>
332+
<a href="/docs/providers/github/r/enterprise_team_membership.html">github_enterprise_team_membership</a>
333+
</li>
334+
<li>
335+
<a href="/docs/providers/github/r/enterprise_team_organizations.html">github_enterprise_team_organizations</a>
336+
</li>
328337
<li>
329338
<a href="/docs/providers/github/r/issue.html">github_issue</a>
330339
</li>

0 commit comments

Comments
 (0)