1.2.0

2025-01-21 12:16:49 +03:00
parent 76ea459b3d
commit 60e23338ad
751 changed files with 17877 additions and 1908 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,75 +1,35 @@
-## Version 1.1.0
+## Version 1.2.0

 ### Добавлено

-#### audit
+#### extnet
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-618 | Datasource `dynamix_audit` в cloudapi/audit |
-
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BATF-603 | Опциональное поле `sort_by` в datasource `dynamix_account_flipgroups_list` в cloudapi/account |
-
-#### dpdknet
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BATF-617 | Datasources `dynamix_dpdknet и dynamix_dpdknet_list` в cloudapi/dpkknet |
-
-#### image
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BATF-609 | Опциональное поле `enabled` в datasource `dynamix_image_list` в cloudapi/image |
-
-#### k8s
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BATF-610 | Опциональные поля `worker_chipset, chipset` в resource `dynamix_k8s_wg` в cloudapi/k8s |
-| BATF-610 | Опциональные поля `address_vip, chipset` в resource `dynamix_k8s_cp` в cloudapi/k8s |
-| BATF-610 | Вычисляемые поля `extnet_only, ha_mode, address_vip` в datasource `dynamix_k8s` в cloudapi/k8s |
+| BATF-671 | Data source  `decort_extnet_reserved_ip_list` в cloudapi/extnet |
+| BATF-672 | Вычисляемое поле `account_id` в блоке `reservations` в data sources `dynamix_extnet` в cloudapi/extnet |

 #### kvmvm
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-611 | Опциональные поля `pci_devices, chipset, network/weight` в resource `dynamix_kvmvm` в cloudapi/kvmvm |
-| BATF-611 | Вычисляемые поля `bus_number, libvirt_settings` в resource `dynamix_kvmvm` в cloudapi/kvmvm |
-| BATF-611 | Вычисляемые поля `pci_devices, chipset, bus_number, libvirt_settings` в datasources `dynamix_kvmvm, dynamix_kvmvm_list, dynamix_kvmvm_list_deleted` в cloudapi/kvmvm |
-| BATF-652 | Опциональные поля `pci_devices, chipset, network/weight` в resource `dynamix_kvmvm` в cloudapi/kvmvm |
-
-#### rg
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BATF-613 | Опциональное поле `uniq_pools` в resource `dynamix_resgroup` в cloudapi/rg |
+| BATF-674 | Вычисляемое поле `vnc_password` в resources `dynamix_kvmvm` и data sources `dynamix_kvmvm` в cloudapi/kvmvm |
+| BATF-673 | Опциональное поле `auto_start_w_node`в resources `dynamix_kvmvm` в cloudapi/kvmvm |
+| BATF-673 | Вычисляемое поле `auto_start_w_node`в data_sources `dynamix_kvmvm, dynamix_kvmvm_list, dynamix_kvmvm_list_deleted` в cloudapi/kvmvm |

 #### vins
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-616 | Вычисляемые поля `bus_number, mtu и libvirt_settings` в datasource `dynamix_vins и resource dynamix_vins` в cloudapi/vins |
-| BATF-616 | Опциональное поле `vnf_dev_id` в datasource `dynamix_vins_list` в cloudapi/vins |
+| BATF-676 | Вычисляемое поле `account_id` в блоке `reservations` в resource `dynamix_vins` и data source `dynamix_vins` в cloudapi/vins |
+| BATF-675 | Вычисляемое поле `vnc_password` в блоке `vnf_dev` в resources `dynamix_vins` и data sources `dynamix_vins` в cloudapi/vins |

-### Исправлено
-
-#### kvmvm
+#### общее
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-611 | Возможность смены IP сети без отключения сети и остановки ВМ в resource `dynamix_kvmvm` в cloudapi/kvmvm |
-| BATF-611 | Добавлена поддержка DPDK сетей в resource `dynamix_kvmvm` в cloudapi/kvmvm |
+| BATF-679 | Добавлена поддержка работы с режимом аутентификации `bvs` |

 ### Удалено

