4.0.0

internal/location/location.go

@@ -22,11 +22,10 @@ package location
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"net/url"
 
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
@@ -34,17 +33,10 @@ var DefaultGridID int
 
 func UtilityLocationGetDefaultGridID(ctx context.Context, m interface{}) (int, error) {
 	c := m.(*controller.ControllerCfg)
-
-	urlValues := &url.Values{}
+	req := locations.ListRequest{}
 
 	log.Debug("utilityLocationGetDefaultGridID: retrieving locations list")
-	apiResp, err := c.DecortAPICall(ctx, "POST", LocationsListAPI, urlValues)
-	if err != nil {
-		return 0, err
-	}
-
-	locList := LocationsListResp{}
-	err = json.Unmarshal([]byte(apiResp), &locList)
+	locList, err := c.CloudAPI().Locations().List(ctx, req)
 	if err != nil {
 		return 0, err
 	}
@@ -54,7 +46,7 @@ func UtilityLocationGetDefaultGridID(ctx context.Context, m interface{}) (int, e
 		return 0, fmt.Errorf("utilityLocationGetDefaultGridID: retrieved 0 length locations list")
 	}
 
-	DefaultGridID = locList[0].GridID
+	DefaultGridID = int(locList[0].GID)
 	log.Debugf("utilityLocationGetDefaultGridID: default location GridID %d, name %s", DefaultGridID, locList[0].Name)
 
 	return DefaultGridID, nil