Use context-aware CRUD for enterprise cost centers

Author: github-actions[bot]

github/data_source_github_enterprise_cost_center.go

@@ -5,12 +5,13 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceGithubEnterpriseCostCenter() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceGithubEnterpriseCostCenterRead,
+		ReadContext: dataSourceGithubEnterpriseCostCenterRead,
 
 		Schema: map[string]*schema.Schema{
 			"enterprise_slug": {
@@ -58,16 +59,16 @@ func dataSourceGithubEnterpriseCostCenter() *schema.Resource {
 	}
 }
 
-func dataSourceGithubEnterpriseCostCenterRead(d *schema.ResourceData, meta any) error {
+func dataSourceGithubEnterpriseCostCenterRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	enterpriseSlug := d.Get("enterprise_slug").(string)
 	costCenterID := d.Get("cost_center_id").(string)
 
-	ctx := context.WithValue(context.Background(), ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
+	ctx = context.WithValue(ctx, ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
 
 	cc, err := enterpriseCostCenterGet(ctx, client, enterpriseSlug, costCenterID)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	d.SetId(costCenterID)

github/data_source_github_enterprise_cost_centers.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
 func dataSourceGithubEnterpriseCostCenters() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceGithubEnterpriseCostCentersRead,
+		ReadContext: dataSourceGithubEnterpriseCostCentersRead,
 
 		Schema: map[string]*schema.Schema{
 			"enterprise_slug": {
@@ -62,18 +63,18 @@ func dataSourceGithubEnterpriseCostCenters() *schema.Resource {
 	}
 }
 
-func dataSourceGithubEnterpriseCostCentersRead(d *schema.ResourceData, meta any) error {
+func dataSourceGithubEnterpriseCostCentersRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	enterpriseSlug := d.Get("enterprise_slug").(string)
 	state := ""
 	if v, ok := d.GetOk("state"); ok {
 		state = v.(string)
 	}
 
-	ctx := context.WithValue(context.Background(), ctxId, fmt.Sprintf("%s/cost-centers", enterpriseSlug))
+	ctx = context.WithValue(ctx, ctxId, fmt.Sprintf("%s/cost-centers", enterpriseSlug))
 	centers, err := enterpriseCostCentersList(ctx, client, enterpriseSlug, state)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	items := make([]any, 0, len(centers))

github/resource_github_enterprise_cost_center.go

@@ -6,17 +6,18 @@ import (
 	"log"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceGithubEnterpriseCostCenter() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceGithubEnterpriseCostCenterCreate,
-		Read:   resourceGithubEnterpriseCostCenterRead,
-		Update: resourceGithubEnterpriseCostCenterUpdate,
-		Delete: resourceGithubEnterpriseCostCenterDelete,
+		CreateContext: resourceGithubEnterpriseCostCenterCreate,
+		ReadContext:   resourceGithubEnterpriseCostCenterRead,
+		UpdateContext: resourceGithubEnterpriseCostCenterUpdate,
+		DeleteContext: resourceGithubEnterpriseCostCenterDelete,
 		Importer: &schema.ResourceImporter{
-			State: resourceGithubEnterpriseCostCenterImport,
+			StateContext: resourceGithubEnterpriseCostCenterImport,
 		},
 
 		Schema: map[string]*schema.Schema{
@@ -63,33 +64,33 @@ func resourceGithubEnterpriseCostCenter() *schema.Resource {
 	}
 }
 
-func resourceGithubEnterpriseCostCenterCreate(d *schema.ResourceData, meta any) error {
+func resourceGithubEnterpriseCostCenterCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	enterpriseSlug := d.Get("enterprise_slug").(string)
 	name := d.Get("name").(string)
 
-	ctx := context.WithValue(context.Background(), ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, name))
+	ctx = context.WithValue(ctx, ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, name))
 	log.Printf("[INFO] Creating enterprise cost center: %s (%s)", name, enterpriseSlug)
 
 	cc, err := enterpriseCostCenterCreate(ctx, client, enterpriseSlug, name)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	if cc == nil || cc.ID == "" {
-		return fmt.Errorf("failed to create cost center: missing id in response")
+		return diag.FromErr(fmt.Errorf("failed to create cost center: missing id in response"))
 	}
 
 	d.SetId(cc.ID)
-	return resourceGithubEnterpriseCostCenterRead(d, meta)
+	return resourceGithubEnterpriseCostCenterRead(ctx, d, meta)
 }
 
-func resourceGithubEnterpriseCostCenterRead(d *schema.ResourceData, meta any) error {
+func resourceGithubEnterpriseCostCenterRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	enterpriseSlug := d.Get("enterprise_slug").(string)
 	costCenterID := d.Id()
 
-	ctx := context.WithValue(context.Background(), ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
+	ctx = context.WithValue(ctx, ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
 
 	cc, err := enterpriseCostCenterGet(ctx, client, enterpriseSlug, costCenterID)
 	if err != nil {
@@ -98,7 +99,7 @@ func resourceGithubEnterpriseCostCenterRead(d *schema.ResourceData, meta any) er
 			d.SetId("")
 			return nil
 		}
-		return err
+		return diag.FromErr(err)
 	}
 
 	_ = d.Set("name", cc.Name)
@@ -122,53 +123,53 @@ func resourceGithubEnterpriseCostCenterRead(d *schema.ResourceData, meta any) er
 	return nil
 }
 
-func resourceGithubEnterpriseCostCenterUpdate(d *schema.ResourceData, meta any) error {
+func resourceGithubEnterpriseCostCenterUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	enterpriseSlug := d.Get("enterprise_slug").(string)
 	costCenterID := d.Id()
 
-	ctx := context.WithValue(context.Background(), ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
+	ctx = context.WithValue(ctx, ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
 
 	cc, err := enterpriseCostCenterGet(ctx, client, enterpriseSlug, costCenterID)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	if strings.EqualFold(cc.State, "deleted") {
-		return fmt.Errorf("cannot update cost center %q because it is archived", costCenterID)
+		return diag.FromErr(fmt.Errorf("cannot update cost center %q because it is archived", costCenterID))
 	}
 
 	if d.HasChange("name") {
 		name := d.Get("name").(string)
 		log.Printf("[INFO] Updating enterprise cost center: %s/%s", enterpriseSlug, costCenterID)
 		_, err := enterpriseCostCenterUpdate(ctx, client, enterpriseSlug, costCenterID, name)
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 	}
 
-	return resourceGithubEnterpriseCostCenterRead(d, meta)
+	return resourceGithubEnterpriseCostCenterRead(ctx, d, meta)
 }
 
-func resourceGithubEnterpriseCostCenterDelete(d *schema.ResourceData, meta any) error {
+func resourceGithubEnterpriseCostCenterDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	enterpriseSlug := d.Get("enterprise_slug").(string)
 	costCenterID := d.Id()
 
-	ctx := context.WithValue(context.Background(), ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
+	ctx = context.WithValue(ctx, ctxId, fmt.Sprintf("%s/%s", enterpriseSlug, costCenterID))
 	log.Printf("[INFO] Archiving enterprise cost center: %s/%s", enterpriseSlug, costCenterID)
 
 	_, err := enterpriseCostCenterArchive(ctx, client, enterpriseSlug, costCenterID)
 	if err != nil {
 		if is404(err) {
 			return nil
 		}
-		return err
+		return diag.FromErr(err)
 	}
 
 	return nil
 }
 
-func resourceGithubEnterpriseCostCenterImport(d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
+func resourceGithubEnterpriseCostCenterImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
 	parts := strings.Split(d.Id(), "/")
 	if len(parts) != 2 {
 		return nil, fmt.Errorf("invalid import specified: supplied import must be written as <enterprise_slug>/<cost_center_id>")