-#### all
+#### vins
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-620 | Поле `reason` во всех resources |
-| BATF-623 | Поддержка архитектуры `kvmppc` во всех resources |
-
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BATF-603 | Опциональное поле `recursive_delete` в `resource dynamix_account` в cloudapi/account |
-
-#### image
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BATF-609 | Опциональное поле `permanently`` в `resources dynamix_account, dynamix_image_virtual` в cloudapi/image |
+| BATF-676 | Вычисляемые поля `client_type, description, domain_name, hostname` в блоке `reservations` в resources `dynamix_vins` и data sources `dynamix_vins` в cloudapi/vins|
+| BATF-680 | Опциональное поле `compute_ids` в resource `decort_vins_static_route` в cloudapi/vins |
--- a/2
+++ b/2
@@ -8,7 +8,7 @@ ZIPDIR = ./zip
 BINARY=${NAME}
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${SECONDNAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/dynamix/
-VERSION=1.1.0
+VERSION=1.2.0
 OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)

 FILES = ${BINARY}_${VERSION}_darwin_amd64\
--- a/docs/data-sources/extnet.md
+++ b/docs/data-sources/extnet.md
@@ -89,6 +89,7 @@ Read-Only:

 Read-Only:

+- `account_id` (Number)
 - `client_type` (String)
 - `desc` (String)
 - `domainname` (String)
--- a/docs/data-sources/extnet_reserved_ip_list.md
+++ b/docs/data-sources/extnet_reserved_ip_list.md
@@ -0,0 +1,60 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "dynamix_extnet_reserved_ip_list Data Source - terraform-provider-dynamix"
+subcategory: ""
+description: |-
+  
+---
+
+# dynamix_extnet_reserved_ip_list (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `account_id` (Number) find by account id
+
+### Optional
+
+- `extnet_id` (Number) find by account id
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+- `items` (Attributes List) (see [below for nested schema](#nestedatt--items))
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `read` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours).
+
+
+<a id="nestedatt--items"></a>
+### Nested Schema for `items`
+
+Read-Only:
+
+- `extnet_id` (Number)
+- `reservations` (Attributes List) (see [below for nested schema](#nestedatt--items--reservations))
+
+<a id="nestedatt--items--reservations"></a>
+### Nested Schema for `items.reservations`
+
+Read-Only:
+
+- `account_id` (Number)
+- `client_type` (String)
+- `domain_name` (String)
+- `hostname` (String)
+- `ip` (String)
+- `mac` (String)
+- `type` (String)
+- `vm_id` (Number)
--- a/docs/data-sources/kvmvm.md
+++ b/docs/data-sources/kvmvm.md
@@ -33,6 +33,7 @@ description: |-
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (Attributes List) (see [below for nested schema](#nestedatt--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
@@ -95,6 +96,7 @@ description: |-
 - `vgpus` (List of Number)
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
+- `vnc_password` (String)

 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
--- a/docs/data-sources/kvmvm_list.md
+++ b/docs/data-sources/kvmvm_list.md
@@ -61,6 +61,7 @@ Read-Only:
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (Attributes List) (see [below for nested schema](#nestedatt--items--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
--- a/docs/data-sources/kvmvm_list_deleted.md
+++ b/docs/data-sources/kvmvm_list_deleted.md
@@ -59,6 +59,7 @@ Read-Only:
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (Attributes List) (see [below for nested schema](#nestedatt--items--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
--- a/docs/data-sources/vins.md
+++ b/docs/data-sources/vins.md
@@ -107,6 +107,7 @@ Read-Only:
 - `tech_status` (String)
 - `type` (String)
 - `vins` (List of Number)
+- `vnc_password` (String)
 - `vnf_id` (Number)
 - `vnf_name` (String)

@@ -247,10 +248,7 @@ Read-Only:

 Read-Only:

- `client_type` (String)
- `desc` (String)
- `domainname` (String)
- `hostname` (String)
+- `account_id` (Number)
 - `ip` (String)
 - `mac` (String)
 - `type` (String)
--- a/docs/resources/kvmvm.md
+++ b/docs/resources/kvmvm.md
@@ -29,6 +29,7 @@ description: |-
 - `affinity_rules` (Attributes Set) (see [below for nested schema](#nestedatt--affinity_rules))
 - `anti_affinity_rules` (Attributes Set) (see [below for nested schema](#nestedatt--anti_affinity_rules))
 - `auto_start` (Boolean) Flag for redeploy compute
+- `auto_start_w_node` (Boolean) Flag for start compute after node exits from MAINTENANCE state
 - `boot_disk_size` (Number) This compute instance boot disk size in GB. Make sure it is large enough to accomodate selected OS image.
 - `cd` (Attributes) (see [below for nested schema](#nestedatt--cd))
 - `chipset` (String) Type of the emulated system, Q35 or i440fx
@@ -123,6 +124,7 @@ description: |-
 - `vgpus` (List of Number)
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
+- `vnc_password` (String)

 <a id="nestedatt--affinity_rules"></a>
 ### Nested Schema for `affinity_rules`
--- a/docs/resources/vins.md
+++ b/docs/resources/vins.md
@@ -164,6 +164,7 @@ Read-Only:
 - `tech_status` (String)
 - `type` (String)
 - `vins` (List of Number)
+- `vnc_password` (String)
 - `vnf_id` (Number)
 - `vnf_name` (String)

--- a/docs/resources/vins_static_route.md
+++ b/docs/resources/vins_static_route.md
@@ -24,12 +24,12 @@ description: |-

 ### Optional

- `compute_ids` (List of Number)
 - `route_id` (Number)
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))

 ### Read-Only

+- `compute_ids` (List of Number)
 - `guid` (String)
 - `id` (String) The ID of this resource.
 - `last_updated` (String)
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/sirupsen/logrus v1.9.3
-	repository.basistech.ru/BASIS/decort-golang-sdk v1.9.2
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.10.0
 )

 require (
--- a/go.sum
+++ b/go.sum
@@ -100,5 +100,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.9.2 h1:MPH1tMQrDN1Gri4FrQP3cx60uR3uZioEDb707D88/7c=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.9.2/go.mod h1:OaUynHHuSjWMzpfyoL4au6oLcUogqUkPPBKA15pbHWo=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.10.0 h1:/Q5MB07rqqv1m1XcAsU3f1ybMRYOgF908+PKEfcHzPs=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.10.0/go.mod h1:OaUynHHuSjWMzpfyoL4au6oLcUogqUkPPBKA15pbHWo=
--- a/internal/client/client.go
+++ b/internal/client/client.go
@@ -8,36 +8,76 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 )

-func DataSource(ctx context.Context, req *datasource.ConfigureRequest, resp *datasource.ConfigureResponse) *decort.DecortClient {
+type Client struct {
+	Provider any
+}
+
+func DataSource(ctx context.Context, req *datasource.ConfigureRequest, resp *datasource.ConfigureResponse) *Client {
 	if req.ProviderData == nil {
 		tflog.Error(ctx, "Provider Configure is nill")
 		return nil
 	}
-	client, ok := req.ProviderData.(*decort.DecortClient)
-	if !ok {
-		resp.Diagnostics.AddError(
-			"Unexpected Data Source Configure Type",
-			fmt.Sprintf("Expected *decort.DecortClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
-		)
-		return nil
+
+	res := Client{}
+	if decort, ok := req.ProviderData.(*decort.DecortClient); ok {
+		res.Provider = decort
+		return &res
 	}
-	return client
+	if bvs, ok := req.ProviderData.(*decort.BVSDecortClient); ok {
+		res.Provider = bvs
+		return &res
 	}

-func Resource(ctx context.Context, req *resource.ConfigureRequest, resp *resource.ConfigureResponse) *decort.DecortClient {
+	resp.Diagnostics.AddError(
+		"Unexpected Data Source Configure Type",
+		fmt.Sprintf("Expected *decort.DecortClient or *decort.BVSDecortClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+	)
+	return nil
+
+}
+
+func Resource(ctx context.Context, req *resource.ConfigureRequest, resp *resource.ConfigureResponse) *Client {
 	if req.ProviderData == nil {
 		tflog.Error(ctx, "Provider Configure is nill")
 		return nil
 	}
-	client, ok := req.ProviderData.(*decort.DecortClient)
-	if !ok {
+	res := Client{}
+	if decort, ok := req.ProviderData.(*decort.DecortClient); ok {
+		res.Provider = decort
+		return &res
+	}
+	if bvs, ok := req.ProviderData.(*decort.BVSDecortClient); ok {
+		res.Provider = bvs
+		return &res
+	}
+
 	resp.Diagnostics.AddError(
 		"Unexpected Data Source Configure Type",
-			fmt.Sprintf("Expected *decort.DecortClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+		fmt.Sprintf("Expected *decort.DecortClient or *decort.BVSDecortClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
 	)
 	return nil
 }
-	return client
+
+func (c *Client) CloudAPI() *cloudapi.CloudAPI {
+	if decort, ok := c.Provider.(*decort.DecortClient); ok {
+		return decort.CloudAPI()
+	}
+	if bvs, ok := c.Provider.(*decort.BVSDecortClient); ok {
+		return bvs.CloudAPI()
+	}
+	return nil
+}
+
+func (c *Client) CloudBroker() *cloudbroker.CloudBroker {
+	if decort, ok := c.Provider.(*decort.DecortClient); ok {
+		return decort.CloudBroker()
+	}
+	if bvs, ok := c.Provider.(*decort.BVSDecortClient); ok {
+		return bvs.CloudBroker()
+	}
+	return nil
 }
--- a/internal/provider/data_sources_map.go
+++ b/internal/provider/data_sources_map.go
@@ -72,6 +72,7 @@ func newDataSourcesMap() []func() datasource.DataSource {
 		extnet.NewDataSourceExtNetComputesList,
 		extnet.NewDataSourceExtNetDefault,
 		extnet.NewDataSourceExtNetList,
+		extnet.NewDataSourceExtNetReservedIP,

 		flipgroup.NewDataSourceFlipgroup,
 		flipgroup.NewDataSourceFlipgroupList,
--- a/internal/service/cloudapi/account/data_source_account.go
+++ b/internal/service/cloudapi/account/data_source_account.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccount() datasource.DataSource {

 // dataSourceAccount is the data source implementation.
 type dataSourceAccount struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccount) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_audits_list.go
+++ b/internal/service/cloudapi/account/data_source_account_audits_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountAuditsList() datasource.DataSource {

 // dataSourceAccountAuditsList is the data source implementation.
 type dataSourceAccountAuditsList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountAuditsList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_computes_list.go
+++ b/internal/service/cloudapi/account/data_source_account_computes_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountComputesList() datasource.DataSource {

 // dataSourceAccountComputesList is the data source implementation.
 type dataSourceAccountComputesList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountComputesList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_consumed_unit_by_type.go
+++ b/internal/service/cloudapi/account/data_source_account_consumed_unit_by_type.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountConsumedUnitsByType() datasource.DataSource {

 // dataSourceAccountConsumedUnitsByType is the data source implementation.
 type dataSourceAccountConsumedUnitsByType struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountConsumedUnitsByType) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_consumed_units.go
+++ b/internal/service/cloudapi/account/data_source_account_consumed_units.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountConsumedUnits() datasource.DataSource {

 // dataSourceAccountConsumedUints is the data source implementation.
 type dataSourceAccountConsumedUints struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountConsumedUints) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_disks_list.go
+++ b/internal/service/cloudapi/account/data_source_account_disks_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountDisksList() datasource.DataSource {

 // dataSourceAccountDisksList is the data source implementation.
 type dataSourceAccountDisksList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountDisksList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_flipgroups_list.go
+++ b/internal/service/cloudapi/account/data_source_account_flipgroups_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountFlipgroupsList() datasource.DataSource {

 // dataSourceAccountFlipgroupsList is the data source implementation.
 type dataSourceAccountFlipgroupsList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountFlipgroupsList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_get_resource_consumption.go
+++ b/internal/service/cloudapi/account/data_source_account_get_resource_consumption.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountGetResourceConsumption() datasource.DataSource {

 // dataSourceAccountGetResourceConsumption is the data source implementation.
 type dataSourceAccountGetResourceConsumption struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountGetResourceConsumption) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_get_resource_consumption_list.go
+++ b/internal/service/cloudapi/account/data_source_account_get_resource_consumption_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountGetResourceConsumptionList() datasource.DataSource {

 // dataSourceAccountGetResourceConsumptionList is the data source implementation.
 type dataSourceAccountGetResourceConsumptionList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountGetResourceConsumptionList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_list.go
+++ b/internal/service/cloudapi/account/data_source_account_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountList() datasource.DataSource {

 // dataSourceAccountList is the data source implementation.
 type dataSourceAccountList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_list_deleted.go
+++ b/internal/service/cloudapi/account/data_source_account_list_deleted.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountListDeleted() datasource.DataSource {

 // dataSourceAccountListDeleted is the data source implementation.
 type dataSourceAccountListDeleted struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_reserved_units.go
+++ b/internal/service/cloudapi/account/data_source_account_reserved_units.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountReservedUnits() datasource.DataSource {

 // dataSourceAccount is the data source implementation.
 type dataSourceAccountReservedUnits struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountReservedUnits) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_rg_list.go
+++ b/internal/service/cloudapi/account/data_source_account_rg_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountRGList() datasource.DataSource {

 // dataSourceAccountList is the data source implementation.
 type dataSourceAccountRGList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountRGList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_templates_list.go
+++ b/internal/service/cloudapi/account/data_source_account_templates_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountTemplatesList() datasource.DataSource {

 // dataSourceAccountTemplatesList is the data source implementation.
 type dataSourceAccountTemplatesList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountTemplatesList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/data_source_account_vins_list.go
+++ b/internal/service/cloudapi/account/data_source_account_vins_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAccountVinsList() datasource.DataSource {

 // dataSourceAccountVinsList is the data source implementation.
 type dataSourceAccountVinsList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAccountVinsList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account.go
@@ -8,8 +8,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -17,7 +17,7 @@ import (
 // AccountDataSource flattens data source for account.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountDataSource(ctx context.Context, state *models.DataSourceAccountModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountDataSource(ctx context.Context, state *models.DataSourceAccountModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_audits_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_audits_list.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -16,7 +16,7 @@ import (
 // AccountAuditsDataSourceList flattens data source for account audits.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountAuditsDataSourceList(ctx context.Context, state *models.DataSourceAccountAuditsListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountAuditsDataSourceList(ctx context.Context, state *models.DataSourceAccountAuditsListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountAuditsDataSourceList")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_computes_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_computes_list.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -15,7 +15,7 @@ import (
 // AccountComputesListDataSource flattens data source for account computes list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountComputesListDataSource(ctx context.Context, state *models.DataSourceAccountComputesListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountComputesListDataSource(ctx context.Context, state *models.DataSourceAccountComputesListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountComputesListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_consumed_units.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_consumed_units.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -16,7 +16,7 @@ import (
 // AccountConsumedUnitsDataSource flattens data source for account consumed units.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountConsumedUnitsDataSource(ctx context.Context, state *models.DataSourceAccountConsumedUnitsModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountConsumedUnitsDataSource(ctx context.Context, state *models.DataSourceAccountConsumedUnitsModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountConsumedUnitsDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_consumed_units_by_type.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_consumed_units_by_type.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -16,7 +16,7 @@ import (
 // AccountConsumedUnitsByTypeDataSource flattens data source for account consumed units by type.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountConsumedUnitsByTypeDataSource(ctx context.Context, state *models.DataSourceAccountConsumedUnitsByTypeModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountConsumedUnitsByTypeDataSource(ctx context.Context, state *models.DataSourceAccountConsumedUnitsByTypeModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountConsumedUnitsByTypeDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_disks_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_disks_list.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -15,7 +15,7 @@ import (
 // AccountDisksListDataSource flattens data source for account disks list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountDisksListDataSource(ctx context.Context, state *models.DataSourceAccountDisksListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountDisksListDataSource(ctx context.Context, state *models.DataSourceAccountDisksListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountDisksListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_flipgroups_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_flipgroups_list.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -15,7 +15,7 @@ import (
 // AccountFlipgroupsListDataSource flattens data source for account flipgroups list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountFlipgroupsListDataSource(ctx context.Context, state *models.DataSourceAccountFlipgroupsListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountFlipgroupsListDataSource(ctx context.Context, state *models.DataSourceAccountFlipgroupsListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountFlipgroupsListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_get_resource_consumption.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_get_resource_consumption.go
@@ -7,8 +7,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -16,7 +16,7 @@ import (
 // AccountGetResourceConsumptionDataSource flattens data source for account.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountGetResourceConsumptionDataSource(ctx context.Context, state *models.AccountGetResourceConsumptionModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountGetResourceConsumptionDataSource(ctx context.Context, state *models.AccountGetResourceConsumptionModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountGetResourceConsumptionDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_get_resource_consumption_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_get_resource_consumption_list.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -14,7 +14,7 @@ import (
 // AccountGetResourceConsumptionList flattens data source for rg get resource consumption.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountGetResourceConsumptionList(ctx context.Context, state *models.AccountGetResourceConsumptionListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountGetResourceConsumptionList(ctx context.Context, state *models.AccountGetResourceConsumptionListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountGetResourceConsumptionList")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_list.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -16,7 +16,7 @@ import (
 // AccountListDataSource flattens data source for account list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountListDataSource(ctx context.Context, state *models.DataSourceAccountListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountListDataSource(ctx context.Context, state *models.DataSourceAccountListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_list_deleted.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_list_deleted.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -16,7 +16,7 @@ import (
 // AccountListDeletedDataSource flattens data source for account list deleted.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountListDeletedDataSource(ctx context.Context, state *models.DataSourceAccountListDeletedModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountListDeletedDataSource(ctx context.Context, state *models.DataSourceAccountListDeletedModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountListDeletedDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_reserved_units.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_reserved_units.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -15,7 +15,7 @@ import (
 // AccountReservedUnitsDataSource flattens data source for account.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountReservedUnitsDataSource(ctx context.Context, state *models.DataSourceAccountReservedUnitsModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountReservedUnitsDataSource(ctx context.Context, state *models.DataSourceAccountReservedUnitsModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountReservedUnitsDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_rg_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_rg_list.go
@@ -4,12 +4,12 @@ import (
 	"context"

 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"

 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -17,7 +17,7 @@ import (
 // AccountRGListDataSource flattens data source for account rg list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountRGListDataSource(ctx context.Context, state *models.DataSourceAccountRGListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountRGListDataSource(ctx context.Context, state *models.DataSourceAccountRGListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountRGListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_templates_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_templates_list.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -15,7 +15,7 @@ import (
 // AccountTemplatesListDataSource flattens data source for account templates list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountTemplatesListDataSource(ctx context.Context, state *models.DataSourceAccountTemplatesListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountTemplatesListDataSource(ctx context.Context, state *models.DataSourceAccountTemplatesListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountTemplatesListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_data_source_account_vins_list.go
+++ b/internal/service/cloudapi/account/flattens/flatten_data_source_account_vins_list.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
 )
@@ -14,7 +14,7 @@ import (
 // AccountVinsListDataSource flattens data source for account list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountVinsListDataSource(ctx context.Context, state *models.DataSourceAccountVinsListModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountVinsListDataSource(ctx context.Context, state *models.DataSourceAccountVinsListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountVinsListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/flattens/flatten_resource_account.go
+++ b/internal/service/cloudapi/account/flattens/flatten_resource_account.go
@@ -6,11 +6,11 @@ import (
 	"strconv"

 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"

 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/utilities"
@@ -19,7 +19,7 @@ import (
 // AccountResource flattens resource for account.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func AccountResource(ctx context.Context, state *models.ResourceAccountModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountResource(ctx context.Context, state *models.ResourceAccountModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AccountResource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/account/resource_account.go
+++ b/internal/service/cloudapi/account/resource_account.go
@@ -11,7 +11,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
@@ -34,7 +33,7 @@ func NewResourceAccount() resource.Resource {

 // resourceAccount is the resource implementation.
 type resourceAccount struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 // Create creates the resource and sets the initial Terraform state.
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func AccountDataSourceCheckPresence(ctx context.Context, accountId uint64, c *decort.DecortClient) (*account.RecordAccount, error) {
+func AccountDataSourceCheckPresence(ctx context.Context, accountId uint64, c *client.Client) (*account.RecordAccount, error) {
 	tflog.Info(ctx, fmt.Sprintf("AccountDataSourceCheckPresence: Get info about account with ID - %v", accountId))

 	recordAccount, err := c.CloudAPI().Account().Get(ctx, account.GetRequest{AccountID: accountId})
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_audits_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_audits_list.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func AccountAuditsListDataSourceCheckPresence(ctx context.Context, accountId uint64, c *decort.DecortClient) (*account.ListAudits, error) {
+func AccountAuditsListDataSourceCheckPresence(ctx context.Context, accountId uint64, c *client.Client) (*account.ListAudits, error) {
 	tflog.Info(ctx, fmt.Sprintf("AccountAuditsListDataSourceCheckPresence: Get info about account audits with account ID - %v", accountId))

 	auditsList, err := c.CloudAPI().Account().Audits(ctx, account.AuditsRequest{AccountID: accountId})
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_computes_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_computes_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountComputesListCheckPresence(ctx context.Context, plan *models.DataSourceAccountComputesListModel, c *decort.DecortClient) (*account.ListComputes, error) {
+func AccountComputesListCheckPresence(ctx context.Context, plan *models.DataSourceAccountComputesListModel, c *client.Client) (*account.ListComputes, error) {
 	tflog.Info(ctx, "AccountComputesListCheckPresence: Get info about account computes list")

 	computesListReq := account.ListComputesRequest{
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_consumed_units.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_consumed_units.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func AccountConsumedUnitsDataSourceCheckPresence(ctx context.Context, accountId uint64, c *decort.DecortClient) (*account.ResourceLimits, error) {
+func AccountConsumedUnitsDataSourceCheckPresence(ctx context.Context, accountId uint64, c *client.Client) (*account.ResourceLimits, error) {
 	tflog.Info(ctx, fmt.Sprintf("AccountConsumedUnitsDataSourceCheckPresence: Get info about account with ID - %v", accountId))

 	limits, err := c.CloudAPI().Account().GetConsumedAccountUnits(ctx, account.GetConsumedAccountUnitsRequest{AccountID: accountId})
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_consumed_units_by_type.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_consumed_units_by_type.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func AccountConsumedUnitsByTypeDataSourceCheckPresence(ctx context.Context, accountId uint64, cuType string, c *decort.DecortClient) (float64, error) {
+func AccountConsumedUnitsByTypeDataSourceCheckPresence(ctx context.Context, accountId uint64, cuType string, c *client.Client) (float64, error) {
 	tflog.Info(ctx, fmt.Sprintf("AccountConsumedUnitsByTypeDataSourceCheckPresence: Get info about account with ID - %v", accountId))

 	req := account.GetConsumedCloudUnitsByTypeRequest{
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_disks_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_disks_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountDisksListCheckPresence(ctx context.Context, plan *models.DataSourceAccountDisksListModel, c *decort.DecortClient) (*account.ListDisks, error) {
+func AccountDisksListCheckPresence(ctx context.Context, plan *models.DataSourceAccountDisksListModel, c *client.Client) (*account.ListDisks, error) {
 	tflog.Info(ctx, "AccountDisksListCheckPresence: Get info about account disks list")

 	disksListReq := account.ListDisksRequest{
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_flipgroups_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_flipgroups_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountFlipgroupsListCheckPresence(ctx context.Context, plan *models.DataSourceAccountFlipgroupsListModel, c *decort.DecortClient) (*account.ListFLIPGroups, error) {
+func AccountFlipgroupsListCheckPresence(ctx context.Context, plan *models.DataSourceAccountFlipgroupsListModel, c *client.Client) (*account.ListFLIPGroups, error) {
 	tflog.Info(ctx, "AccountFlipgroupsListCheckPresence: Get info about account flipgroups list")

 	flipgroupsListReq := account.ListFLIPGroupsRequest{AccountID: uint64(plan.AccountID.ValueInt64())}
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_get_resource_consumption.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_get_resource_consumption.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func AccountGetResourceConsumptionDataSourceCheckPresence(ctx context.Context, accountId uint64, c *decort.DecortClient) (*account.RecordResourceConsumption, error) {
+func AccountGetResourceConsumptionDataSourceCheckPresence(ctx context.Context, accountId uint64, c *client.Client) (*account.RecordResourceConsumption, error) {
 	tflog.Info(ctx, fmt.Sprintf("AccountGetResourceConsumptionDataSourceCheckPresence: Get info about account with ID - %v", accountId))

 	record, err := c.CloudAPI().Account().GetResourceConsumption(ctx, account.GetResourceConsumptionRequest{AccountID: accountId})
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_get_resource_consumption_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_get_resource_consumption_list.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func AccountGetResourceConsumptionListDataSourceCheckPresence(ctx context.Context, c *decort.DecortClient) (*account.ListResourceConsumption, error) {
+func AccountGetResourceConsumptionListDataSourceCheckPresence(ctx context.Context, c *client.Client) (*account.ListResourceConsumption, error) {
 	tflog.Info(ctx, fmt.Sprintf("AccountGetResourceConsumptionListDataSourceCheckPresence: Get info about account resource consumption list"))

 	record, err := c.CloudAPI().Account().ListResourceConsumption(ctx)
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountListCheckPresence(ctx context.Context, plan *models.DataSourceAccountListModel, c *decort.DecortClient) (*account.ListAccounts, error) {
+func AccountListCheckPresence(ctx context.Context, plan *models.DataSourceAccountListModel, c *client.Client) (*account.ListAccounts, error) {
 	tflog.Info(ctx, "AccountListCheckPresence: Get info about account list")

 	accListReq := account.ListRequest{}
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_list_deleted.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_list_deleted.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountListDeletedCheckPresence(ctx context.Context, plan *models.DataSourceAccountListDeletedModel, c *decort.DecortClient) (*account.ListAccounts, error) {
+func AccountListDeletedCheckPresence(ctx context.Context, plan *models.DataSourceAccountListDeletedModel, c *client.Client) (*account.ListAccounts, error) {
 	tflog.Info(ctx, "AccountListDeletedCheckPresence: Get info about account list deleted")

 	accListDelReq := account.ListDeletedRequest{}
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_reserved_units.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_reserved_units.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountReservedUnitsCheck(ctx context.Context, plan *models.DataSourceAccountReservedUnitsModel, c *decort.DecortClient) (*account.ResourceLimits, error) {
+func AccountReservedUnitsCheck(ctx context.Context, plan *models.DataSourceAccountReservedUnitsModel, c *client.Client) (*account.ResourceLimits, error) {
 	tflog.Info(ctx, "AccountReservedUnitsCheck: Get info about account units")

 	req := account.GetReservedAccountUnitsRequest{
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_rg_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_rg_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountRGListCheckPresence(ctx context.Context, plan *models.DataSourceAccountRGListModel, c *decort.DecortClient) (*account.ListRG, error) {
+func AccountRGListCheckPresence(ctx context.Context, plan *models.DataSourceAccountRGListModel, c *client.Client) (*account.ListRG, error) {
 	tflog.Info(ctx, "AccountRGListCheckPresence: Get info about account rg list")

 	rgListReq := account.ListRGRequest{AccountID: uint64(plan.AccountID.ValueInt64())}
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_templates_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_templates_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountTemplatesListCheckPresence(ctx context.Context, plan *models.DataSourceAccountTemplatesListModel, c *decort.DecortClient) (*account.ListTemplates, error) {
+func AccountTemplatesListCheckPresence(ctx context.Context, plan *models.DataSourceAccountTemplatesListModel, c *client.Client) (*account.ListTemplates, error) {
 	tflog.Info(ctx, "AccountTemplatesListCheckPresence: Get info about account templates list")

 	tempListReq := account.ListTemplatesRequest{
--- a/internal/service/cloudapi/account/utilities/utility_data_source_account_vins_list.go
+++ b/internal/service/cloudapi/account/utilities/utility_data_source_account_vins_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 )

-func AccountVinsListCheck(ctx context.Context, plan *models.DataSourceAccountVinsListModel, c *decort.DecortClient) (*account.ListVINS, error) {
+func AccountVinsListCheck(ctx context.Context, plan *models.DataSourceAccountVinsListModel, c *client.Client) (*account.ListVINS, error) {
 	tflog.Info(ctx, "AccountVinsListCheck: Get info about list vins")

 	vinsListReq := account.ListVINSRequest{}
--- a/internal/service/cloudapi/account/utilities/utility_resource_account.go
+++ b/internal/service/cloudapi/account/utilities/utility_resource_account.go
@@ -10,14 +10,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/account/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status"
 )

 // AccountResourceCheckPresence checks if account with accountId exists
-func AccountResourceCheckPresence(ctx context.Context, accountId uint64, c *decort.DecortClient) (*account.RecordAccount, error) {
+func AccountResourceCheckPresence(ctx context.Context, accountId uint64, c *client.Client) (*account.RecordAccount, error) {
 	tflog.Info(ctx, fmt.Sprintf("AccountResourceCheckPresence: Get info about resource with ID - %v", accountId))

 	accountRecord, err := c.CloudAPI().Account().Get(ctx, account.GetRequest{AccountID: accountId})
@@ -33,7 +33,7 @@ func AccountResourceCheckPresence(ctx context.Context, accountId uint64, c *deco
 // AccountReadStatus loads account resource by its id, gets it current status. Performs restore and enable if needed for
 // Deleted status.
 // In case of failure returns errors.
-func AccountReadStatus(ctx context.Context, state *models.ResourceAccountModel, c *decort.DecortClient) diag.Diagnostics {
+func AccountReadStatus(ctx context.Context, state *models.ResourceAccountModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "AccountReadStatus: Read status resource with ID", map[string]any{"account_id": state.Id.ValueString()})

 	diags := diag.Diagnostics{}
@@ -96,7 +96,7 @@ func AccountReadStatus(ctx context.Context, state *models.ResourceAccountModel,

 // RestoreAccount performs account Restore request.
 // Returns error in case of failures.
-func RestoreAccount(ctx context.Context, accountId uint64, c *decort.DecortClient) diag.Diagnostics {
+func RestoreAccount(ctx context.Context, accountId uint64, c *client.Client) diag.Diagnostics {
 	diags := diag.Diagnostics{}

 	restoreReq := account.RestoreRequest{
@@ -120,7 +120,7 @@ func RestoreAccount(ctx context.Context, accountId uint64, c *decort.DecortClien

 // EnableDisableAccount performs account Enable/Disable request.
 // Returns error in case of failures.
-func EnableDisableAccount(ctx context.Context, accountId uint64, enable bool, c *decort.DecortClient) diag.Diagnostics {
+func EnableDisableAccount(ctx context.Context, accountId uint64, enable bool, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start EnableDisableAccount", map[string]any{"account_id": accountId})

 	diags := diag.Diagnostics{}
@@ -156,7 +156,7 @@ func EnableDisableAccount(ctx context.Context, accountId uint64, enable bool, c

 // UpdateAccount updates disk data: account_name, resource_limits, send_access_emails.
 // Returns error in case of failures.
-func UpdateAccount(ctx context.Context, accountId uint64, plan, state *models.ResourceAccountModel, c *decort.DecortClient) diag.Diagnostics {
+func UpdateAccount(ctx context.Context, accountId uint64, plan, state *models.ResourceAccountModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start UpdateAccount", map[string]any{"account_id": accountId})

 	var diags diag.Diagnostics
@@ -254,7 +254,7 @@ func UpdateAccount(ctx context.Context, accountId uint64, plan, state *models.Re

 // AddDeleteUsersAccount adds/deletes users to/from account.
 // In case of failure returns errors.
-func AddDeleteUsersAccount(ctx context.Context, accountId uint64, plan, state *models.ResourceAccountModel, c *decort.DecortClient) diag.Diagnostics {
+func AddDeleteUsersAccount(ctx context.Context, accountId uint64, plan, state *models.ResourceAccountModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start AddDeleteUsersAccount: new users specified", map[string]any{"account_id": accountId})
 	diags := diag.Diagnostics{}

--- a/internal/service/cloudapi/audit/data_source_audit.go
+++ b/internal/service/cloudapi/audit/data_source_audit.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/audit/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceAudit() datasource.DataSource {

 // dataSourceAudit is the data source implementation.
 type dataSourceAudit struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceAudit) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/audit/flattens/flatten_data_source_audit.go
+++ b/internal/service/cloudapi/audit/flattens/flatten_data_source_audit.go
@@ -6,12 +6,12 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/audit/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/audit/utilities"
 )

-func AuditDataSource(ctx context.Context, state *models.DataSourceAudit, c *decort.DecortClient) diag.Diagnostics {
+func AuditDataSource(ctx context.Context, state *models.DataSourceAudit, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.AuditDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/audit/utilities/utility_data_source_audit.go
+++ b/internal/service/cloudapi/audit/utilities/utility_data_source_audit.go
@@ -6,11 +6,11 @@ import (

 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/audit"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func AuditDataSourceCheckPresence(ctx context.Context, auditGuid string, c *decort.DecortClient) (*audit.RecordAudit, diag.Diagnostics) {
+func AuditDataSourceCheckPresence(ctx context.Context, auditGuid string, c *client.Client) (*audit.RecordAudit, diag.Diagnostics) {
 	tflog.Info(ctx, fmt.Sprintf("AuditDataSourceCheckPresence: Get info about audit with ID - %v", auditGuid))

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/data_source_bservice.go
+++ b/internal/service/cloudapi/bservice/data_source_bservice.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceBService() datasource.DataSource {

 // dataSourceBService is the data source implementation.
 type dataSourceBService struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceBService) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/bservice/data_source_bservice__deleted_list.go
+++ b/internal/service/cloudapi/bservice/data_source_bservice__deleted_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceBServiceDeletedList() datasource.DataSource {

 // dataSourceBServiceDeletedList is the data source implementation.
 type dataSourceBServiceDeletedList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceBServiceDeletedList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/bservice/data_source_bservice_group.go
+++ b/internal/service/cloudapi/bservice/data_source_bservice_group.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceBServiceGroup() datasource.DataSource {

 // dataSourceBServiceGroup is the data source implementation.
 type dataSourceBServiceGroup struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceBServiceGroup) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/bservice/data_source_bservice_list.go
+++ b/internal/service/cloudapi/bservice/data_source_bservice_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceBServiceList() datasource.DataSource {

 // dataSourceBServiceList is the data source implementation.
 type dataSourceBServiceList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceBServiceList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go
+++ b/internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceBServiceSnapshotList() datasource.DataSource {

 // dataSourceBServiceSnapshotList is the data source implementation.
 type dataSourceBServiceSnapshotList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceBServiceSnapshotList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice.go
+++ b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/utilities"
 )
@@ -15,7 +15,7 @@ import (
 // BServiceDataSource flattens data source for bservice.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func BServiceDataSource(ctx context.Context, state *models.RecordBasicServiceModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceDataSource(ctx context.Context, state *models.RecordBasicServiceModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.BServiceDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_deleted_list.go
+++ b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_deleted_list.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/utilities"
 )
@@ -14,7 +14,7 @@ import (
 // BServicesDeletedListDataSource flattens data source for a list of basic services.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func BServicesDeletedListDataSource(ctx context.Context, state *models.ListBasicServicesDelModel, c *decort.DecortClient) diag.Diagnostics {
+func BServicesDeletedListDataSource(ctx context.Context, state *models.ListBasicServicesDelModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.BServicesDeletedListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_group.go
+++ b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_group.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/utilities"
@@ -16,7 +16,7 @@ import (
 // BServiceGroupDataSource flattens data source for a group.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func BServiceGroupDataSource(ctx context.Context, state *models.RecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupDataSource(ctx context.Context, state *models.RecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.BServiceGroupDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_list.go
+++ b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_list.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/utilities"
 )
@@ -14,7 +14,7 @@ import (
 // BServicesListDataSource flattens data source for a list of basic services.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func BServicesListDataSource(ctx context.Context, state *models.ListBasicServicesModel, c *decort.DecortClient) diag.Diagnostics {
+func BServicesListDataSource(ctx context.Context, state *models.ListBasicServicesModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.BServicesListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_snapshot_list.go
+++ b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_snapshot_list.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/utilities"
 )
@@ -15,7 +15,7 @@ import (
 // BServiceSnapshotListDataSource flattens data source for account.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func BServiceSnapshotListDataSource(ctx context.Context, state *models.ListInfoSnapshotsModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceSnapshotListDataSource(ctx context.Context, state *models.ListInfoSnapshotsModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.BServiceSnapshotListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice.go
+++ b/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice.go
@@ -8,13 +8,13 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/utilities"
 )

-func BServiceResource(ctx context.Context, state *models.RecordBasicServiceResourceModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceResource(ctx context.Context, state *models.RecordBasicServiceResourceModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.BServiceResource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice_group.go
+++ b/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice_group.go
@@ -8,14 +8,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/utilities"
 )

-func BServiceGroupResource(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupResource(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start BServiceGroupResource", map[string]any{"service_id": plan.ServiceID.ValueInt64(), "compgroup_id": plan.CompgroupID.ValueInt64()})

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/bservice/resource_bservice.go
+++ b/internal/service/cloudapi/bservice/resource_bservice.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
@@ -33,7 +32,7 @@ func NewResourceBService() resource.Resource {

 // resourceBService is the resource implementation.
 type resourceBService struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 // Create creates the resource and sets the initial Terraform state.
--- a/internal/service/cloudapi/bservice/resource_bservice_group.go
+++ b/internal/service/cloudapi/bservice/resource_bservice_group.go
@@ -12,7 +12,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
@@ -35,7 +34,7 @@ func NewResourceBServiceGroup() resource.Resource {

 // resourceBServiceGroup is the resource implementation.
 type resourceBServiceGroup struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 // Create creates the resource and sets the initial Terraform state.
--- a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice.go
+++ b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func BServiceDataSourceCheckPresence(ctx context.Context, serviceId uint64, c *decort.DecortClient) (*bservice.RecordBasicService, error) {
+func BServiceDataSourceCheckPresence(ctx context.Context, serviceId uint64, c *client.Client) (*bservice.RecordBasicService, error) {
 	tflog.Info(ctx, fmt.Sprintf("BServiceDataSourceCheckPresence: Get info about bserivce  with  ID - %v", serviceId))

 	record, err := c.CloudAPI().BService().Get(ctx, bservice.GetRequest{ServiceID: serviceId})
--- a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_deleted_list.go
+++ b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_deleted_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 )

-func BServiceDeletedListDataSourceCheckPresence(ctx context.Context, plan models.ListBasicServicesDelModel, c *decort.DecortClient) (*bservice.ListBasicServices, error) {
+func BServiceDeletedListDataSourceCheckPresence(ctx context.Context, plan models.ListBasicServicesDelModel, c *client.Client) (*bservice.ListBasicServices, error) {
 	tflog.Info(ctx, "BServiceListDataSourceCheckPresence: Get deleted list bserivce")

 	accListDelReq := bservice.ListDeletedRequest{}
--- a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_group.go
+++ b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_group.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 )

-func BServiceGroupDataSourceCheckPresence(ctx context.Context, state models.RecordGroupModel, c *decort.DecortClient) (*bservice.RecordGroup, error) {
+func BServiceGroupDataSourceCheckPresence(ctx context.Context, state models.RecordGroupModel, c *client.Client) (*bservice.RecordGroup, error) {
 	tflog.Info(ctx, fmt.Sprintf("BServiceGroupDataSourceCheckPresence: Get info about bserivce  with  ID - %v", state.ServiceID))

 	req := bservice.GroupGetRequest{ServiceID: uint64(state.ServiceID.ValueInt64()), CompGroupID: uint64(state.ID.ValueInt64())}
--- a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_list.go
+++ b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_list.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 )

-func BServiceListDataSourceCheckPresence(ctx context.Context, plan models.ListBasicServicesModel, c *decort.DecortClient) (*bservice.ListBasicServices, error) {
+func BServiceListDataSourceCheckPresence(ctx context.Context, plan models.ListBasicServicesModel, c *client.Client) (*bservice.ListBasicServices, error) {
 	tflog.Info(ctx, "BServiceListDataSourceCheckPresence: Get list bserivce")

 	accListReq := bservice.ListRequest{}
--- a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_snapshot_list.go
+++ b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_snapshot_list.go
@@ -5,11 +5,11 @@ import (
 	"fmt"

 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 )

-func BServiceSnapshotListDataSourceCheckPresence(ctx context.Context, serviceID uint64, c *decort.DecortClient) (*bservice.ListInfoSnapshots, error) {
+func BServiceSnapshotListDataSourceCheckPresence(ctx context.Context, serviceID uint64, c *client.Client) (*bservice.ListInfoSnapshots, error) {
 	tflog.Info(ctx, "BServiceSnapshotListDataSourceCheckPresence: Get deleted list bserivce")

 	req := bservice.SnapshotListRequest{ServiceID: serviceID}
--- a/internal/service/cloudapi/bservice/utilities/utility_resource_bservice.go
+++ b/internal/service/cloudapi/bservice/utilities/utility_resource_bservice.go
@@ -9,15 +9,15 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/ic"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status"
 )

 // BServiceResourceCheckPresence checks if BService with serviceID exists
-func BServiceResourceCheckPresence(ctx context.Context, serviceID uint64, c *decort.DecortClient) (*bservice.RecordBasicService, error) {
+func BServiceResourceCheckPresence(ctx context.Context, serviceID uint64, c *client.Client) (*bservice.RecordBasicService, error) {
 	tflog.Info(ctx, fmt.Sprintf("BServiceResourceCheckPresence: Get info about service with ID - %v", serviceID))

 	record, err := c.CloudAPI().BService().Get(ctx, bservice.GetRequest{ServiceID: serviceID})
@@ -33,7 +33,7 @@ func BServiceResourceCheckPresence(ctx context.Context, serviceID uint64, c *dec
 // BServiceReadStatus loads BService resource by its id, gets it current status. Performs restore and enable if needed for
 // Deleted status.
 // In case of failure returns errors.
-func BSerivceReadStatus(ctx context.Context, state *models.RecordBasicServiceResourceModel, c *decort.DecortClient) diag.Diagnostics {
+func BSerivceReadStatus(ctx context.Context, state *models.RecordBasicServiceResourceModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "BSerivceReadStatus: Read status resource with ID", map[string]any{"resource_id": state.ID.ValueString()})

 	diags := diag.Diagnostics{}
@@ -96,7 +96,7 @@ func BSerivceReadStatus(ctx context.Context, state *models.RecordBasicServiceRes
 	return nil
 }

-func BServiceResourceCreate(ctx context.Context, plan *models.RecordBasicServiceResourceModel, c *decort.DecortClient) (*uint64, diag.Diagnostics) {
+func BServiceResourceCreate(ctx context.Context, plan *models.RecordBasicServiceResourceModel, c *client.Client) (*uint64, diag.Diagnostics) {
 	tflog.Info(ctx, "Start BServiceResourceCreate", map[string]any{"service_id": plan.ServiceId.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -170,7 +170,7 @@ func BServiceResourceCreate(ctx context.Context, plan *models.RecordBasicService

 // EnableDisableBService performs BService Enable/Disable request.
 // Returns error in case of failures.
-func EnableDisableBService(ctx context.Context, plan *models.RecordBasicServiceResourceModel, c *decort.DecortClient) diag.Diagnostics {
+func EnableDisableBService(ctx context.Context, plan *models.RecordBasicServiceResourceModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start EnableDisableBService", map[string]any{"service_id": plan.ID.ValueString()})

 	diags := diag.Diagnostics{}
@@ -211,7 +211,7 @@ func EnableDisableBService(ctx context.Context, plan *models.RecordBasicServiceR

 // StartStopBService performs BService Start/Stop request.
 // Returns error in case of failures.
-func StartStopBService(ctx context.Context, plan *models.RecordBasicServiceResourceModel, c *decort.DecortClient) diag.Diagnostics {
+func StartStopBService(ctx context.Context, plan *models.RecordBasicServiceResourceModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start StartStopBService", map[string]any{"service_id": plan.ID.ValueString()})

 	diags := diag.Diagnostics{}
@@ -250,7 +250,7 @@ func StartStopBService(ctx context.Context, plan *models.RecordBasicServiceResou
 	return nil
 }

-func SnapshotsBService(ctx context.Context, oldSnapshots basetypes.ListValue, newSnapshots basetypes.ListValue, serviceID uint64, c *decort.DecortClient) diag.Diagnostics {
+func SnapshotsBService(ctx context.Context, oldSnapshots basetypes.ListValue, newSnapshots basetypes.ListValue, serviceID uint64, c *client.Client) diag.Diagnostics {
 	diags := diag.Diagnostics{}
 	// Handle snapshot changes in the plan
 	tflog.Info(ctx, "Start SnapshotsBService", map[string]any{"service_id": serviceID})
@@ -363,7 +363,7 @@ func isRollback(els []models.ItemSnapshotResourceModel, el models.ItemSnapshotRe

 // restoreBservice performs BService Restore request.
 // Returns error in case of failures.
-func restoreBservice(ctx context.Context, serviceID uint64, c *decort.DecortClient) diag.Diagnostics {
+func restoreBservice(ctx context.Context, serviceID uint64, c *client.Client) diag.Diagnostics {
 	diags := diag.Diagnostics{}

 	restoreReq := bservice.RestoreRequest{
--- a/internal/service/cloudapi/bservice/utilities/utility_resource_bservice_group.go
+++ b/internal/service/cloudapi/bservice/utilities/utility_resource_bservice_group.go
@@ -9,13 +9,13 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/bservice/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status"
 )

-func BServiceGroupResourceCheckPresence(ctx context.Context, serviceID uint64, compGroupID uint64, c *decort.DecortClient) (*bservice.RecordGroup, error) {
+func BServiceGroupResourceCheckPresence(ctx context.Context, serviceID uint64, compGroupID uint64, c *client.Client) (*bservice.RecordGroup, error) {
 	tflog.Info(ctx, fmt.Sprintf("BServiceGroupResourceCheckPresence: Get info about bserivce group with  ID - %v", compGroupID))

 	req := bservice.GroupGetRequest{ServiceID: serviceID, CompGroupID: compGroupID}
@@ -28,7 +28,7 @@ func BServiceGroupResourceCheckPresence(ctx context.Context, serviceID uint64, c
 	return record, err
 }

-func BServiceGroupResourceCreate(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupResourceCreate(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start BServiceGroupResourceCreate", map[string]any{"service": plan.ServiceID.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -113,7 +113,7 @@ func BServiceGroupResourceCreate(ctx context.Context, plan *models.ResourceRecor
 	return diags
 }

-func BServiceGroupResize(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupResize(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "BServiceGroupResize: start.", map[string]any{"service_id": plan.ServiceID.ValueInt64(), "compgroup_id": plan.CompgroupID.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -135,7 +135,7 @@ func BServiceGroupResize(ctx context.Context, plan *models.ResourceRecordGroupMo
 	return diags
 }

-func BServiceGroupUpdate(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupUpdate(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "BServiceGroupUpdate: start.", map[string]any{"service_id": plan.ServiceID.ValueInt64(), "compgroup_id": plan.CompgroupID.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -161,7 +161,7 @@ func BServiceGroupUpdate(ctx context.Context, plan *models.ResourceRecordGroupMo
 	return diags
 }

-func BServiceGroupReadStatus(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupReadStatus(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Read status BServiceGroupReadStatus with ID", map[string]any{"service_id": plan.ServiceID.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -200,7 +200,7 @@ func BServiceGroupReadStatus(ctx context.Context, plan *models.ResourceRecordGro
 	return diags
 }

-func BServiceGroupStartStop(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupStartStop(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start/Stop bservice group", map[string]any{"service_id": plan.ServiceID.ValueInt64(), "compgroup_id": plan.CompgroupID.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -233,7 +233,7 @@ func BServiceGroupStartStop(ctx context.Context, plan *models.ResourceRecordGrou
 	return diags
 }

-func BServiceGroupExtNet(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupExtNet(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "update ExtNets", map[string]any{"service_id": plan.ServiceID.ValueInt64(), "compgroup_id": plan.CompgroupID.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -262,7 +262,7 @@ func BServiceGroupExtNet(ctx context.Context, plan *models.ResourceRecordGroupMo
 	return diags
 }

-func BServiceGroupVinses(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupVinses(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "update Vinses", map[string]any{"service_id": plan.ServiceID.ValueInt64(), "compgroup_id": plan.CompgroupID.ValueInt64()})

 	diags := diag.Diagnostics{}
@@ -291,7 +291,7 @@ func BServiceGroupVinses(ctx context.Context, plan *models.ResourceRecordGroupMo
 	return diags
 }

-func BServiceGroupParents(ctx context.Context, newParents basetypes.ListValue, oldParents basetypes.ListValue, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupParents(ctx context.Context, newParents basetypes.ListValue, oldParents basetypes.ListValue, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	diags := diag.Diagnostics{}
 	tflog.Info(ctx, "Start BServiceGroupParents", map[string]any{"service_id": plan.ServiceID.ValueInt64(), "compgroup_id": plan.CompgroupID.ValueInt64()})

@@ -364,7 +364,7 @@ func BServiceGroupParents(ctx context.Context, newParents basetypes.ListValue, o
 	return diags
 }

-func BServiceGroupRemoveComputes(ctx context.Context, plan *models.ResourceRecordGroupModel, c *decort.DecortClient) diag.Diagnostics {
+func BServiceGroupRemoveComputes(ctx context.Context, plan *models.ResourceRecordGroupModel, c *client.Client) diag.Diagnostics {
 	diags := diag.Diagnostics{}
 	rcs := plan.RemoveComputes

--- a/internal/service/cloudapi/disks/data_source_disk.go
+++ b/internal/service/cloudapi/disks/data_source_disk.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDisk() datasource.DataSource {

 // dataSourceDisk is the data source implementation.
 type dataSourceDisk struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDisk) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_list.go
+++ b/internal/service/cloudapi/disks/data_source_disk_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskList() datasource.DataSource {

 // dataSourceDisk is the data source implementation.
 type dataSourceDiskList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_list_deleted.go
+++ b/internal/service/cloudapi/disks/data_source_disk_list_deleted.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskListDeleted() datasource.DataSource {

 // dataSourceDisk is the data source implementation.
 type dataSourceDiskListDeleted struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_list_types.go
+++ b/internal/service/cloudapi/disks/data_source_disk_list_types.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskListTypes() datasource.DataSource {

 // dataSourceDiskListTypes is the data source implementation.
 type dataSourceDiskListTypes struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskListTypes) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go
+++ b/internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskListTypesDetailed() datasource.DataSource {

 // dataSourceDiskListTypesDetailed is the data source implementation.
 type dataSourceDiskListTypesDetailed struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskListTypesDetailed) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_list_unattached.go
+++ b/internal/service/cloudapi/disks/data_source_disk_list_unattached.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskListUnattached() datasource.DataSource {

 // dataSourceDiskListUnattached is the data source implementation.
 type dataSourceDiskListUnattached struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskListUnattached) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_replication.go
+++ b/internal/service/cloudapi/disks/data_source_disk_replication.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskReplication() datasource.DataSource {

 // dataSourceDisk is the data source implementation.
 type dataSourceDiskReplication struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskReplication) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_snapshot.go
+++ b/internal/service/cloudapi/disks/data_source_disk_snapshot.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskSnapshot() datasource.DataSource {

 // dataSourceDiskSnapshotList is the data source implementation.
 type dataSourceDiskSnapshot struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskSnapshot) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/data_source_disk_snapshot_list.go
+++ b/internal/service/cloudapi/disks/data_source_disk_snapshot_list.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/flattens"
@@ -26,7 +25,7 @@ func NewDataSourceDiskSnapshotList() datasource.DataSource {

 // dataSourceDiskSnapshotList is the data source implementation.
 type dataSourceDiskSnapshotList struct {
-	client *decort.DecortClient
+	client *client.Client
 }

 func (d *dataSourceDiskSnapshotList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
--- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk.go
+++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities"
 )
@@ -17,7 +17,7 @@ import (
 // DiskDataSource flattens data source for disk.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func DiskDataSource(ctx context.Context, state *models.DataSourceDiskModel, c *decort.DecortClient) diag.Diagnostics {
+func DiskDataSource(ctx context.Context, state *models.DataSourceDiskModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.DiskDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list.go
+++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities"
 )
@@ -17,7 +17,7 @@ import (
 // DiskListDataSource flattens data source for disk list.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func DiskListDataSource(ctx context.Context, state *models.DataSourceDiskListModel, c *decort.DecortClient) diag.Diagnostics {
+func DiskListDataSource(ctx context.Context, state *models.DataSourceDiskListModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.DiskListDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_deleted.go
+++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_deleted.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities"
 )
@@ -17,7 +17,7 @@ import (
 // DiskListDeletedDataSource flattens data source for disk list deleted.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func DiskListDeletedDataSource(ctx context.Context, state *models.DataSourceDiskListDeletedModel, c *decort.DecortClient) diag.Diagnostics {
+func DiskListDeletedDataSource(ctx context.Context, state *models.DataSourceDiskListDeletedModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.DiskListDeletedDataSource")

 	diags := diag.Diagnostics{}
--- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_types.go
+++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_types.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
+	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models"
 	"repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities"
 )
@@ -16,7 +16,7 @@ import (
 // DiskListTypesDataSource flattens data source for disk list types.
 // Return error in case data source is not found on the platform.
 // Flatten errors are added to tflog.
-func DiskListTypesDataSource(ctx context.Context, state *models.DataSourceDiskListTypesModel, c *decort.DecortClient) diag.Diagnostics {
+func DiskListTypesDataSource(ctx context.Context, state *models.DataSourceDiskListTypesModel, c *client.Client) diag.Diagnostics {
 	tflog.Info(ctx, "Start flattens.DiskListTypesDataSource")

 	diags := diag.Diagnostics{}
--- a/Show More
+++ b/Show More