fix: pass through context to resource operations.

skpr · Nov 21, 2024 · 9347090 · 9347090
1 parent 71e94d0
commit 9347090
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/internal/provider/log_group/create.go b/internal/provider/log_group/create.go
@@ -7,35 +7,37 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 // Create the log group.
-func Create(d *schema.ResourceData, m interface{}) error {
+func Create(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	cfg := m.(aws.Config)
 	c := cloudwatchlogs.NewFromConfig(cfg)
 
 	var (
 		name      = d.Get(Name).(string)
-		ctx       = context.TODO()
 		exception *types.ResourceAlreadyExistsException
+		// Warning or errors can be collected in a slice type
+		diags diag.Diagnostics
 	)
 
 	_, err := c.CreateLogGroup(context.TODO(), &cloudwatchlogs.CreateLogGroupInput{
 		LogGroupName: aws.String(name),
 	})
 
 	if !errors.As(err, &exception) && err != nil {
-		return err
+		return diags
 	}
 
 	lg, err := findLogGroupByName(ctx, c, name)
 	if err != nil {
-		return err
+		return diags
 	}
 
 	d.Set(Name, name)
 	d.SetId(TrimLogGroupARNWildcardSuffix(aws.ToString(lg.Arn)))
 
-	return nil
+	return diags
 }
diff --git a/internal/provider/log_group/read.go b/internal/provider/log_group/read.go
@@ -9,28 +9,31 @@ import (
 	// "github.com/aws/aws-sdk-go-v2/aws/session"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 // Read the log group.
-func Read(d *schema.ResourceData, m interface{}) error {
+func Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+
 	cfg := m.(aws.Config)
 	c := cloudwatchlogs.NewFromConfig(cfg)
 
 	logGroupName := d.Get("name").(string)
 
-	lg, err := findLogGroupByName(context.TODO(), c, logGroupName)
+	lg, err := findLogGroupByName(ctx, c, logGroupName)
 
 	if !d.IsNewResource() && err != nil {
 		log.Printf("[WARN] CloudWatch Logs Log Group (%s) not found, removing from state", d.Id())
 		d.SetId("")
-		return err
+		return diag.FromErr(err)
 	}
 
 	d.SetId(TrimLogGroupARNWildcardSuffix(aws.ToString(lg.Arn)))
 	d.Set(Name, logGroupName)
 
-	return nil
+	return diags
 }
 
 func findLogGroupByName(ctx context.Context, conn *cloudwatchlogs.Client, name string) (*types.LogGroup, error) {

diff --git a/internal/provider/log_group/resource.go b/internal/provider/log_group/resource.go
@@ -12,9 +12,8 @@ const (
 // Resource returns this packages resource.
 func Resource() *schema.Resource {
 	return &schema.Resource{
-		Create: Create,
-		Read:   Read,
-		Update: Update,
+		CreateContext: Create,
+		ReadContext:   Read,
 
 		Schema: map[string]*schema.Schema{
 			Name: {

diff --git a/internal/provider/log_group/update.go b/internal/provider/log_group/update.go