BASIS/terraform-provider-decort
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 62 Wiki Activity

Add context to DecortAPICall method

Browse Source
This commit is contained in:
stSolo
2022-06-29 16:22:31 +03:00
parent 3613bbea28
commit 9a7642cf33
114 changed files with 406 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/service/cloudapi/snapshot/data_source_snapshot_list.go
View File

@@ -56,7 +56,7 @@ func flattenSnapshotList(gl SnapshotList) []map[string]interface{} {
}
func dataSourceSnapshotListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
snapshotList, err := utilitySnapshotListCheckPresence(d, m)
snapshotList, err := utilitySnapshotListCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

17
internal/service/cloudapi/snapshot/resource_snapshot.go
View File

@@ -52,7 +52,7 @@ func resourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m inter
urlValues.Add("label", d.Get("label").(string))
urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
snapshotId, err := c.DecortAPICall("POST", snapshotCreateAPI, urlValues)
snapshotId, err := c.DecortAPICall(ctx, "POST", snapshotCreateAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -71,7 +71,7 @@ func resourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m inter
}
func resourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
snapshot, err := utilitySnapshotCheckPresence(d, m)
snapshot, err := utilitySnapshotCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -92,7 +92,7 @@ func resourceSnapshotDelete(ctx context.Context, d *schema.ResourceData, m inter
urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
urlValues.Add("label", d.Get("label").(string))
_, err := c.DecortAPICall("POST", snapshotDeleteAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", snapshotDeleteAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -101,8 +101,8 @@ func resourceSnapshotDelete(ctx context.Context, d *schema.ResourceData, m inter
return nil
}
func resourceSnapshotExists(d *schema.ResourceData, m interface{}) (bool, error) {
snapshot, err := utilitySnapshotCheckPresence(d, m)
func resourceSnapshotExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
snapshot, err := utilitySnapshotCheckPresence(ctx, d, m)
if err != nil {
return false, err
}
@@ -116,7 +116,7 @@ func resourceSnapshotExists(d *schema.ResourceData, m interface{}) (bool, error)
func resourceSnapshotEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
if d.HasChange("rollback") {
if d.Get("rollback").(bool) {
err := resourceSnapshotRollback(d, m)
err := resourceSnapshotRollback(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -126,14 +126,14 @@ func resourceSnapshotEdit(ctx context.Context, d *schema.ResourceData, m interfa
return nil
}
func resourceSnapshotRollback(d *schema.ResourceData, m interface{}) error {
func resourceSnapshotRollback(ctx context.Context, d *schema.ResourceData, m interface{}) error {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
urlValues.Add("label", d.Get("label").(string))
_, err := c.DecortAPICall("POST", snapshotRollbackAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", snapshotRollbackAPI, urlValues)
if err != nil {
return err
}
@@ -188,7 +188,6 @@ func ResourceSnapshot() *schema.Resource {
ReadContext: resourceSnapshotRead,
UpdateContext: resourceSnapshotEdit,
DeleteContext: resourceSnapshotDelete,
Exists: resourceSnapshotExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,

5
internal/service/cloudapi/snapshot/utility_snapshot.go
View File

@@ -32,13 +32,14 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package snapshot
import (
"context"
"errors"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilitySnapshotCheckPresence(d *schema.ResourceData, m interface{}) (*Snapshot, error) {
snapShotList, err := utilitySnapshotListCheckPresence(d, m)
func utilitySnapshotCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*Snapshot, error) {
snapShotList, err := utilitySnapshotListCheckPresence(ctx, d, m)
if err != nil {
return nil, err
}

5
internal/service/cloudapi/snapshot/utility_snapshot_list.go
View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package snapshot
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -40,12 +41,12 @@ import (
"github.com/rudecs/terraform-provider-decort/internal/controller"
)
func utilitySnapshotListCheckPresence(d *schema.ResourceData, m interface{}) (SnapshotList, error) {
func utilitySnapshotListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (SnapshotList, error) {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
resp, err := c.DecortAPICall("POST", snapshotListAPI, urlValues)
resp, err := c.DecortAPICall(ctx, "POST", snapshotListAPI, urlValues)
if err != nil {
return nil, err
}