4.0.0

internal/service/cloudbroker/image/data_source_image.go

@@ -38,57 +38,15 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
 )
 
-func flattenImage(d *schema.ResourceData, image *Image) {
-	d.Set("name", image.Name)
-	d.Set("drivers", image.Drivers)
-	d.Set("url", image.Url)
-	d.Set("gid", image.Gid)
-	d.Set("image_id", image.ImageId)
-	d.Set("boot_type", image.Boottype)
-	d.Set("image_type", image.Imagetype)
-	d.Set("bootable", image.Bootable)
-	d.Set("sep_id", image.SepId)
-	d.Set("unc_path", image.UNCPath)
-	d.Set("link_to", image.LinkTo)
-	d.Set("status", image.Status)
-	d.Set("tech_status", image.TechStatus)
-	d.Set("version", image.Version)
-	d.Set("size", image.Size)
-	d.Set("enabled", image.Enabled)
-	d.Set("computeci_id", image.ComputeciId)
-	d.Set("pool_name", image.PoolName)
-	d.Set("username", image.Username)
-	d.Set("username_dl", image.UsernameDL)
-	d.Set("password", image.Password)
-	d.Set("password_dl", image.PasswordDL)
-	d.Set("account_id", image.AccountId)
-	d.Set("guid", image.Guid)
-	d.Set("milestones", image.Milestones)
-	d.Set("provider_name", image.ProviderName)
-	d.Set("purge_attempts", image.PurgeAttempts)
-	d.Set("reference_id", image.ReferenceId)
-	d.Set("res_id", image.ResId)
-	d.Set("res_name", image.ResName)
-	d.Set("rescuecd", image.Rescuecd)
-	d.Set("architecture", image.Architecture)
-	d.Set("hot_resize", image.Hotresize)
-	d.Set("history", flattenHistory(image.History))
-	d.Set("last_modified", image.LastModified)
-	d.Set("meta", flattens.FlattenMeta(image.Meta))
-	d.Set("desc", image.Desc)
-	d.Set("shared_with", image.SharedWith)
-}
-
 func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	image, err := utilityImageCheckPresence(ctx, d, m)
 	if err != nil {
 
 		return diag.FromErr(err)
 	}
-	d.SetId(strconv.Itoa(image.Guid))
+	d.SetId(strconv.FormatUint(image.ID, 10))
 	flattenImage(d, image)
 
 	return nil

internal/service/cloudbroker/image/data_source_image_list.go

