Add context to DecortAPICall method

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

View File

@@ -50,7 +50,7 @@ func flattenGrid(d *schema.ResourceData, grid *Grid) {
}
func dataSourceGridRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
grid, err := utilityGridCheckPresence(d, m)
grid, err := utilityGridCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -58,7 +58,7 @@ func flattenGridList(gl GridList) []map[string]interface{} {
}
func dataSourceGridListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
gridList, err := utilityGridListCheckPresence(d, m)
gridList, err := utilityGridListCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package grid
import (
"context"
"encoding/json"
"errors"
"net/url"
@@ -43,7 +44,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilityGridCheckPresence(d *schema.ResourceData, m interface{}) (*Grid, error) {
func utilityGridCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*Grid, error) {
grid := &Grid{}
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -55,7 +56,7 @@ func utilityGridCheckPresence(d *schema.ResourceData, m interface{}) (*Grid, err
}
log.Debugf("utilityGridCheckPresence: load grid")
gridRaw, err := c.DecortAPICall("POST", GridGetAPI, urlValues)
gridRaw, err := c.DecortAPICall(ctx, "POST", GridGetAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package grid
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilityGridListCheckPresence(d *schema.ResourceData, m interface{}) (GridList, error) {
func utilityGridListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (GridList, error) {
gridList := GridList{}
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -55,7 +56,7 @@ func utilityGridListCheckPresence(d *schema.ResourceData, m interface{}) (GridLi
}
log.Debugf("utilityGridListCheckPresence: load grid list")
gridListRaw, err := c.DecortAPICall("POST", GridListGetAPI, urlValues)
gridListRaw, err := c.DecortAPICall(ctx, "POST", GridListGetAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -83,7 +83,7 @@ func flattenImage(d *schema.ResourceData, image *Image) {
}
func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)

View File

@@ -89,7 +89,7 @@ func flattenImageList(il ImageList) []map[string]interface{} {
}
func dataSourceImageListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
imageList, err := utilityImageListCheckPresence(d, m)
imageList, err := utilityImageListCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -67,7 +67,7 @@ func flattenImageListStacks(_ *schema.ResourceData, stack ImageListStacks) []map
}
func dataSourceImageListStacksRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
imageListStacks, err := utilityImageListStacksCheckPresence(d, m)
imageListStacks, err := utilityImageListStacksCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -90,7 +90,7 @@ func resourceCDROMImageCreate(ctx context.Context, d *schema.ResourceData, m int
urlValues.Add("architecture", architecture.(string))
}
imageId, err := c.DecortAPICall("POST", imageCreateCDROMAPI, urlValues)
imageId, err := c.DecortAPICall(ctx, "POST", imageCreateCDROMAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -98,7 +98,7 @@ func resourceCDROMImageCreate(ctx context.Context, d *schema.ResourceData, m int
d.SetId(imageId)
d.Set("image_id", imageId)
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -118,7 +118,7 @@ func resourceCDROMImageCreate(ctx context.Context, d *schema.ResourceData, m int
func resourceCDROMImageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
log.Debugf("resourceCDROMImageDelete: called for %s, id: %s", d.Get("name").(string), d.Id())
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if image == nil {
if err != nil {
return diag.FromErr(err)
@@ -134,7 +134,7 @@ func resourceCDROMImageDelete(ctx context.Context, d *schema.ResourceData, m int
urlValues.Add("permanently", strconv.FormatBool(permanently.(bool)))
}
_, err = c.DecortAPICall("POST", imageDeleteCDROMAPI, urlValues)
_, err = c.DecortAPICall(ctx, "POST", imageDeleteCDROMAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -379,7 +379,6 @@ func ResourceCDROMImage() *schema.Resource {
ReadContext: resourceImageRead,
UpdateContext: resourceImageEdit,
DeleteContext: resourceCDROMImageDelete,
Exists: resourceImageExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,

View File

@@ -74,7 +74,7 @@ func resourceDeleteListImages(ctx context.Context, d *schema.ResourceData, m int
urlValues.Add("permanently", strconv.FormatBool(d.Get("permanently").(bool)))
urlValues.Add("imageIds", temp)
_, err := c.DecortAPICall("POST", imageDeleteImagesAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", imageDeleteImagesAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -103,7 +103,7 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
} else {
api = imageSyncCreateAPI
}
imageId, err := c.DecortAPICall("POST", api, urlValues)
imageId, err := c.DecortAPICall(ctx, "POST", api, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -111,7 +111,7 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
d.SetId(imageId)
d.Set("image_id", imageId)
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -131,7 +131,7 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
log.Debugf("resourceImageRead: called for %s id: %s", d.Get("name").(string), d.Id())
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if image == nil {
d.SetId("")
return diag.FromErr(err)
@@ -182,7 +182,7 @@ func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{
func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
log.Debugf("resourceImageDelete: called for %s, id: %s", d.Get("name").(string), d.Id())
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if image == nil {
if err != nil {
return diag.FromErr(err)
@@ -202,7 +202,7 @@ func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interfac
urlValues.Add("permanently", strconv.FormatBool(permanently.(bool)))
}
_, err = c.DecortAPICall("POST", imageDeleteAPI, urlValues)
_, err = c.DecortAPICall(ctx, "POST", imageDeleteAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -211,10 +211,10 @@ func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interfac
return nil
}
func resourceImageExists(d *schema.ResourceData, m interface{}) (bool, error) {
func resourceImageExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
log.Debugf("resourceImageExists: called for %s, id: %s", d.Get("name").(string), d.Id())
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if image == nil {
if err != nil {
return false, err
@@ -225,13 +225,13 @@ func resourceImageExists(d *schema.ResourceData, m interface{}) (bool, error) {
return true, nil
}
func resourceImageEditName(d *schema.ResourceData, m interface{}) error {
func resourceImageEditName(ctx context.Context, d *schema.ResourceData, m interface{}) error {
log.Debugf("resourceImageEditName: called for %s, id: %s", d.Get("name").(string), d.Id())
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
urlValues.Add("name", d.Get("name").(string))
_, err := c.DecortAPICall("POST", imageEditNameAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", imageEditNameAPI, urlValues)
if err != nil {
return err
}
@@ -245,7 +245,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
urlValues := &url.Values{}
if d.HasChange("enabled") {
err := resourceImageChangeEnabled(d, m)
err := resourceImageChangeEnabled(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -253,7 +253,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
}
if d.HasChange("name") {
err := resourceImageEditName(d, m)
err := resourceImageEditName(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -261,14 +261,14 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
}
if d.HasChange("shared_with") {
err := resourceImageShare(d, m)
err := resourceImageShare(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
urlValues = &url.Values{}
}
if d.HasChange("computeci_id") {
err := resourceImageChangeComputeci(d, m)
err := resourceImageChangeComputeci(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -276,7 +276,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
}
if d.HasChange("enabled_stacks") {
err := resourceImageUpdateNodes(d, m)
err := resourceImageUpdateNodes(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -284,7 +284,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
}
if d.HasChange("link_to") {
err := resourceImageLink(d, m)
err := resourceImageLink(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -302,7 +302,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
urlValues.Add("bootable", strconv.FormatBool(d.Get("bootable").(bool)))
urlValues.Add("hotresize", strconv.FormatBool(d.Get("hot_resize").(bool)))
_, err := c.DecortAPICall("POST", imageEditAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", imageEditAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -311,7 +311,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
return nil
}
func resourceImageChangeEnabled(d *schema.ResourceData, m interface{}) error {
func resourceImageChangeEnabled(ctx context.Context, d *schema.ResourceData, m interface{}) error {
var api string
c := m.(*controller.ControllerCfg)
@@ -322,7 +322,7 @@ func resourceImageChangeEnabled(d *schema.ResourceData, m interface{}) error {
} else {
api = imageDisableAPI
}
resp, err := c.DecortAPICall("POST", api, urlValues)
resp, err := c.DecortAPICall(ctx, "POST", api, urlValues)
if err != nil {
return err
}
@@ -336,13 +336,13 @@ func resourceImageChangeEnabled(d *schema.ResourceData, m interface{}) error {
return nil
}
func resourceImageLink(d *schema.ResourceData, m interface{}) error {
func resourceImageLink(ctx context.Context, d *schema.ResourceData, m interface{}) error {
log.Debugf("resourceVirtualImageLink: called for %s, id: %s", d.Get("name").(string), d.Id())
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
urlValues.Add("targetId", strconv.Itoa(d.Get("link_to").(int)))
_, err := c.DecortAPICall("POST", imageLinkAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", imageLinkAPI, urlValues)
if err != nil {
return err
}
@@ -350,7 +350,7 @@ func resourceImageLink(d *schema.ResourceData, m interface{}) error {
return nil
}
func resourceImageShare(d *schema.ResourceData, m interface{}) error {
func resourceImageShare(ctx context.Context, d *schema.ResourceData, m interface{}) error {
log.Debugf("resourceImageShare: called for %s, id: %s", d.Get("name").(string), d.Id())
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -369,7 +369,7 @@ func resourceImageShare(d *schema.ResourceData, m interface{}) error {
}
temp = "[" + temp + "]"
urlValues.Add("accounts", temp)
_, err := c.DecortAPICall("POST", imageShareAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", imageShareAPI, urlValues)
if err != nil {
return err
}
@@ -377,7 +377,7 @@ func resourceImageShare(d *schema.ResourceData, m interface{}) error {
return nil
}
func resourceImageChangeComputeci(d *schema.ResourceData, m interface{}) error {
func resourceImageChangeComputeci(ctx context.Context, d *schema.ResourceData, m interface{}) error {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -393,7 +393,7 @@ func resourceImageChangeComputeci(d *schema.ResourceData, m interface{}) error {
api = imageComputeciSetAPI
}
_, err := c.DecortAPICall("POST", api, urlValues)
_, err := c.DecortAPICall(ctx, "POST", api, urlValues)
if err != nil {
return err
}
@@ -401,7 +401,7 @@ func resourceImageChangeComputeci(d *schema.ResourceData, m interface{}) error {
return nil
}
func resourceImageUpdateNodes(d *schema.ResourceData, m interface{}) error {
func resourceImageUpdateNodes(ctx context.Context, d *schema.ResourceData, m interface{}) error {
log.Debugf("resourceImageUpdateNodes: called for %s, id: %s", d.Get("name").(string), d.Id())
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -418,7 +418,7 @@ func resourceImageUpdateNodes(d *schema.ResourceData, m interface{}) error {
}
temp = "[" + temp + "]"
urlValues.Add("enabledStacks", temp)
_, err := c.DecortAPICall("POST", imageUpdateNodesAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", imageUpdateNodesAPI, urlValues)
if err != nil {
return err
}
@@ -677,7 +677,6 @@ func ResourceImage() *schema.Resource {
ReadContext: resourceImageRead,
UpdateContext: resourceImageEdit,
DeleteContext: resourceImageDelete,
Exists: resourceImageExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,

View File

@@ -51,7 +51,7 @@ func resourceVirtualImageCreate(ctx context.Context, d *schema.ResourceData, m i
urlValues.Add("name", d.Get("name").(string))
urlValues.Add("targetId", strconv.Itoa(d.Get("target_id").(int)))
imageId, err := c.DecortAPICall("POST", imageCreateVirtualAPI, urlValues)
imageId, err := c.DecortAPICall(ctx, "POST", imageCreateVirtualAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -59,7 +59,7 @@ func resourceVirtualImageCreate(ctx context.Context, d *schema.ResourceData, m i
d.SetId(imageId)
d.Set("image_id", imageId)
image, err := utilityImageCheckPresence(d, m)
image, err := utilityImageCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -326,7 +326,6 @@ func ResourceVirtualImage() *schema.Resource {
ReadContext: resourceImageRead,
UpdateContext: resourceImageEdit,
DeleteContext: resourceImageDelete,
Exists: resourceImageExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package image
import (
"context"
"encoding/json"
"errors"
"fmt"
@@ -42,7 +43,7 @@ import (
"github.com/rudecs/terraform-provider-decort/internal/controller"
)
func utilityImageCheckPresence(d *schema.ResourceData, m interface{}) (*Image, error) {
func utilityImageCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*Image, error) {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -52,7 +53,7 @@ func utilityImageCheckPresence(d *schema.ResourceData, m interface{}) (*Image, e
urlValues.Add("imageId", d.Id())
}
resp, err := c.DecortAPICall("POST", imageGetAPI, urlValues)
resp, err := c.DecortAPICall(ctx, "POST", imageGetAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package image
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilityImageListCheckPresence(d *schema.ResourceData, m interface{}) (ImageList, error) {
func utilityImageListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (ImageList, error) {
imageList := ImageList{}
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -62,7 +63,7 @@ func utilityImageListCheckPresence(d *schema.ResourceData, m interface{}) (Image
}
log.Debugf("utilityImageListCheckPresence: load image list")
imageListRaw, err := c.DecortAPICall("POST", imageListGetAPI, urlValues)
imageListRaw, err := c.DecortAPICall(ctx, "POST", imageListGetAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package image
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilityImageListStacksCheckPresence(d *schema.ResourceData, m interface{}) (ImageListStacks, error) {
func utilityImageListStacksCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (ImageListStacks, error) {
imageListStacks := ImageListStacks{}
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -50,7 +51,7 @@ func utilityImageListStacksCheckPresence(d *schema.ResourceData, m interface{})
urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
log.Debugf("utilityImageListStacksCheckPresence: load image list")
imageListRaw, err := c.DecortAPICall("POST", imageListStacksApi, urlValues)
imageListRaw, err := c.DecortAPICall(ctx, "POST", imageListStacksApi, urlValues)
if err != nil {
return nil, err
}

View File

@@ -42,7 +42,7 @@ import (
)
func dataSourcePcideviceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
pcidevice, err := utilityPcideviceCheckPresence(d, m)
pcidevice, err := utilityPcideviceCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -64,7 +64,7 @@ func flattenPcideviceList(pl PcideviceList) []map[string]interface{} {
}
func dataSourcePcideviceListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
pcideviceList, err := utilityPcideviceListCheckPresence(d, m)
pcideviceList, err := utilityPcideviceListCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -48,7 +48,7 @@ func resourcePcideviceCreate(ctx context.Context, d *schema.ResourceData, m inte
log.Debugf("resourcePcideviceCreate: called for pcidevice %s", d.Get("name").(string))
if deviceId, ok := d.GetOk("device_id"); ok {
if exists, err := resourcePcideviceExists(d, m); exists {
if exists, err := resourcePcideviceExists(ctx, d, m); exists {
if err != nil {
return diag.FromErr(err)
}
@@ -74,7 +74,7 @@ func resourcePcideviceCreate(ctx context.Context, d *schema.ResourceData, m inte
urlValues.Add("description", description.(string))
}
pcideviceId, err := c.DecortAPICall("POST", pcideviceCreateAPI, urlValues)
pcideviceId, err := c.DecortAPICall(ctx, "POST", pcideviceCreateAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -91,7 +91,7 @@ func resourcePcideviceCreate(ctx context.Context, d *schema.ResourceData, m inte
}
func resourcePcideviceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
pcidevice, err := utilityPcideviceCheckPresence(d, m)
pcidevice, err := utilityPcideviceCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -121,7 +121,7 @@ func resourcePcideviceDelete(ctx context.Context, d *schema.ResourceData, m inte
urlValues.Add("deviceId", d.Id())
urlValues.Add("force", strconv.FormatBool(d.Get("force").(bool)))
_, err := c.DecortAPICall("POST", pcideviceDeleteAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", pcideviceDeleteAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -131,8 +131,8 @@ func resourcePcideviceDelete(ctx context.Context, d *schema.ResourceData, m inte
return nil
}
func resourcePcideviceExists(d *schema.ResourceData, m interface{}) (bool, error) {
pcidevice, err := utilityPcideviceCheckPresence(d, m)
func resourcePcideviceExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
pcidevice, err := utilityPcideviceCheckPresence(ctx, d, m)
if err != nil {
return false, err
}
@@ -158,7 +158,7 @@ func resourcePcideviceEdit(ctx context.Context, d *schema.ResourceData, m interf
api = pcideviceDisableAPI
}
_, err := c.DecortAPICall("POST", api, urlValues)
_, err := c.DecortAPICall(ctx, "POST", api, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -255,7 +255,6 @@ func ResourcePcidevice() *schema.Resource {
ReadContext: resourcePcideviceRead,
UpdateContext: resourcePcideviceEdit,
DeleteContext: resourcePcideviceDelete,
Exists: resourcePcideviceExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,

View File

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

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package pcidevice
import (
"context"
"encoding/json"
"net/url"
@@ -39,12 +40,12 @@ import (
"github.com/rudecs/terraform-provider-decort/internal/controller"
)
func utilityPcideviceListCheckPresence(_ *schema.ResourceData, m interface{}) (PcideviceList, error) {
func utilityPcideviceListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (PcideviceList, error) {
pcideviceList := PcideviceList{}
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
pcideviceListRaw, err := c.DecortAPICall("POST", pcideviceListAPI, urlValues)
pcideviceListRaw, err := c.DecortAPICall(ctx, "POST", pcideviceListAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -43,7 +43,7 @@ import (
)
func dataSourceSepRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
desSep, err := utilitySepCheckPresence(d, m)
desSep, err := utilitySepCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -42,7 +42,7 @@ import (
)
func dataSourceSepConfigRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
sepConfig, err := utilitySepConfigCheckPresence(d, m)
sepConfig, err := utilitySepConfigCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -41,7 +41,7 @@ import (
)
func dataSourceSepConsumptionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
sepCons, err := utilitySepConsumptionCheckPresence(d, m)
sepCons, err := utilitySepConsumptionCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -41,7 +41,7 @@ import (
)
func dataSourceSepDiskListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
sepDiskList, err := utilitySepDiskListCheckPresence(d, m)
sepDiskList, err := utilitySepDiskListCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -69,7 +69,7 @@ func flattenSepList(sl SepList) []map[string]interface{} {
}
func dataSourceSepListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
sepList, err := utilitySepListCheckPresence(d, m)
sepList, err := utilitySepListCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -42,7 +42,7 @@ import (
)
func dataSourceSepPoolRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
sepPool, err := utilitySepPoolCheckPresence(d, m)
sepPool, err := utilitySepPoolCheckPresence(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}

View File

@@ -51,7 +51,7 @@ func resourceSepCreate(ctx context.Context, d *schema.ResourceData, m interface{
log.Debugf("resourceSepCreate: called for sep %s", d.Get("name").(string))
if sepId, ok := d.GetOk("sep_id"); ok {
if exists, err := resourceSepExists(d, m); exists {
if exists, err := resourceSepExists(ctx, d, m); exists {
if err != nil {
return diag.FromErr(err)
}
@@ -109,7 +109,7 @@ func resourceSepCreate(ctx context.Context, d *schema.ResourceData, m interface{
temp = "[" + temp + "]"
urlValues.Add("provider_nids", temp)
sepId, err := c.DecortAPICall("POST", sepCreateAPI, urlValues)
sepId, err := c.DecortAPICall(ctx, "POST", sepCreateAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -131,7 +131,7 @@ func resourceSepCreate(ctx context.Context, d *schema.ResourceData, m interface{
func resourceSepRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
log.Debugf("resourceSepRead: called for %s id: %d", d.Get("name").(string), d.Get("sep_id").(int))
sep, err := utilitySepCheckPresence(d, m)
sep, err := utilitySepCheckPresence(ctx, d, m)
if sep == nil {
d.SetId("")
return diag.FromErr(err)
@@ -159,7 +159,7 @@ func resourceSepRead(ctx context.Context, d *schema.ResourceData, m interface{})
func resourceSepDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
log.Debugf("resourceSepDelete: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
sepDes, err := utilitySepCheckPresence(d, m)
sepDes, err := utilitySepCheckPresence(ctx, d, m)
if sepDes == nil {
if err != nil {
return diag.FromErr(err)
@@ -171,7 +171,7 @@ func resourceSepDelete(ctx context.Context, d *schema.ResourceData, m interface{
urlValues := &url.Values{}
urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
_, err = c.DecortAPICall("POST", sepDeleteAPI, urlValues)
_, err = c.DecortAPICall(ctx, "POST", sepDeleteAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -180,10 +180,10 @@ func resourceSepDelete(ctx context.Context, d *schema.ResourceData, m interface{
return nil
}
func resourceSepExists(d *schema.ResourceData, m interface{}) (bool, error) {
func resourceSepExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
log.Debugf("resourceSepExists: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
sepDes, err := utilitySepCheckPresence(d, m)
sepDes, err := utilitySepCheckPresence(ctx, d, m)
if sepDes == nil {
if err != nil {
return false, err
@@ -204,7 +204,7 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
if decommission {
urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
urlValues.Add("clear_physically", strconv.FormatBool(d.Get("clear_physically").(bool)))
_, err := c.DecortAPICall("POST", sepDecommissionAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", sepDecommissionAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -216,7 +216,7 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
updCapacityLimit := d.Get("upd_capacity_limit").(bool)
if updCapacityLimit {
urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
_, err := c.DecortAPICall("POST", sepUpdateCapacityLimitAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", sepUpdateCapacityLimitAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -227,11 +227,11 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
if d.HasChange("config") {
urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
urlValues.Add("config", d.Get("config").(string))
_, err := c.DecortAPICall("POST", sepConfigValidateAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", sepConfigValidateAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
_, err = c.DecortAPICall("POST", sepConfigInsertAPI, urlValues)
_, err = c.DecortAPICall(ctx, "POST", sepConfigInsertAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -247,7 +247,7 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
urlValues.Add("field_value", field["field_value"].(string))
urlValues.Add("field_type", field["field_type"].(string))
_, err := c.DecortAPICall("POST", sepConfigFieldEditAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", sepConfigFieldEditAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -255,7 +255,7 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
urlValues = &url.Values{}
if d.HasChange("enable") {
err := resourceSepChangeEnabled(d, m)
err := resourceSepChangeEnabled(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -263,7 +263,7 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
urlValues = &url.Values{}
if d.HasChange("consumed_by") {
err := resourceSepUpdateNodes(d, m)
err := resourceSepUpdateNodes(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -271,7 +271,7 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
urlValues = &url.Values{}
if d.HasChange("provided_by") {
err := resourceSepUpdateProviders(d, m)
err := resourceSepUpdateProviders(ctx, d, m)
if err != nil {
return diag.FromErr(err)
}
@@ -285,7 +285,7 @@ func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{})
return nil
}
func resourceSepChangeEnabled(d *schema.ResourceData, m interface{}) error {
func resourceSepChangeEnabled(ctx context.Context, d *schema.ResourceData, m interface{}) error {
var api string
c := m.(*controller.ControllerCfg)
@@ -296,7 +296,7 @@ func resourceSepChangeEnabled(d *schema.ResourceData, m interface{}) error {
} else {
api = sepDisableAPI
}
resp, err := c.DecortAPICall("POST", api, urlValues)
resp, err := c.DecortAPICall(ctx, "POST", api, urlValues)
if err != nil {
return err
}
@@ -310,7 +310,7 @@ func resourceSepChangeEnabled(d *schema.ResourceData, m interface{}) error {
return nil
}
func resourceSepUpdateNodes(d *schema.ResourceData, m interface{}) error {
func resourceSepUpdateNodes(ctx context.Context, d *schema.ResourceData, m interface{}) error {
log.Debugf("resourceSepUpdateNodes: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -345,7 +345,7 @@ func resourceSepUpdateNodes(d *schema.ResourceData, m interface{}) error {
}
temp = "[" + temp + "]"
urlValues.Add("consumer_nids", temp)
_, err := c.DecortAPICall("POST", api, urlValues)
_, err := c.DecortAPICall(ctx, "POST", api, urlValues)
if err != nil {
return err
}
@@ -362,7 +362,7 @@ func findElInt(sl []interface{}, el interface{}) bool {
return false
}
func resourceSepUpdateProviders(d *schema.ResourceData, m interface{}) error {
func resourceSepUpdateProviders(ctx context.Context, d *schema.ResourceData, m interface{}) error {
log.Debugf("resourceSepUpdateProviders: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -379,7 +379,7 @@ func resourceSepUpdateProviders(d *schema.ResourceData, m interface{}) error {
}
temp = "[" + temp + "]"
urlValues.Add("provider_nids", temp)
_, err := c.DecortAPICall("POST", sepAddProviderNodesAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", sepAddProviderNodesAPI, urlValues)
if err != nil {
return err
}
@@ -524,7 +524,6 @@ func ResourceSep() *schema.Resource {
ReadContext: resourceSepRead,
UpdateContext: resourceSepEdit,
DeleteContext: resourceSepDelete,
Exists: resourceSepExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,

View File

@@ -49,7 +49,7 @@ func resourceSepConfigCreate(ctx context.Context, d *schema.ResourceData, m inte
log.Debugf("resourceSepConfigCreate: called for sep id %d", d.Get("sep_id").(int))
if _, ok := d.GetOk("sep_id"); ok {
if exists, err := resourceSepConfigExists(d, m); exists {
if exists, err := resourceSepConfigExists(ctx, d, m); exists {
if err != nil {
return diag.FromErr(err)
}
@@ -71,7 +71,7 @@ func resourceSepConfigCreate(ctx context.Context, d *schema.ResourceData, m inte
func resourceSepConfigRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
log.Debugf("resourceSepConfigRead: called for sep id: %d", d.Get("sep_id").(int))
sepConfig, err := utilitySepConfigCheckPresence(d, m)
sepConfig, err := utilitySepConfigCheckPresence(ctx, d, m)
if sepConfig == nil {
d.SetId("")
return diag.FromErr(err)
@@ -86,10 +86,10 @@ func resourceSepConfigDelete(ctx context.Context, d *schema.ResourceData, m inte
return nil
}
func resourceSepConfigExists(d *schema.ResourceData, m interface{}) (bool, error) {
func resourceSepConfigExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
log.Debugf("resourceSepConfigExists: called for sep id: %d", d.Get("sep_id").(int))
sepDesConfig, err := utilitySepConfigCheckPresence(d, m)
sepDesConfig, err := utilitySepConfigCheckPresence(ctx, d, m)
if sepDesConfig == nil {
if err != nil {
return false, err
@@ -108,11 +108,11 @@ func resourceSepConfigEdit(ctx context.Context, d *schema.ResourceData, m interf
if d.HasChange("config") {
urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
urlValues.Add("config", d.Get("config").(string))
_, err := c.DecortAPICall("POST", sepConfigValidateAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", sepConfigValidateAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
_, err = c.DecortAPICall("POST", sepConfigInsertAPI, urlValues)
_, err = c.DecortAPICall(ctx, "POST", sepConfigInsertAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -128,7 +128,7 @@ func resourceSepConfigEdit(ctx context.Context, d *schema.ResourceData, m interf
urlValues.Add("field_value", field["field_value"].(string))
urlValues.Add("field_type", field["field_type"].(string))
_, err := c.DecortAPICall("POST", sepConfigFieldEditAPI, urlValues)
_, err := c.DecortAPICall(ctx, "POST", sepConfigFieldEditAPI, urlValues)
if err != nil {
return diag.FromErr(err)
}
@@ -186,7 +186,6 @@ func ResourceSepConfig() *schema.Resource {
ReadContext: resourceSepConfigRead,
UpdateContext: resourceSepConfigEdit,
DeleteContext: resourceSepConfigDelete,
Exists: resourceSepConfigExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package sep
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilitySepCheckPresence(d *schema.ResourceData, m interface{}) (*Sep, error) {
func utilitySepCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*Sep, error) {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -55,7 +56,7 @@ func utilitySepCheckPresence(d *schema.ResourceData, m interface{}) (*Sep, error
}
log.Debugf("utilitySepCheckPresence: load sep")
sepRaw, err := c.DecortAPICall("POST", sepGetAPI, urlValues)
sepRaw, err := c.DecortAPICall(ctx, "POST", sepGetAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package sep
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilitySepConfigCheckPresence(d *schema.ResourceData, m interface{}) (SepConfig, error) {
func utilitySepConfigCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (SepConfig, error) {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -51,7 +52,7 @@ func utilitySepConfigCheckPresence(d *schema.ResourceData, m interface{}) (SepCo
urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
log.Debugf("utilitySepConfigCheckPresence: load sep config")
sepConfigRaw, err := c.DecortAPICall("POST", sepGetConfigAPI, urlValues)
sepConfigRaw, err := c.DecortAPICall(ctx, "POST", sepGetConfigAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package sep
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -40,7 +41,7 @@ import (
"github.com/rudecs/terraform-provider-decort/internal/controller"
)
func utilitySepConsumptionCheckPresence(d *schema.ResourceData, m interface{}) (*SepConsumption, error) {
func utilitySepConsumptionCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*SepConsumption, error) {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -48,7 +49,7 @@ func utilitySepConsumptionCheckPresence(d *schema.ResourceData, m interface{}) (
urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
sepConsRaw, err := c.DecortAPICall("POST", sepConsumptionAPI, urlValues)
sepConsRaw, err := c.DecortAPICall(ctx, "POST", sepConsumptionAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package sep
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilitySepDiskListCheckPresence(d *schema.ResourceData, m interface{}) ([]int, error) {
func utilitySepDiskListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]int, error) {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -55,7 +56,7 @@ func utilitySepDiskListCheckPresence(d *schema.ResourceData, m interface{}) ([]i
}
log.Debugf("utilitySepDiskListCheckPresence: load sep")
sepDiskListRaw, err := c.DecortAPICall("POST", sepDiskListAPI, urlValues)
sepDiskListRaw, err := c.DecortAPICall(ctx, "POST", sepDiskListAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package sep
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilitySepListCheckPresence(d *schema.ResourceData, m interface{}) (SepList, error) {
func utilitySepListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (SepList, error) {
sepList := SepList{}
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -55,7 +56,7 @@ func utilitySepListCheckPresence(d *schema.ResourceData, m interface{}) (SepList
}
log.Debugf("utilitySepListCheckPresence: load image list")
sepListRaw, err := c.DecortAPICall("POST", sepListAPI, urlValues)
sepListRaw, err := c.DecortAPICall(ctx, "POST", sepListAPI, urlValues)
if err != nil {
return nil, err
}

View File

@@ -32,6 +32,7 @@ Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
package sep
import (
"context"
"encoding/json"
"net/url"
"strconv"
@@ -42,7 +43,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilitySepPoolCheckPresence(d *schema.ResourceData, m interface{}) (SepPool, error) {
func utilitySepPoolCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (SepPool, error) {
c := m.(*controller.ControllerCfg)
urlValues := &url.Values{}
@@ -52,7 +53,7 @@ func utilitySepPoolCheckPresence(d *schema.ResourceData, m interface{}) (SepPool
urlValues.Add("pool_name", d.Get("pool_name").(string))
log.Debugf("utilitySepDesPoolCheckPresence: load sep")
sepPoolRaw, err := c.DecortAPICall("POST", sepGetPoolAPI, urlValues)
sepPoolRaw, err := c.DecortAPICall(ctx, "POST", sepGetPoolAPI, urlValues)
if err != nil {
return nil, err
}