Skip to content

Commit 1e348f6

Browse files
nickfloydnickfloyd
authored
Merge branch 'main' into oidc-subject-claim-customization-template
2 parents 6e2d470 + f60e556 commit 1e348f6

File tree

7 files changed

+620
-0
lines changed

7 files changed

+620
-0
lines changed

‎github/data_source_github_enterprise.go‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package github
2+
3+
import (
4+
"context"
5+
"fmt"
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
7+
"github.com/shurcooL/githubv4"
8+
)
9+
10+
func dataSourceGithubEnterprise() *schema.Resource {
11+
return &schema.Resource{
12+
Read: dataSourceGithubEnterpriseRead,
13+
Schema: map[string]*schema.Schema{
14+
"slug": {
15+
Type: schema.TypeString,
16+
Required: true,
17+
},
18+
"name": {
19+
Type: schema.TypeString,
20+
Computed: true,
21+
},
22+
"description": {
23+
Type: schema.TypeString,
24+
Computed: true,
25+
},
26+
"created_at": {
27+
Type: schema.TypeString,
28+
Computed: true,
29+
},
30+
"url": {
31+
Type: schema.TypeString,
32+
Computed: true,
33+
},
34+
},
35+
}
36+
}
37+
38+
func dataSourceGithubEnterpriseRead(data *schema.ResourceData, meta interface{}) error {
39+
var query struct {
40+
Enterprise struct {
41+
ID githubv4.String
42+
Name githubv4.String
43+
Description githubv4.String
44+
CreatedAt githubv4.String
45+
Url githubv4.String
46+
} `graphql:"enterprise(slug: $slug)"`
47+
}
48+
49+
slug := data.Get("slug").(string)
50+
client := meta.(*Owner).v4client
51+
variables := map[string]interface{}{
52+
"slug": githubv4.String(slug),
53+
}
54+
err := client.Query(context.Background(), &query, variables)
55+
if err != nil {
56+
return err
57+
}
58+
if query.Enterprise.ID == "" {
59+
return fmt.Errorf("could not find enterprise %v", slug)
60+
}
61+
data.SetId(string(query.Enterprise.ID))
62+
data.Set("name", query.Enterprise.Name)
63+
data.Set("description", query.Enterprise.Description)
64+
data.Set("created_at", query.Enterprise.CreatedAt)
65+
data.Set("url", query.Enterprise.Url)
66+
67+
return nil
68+
}

‎github/data_source_github_enterprise_test.go‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
package github
2+
3+
import (
4+
"fmt"
5+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
6+
"testing"
7+
)
8+
9+
func TestAccGithubEnterpriseDataSource(t *testing.T) {
10+
if isEnterprise != "true" {
11+
t.Skip("Skipping because `ENTERPRISE_ACCOUNT` is not set or set to false")
12+
}
13+
14+
if testEnterprise == "" {
15+
t.Skip("Skipping because `ENTERPRISE_SLUG` is not set")
16+
}
17+
18+
config := fmt.Sprintf(`
19+
data "github_enterprise" "test" {
20+
slug = "%s"
21+
}
22+
`,
23+
testEnterprise,
24+
)
25+
26+
check := resource.ComposeTestCheckFunc(
27+
resource.TestCheckResourceAttr("data.github_enterprise.test", "slug", testEnterprise),
28+
resource.TestCheckResourceAttrSet("data.github_enterprise.test", "name"),
29+
resource.TestCheckResourceAttrSet("data.github_enterprise.test", "created_at"),
30+
resource.TestCheckResourceAttrSet("data.github_enterprise.test", "url"),
31+
)
32+
33+
resource.Test(
34+
t,
35+
resource.TestCase{
36+
PreCheck: func() { skipUnlessMode(t, enterprise) },
37+
Providers: testAccProviders,
38+
Steps: []resource.TestStep{
39+
{
40+
Config: config,
41+
Check: check,
42+
},
43+
},
44+
},
45+
)
46+
}

