From 8f4dd7543c06ea2777d41a486921084dbb74f0fe Mon Sep 17 00:00:00 2001 From: Steve Hipwell Date: Fri, 21 Nov 2025 13:28:27 +0000 Subject: [PATCH] chore: Deprecate duplicate org team role resources Signed-off-by: Steve Hipwell --- ...source_github_organization_security_managers.go | 2 ++ ...rce_github_organization_role_team_assignment.go | 2 ++ ...esource_github_organization_security_manager.go | 2 ++ .../d/organization_security_managers.html.markdown | 14 ++++++++------ ...organization_role_team_assignment.html.markdown | 4 +++- .../r/organization_security_manager.html.markdown | 4 +++- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/github/data_source_github_organization_security_managers.go b/github/data_source_github_organization_security_managers.go index 705a7fa4e0..f706e00378 100644 --- a/github/data_source_github_organization_security_managers.go +++ b/github/data_source_github_organization_security_managers.go @@ -9,6 +9,8 @@ import ( func dataSourceGithubOrganizationSecurityManagers() *schema.Resource { return &schema.Resource{ + DeprecationMessage: "This data source is deprecated in favour of using the github_organization_role_teams data source.", + Read: dataSourceGithubOrganizationSecurityManagersRead, Schema: map[string]*schema.Schema{ diff --git a/github/resource_github_organization_role_team_assignment.go b/github/resource_github_organization_role_team_assignment.go index a42263f4b7..2a75eb2c1e 100644 --- a/github/resource_github_organization_role_team_assignment.go +++ b/github/resource_github_organization_role_team_assignment.go @@ -11,6 +11,8 @@ import ( func resourceGithubOrganizationRoleTeamAssignment() *schema.Resource { return &schema.Resource{ + DeprecationMessage: "This resource is deprecated in favor of the github_organization_role_team resource.", + Create: resourceGithubOrganizationRoleTeamAssignmentCreate, Read: resourceGithubOrganizationRoleTeamAssignmentRead, Delete: resourceGithubOrganizationRoleTeamAssignmentDelete, diff --git a/github/resource_github_organization_security_manager.go b/github/resource_github_organization_security_manager.go index 0771171ec0..732aba278c 100644 --- a/github/resource_github_organization_security_manager.go +++ b/github/resource_github_organization_security_manager.go @@ -12,6 +12,8 @@ import ( func resourceGithubOrganizationSecurityManager() *schema.Resource { return &schema.Resource{ + DeprecationMessage: "This resource is deprecated in favor of the github_organization_role_team resource.", + Create: resourceGithubOrganizationSecurityManagerCreate, Read: resourceGithubOrganizationSecurityManagerRead, Update: resourceGithubOrganizationSecurityManagerUpdate, diff --git a/website/docs/d/organization_security_managers.html.markdown b/website/docs/d/organization_security_managers.html.markdown index 3ebea2770d..52b9cb29d7 100644 --- a/website/docs/d/organization_security_managers.html.markdown +++ b/website/docs/d/organization_security_managers.html.markdown @@ -7,6 +7,8 @@ description: |- # github_organization_security_managers +~> **Note:** This data source is deprecated, please use the `github_organization_role_team` resource instead. + Use this data source to retrieve the security managers for an organization. ## Example Usage @@ -17,13 +19,13 @@ data "github_organization_security_managers" "test" {} ## Attributes Reference - * `teams` - An list of GitHub teams. Each `team` block consists of the fields documented below. +* `teams` - An list of GitHub teams. Each `team` block consists of the fields documented below. -___ +---___ The `team` block consists of: - * `id` - Unique identifier of the team. - * `slug` - Name based identifier of the team. - * `name` - Name of the team. - * `permission` - Permission that the team will have for its repositories. +* `id` - Unique identifier of the team. +* `slug` - Name based identifier of the team. +* `name` - Name of the team. +* `permission` - Permission that the team will have for its repositories. diff --git a/website/docs/r/organization_role_team_assignment.html.markdown b/website/docs/r/organization_role_team_assignment.html.markdown index ef5373b1c5..f2916ebfb1 100644 --- a/website/docs/r/organization_role_team_assignment.html.markdown +++ b/website/docs/r/organization_role_team_assignment.html.markdown @@ -7,6 +7,8 @@ description: |- # github_organization_role_team_assignment +~> **Note:** This resource is deprecated, please use the `github_organization_role_team` resource instead. + This resource manages relationships between teams and organization roles in your GitHub organization. This works on predefined roles, and custom roles, where the latter is an Enterprise feature. @@ -39,6 +41,6 @@ The following arguments are supported: GitHub Team Organization Role Assignment can be imported using an ID made up of `team_slug:role_id` -``` +```text $ terraform import github_organization_role_team_assignment.role_assignment test-team:8132 ``` diff --git a/website/docs/r/organization_security_manager.html.markdown b/website/docs/r/organization_security_manager.html.markdown index 246dbb7729..1696309017 100644 --- a/website/docs/r/organization_security_manager.html.markdown +++ b/website/docs/r/organization_security_manager.html.markdown @@ -7,6 +7,8 @@ description: |- # github_organization_security_manager +~> **Note:** This resource is deprecated, please use the `github_organization_role_team` resource instead. + ## Example Usage ```hcl @@ -30,6 +32,6 @@ The following arguments are supported: GitHub Security Manager Teams can be imported using the GitHub team ID e.g. -``` +```text $ terraform import github_organization_security_manager.core 1234567 ```