Remove legacy cost center resources

Author: github-actions[bot]

examples/cost_centers/main.tf

@@ -48,13 +48,8 @@ variable "repositories" {
 resource "github_enterprise_cost_center" "example" {
   enterprise_slug = var.enterprise_slug
   name            = var.cost_center_name
-}
-
-# Authoritative assignments: Terraform will add/remove to match these lists.
-resource "github_enterprise_cost_center_resources" "example" {
-  enterprise_slug = var.enterprise_slug
-  cost_center_id  = github_enterprise_cost_center.example.id
 
+  # Authoritative assignments: Terraform will add/remove to match these lists.
   users         = var.users
   organizations = var.organizations
   repositories  = var.repositories
@@ -63,8 +58,6 @@ resource "github_enterprise_cost_center_resources" "example" {
 data "github_enterprise_cost_center" "by_id" {
   enterprise_slug = var.enterprise_slug
   cost_center_id  = github_enterprise_cost_center.example.id
-
-  depends_on = [github_enterprise_cost_center_resources.example]
 }
 
 data "github_enterprise_cost_centers" "active" {
@@ -87,17 +80,20 @@ output "cost_center" {
 output "cost_center_resources" {
   description = "Effective assignments (read from API)"
   value = {
-    users         = sort(tolist(github_enterprise_cost_center_resources.example.users))
-    organizations = sort(tolist(github_enterprise_cost_center_resources.example.organizations))
-    repositories  = sort(tolist(github_enterprise_cost_center_resources.example.repositories))
+    users         = sort(tolist(github_enterprise_cost_center.example.users))
+    organizations = sort(tolist(github_enterprise_cost_center.example.organizations))
+    repositories  = sort(tolist(github_enterprise_cost_center.example.repositories))
   }
 }
 
 output "cost_center_from_data_source" {
   description = "Cost center fetched by data source"
   value = {
-    id    = data.github_enterprise_cost_center.by_id.cost_center_id
-    name  = data.github_enterprise_cost_center.by_id.name
-    state = data.github_enterprise_cost_center.by_id.state
+    id            = data.github_enterprise_cost_center.by_id.cost_center_id
+    name          = data.github_enterprise_cost_center.by_id.name
+    state         = data.github_enterprise_cost_center.by_id.state
+    users         = sort(tolist(data.github_enterprise_cost_center.by_id.users))
+    organizations = sort(tolist(data.github_enterprise_cost_center.by_id.organizations))
+    repositories  = sort(tolist(data.github_enterprise_cost_center.by_id.repositories))
   }
 }

github/data_source_github_enterprise_cost_center.go

@@ -3,6 +3,7 @@ package github
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -39,6 +40,24 @@ func dataSourceGithubEnterpriseCostCenter() *schema.Resource {
 				Computed:    true,
 				Description: "The Azure subscription associated with the cost center.",
 			},
+			"users": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+				Description: "The usernames assigned to this cost center.",
+			},
+			"organizations": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+				Description: "The organization logins assigned to this cost center.",
+			},
+			"repositories": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+				Description: "The repositories (full name) assigned to this cost center.",
+			},
 			"resources": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -90,5 +109,13 @@ func dataSourceGithubEnterpriseCostCenterRead(ctx context.Context, d *schema.Res
 	}
 	_ = d.Set("resources", resources)
 
+	users, organizations, repositories := enterpriseCostCenterSplitResources(cc.Resources)
+	sort.Strings(users)
+	sort.Strings(organizations)
+	sort.Strings(repositories)
+	_ = d.Set("users", stringSliceToAnySlice(users))
+	_ = d.Set("organizations", stringSliceToAnySlice(organizations))
+	_ = d.Set("repositories", stringSliceToAnySlice(repositories))
+
 	return nil
 }

github/data_source_github_enterprise_cost_center_test.go

@@ -2,6 +2,7 @@ package github
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -17,6 +18,26 @@ func TestAccGithubEnterpriseCostCenterDataSource(t *testing.T) {
 	if testEnterprise == "" {
 		t.Skip("Skipping because `ENTERPRISE_SLUG` is not set")
 	}
+	testEnterpriseCostCenterOrganization := os.Getenv("ENTERPRISE_TEST_ORGANIZATION")
+	testEnterpriseCostCenterRepository := os.Getenv("ENTERPRISE_TEST_REPOSITORY")
+	testEnterpriseCostCenterUsers := os.Getenv("ENTERPRISE_TEST_USERS")
+
+	if testEnterpriseCostCenterOrganization == "" {
+		t.Skip("Skipping because `ENTERPRISE_TEST_ORGANIZATION` is not set")
+	}
+	if testEnterpriseCostCenterRepository == "" {
+		t.Skip("Skipping because `ENTERPRISE_TEST_REPOSITORY` is not set")
+	}
+	if testEnterpriseCostCenterUsers == "" {
+		t.Skip("Skipping because `ENTERPRISE_TEST_USERS` is not set")
+	}
+
+	users := splitCommaSeparated(testEnterpriseCostCenterUsers)
+	if len(users) == 0 {
+		t.Skip("Skipping because `ENTERPRISE_TEST_USERS` must contain at least one username")
+	}
+
+	userList := fmt.Sprintf("%q", users[0])
 
 	config := fmt.Sprintf(`
 		data "github_enterprise" "enterprise" {
@@ -26,18 +47,28 @@ func TestAccGithubEnterpriseCostCenterDataSource(t *testing.T) {
 		resource "github_enterprise_cost_center" "test" {
 			enterprise_slug = data.github_enterprise.enterprise.slug
 			name            = "tf-acc-test-%s"
+
+			users         = [%s]
+			organizations = [%q]
+			repositories  = [%q]
 		}
 
 		data "github_enterprise_cost_center" "test" {
 			enterprise_slug = data.github_enterprise.enterprise.slug
 			cost_center_id  = github_enterprise_cost_center.test.id
 		}
-	`, testEnterprise, randomID)
+	`, testEnterprise, randomID, userList, testEnterpriseCostCenterOrganization, testEnterpriseCostCenterRepository)
 
 	check := resource.ComposeTestCheckFunc(
 		resource.TestCheckResourceAttrPair("data.github_enterprise_cost_center.test", "cost_center_id", "github_enterprise_cost_center.test", "id"),
 		resource.TestCheckResourceAttrPair("data.github_enterprise_cost_center.test", "name", "github_enterprise_cost_center.test", "name"),
 		resource.TestCheckResourceAttr("data.github_enterprise_cost_center.test", "state", "active"),
+		resource.TestCheckResourceAttr("data.github_enterprise_cost_center.test", "organizations.#", "1"),
+		resource.TestCheckTypeSetElemAttr("data.github_enterprise_cost_center.test", "organizations.*", testEnterpriseCostCenterOrganization),
+		resource.TestCheckResourceAttr("data.github_enterprise_cost_center.test", "repositories.#", "1"),
+		resource.TestCheckTypeSetElemAttr("data.github_enterprise_cost_center.test", "repositories.*", testEnterpriseCostCenterRepository),
+		resource.TestCheckResourceAttr("data.github_enterprise_cost_center.test", "users.#", "1"),
+		resource.TestCheckTypeSetElemAttr("data.github_enterprise_cost_center.test", "users.*", users[0]),
 	)
 
 	resource.Test(t, resource.TestCase{

github/provider.go

@@ -212,7 +212,6 @@ func Provider() *schema.Provider {
 			"github_enterprise_actions_workflow_permissions":                        resourceGithubEnterpriseActionsWorkflowPermissions(),
 			"github_enterprise_security_analysis_settings":                          resourceGithubEnterpriseSecurityAnalysisSettings(),
 			"github_enterprise_cost_center":                                         resourceGithubEnterpriseCostCenter(),
-			"github_enterprise_cost_center_resources":                               resourceGithubEnterpriseCostCenterResources(),
 			"github_workflow_repository_permissions":                                resourceGithubWorkflowRepositoryPermissions(),
 		},