‎github/provider.go‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,56 @@ func Provider() terraform.ResourceProvider {
140140
"github_user_gpg_key": resourceGithubUserGpgKey(),
141141
"github_user_invitation_accepter": resourceGithubUserInvitationAccepter(),
142142
"github_user_ssh_key": resourceGithubUserSshKey(),
143+
"github_actions_environment_secret": resourceGithubActionsEnvironmentSecret(),
144+
"github_actions_organization_permissions": resourceGithubActionsOrganizationPermissions(),
145+
"github_actions_organization_secret": resourceGithubActionsOrganizationSecret(),
146+
"github_actions_organization_secret_repositories": resourceGithubActionsOrganizationSecretRepositories(),
147+
"github_actions_repository_access_level": resourceGithubActionsRepositoryAccessLevel(),
148+
"github_actions_repository_permissions": resourceGithubActionsRepositoryPermissions(),
149+
"github_actions_runner_group": resourceGithubActionsRunnerGroup(),
150+
"github_actions_secret": resourceGithubActionsSecret(),
151+
"github_app_installation_repositories": resourceGithubAppInstallationRepositories(),
152+
"github_app_installation_repository": resourceGithubAppInstallationRepository(),
153+
"github_branch": resourceGithubBranch(),
154+
"github_branch_default": resourceGithubBranchDefault(),
155+
"github_branch_protection": resourceGithubBranchProtection(),
156+
"github_branch_protection_v3": resourceGithubBranchProtectionV3(),
157+
"github_dependabot_organization_secret": resourceGithubDependabotOrganizationSecret(),
158+
"github_dependabot_organization_secret_repositories": resourceGithubDependabotOrganizationSecretRepositories(),
159+
"github_dependabot_secret": resourceGithubDependabotSecret(),
160+
"github_enterprise_organization": resourceGithubEnterpriseOrganization(),
161+
"github_emu_group_mapping": resourceGithubEMUGroupMapping(),
162+
"github_issue": resourceGithubIssue(),
163+
"github_issue_label": resourceGithubIssueLabel(),
164+
"github_membership": resourceGithubMembership(),
165+
"github_organization_block": resourceOrganizationBlock(),
166+
"github_organization_project": resourceGithubOrganizationProject(),
167+
"github_organization_security_manager": resourceGithubOrganizationSecurityManager(),
168+
"github_organization_settings": resourceGithubOrganizationSettings(),
169+
"github_organization_webhook": resourceGithubOrganizationWebhook(),
170+
"github_project_card": resourceGithubProjectCard(),
171+
"github_project_column": resourceGithubProjectColumn(),
172+
"github_release": resourceGithubRelease(),
173+
"github_repository": resourceGithubRepository(),
174+
"github_repository_autolink_reference": resourceGithubRepositoryAutolinkReference(),
175+
"github_repository_collaborator": resourceGithubRepositoryCollaborator(),
176+
"github_repository_deploy_key": resourceGithubRepositoryDeployKey(),
177+
"github_repository_environment": resourceGithubRepositoryEnvironment(),
178+
"github_repository_file": resourceGithubRepositoryFile(),
179+
"github_repository_milestone": resourceGithubRepositoryMilestone(),
180+
"github_repository_project": resourceGithubRepositoryProject(),
181+
"github_repository_pull_request": resourceGithubRepositoryPullRequest(),
182+
"github_repository_tag_protection": resourceGithubRepositoryTagProtection(),
183+
"github_repository_webhook": resourceGithubRepositoryWebhook(),
184+
"github_team": resourceGithubTeam(),
185+
"github_team_members": resourceGithubTeamMembers(),
186+
"github_team_membership": resourceGithubTeamMembership(),
187+
"github_team_repository": resourceGithubTeamRepository(),
188+
"github_team_settings": resourceGithubTeamSettings(),
189+
"github_team_sync_group_mapping": resourceGithubTeamSyncGroupMapping(),
190+
"github_user_gpg_key": resourceGithubUserGpgKey(),
191+
"github_user_invitation_accepter": resourceGithubUserInvitationAccepter(),
192+
"github_user_ssh_key": resourceGithubUserSshKey(),
143193
},
144194

