Skip to content

Commit 381f08c

Browse files
nickfloydnickfloyd
committed
fixes duplicates from the merge conflict
1 parent 1e348f6 commit 381f08c

File tree

1 file changed

+0
-84
lines changed

1 file changed

+0
-84
lines changed

‎github/provider.go‎

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -140,56 +140,7 @@ 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(),
160143
"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(),
193144
},
194145

195146
DataSourcesMap: map[string]*schema.Resource{
@@ -230,42 +181,7 @@ func Provider() terraform.ResourceProvider {
230181
"github_tree": dataSourceGithubTree(),
231182
"github_user": dataSourceGithubUser(),
232183
"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(),
244184
"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(),
269185
},
270186
}
271187

0 commit comments

Comments
 (0)