@@ -40,54 +40,6 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
-func flattenImageList(il ImageList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, item := range il {
-		temp := map[string]interface{}{
-			"name":           item.Name,
-			"url":            item.Url,
-			"gid":            item.Gid,
-			"guid":           item.Guid,
-			"drivers":        item.Drivers,
-			"image_id":       item.ImageId,
-			"boot_type":      item.Boottype,
-			"bootable":       item.Bootable,
-			"image_type":     item.Imagetype,
-			"status":         item.Status,
-			"tech_status":    item.TechStatus,
-			"version":        item.Version,
-			"username":       item.Username,
-			"username_dl":    item.UsernameDL,
-			"password":       item.Password,
-			"password_dl":    item.PasswordDL,
-			"purge_attempts": item.PurgeAttempts,
-			"architecture":   item.Architecture,
-			"account_id":     item.AccountId,
-			"computeci_id":   item.ComputeciId,
-			"enabled":        item.Enabled,
-			"reference_id":   item.ReferenceId,
-			"res_id":         item.ResId,
-			"res_name":       item.ResName,
-			"rescuecd":       item.Rescuecd,
-			"provider_name":  item.ProviderName,
-			"milestones":     item.Milestones,
-			"size":           item.Size,
-			"sep_id":         item.SepId,
-			"link_to":        item.LinkTo,
-			"unc_path":       item.UNCPath,
-			"pool_name":      item.PoolName,
-			"hot_resize":     item.Hotresize,
-			"history":        flattenHistory(item.History),
-			"last_modified":  item.LastModified,
-			"meta":           flattenMeta(item.Meta),
-			"desc":           item.Desc,
-			"shared_with":    item.SharedWith,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
 func dataSourceImageListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	imageList, err := utilityImageListCheckPresence(ctx, d, m)
 	if err != nil {

internal/service/cloudbroker/image/data_source_image_list_stacks.go

@@ -40,32 +40,6 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
-func flattenImageListStacks(_ *schema.ResourceData, stack ImageListStacks) []map[string]interface{} {
-	temp := make([]map[string]interface{}, 0)
-	for _, item := range stack {
-		t := map[string]interface{}{
-			"api_url":      item.ApiURL,
-			"api_key":      item.ApiKey,
-			"app_id":       item.AppId,
-			"desc":         item.Desc,
-			"drivers":      item.Drivers,
-			"error":        item.Error,
-			"guid":         item.Guid,
-			"id":           item.Id,
-			"images":       item.Images,
-			"login":        item.Login,
-			"name":         item.Name,
-			"passwd":       item.Passwd,
-			"reference_id": item.ReferenceId,
-			"status":       item.Status,
-			"type":         item.Type,
-		}
-
-		temp = append(temp, t)
-	}
-	return temp
-}
-
 func dataSourceImageListStacksRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	imageListStacks, err := utilityImageListStacksCheckPresence(ctx, d, m)
 	if err != nil {

internal/service/cloudbroker/image/flattens.go

@@ -0,0 +1,157 @@
+package image
+
+import (
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
+)
+
+func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
+	d.Set("name", img.Name)
+	d.Set("drivers", img.Drivers)
+	d.Set("url", img.URL)
+	d.Set("gid", img.GID)
+	d.Set("image_id", img.ID)
+	d.Set("boot_type", img.BootType)
+	d.Set("image_type", img.Type)
+	d.Set("bootable", img.Bootable)
+	d.Set("sep_id", img.SEPID)
+	d.Set("unc_path", img.UNCPath)
+	d.Set("link_to", img.LinkTo)
+	d.Set("status", img.Status)
+	d.Set("tech_status", img.TechStatus)
+	d.Set("version", img.Version)
+	d.Set("size", img.Size)
+	d.Set("enabled", img.Enabled)
+	d.Set("computeci_id", img.ComputeCIID)
+	d.Set("pool_name", img.Pool)
+	d.Set("username", img.Username)
+	// d.Set("username_dl", img.UsernameDL)
+	d.Set("password", img.Password)
+	// d.Set("password_dl", img.PasswordDL)
+	d.Set("account_id", img.AccountID)
+	d.Set("guid", img.GUID)
+	d.Set("milestones", img.Milestones)
+	d.Set("provider_name", img.ProviderName)
+	d.Set("purge_attempts", img.PurgeAttempts)
+	d.Set("reference_id", img.ReferenceID)
+	d.Set("res_id", img.ResID)
+	d.Set("res_name", img.ResName)
+	d.Set("rescuecd", img.RescueCD)
+	d.Set("architecture", img.Architecture)
+	d.Set("hot_resize", img.HotResize)
+	d.Set("history", flattenHistory(img.History))
+	d.Set("last_modified", img.LastModified)
+	d.Set("meta", flattens.FlattenMeta(img.Meta))
+	d.Set("desc", img.Description)
+	d.Set("shared_with", img.SharedWith)
+}
+
+func flattenMeta(m []interface{}) []string {
+	output := []string{}
+	for _, item := range m {
+		switch d := item.(type) {
+		case string:
+			output = append(output, d)
+		case int:
+			output = append(output, strconv.Itoa(d))
+		case int64:
+			output = append(output, strconv.FormatInt(d, 10))
+		case float64:
+			output = append(output, strconv.FormatInt(int64(d), 10))
+		default:
+			output = append(output, "")
+		}
+	}
+	return output
+}
+
+func flattenHistory(history []image.History) []map[string]interface{} {
+	temp := make([]map[string]interface{}, 0)
+	for _, item := range history {
+		t := map[string]interface{}{
+			"id":        item.ID,
+			"guid":      item.GUID,
+			"timestamp": item.Timestamp,
+		}
+
+		temp = append(temp, t)
+	}
+	return temp
+}
+
+func flattenImageList(il image.ListImages) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, item := range il {
+		temp := map[string]interface{}{
+			"name":        item.Name,
+			"url":         item.URL,
+			"gid":         item.GID,
+			"guid":        item.GUID,
+			"drivers":     item.Drivers,
+			"image_id":    item.ID,
+			"boot_type":   item.BootType,
+			"bootable":    item.Bootable,
+			"image_type":  item.Type,
+			"status":      item.Status,
+			"tech_status": item.TechStatus,
+			"version":     item.Version,
+			"username":    item.Username,
+			// "username_dl":    item.UsernameDL,
+			"password": item.Password,
+			// "password_dl":    item.PasswordDL,
+			"purge_attempts": item.PurgeAttempts,
+			"architecture":   item.Architecture,
+			"account_id":     item.AccountID,
+			"computeci_id":   item.ComputeCIID,
+			"enabled":        item.Enabled,
+			"reference_id":   item.ReferenceID,
+			"res_id":         item.ResID,
+			"res_name":       item.ResName,
+			"rescuecd":       item.RescueCD,
+			"provider_name":  item.ProviderName,
+			"milestones":     item.Milestones,
+			"size":           item.Size,
+			"sep_id":         item.SEPID,
+			"link_to":        item.LinkTo,
+			"unc_path":       item.UNCPath,
+			"pool_name":      item.Pool,
+			"hot_resize":     item.HotResize,
+			"history":        flattenHistory(item.History),
+			"last_modified":  item.LastModified,
+			"meta":           flattenMeta(item.Meta),
+			"desc":           item.Description,
+			"shared_with":    item.SharedWith,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenImageListStacks(_ *schema.ResourceData, stack image.ListStacks) []map[string]interface{} {
+	temp := make([]map[string]interface{}, 0)
+	for _, item := range stack {
+		t := map[string]interface{}{
+			"api_url":      item.APIURL,
+			"api_key":      item.APIKey,
+			"app_id":       item.AppID,
+			"desc":         item.Description,
+			"drivers":      item.Drivers,
+			"error":        item.Error,
+			"guid":         item.GUID,
+			"id":           item.ID,
+			"images":       item.Images,
+			"login":        item.Login,
+			"name":         item.Name,
+			"passwd":       item.Password,
+			"reference_id": item.ReferenceID,
+			"status":       item.Status,
+			"type":         item.Type,
+		}
+
+		temp = append(temp, t)
+	}
+	return temp
+}

internal/service/cloudbroker/image/models.go

@@ -1,101 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package image
-
-type History struct {
-	Guid      string `json:"guid"`
-	Id        int    `json:"id"`
-	Timestamp int64  `json:"timestamp"`
-}
-
-type Image struct {
-	ImageId       int           `json:"id"`
-	Name          string        `json:"name"`
-	Url           string        `json:"url"`
-	Gid           int           `json:"gid"`
-	Guid          int           `json:"guid"`
-	Boottype      string        `json:"bootType"`
-	Imagetype     string        `json:"type"`
-	Drivers       []string      `json:"drivers"`
-	Hotresize     bool          `json:"hotResize"`
-	Bootable      bool          `json:"bootable"`
-	Username      string        `json:"username"`
-	Password      string        `json:"password"`
-	AccountId     int           `json:"accountId"`
-	UsernameDL    string        `json:"usernameDL"`
-	PasswordDL    string        `json:"passwordDL"`
-	SepId         int           `json:"sepId"`
-	PoolName      string        `json:"pool"`
-	Architecture  string        `json:"architecture"`
-	UNCPath       string        `json:"UNCPath"`
-	LinkTo        int           `json:"linkTo"`
-	Status        string        `json:"status"`
-	TechStatus    string        `json:"techStatus"`
-	Size          int           `json:"size"`
-	Version       string        `json:"version"`
-	Enabled       bool          `json:"enabled"`
-	ComputeciId   int           `json:"computeciId"`
-	Milestones    int           `json:"milestones"`
-	ProviderName  string        `json:"provider_name"`
-	PurgeAttempts int           `json:"purgeAttempts"`
-	ReferenceId   string        `json:"referenceId"`
-	ResId         string        `json:"resId"`
-	ResName       string        `json:"resName"`
-	Rescuecd      bool          `json:"rescuecd"`
-	Meta          []interface{} `json:"_meta"`
-	History       []History     `json:"history"`
-	LastModified  int64         `json:"lastModified"`
-	Desc          string        `json:"desc"`
-	SharedWith    []int         `json:"sharedWith"`
-}
-
-type ImageList []Image
-
-type ImageStack struct {
-	ApiURL      string   `json:"apiUrl"`
-	ApiKey      string   `json:"apikey"`
-	AppId       string   `json:"appId"`
-	Desc        string   `json:"desc"`
-	Drivers     []string `json:"drivers"`
-	Error       int      `json:"error"`
-	Guid        int      `json:"guid"`
-	Id          int      `json:"id"`
-	Images      []int    `json:"images"`
-	Login       string   `json:"login"`
-	Name        string   `json:"name"`
-	Passwd      string   `json:"passwd"`
-	ReferenceId string   `json:"referenceId"`
-	Status      string   `json:"status"`
-	Type        string   `json:"type"`
-}
-
-type ImageListStacks []ImageStack

internal/service/cloudbroker/image/resource_cdrom_image.go

@@ -33,69 +33,57 @@ package image
 
 import (
 	"context"
-	"net/url"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	log "github.com/sirupsen/logrus"
 )
 
 func resourceCDROMImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceCDROMImageCreate: called for image %s", d.Get("name").(string))
-
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("name", d.Get("name").(string))
-	urlValues.Add("url", d.Get("url").(string))
-	urlValues.Add("gid", strconv.Itoa(d.Get("gid").(int)))
-
-	tstr := d.Get("drivers").([]interface{})
-	temp := ""
-	l := len(tstr)
-	for i, str := range tstr {
-		s := "\"" + str.(string) + "\""
-		if i != (l - 1) {
-			s += ","
-		}
-		temp = temp + s
+	req := image.CreateCDROMImageRequest{
+		Name: d.Get("name").(string),
+		URL:  d.Get("url").(string),
+		GID:  uint64(d.Get("gid").(int)),
 	}
-	temp = "[" + temp + "]"
-	urlValues.Add("drivers", temp)
 
-	if username, ok := d.GetOk("username"); ok {
-		urlValues.Add("username", username.(string))
+	drivers := []string{}
+	for _, driver := range d.Get("drivers").([]interface{}) {
+		drivers = append(drivers, driver.(string))
 	}
-	if password, ok := d.GetOk("password"); ok {
-		urlValues.Add("password", password.(string))
+
+	req.Drivers = drivers
+
+	if username, ok := d.GetOk("username_dl"); ok {
+		req.UsernameDL = username.(string)
+	}
+	if password, ok := d.GetOk("password_dl"); ok {
+		req.PasswordDl = password.(string)
 	}
 	if accountId, ok := d.GetOk("account_id"); ok {
-		urlValues.Add("accountId", strconv.Itoa(accountId.(int)))
-	}
-	if usernameDL, ok := d.GetOk("username_dl"); ok {
-		urlValues.Add("usernameDL", usernameDL.(string))
-	}
-	if passwordDL, ok := d.GetOk("password_dl"); ok {
-		urlValues.Add("passwordDL", passwordDL.(string))
+		req.AccountID = uint64(accountId.(int))
 	}
 	if sepId, ok := d.GetOk("sep_id"); ok {
-		urlValues.Add("sepId", strconv.Itoa(sepId.(int)))
+		req.SEPID = uint64(sepId.(int))
 	}
 	if poolName, ok := d.GetOk("pool_name"); ok {
-		urlValues.Add("pool_name", poolName.(string))
+		req.PoolName = poolName.(string)
 	}
 	if architecture, ok := d.GetOk("architecture"); ok {
-		urlValues.Add("architecture", architecture.(string))
+		req.Architecture = architecture.(string)
 	}
 
-	imageId, err := c.DecortAPICall(ctx, "POST", imageCreateCDROMAPI, urlValues)
+	imageId, err := c.CloudBroker().Image().CreateCDROMImage(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	d.SetId(imageId)
+	d.SetId(strconv.FormatUint(imageId, 10))
 	d.Set("image_id", imageId)
 
 	image, err := utilityImageCheckPresence(ctx, d, m)
@@ -103,9 +91,7 @@ func resourceCDROMImageCreate(ctx context.Context, d *schema.ResourceData, m int
 		return diag.FromErr(err)
 	}
 
-	d.SetId(strconv.Itoa(image.ImageId))
 	d.Set("bootable", image.Bootable)
-	//d.Set("image_id", image.ImageId)
 
 	diagnostics := resourceImageRead(ctx, d, m)
 	if diagnostics != nil {
@@ -118,26 +104,25 @@ 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(ctx, d, m)
-	if image == nil {
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		return nil
-	}
-
-	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-
-	if permanently, ok := d.GetOk("permanently"); ok {
-		urlValues.Add("permanently", strconv.FormatBool(permanently.(bool)))
-	}
-
-	_, err = c.DecortAPICall(ctx, "POST", imageDeleteCDROMAPI, urlValues)
+	imageData, err := utilityImageCheckPresence(ctx, d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
+
+	c := m.(*controller.ControllerCfg)
+	req := image.DeleteCDROMImageRequest{
+		ImageID: imageData.ID,
+	}
+
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err = c.CloudBroker().Image().DeleteCDROMImage(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	d.SetId("")
 
 	return nil
@@ -192,18 +177,18 @@ func resourceCDROMImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Does this machine supports hot resize",
 		},
-		"username": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "Optional username for the image",
-		},
-		"password": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "Optional password for the image",
-		},
+		// "username": {
+		// 	Type:        schema.TypeString,
+		// 	Optional:    true,
+		// 	Computed:    true,
+		// 	Description: "Optional username for the image",
+		// },
+		// "password": {
+		// 	Type:        schema.TypeString,
+		// 	Optional:    true,
+		// 	Computed:    true,
+		// 	Description: "Optional password for the image",
+		// },
 		"account_id": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -377,7 +362,7 @@ func ResourceCDROMImage() *schema.Resource {
 
 		CreateContext: resourceCDROMImageCreate,
 		ReadContext:   resourceImageRead,
-		UpdateContext: resourceImageEdit,
+		UpdateContext: resourceImageUpdate,
 		DeleteContext: resourceCDROMImageDelete,
 
 		Importer: &schema.ResourceImporter{

internal/service/cloudbroker/image/resource_delete_images.go

@@ -33,54 +33,17 @@ package image
 
 import (
 	"context"
-	"net/url"
-	"strconv"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	log "github.com/sirupsen/logrus"
 )
 
 func resourceCreateListImages(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	id := uuid.New()
-	d.SetId(id.String())
 	return nil
 }
 
 func resourceDeleteListImages(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceDeleteListImages: start deleting...")
-
-	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-
-	imageIds := d.Get("image_ids").([]interface{})
-	temp := ""
-	l := len(imageIds)
-	for i, imageId := range imageIds {
-		s := strconv.Itoa(imageId.(int))
-		if i != (l - 1) {
-			s += ",\n"
-		} else {
-			s += "\n"
-		}
-		temp = temp + s
-	}
-	temp = "[" + temp + "]"
-
-	urlValues.Add("reason", d.Get("reason").(string))
-	urlValues.Add("permanently", strconv.FormatBool(d.Get("permanently").(bool)))
-	urlValues.Add("imageIds", temp)
-
-	_, err := c.DecortAPICall(ctx, "POST", imageDeleteImagesAPI, urlValues)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId("")
-
 	return nil
 }
 

internal/service/cloudbroker/image/resource_image.go

@@ -33,148 +33,84 @@ package image
 
 import (
 	"context"
-	"errors"
-	"net/url"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
-	log "github.com/sirupsen/logrus"
 )
 
 func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceImageCreate: called for image %s", d.Get("name").(string))
 
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("name", d.Get("name").(string))
-	urlValues.Add("url", d.Get("url").(string))
-	urlValues.Add("gid", strconv.Itoa(d.Get("gid").(int)))
-	urlValues.Add("boottype", d.Get("boot_type").(string))
-	urlValues.Add("imagetype", d.Get("image_type").(string))
-
-	tstr := d.Get("drivers").([]interface{})
-	temp := ""
-	l := len(tstr)
-	for i, str := range tstr {
-		s := "\"" + str.(string) + "\""
-		if i != (l - 1) {
-			s += ","
-		}
-		temp = temp + s
+	req := image.CreateRequest{
+		Name:      d.Get("name").(string),
+		URL:       d.Get("url").(string),
+		GID:       uint64(d.Get("gid").(int)),
+		BootType:  d.Get("boot_type").(string),
+		ImageType: d.Get("image_type").(string),
 	}
-	temp = "[" + temp + "]"
-	urlValues.Add("drivers", temp)
+
+	drivers := []string{}
+	for _, driver := range d.Get("drivers").([]interface{}) {
+		drivers = append(drivers, driver.(string))
+	}
+
+	req.Drivers = drivers
 
 	if hotresize, ok := d.GetOk("hot_resize"); ok {
-		urlValues.Add("hotresize", strconv.FormatBool(hotresize.(bool)))
+		req.HotResize = hotresize.(bool)
 	}
 	if username, ok := d.GetOk("username"); ok {
-		urlValues.Add("username", username.(string))
+		req.Username = username.(string)
 	}
 	if password, ok := d.GetOk("password"); ok {
-		urlValues.Add("password", password.(string))
+		req.Password = password.(string)
 	}
 	if accountId, ok := d.GetOk("account_id"); ok {
-		urlValues.Add("accountId", strconv.Itoa(accountId.(int)))
+		req.AccountID = uint64(accountId.(int))
 	}
 	if usernameDL, ok := d.GetOk("username_dl"); ok {
-		urlValues.Add("usernameDL", usernameDL.(string))
+		req.UsernameDL = usernameDL.(string)
 	}
 	if passwordDL, ok := d.GetOk("password_dl"); ok {
-		urlValues.Add("passwordDL", passwordDL.(string))
+		req.PasswordDL = passwordDL.(string)
 	}
 	if sepId, ok := d.GetOk("sep_id"); ok {
-		urlValues.Add("sepId", strconv.Itoa(sepId.(int)))
+		req.SEPID = uint64(sepId.(int))
 	}
 	if poolName, ok := d.GetOk("pool_name"); ok {
-		urlValues.Add("poolName", poolName.(string))
+		req.PoolName = poolName.(string)
 	}
 	if architecture, ok := d.GetOk("architecture"); ok {
-		urlValues.Add("architecture", architecture.(string))
+		req.Architecture = architecture.(string)
 	}
 
-	api := ""
-	if isSync := d.Get("sync").(bool); !isSync {
-		api = imageCreateAPI
-	} else {
-		api = imageSyncCreateAPI
-	}
-	imageId, err := c.DecortAPICall(ctx, "POST", api, urlValues)
+	imageId, err := c.CloudBroker().Image().CreateImage(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	d.SetId(imageId)
+	d.SetId(strconv.FormatUint(imageId, 10))
 	d.Set("image_id", imageId)
 
-	image, err := utilityImageCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.Itoa(image.ImageId))
-	d.Set("bootable", image.Bootable)
-	//d.Set("image_id", image.ImageId)
-
-	diagnostics := resourceImageRead(ctx, d, m)
-	if diagnostics != nil {
-		return diagnostics
-	}
-
-	return nil
+	return resourceImageRead(ctx, d, m)
 }
 
 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(ctx, d, m)
-	if image == nil {
+	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
 	}
 
-	d.Set("name", image.Name)
-	d.Set("drivers", image.Drivers)
-	d.Set("url", image.Url)
-	d.Set("gid", image.Gid)
-	d.Set("image_id", image.ImageId)
-	d.Set("boot_type", image.Boottype)
-	d.Set("image_type", image.Imagetype)
-	d.Set("bootable", image.Bootable)
-	d.Set("sep_id", image.SepId)
-	d.Set("unc_path", image.UNCPath)
-	d.Set("link_to", image.LinkTo)
-	d.Set("status", image.Status)
-	d.Set("tech_status", image.TechStatus)
-	d.Set("version", image.Version)
-	d.Set("size", image.Size)
-	d.Set("enabled", image.Enabled)
-	d.Set("computeci_id", image.ComputeciId)
-	d.Set("pool_name", image.PoolName)
-	d.Set("username", image.Username)
-	d.Set("username_dl", image.UsernameDL)
-	d.Set("password", image.Password)
-	d.Set("password_dl", image.PasswordDL)
-	d.Set("account_id", image.AccountId)
-	d.Set("guid", image.Guid)
-	d.Set("milestones", image.Milestones)
-	d.Set("provider_name", image.ProviderName)
-	d.Set("purge_attempts", image.PurgeAttempts)
-	d.Set("reference_id", image.ReferenceId)
-	d.Set("res_id", image.ResId)
-	d.Set("res_name", image.ResName)
-	d.Set("rescuecd", image.Rescuecd)
-	d.Set("architecture", image.Architecture)
-	d.Set("meta", flattens.FlattenMeta(image.Meta))
-	d.Set("hot_resize", image.Hotresize)
-	d.Set("history", flattenHistory(image.History))
-	d.Set("last_modified", image.LastModified)
-	d.Set("desc", image.Desc)
-	d.Set("shared_with", image.SharedWith)
+	flattenImage(d, image)
 
 	return nil
 }
@@ -182,30 +118,28 @@ 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(ctx, d, m)
-	if image == nil {
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		return nil
-	}
-
-	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-	if reason, ok := d.GetOk("reason"); ok {
-		urlValues.Add("reason", reason.(string))
-	} else {
-		urlValues.Add("reason", "")
-	}
-	if permanently, ok := d.GetOk("permanently"); ok {
-		urlValues.Add("permanently", strconv.FormatBool(permanently.(bool)))
-	}
-
-	_, err = c.DecortAPICall(ctx, "POST", imageDeleteAPI, urlValues)
+	_, err := utilityImageCheckPresence(ctx, d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
+
+	c := m.(*controller.ControllerCfg)
+	req := image.DeleteRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
+	}
+
+	if reason, ok := d.GetOk("reason"); ok {
+		req.Reason = reason.(string)
+	}
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err = c.CloudBroker().Image().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	d.SetId("")
 
 	return nil
@@ -214,10 +148,12 @@ func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interfac
 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(ctx, "POST", imageEditNameAPI, urlValues)
+	req := image.RenameRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
+		Name:    d.Get("name").(string),
+	}
+
+	_, err := c.CloudBroker().Image().Rename(ctx, req)
 	if err != nil {
 		return err
 	}
@@ -225,17 +161,15 @@ func resourceImageEditName(ctx context.Context, d *schema.ResourceData, m interf
 	return nil
 }
 
-func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceImageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceImageEdit: called for %s, id: %s", d.Get("name").(string), d.Id())
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
 
 	if d.HasChange("enabled") {
 		err := resourceImageChangeEnabled(ctx, d, m)
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		urlValues = &url.Values{}
 	}
 
 	if d.HasChange("name") {
@@ -243,7 +177,6 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		urlValues = &url.Values{}
 	}
 
 	if d.HasChange("shared_with") {
@@ -251,14 +184,13 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		urlValues = &url.Values{}
 	}
+
 	if d.HasChange("computeci_id") {
 		err := resourceImageChangeComputeci(ctx, d, m)
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		urlValues = &url.Values{}
 	}
 
 	if d.HasChange("enabled_stacks") {
@@ -266,7 +198,6 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		urlValues = &url.Values{}
 	}
 
 	if d.HasChange("link_to") {
@@ -274,21 +205,21 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		urlValues = &url.Values{}
 	}
 
 	if d.HasChanges("name", "username", "password", "account_id", "bootable", "hot_resize") {
+		req := image.EditRequest{}
 
-		urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-		urlValues.Add("name", d.Get("name").(string))
+		req.ImageID = uint64(d.Get("image_id").(int))
+		req.Name = d.Get("name").(string)
 
-		urlValues.Add("username", d.Get("username").(string))
-		urlValues.Add("password", d.Get("password").(string))
-		urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-		urlValues.Add("bootable", strconv.FormatBool(d.Get("bootable").(bool)))
-		urlValues.Add("hotresize", strconv.FormatBool(d.Get("hot_resize").(bool)))
+		req.Username = d.Get("username").(string)
+		req.Password = d.Get("password").(string)
+		req.AccountID = uint64(d.Get("account_id").(int))
+		req.Bootable = d.Get("bootable").(bool)
+		req.HotResize = d.Get("hot_resize").(bool)
 
-		_, err := c.DecortAPICall(ctx, "POST", imageEditAPI, urlValues)
+		_, err := c.CloudBroker().Image().Edit(ctx, req)
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -298,37 +229,41 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 }
 
 func resourceImageChangeEnabled(ctx context.Context, d *schema.ResourceData, m interface{}) error {
-	var api string
-
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
+	imageId := uint64(d.Get("image_id").(int))
+
 	if d.Get("enabled").(bool) {
-		api = imageEnableAPI
+		req := image.EnableRequest{
+			ImageID: imageId,
+		}
+
+		_, err := c.CloudBroker().Image().Enable(ctx, req)
+		if err != nil {
+			return err
+		}
 	} else {
-		api = imageDisableAPI
-	}
-	resp, err := c.DecortAPICall(ctx, "POST", api, urlValues)
-	if err != nil {
-		return err
-	}
-	res, err := strconv.ParseBool(resp)
-	if err != nil {
-		return err
-	}
-	if !res {
-		return errors.New("Cannot enable/disable")
+		req := image.DisableRequest{
+			ImageID: imageId,
+		}
+
+		_, err := c.CloudBroker().Image().Disable(ctx, req)
+		if err != nil {
+			return err
+		}
 	}
+
 	return nil
 }
 
 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(ctx, "POST", imageLinkAPI, urlValues)
+	req := image.LinkRequest{
+		ImageID:  uint64(d.Get("image_id").(int)),
+		TargetID: uint64(d.Get("link_to").(int)),
+	}
+
+	_, err := c.CloudBroker().Image().Link(ctx, req)
 	if err != nil {
 		return err
 	}
@@ -339,23 +274,16 @@ func resourceImageLink(ctx context.Context, d *schema.ResourceData, m interface{
 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{}
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-	accIds := d.Get("shared_with").([]interface{})
-	temp := ""
-	l := len(accIds)
-	for i, accId := range accIds {
-		s := strconv.Itoa(accId.(int))
-		if i != (l - 1) {
-			s += ",\n"
-		} else {
-			s += "\n"
-		}
-		temp = temp + s
+	req := image.ShareRequest{
+		ImageId: uint64(d.Get("image_id").(int)),
 	}
-	temp = "[" + temp + "]"
-	urlValues.Add("accounts", temp)
-	_, err := c.DecortAPICall(ctx, "POST", imageShareAPI, urlValues)
+	accIds := []uint64{}
+	for _, accId := range d.Get("shared_with").([]interface{}) {
+		accIds = append(accIds, uint64(accId.(int)))
+	}
+	req.AccountIDs = accIds
+
+	_, err := c.CloudBroker().Image().Share(ctx, req)
 	if err != nil {
 		return err
 	}
@@ -365,23 +293,29 @@ func resourceImageShare(ctx context.Context, d *schema.ResourceData, m interface
 
 func resourceImageChangeComputeci(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
 
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-	computeci := d.Get("computeci_id").(int)
-
-	api := ""
+	imageId := uint64(d.Get("image_id").(int))
+	computeci := uint64(d.Get("computeci_id").(int))
 
 	if computeci == 0 {
-		api = imageComputeciUnsetAPI
-	} else {
-		urlValues.Add("computeciId", strconv.Itoa(computeci))
-		api = imageComputeciSetAPI
-	}
+		req := image.ComputeCIUnsetRequest{
+			ImageID: imageId,
+		}
 
-	_, err := c.DecortAPICall(ctx, "POST", api, urlValues)
-	if err != nil {
-		return err
+		_, err := c.CloudBroker().Image().ComputeCIUnset(ctx, req)
+		if err != nil {
+			return err
+		}
+	} else {
+		req := image.ComputeCISetRequest{
+			ImageID:     imageId,
+			ComputeCIID: computeci,
+		}
+
+		_, err := c.CloudBroker().Image().ComputeCISet(ctx, req)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -390,21 +324,17 @@ func resourceImageChangeComputeci(ctx context.Context, d *schema.ResourceData, m
 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{}
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-	enabledStacks := d.Get("enabled_stacks").([]interface{})
-	temp := ""
-	l := len(enabledStacks)
-	for i, stackId := range enabledStacks {
-		s := stackId.(string)
-		if i != (l - 1) {
-			s += ","
-		}
-		temp = temp + s
+	req := image.UpdateNodesRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
 	}
-	temp = "[" + temp + "]"
-	urlValues.Add("enabledStacks", temp)
-	_, err := c.DecortAPICall(ctx, "POST", imageUpdateNodesAPI, urlValues)
+	enabledStacks := []uint64{}
+	for _, stack := range d.Get("enabled_stacks").([]interface{}) {
+		enabledStacks = append(enabledStacks, uint64(stack.(int)))
+	}
+
+	req.EnabledStacks = enabledStacks
+
+	_, err := c.CloudBroker().Image().UpdateNodes(ctx, req)
 	if err != nil {
 		return err
 	}
@@ -661,7 +591,7 @@ func ResourceImage() *schema.Resource {
 
 		CreateContext: resourceImageCreate,
 		ReadContext:   resourceImageRead,
-		UpdateContext: resourceImageEdit,
+		UpdateContext: resourceImageUpdate,
 		DeleteContext: resourceImageDelete,
 
 		Importer: &schema.ResourceImporter{
@@ -679,36 +609,3 @@ func ResourceImage() *schema.Resource {
 		Schema: resourceImageSchemaMake(),
 	}
 }
-
-func flattenMeta(m []interface{}) []string {
-	output := []string{}
-	for _, item := range m {
-		switch d := item.(type) {
-		case string:
-			output = append(output, d)
-		case int:
-			output = append(output, strconv.Itoa(d))
-		case int64:
-			output = append(output, strconv.FormatInt(d, 10))
-		case float64:
-			output = append(output, strconv.FormatInt(int64(d), 10))
-		default:
-			output = append(output, "")
-		}
-	}
-	return output
-}
-
-func flattenHistory(history []History) []map[string]interface{} {
-	temp := make([]map[string]interface{}, 0)
-	for _, item := range history {
-		t := map[string]interface{}{
-			"id":        item.Id,
-			"guid":      item.Guid,
-			"timestamp": item.Timestamp,
-		}
-
-		temp = append(temp, t)
-	}
-	return temp
-}

internal/service/cloudbroker/image/resource_virtual_image.go

@@ -33,47 +33,34 @@ package image
 
 import (
 	"context"
-	"net/url"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	log "github.com/sirupsen/logrus"
 )
 
 func resourceVirtualImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceImageCreate: called for image %s", d.Get("name").(string))
 
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("name", d.Get("name").(string))
-	urlValues.Add("targetId", strconv.Itoa(d.Get("target_id").(int)))
+	req := image.CreateVirtualRequest{
+		Name:     d.Get("name").(string),
+		TargetID: uint64(d.Get("target_id").(int)),
+	}
 
-	imageId, err := c.DecortAPICall(ctx, "POST", imageCreateVirtualAPI, urlValues)
+	imageId, err := c.CloudBroker().Image().CreateVirtual(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	d.SetId(imageId)
+	d.SetId(strconv.FormatUint(imageId, 10))
 	d.Set("image_id", imageId)
 
-	image, err := utilityImageCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.Itoa(image.ImageId))
-	d.Set("bootable", image.Bootable)
-	//d.Set("image_id", image.ImageId)
-
-	diagnostics := resourceImageRead(ctx, d, m)
-	if diagnostics != nil {
-		return diagnostics
-	}
-
-	return nil
+	return resourceImageRead(ctx, d, m)
 }
 
 func resourceVirtualImageSchemaMake() map[string]*schema.Schema {
@@ -324,7 +311,7 @@ func ResourceVirtualImage() *schema.Resource {
 
 		CreateContext: resourceVirtualImageCreate,
 		ReadContext:   resourceImageRead,
-		UpdateContext: resourceImageEdit,
+		UpdateContext: resourceImageUpdate,
 		DeleteContext: resourceImageDelete,
 
 		Importer: &schema.ResourceImporter{

internal/service/cloudbroker/image/utility_image.go

@@ -33,39 +33,28 @@ package image
 
 import (
 	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/url"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
-func utilityImageCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*Image, error) {
+func utilityImageCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*image.RecordImage, error) {
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
+	req := image.GetRequest{}
 
 	if (strconv.Itoa(d.Get("image_id").(int))) != "0" {
-		urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
+		req.ImageID = uint64(d.Get("image_id").(int))
 	} else {
-		urlValues.Add("imageId", d.Id())
+		id, _ := strconv.ParseUint(d.Id(), 10, 64)
+		req.ImageID = id
 	}
 
-	resp, err := c.DecortAPICall(ctx, "POST", imageGetAPI, urlValues)
+	image, err := c.CloudBroker().Image().Get(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
-	if resp == "" {
-		return nil, nil
-	}
-
-	image := &Image{}
-	if err := json.Unmarshal([]byte(resp), image); err != nil {
-		return nil, errors.New(fmt.Sprint("Can not unmarshall data to image: ", resp, " ", image))
-	}
-
 	return image, nil
 }

internal/service/cloudbroker/image/utility_image_list.go

@@ -33,42 +33,34 @@ package image
 
 import (
 	"context"
-	"encoding/json"
-	"net/url"
-	"strconv"
 
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityImageListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (ImageList, error) {
-	imageList := ImageList{}
+func utilityImageListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (image.ListImages, error) {
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
+	req := image.ListRequest{}
 
 	if sepId, ok := d.GetOk("sep_id"); ok {
-		urlValues.Add("sepId", strconv.Itoa(sepId.(int)))
+		req.SepID = uint64(sepId.(int))
 	}
 	if sharedWith, ok := d.GetOk("shared_with"); ok {
-		urlValues.Add("sharedWith", strconv.Itoa(sharedWith.(int)))
+		req.SharedWith = uint64(sharedWith.(int))
 	}
 
 	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
+		req.Page = uint64(page.(int))
 	}
 	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
+		req.Size = uint64(size.(int))
 	}
 
 	log.Debugf("utilityImageListCheckPresence: load image list")
-	imageListRaw, err := c.DecortAPICall(ctx, "POST", imageListGetAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(imageListRaw), &imageList)
+	imageList, err := c.CloudBroker().Image().List(ctx, req)
 	if err != nil {
 		return nil, err
 	}

internal/service/cloudbroker/image/utility_image_list_stacks.go

@@ -33,30 +33,22 @@ package image
 
 import (
 	"context"
-	"encoding/json"
-	"net/url"
-	"strconv"
 
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityImageListStacksCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (ImageListStacks, error) {
-	imageListStacks := ImageListStacks{}
+func utilityImageListStacksCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (image.ListStacks, error) {
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-
-	log.Debugf("utilityImageListStacksCheckPresence: load image list")
-	imageListRaw, err := c.DecortAPICall(ctx, "POST", imageListStacksApi, urlValues)
-	if err != nil {
-		return nil, err
+	req := image.ListStacksRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
 	}
 
-	err = json.Unmarshal([]byte(imageListRaw), &imageListStacks)
+	log.Debugf("utilityImageListStacksCheckPresence: load image list")
+	imageListStacks, err := c.CloudBroker().Image().ListStacks(ctx, req)
 	if err != nil {
 		return nil, err
 	}