145195
DataSourcesMap: map[string]*schema.Resource{
@@ -180,6 +230,42 @@ func Provider() terraform.ResourceProvider {
180230
"github_tree": dataSourceGithubTree(),
181231
"github_user": dataSourceGithubUser(),
182232
"github_users": dataSourceGithubUsers(),
233+
"github_actions_organization_registration_token": dataSourceGithubActionsOrganizationRegistrationToken(),
234+
"github_actions_organization_secrets": dataSourceGithubActionsOrganizationSecrets(),
235+
"github_actions_public_key": dataSourceGithubActionsPublicKey(),
236+
"github_actions_registration_token": dataSourceGithubActionsRegistrationToken(),
237+
"github_actions_secrets": dataSourceGithubActionsSecrets(),
238+
"github_app": dataSourceGithubApp(),
239+
"github_branch": dataSourceGithubBranch(),
240+
"github_collaborators": dataSourceGithubCollaborators(),
241+
"github_dependabot_organization_secrets": dataSourceGithubDependabotOrganizationSecrets(),
242+
"github_dependabot_public_key": dataSourceGithubDependabotPublicKey(),
243+
"github_dependabot_secrets": dataSourceGithubDependabotSecrets(),
244+
"github_enterprise": dataSourceGithubEnterprise(),
245+
"github_external_groups": dataSourceGithubExternalGroups(),
246+
"github_ip_ranges": dataSourceGithubIpRanges(),
247+
"github_membership": dataSourceGithubMembership(),
248+
"github_organization": dataSourceGithubOrganization(),
249+
"github_organization_ip_allow_list": dataSourceGithubOrganizationIpAllowList(),
250+
"github_organization_team_sync_groups": dataSourceGithubOrganizationTeamSyncGroups(),
251+
"github_organization_teams": dataSourceGithubOrganizationTeams(),
252+
"github_organization_webhooks": dataSourceGithubOrganizationWebhooks(),
253+
"github_ref": dataSourceGithubRef(),
254+
"github_release": dataSourceGithubRelease(),
255+
"github_repositories": dataSourceGithubRepositories(),
256+
"github_repository": dataSourceGithubRepository(),
257+
"github_repository_branches": dataSourceGithubRepositoryBranches(),
258+
"github_repository_deploy_keys": dataSourceGithubRepositoryDeployKeys(),
259+
"github_repository_file": dataSourceGithubRepositoryFile(),
260+
"github_repository_milestone": dataSourceGithubRepositoryMilestone(),
261+
"github_repository_pull_request": dataSourceGithubRepositoryPullRequest(),
262+
"github_repository_pull_requests": dataSourceGithubRepositoryPullRequests(),
263+
"github_repository_teams": dataSourceGithubRepositoryTeams(),
264+
"github_repository_webhooks": dataSourceGithubRepositoryWebhooks(),
265+
"github_team": dataSourceGithubTeam(),
266+
"github_tree": dataSourceGithubTree(),
267+
"github_user": dataSourceGithubUser(),
268+
"github_users": dataSourceGithubUsers(),
183269
},
184270
}
185271

‎github/provider_utils.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
var testCollaborator string = os.Getenv("GITHUB_TEST_COLLABORATOR")
1111
var isEnterprise string = os.Getenv("ENTERPRISE_ACCOUNT")
12+
var testEnterprise string = os.Getenv("ENTERPRISE_SLUG")
1213
var testOrganization string = testOrganizationFunc()
1314
var testOwner string = os.Getenv("GITHUB_OWNER")
1415
var testToken string = os.Getenv("GITHUB_TOKEN")
@@ -49,6 +50,13 @@ func skipUnlessMode(t *testing.T, providerMode string) {
4950
} else {
5051
t.Log("GITHUB_TOKEN environment variable should be empty")
5152
}
53+
case enterprise:
54+
if os.Getenv("GITHUB_TOKEN") == "" {
55+
t.Log("GITHUB_TOKEN environment variable should be set")
56+
} else {
57+
return
58+
}
59+
5260
case individual:
5361
if os.Getenv("GITHUB_TOKEN") != "" && os.Getenv("GITHUB_OWNER") != "" {
5462
return
@@ -125,3 +133,4 @@ func testOwnerFunc() string {
125133
const anonymous = "anonymous"
126134
const individual = "individual"
127135
const organization = "organization"
136+
const enterprise = "enterprise"

0 commit comments

Comments
 (0)