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/cloudbroker/sep/data_source_sep.go
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)
}

2
internal/service/cloudbroker/sep/data_source_sep_config.go
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)
}

2
internal/service/cloudbroker/sep/data_source_sep_consumption.go
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)
}

2
internal/service/cloudbroker/sep/data_source_sep_disk_list.go
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)
}

2
internal/service/cloudbroker/sep/data_source_sep_list.go
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)
}

2
internal/service/cloudbroker/sep/data_source_sep_pool.go
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)
}

43
internal/service/cloudbroker/sep/resource_sep.go
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,

15
internal/service/cloudbroker/sep/resource_sep_config.go
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,

5
internal/service/cloudbroker/sep/utility_sep.go
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
}

5
internal/service/cloudbroker/sep/utility_sep_config.go
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
}

5
internal/service/cloudbroker/sep/utility_sep_consumption.go
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
}

5
internal/service/cloudbroker/sep/utility_sep_disk_list.go
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
}

5
internal/service/cloudbroker/sep/utility_sep_list.go
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
}

5
internal/service/cloudbroker/sep/utility_sep_pool.go
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
}