refactor(org-webhook): migrate to context-aware CRUD functions

Migrate resource_github_organization_webhook.go from legacy CRUD to
context-aware CRUD functions (CreateContext, ReadContext, UpdateContext,
DeleteContext) per Terraform Plugin SDK v2 best practices.

Ref: #2996

Author: deiga

github/resource_github_organization_webhook.go

@@ -8,15 +8,16 @@ import (
 	"strconv"
 
 	"github.com/google/go-github/v81/github"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceGithubOrganizationWebhook() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceGithubOrganizationWebhookCreate,
-		Read:   resourceGithubOrganizationWebhookRead,
-		Update: resourceGithubOrganizationWebhookUpdate,
-		Delete: resourceGithubOrganizationWebhookDelete,
+		CreateContext: resourceGithubOrganizationWebhookCreate,
+		ReadContext:   resourceGithubOrganizationWebhookRead,
+		UpdateContext: resourceGithubOrganizationWebhookUpdate,
+		DeleteContext: resourceGithubOrganizationWebhookDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
@@ -79,21 +80,20 @@ func resourceGithubOrganizationWebhookObject(d *schema.ResourceData) *github.Hoo
 	return hook
 }
 
-func resourceGithubOrganizationWebhookCreate(d *schema.ResourceData, meta any) error {
+func resourceGithubOrganizationWebhookCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	err := checkOrganization(meta)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	client := meta.(*Owner).v3client
 
 	orgName := meta.(*Owner).name
 	webhookObj := resourceGithubOrganizationWebhookObject(d)
-	ctx := context.Background()
 
 	hook, _, err := client.Organizations.CreateHook(ctx, orgName, webhookObj)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	d.SetId(strconv.FormatInt(hook.GetID(), 10))
 
@@ -105,26 +105,26 @@ func resourceGithubOrganizationWebhookCreate(d *schema.ResourceData, meta any) e
 	}
 
 	if err = d.Set("configuration", interfaceFromWebhookConfig(hook.Config)); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
-	return resourceGithubOrganizationWebhookRead(d, meta)
+	return resourceGithubOrganizationWebhookRead(ctx, d, meta)
 }
 
-func resourceGithubOrganizationWebhookRead(d *schema.ResourceData, meta any) error {
+func resourceGithubOrganizationWebhookRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	err := checkOrganization(meta)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	client := meta.(*Owner).v3client
 
 	orgName := meta.(*Owner).name
 	hookID, err := strconv.ParseInt(d.Id(), 10, 64)
 	if err != nil {
-		return unconvertibleIdErr(d.Id(), err)
+		return diag.FromErr(unconvertibleIdErr(d.Id(), err))
 	}
-	ctx := context.WithValue(context.Background(), ctxId, d.Id())
+	ctx = context.WithValue(ctx, ctxId, d.Id())
 	if !d.IsNewResource() {
 		ctx = context.WithValue(ctx, ctxEtag, d.Get("etag").(string))
 	}
@@ -143,20 +143,20 @@ func resourceGithubOrganizationWebhookRead(d *schema.ResourceData, meta any) err
 				return nil
 			}
 		}
-		return err
+		return diag.FromErr(err)
 	}
 
 	if err = d.Set("etag", resp.Header.Get("ETag")); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	if err = d.Set("url", hook.GetURL()); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	if err = d.Set("active", hook.GetActive()); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	if err = d.Set("events", hook.Events); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	// GitHub returns the secret as a string of 8 astrisks "********"
@@ -172,16 +172,16 @@ func resourceGithubOrganizationWebhookRead(d *schema.ResourceData, meta any) err
 	}
 
 	if err = d.Set("configuration", interfaceFromWebhookConfig(hook.Config)); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	return nil
 }
 
-func resourceGithubOrganizationWebhookUpdate(d *schema.ResourceData, meta any) error {
+func resourceGithubOrganizationWebhookUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	err := checkOrganization(meta)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	client := meta.(*Owner).v3client
@@ -190,36 +190,36 @@ func resourceGithubOrganizationWebhookUpdate(d *schema.ResourceData, meta any) e
 	webhookObj := resourceGithubOrganizationWebhookObject(d)
 	hookID, err := strconv.ParseInt(d.Id(), 10, 64)
 	if err != nil {
-		return unconvertibleIdErr(d.Id(), err)
+		return diag.FromErr(unconvertibleIdErr(d.Id(), err))
 	}
-	ctx := context.WithValue(context.Background(), ctxId, d.Id())
+	ctx = context.WithValue(ctx, ctxId, d.Id())
 
 	_, _, err = client.Organizations.EditHook(ctx,
 		orgName, hookID, webhookObj)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
-	return resourceGithubOrganizationWebhookRead(d, meta)
+	return resourceGithubOrganizationWebhookRead(ctx, d, meta)
 }
 
-func resourceGithubOrganizationWebhookDelete(d *schema.ResourceData, meta any) error {
+func resourceGithubOrganizationWebhookDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	err := checkOrganization(meta)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	client := meta.(*Owner).v3client
 
 	orgName := meta.(*Owner).name
 	hookID, err := strconv.ParseInt(d.Id(), 10, 64)
 	if err != nil {
-		return unconvertibleIdErr(d.Id(), err)
+		return diag.FromErr(unconvertibleIdErr(d.Id(), err))
 	}
-	ctx := context.WithValue(context.Background(), ctxId, d.Id())
+	ctx = context.WithValue(ctx, ctxId, d.Id())
 
 	_, err = client.Organizations.DeleteHook(ctx, orgName, hookID)
-	return err
+	return diag.FromErr(err)
 }
 
 func webhookConfigFromInterface(config map[string]any) *github.HookConfig {