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

a lot of refactoring and fixes

Browse Source
This commit is contained in:
kjubybot
2022-07-21 13:38:52 +03:00
parent abd1a439eb
commit fae22aa484
36 changed files with 43 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/service/cloudapi/locations/data_source_locations_url.go
View File

@@ -41,9 +41,8 @@ import (
)
func dataSourceLocationUrlRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
url, err := utilityLocationUrlCheckPresence(ctx, d, m)
url, err := utilityLocationUrlCheckPresence(ctx, m)
if err != nil {
return diag.FromErr(err)
}

6
internal/service/cloudapi/locations/utility_location_url.go
View File

@@ -38,11 +38,9 @@ import (
"github.com/rudecs/terraform-provider-decort/internal/controller"
log "github.com/sirupsen/logrus"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)
func utilityLocationUrlCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
func utilityLocationUrlCheckPresence(ctx context.Context, m interface{}) (string, error) {
c := m.(*controller.ControllerCfg)
log.Debugf("utilityLocationUrlCheckPresence: load locations list")
@@ -54,7 +52,7 @@ func utilityLocationUrlCheckPresence(ctx context.Context, d *schema.ResourceData
location := new(string)
err = json.Unmarshal([]byte(locationUrl), location)
if err != nil {
return "", nil
return "", err
}
return *location, nil