chore(account): use context for workflow (#618)

Author: remyleone

scaleway/data_source_account_ssh_key.go

@@ -1,16 +1,18 @@
 package scaleway
 
 import (
+	"context"
 	"fmt"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
 func dataSourceScalewayAccountSSHKey() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceScalewayAccountSSHKeyRead,
-
+		ReadContext: dataSourceScalewayAccountSSHKeyRead,
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:        schema.TypeString,
@@ -35,29 +37,29 @@ func dataSourceScalewayAccountSSHKey() *schema.Resource {
 	}
 }
 
-func dataSourceScalewayAccountSSHKeyRead(d *schema.ResourceData, m interface{}) error {
+func dataSourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountAPI := accountAPI(m)
 
 	var sshKey *account.SSHKey
 	sshKeyID, ok := d.GetOk("ssh_key_id")
 	if ok {
-		res, err := accountAPI.GetSSHKey(&account.GetSSHKeyRequest{SSHKeyID: expandID(sshKeyID)})
+		res, err := accountAPI.GetSSHKey(&account.GetSSHKeyRequest{SSHKeyID: expandID(sshKeyID)}, scw.WithContext(ctx))
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 		sshKey = res
 	} else {
 		res, err := accountAPI.ListSSHKeys(&account.ListSSHKeysRequest{
 			Name: expandStringPtr(d.Get("name")),
-		})
+		}, scw.WithContext(ctx))
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 		if len(res.SSHKeys) == 0 {
-			return fmt.Errorf("no SSH Key found with the name %s", d.Get("name"))
+			return diag.FromErr(fmt.Errorf("no SSH Key found with the name %s", d.Get("name")))
 		}
 		if len(res.SSHKeys) > 1 {
-			return fmt.Errorf("%d SSH Keys found with the same name %s", len(res.SSHKeys), d.Get("name"))
+			return diag.FromErr(fmt.Errorf("%d SSH Keys found with the same name %s", len(res.SSHKeys), d.Get("name")))
 		}
 		sshKey = res.SSHKeys[0]
 	}

scaleway/resource_account_ssh_key.go

@@ -1,20 +1,23 @@
 package scaleway
 
 import (
+	"context"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
 func resourceScalewayAccountSSKKey() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceScalewayAccountSSHKeyCreate,
-		Read:   resourceScalewayAccountSSHKeyRead,
-		Update: resourceScalewayAccountSSHKeyUpdate,
-		Delete: resourceScalewayAccountSSHKeyDelete,
+		CreateContext: resourceScalewayAccountSSHKeyCreate,
+		ReadContext:   resourceScalewayAccountSSHKeyRead,
+		UpdateContext: resourceScalewayAccountSSHKeyUpdate,
+		DeleteContext: resourceScalewayAccountSSHKeyDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
@@ -37,35 +40,35 @@ func resourceScalewayAccountSSKKey() *schema.Resource {
 	}
 }
 
-func resourceScalewayAccountSSHKeyCreate(d *schema.ResourceData, m interface{}) error {
+func resourceScalewayAccountSSHKeyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountAPI := accountAPI(m)
 
 	res, err := accountAPI.CreateSSHKey(&account.CreateSSHKeyRequest{
 		Name:           d.Get("name").(string),
 		PublicKey:      strings.Trim(d.Get("public_key").(string), "\n"),
 		OrganizationID: expandStringPtr(d.Get("organization_id")),
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	d.SetId(res.ID)
 
-	return resourceScalewayAccountSSHKeyRead(d, m)
+	return resourceScalewayAccountSSHKeyRead(ctx, d, m)
 }
 
-func resourceScalewayAccountSSHKeyRead(d *schema.ResourceData, m interface{}) error {
+func resourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountAPI := accountAPI(m)
 
 	res, err := accountAPI.GetSSHKey(&account.GetSSHKeyRequest{
 		SSHKeyID: d.Id(),
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
 		if is404Error(err) {
 			d.SetId("")
 			return nil
 		}
-		return err
+		return diag.FromErr(err)
 	}
 
 	_ = d.Set("name", res.Name)
@@ -75,30 +78,30 @@ func resourceScalewayAccountSSHKeyRead(d *schema.ResourceData, m interface{}) er
 	return nil
 }
 
-func resourceScalewayAccountSSHKeyUpdate(d *schema.ResourceData, m interface{}) error {
+func resourceScalewayAccountSSHKeyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountAPI := accountAPI(m)
 
 	if d.HasChange("name") {
 		_, err := accountAPI.UpdateSSHKey(&account.UpdateSSHKeyRequest{
 			SSHKeyID: d.Id(),
 			Name:     expandStringPtr(d.Get("name")),
-		})
+		}, scw.WithContext(ctx))
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 	}
 
-	return resourceScalewayAccountSSHKeyRead(d, m)
+	return resourceScalewayAccountSSHKeyRead(ctx, d, m)
 }
 
-func resourceScalewayAccountSSHKeyDelete(d *schema.ResourceData, m interface{}) error {
+func resourceScalewayAccountSSHKeyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountAPI := accountAPI(m)
 
 	err := accountAPI.DeleteSSHKey(&account.DeleteSSHKeyRequest{
 		SSHKeyID: d.Id(),
-	})
+	}, scw.WithContext(ctx))
 	if err != nil && !is404Error(err) {
-		return err
+		return diag.FromErr(err)
 	}
 
 	return nil