diff --git a/CHANGELOG.md b/CHANGELOG.md index b33cf06..d91796c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,75 +1,35 @@ -## Version 1.1.0 +## Version 1.2.0 ### Добавлено -#### audit +#### extnet | Идентификатор
задачи | Описание | | --- | --- | -| BATF-618 | Datasource `dynamix_audit` в cloudapi/audit | - -#### account -| Идентификатор
задачи | Описание | -| --- | --- | -| BATF-603 | Опциональное поле `sort_by` в datasource `dynamix_account_flipgroups_list` в cloudapi/account | - -#### dpdknet -| Идентификатор
задачи | Описание | -| --- | --- | -| BATF-617 | Datasources `dynamix_dpdknet и dynamix_dpdknet_list` в cloudapi/dpkknet | - -#### image -| Идентификатор
задачи | Описание | -| --- | --- | -| BATF-609 | Опциональное поле `enabled` в datasource `dynamix_image_list` в cloudapi/image | - -#### k8s -| Идентификатор
задачи | Описание | -| --- | --- | -| 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 | Идентификатор
задачи | Описание | | --- | --- | -| 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 -| Идентификатор
задачи | Описание | -| --- | --- | -| 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 | Идентификатор
задачи | Описание | | --- | --- | -| 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 +#### общее | Идентификатор
задачи | Описание | | --- | --- | -| BATF-611 | Возможность смены IP сети без отключения сети и остановки ВМ в resource `dynamix_kvmvm` в cloudapi/kvmvm | -| BATF-611 | Добавлена поддержка DPDK сетей в resource `dynamix_kvmvm` в cloudapi/kvmvm | +| BATF-679 | Добавлена поддержка работы с режимом аутентификации `bvs` | ### Удалено -#### all -| Идентификатор
задачи | Описание | -| --- | --- | -| BATF-620 | Поле `reason` во всех resources | -| BATF-623 | Поддержка архитектуры `kvmppc` во всех resources | - -#### account -| Идентификатор
задачи | Описание | -| --- | --- | -| BATF-603 | Опциональное поле `recursive_delete` в `resource dynamix_account` в cloudapi/account | - -#### image +#### vins | Идентификатор
задачи | Описание | | --- | --- | -| BATF-609 | Опциональное поле `permanently`` в `resources dynamix_account, dynamix_image_virtual` в cloudapi/image | \ No newline at end of file +| 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 | diff --git a/Makefile b/Makefile index cb4a19c..99e0ebb 100644 --- a/Makefile +++ b/Makefile @@ -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\ diff --git a/docs/data-sources/extnet.md b/docs/data-sources/extnet.md index 0447def..c762b2a 100644 --- 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) diff --git a/docs/data-sources/extnet_reserved_ip_list.md b/docs/data-sources/extnet_reserved_ip_list.md new file mode 100644 index 0000000..828d349 --- /dev/null +++ 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 + +### 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)) + + +### 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). + + + +### Nested Schema for `items` + +Read-Only: + +- `extnet_id` (Number) +- `reservations` (Attributes List) (see [below for nested schema](#nestedatt--items--reservations)) + + +### 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) diff --git a/docs/data-sources/kvmvm.md b/docs/data-sources/kvmvm.md index 78cc9af..9f20431 100644 --- 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) ### Nested Schema for `timeouts` diff --git a/docs/data-sources/kvmvm_list.md b/docs/data-sources/kvmvm_list.md index 8a848ca..4b1994a 100644 --- 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) diff --git a/docs/data-sources/kvmvm_list_deleted.md b/docs/data-sources/kvmvm_list_deleted.md index 16edb39..3bb8674 100644 --- 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) diff --git a/docs/data-sources/vins.md b/docs/data-sources/vins.md index cececca..c47f805 100644 --- 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) diff --git a/docs/resources/kvmvm.md b/docs/resources/kvmvm.md index 470a676..ef365ea 100644 --- 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) ### Nested Schema for `affinity_rules` diff --git a/docs/resources/vins.md b/docs/resources/vins.md index 25121c4..0e5e687 100644 --- 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) diff --git a/docs/resources/vins_static_route.md b/docs/resources/vins_static_route.md index 5d01c5b..d919c49 100644 --- 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) diff --git a/go.mod b/go.mod index 7027d19..0440635 100644 --- 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 ( diff --git a/go.sum b/go.sum index 6932d25..ecbd4d7 100644 --- 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= diff --git a/internal/client/client.go b/internal/client/client.go index c85f61c..810ad87 100644 --- 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 + } + if bvs, ok := req.ProviderData.(*decort.BVSDecortClient); ok { + res.Provider = bvs + return &res } - return client + + 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) *decort.DecortClient { +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 { - 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 + } + 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 or *decort.BVSDecortClient, got: %T. Please report this issue to the provider developers.", req.ProviderData), + ) + return nil +} + +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 client + return nil } diff --git a/internal/provider/data_sources_map.go b/internal/provider/data_sources_map.go index 81ae7d2..833eb26 100644 --- 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, diff --git a/internal/service/cloudapi/account/data_source_account.go b/internal/service/cloudapi/account/data_source_account.go index 5478999..57802ea 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_audits_list.go b/internal/service/cloudapi/account/data_source_account_audits_list.go index ca72610..94cbda2 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_computes_list.go b/internal/service/cloudapi/account/data_source_account_computes_list.go index 4c576e0..7eb66fd 100644 --- 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) { diff --git 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 index 3ca9ac5..7eb8ad4 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_consumed_units.go b/internal/service/cloudapi/account/data_source_account_consumed_units.go index 97450b0..19f6a98 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_disks_list.go b/internal/service/cloudapi/account/data_source_account_disks_list.go index f4a888a..34ccc64 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_flipgroups_list.go b/internal/service/cloudapi/account/data_source_account_flipgroups_list.go index c121b24..ba774d2 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_get_resource_consumption.go b/internal/service/cloudapi/account/data_source_account_get_resource_consumption.go index 07f5758..8b6065d 100644 --- 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) { diff --git 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 index a992425..e79d46e 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_list.go b/internal/service/cloudapi/account/data_source_account_list.go index dafc792..1627156 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_list_deleted.go b/internal/service/cloudapi/account/data_source_account_list_deleted.go index 62a78fa..4392cac 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_reserved_units.go b/internal/service/cloudapi/account/data_source_account_reserved_units.go index 3d91bc2..64599ff 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_rg_list.go b/internal/service/cloudapi/account/data_source_account_rg_list.go index b58ce3f..8915857 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_templates_list.go b/internal/service/cloudapi/account/data_source_account_templates_list.go index c5b48b0..d764204 100644 --- 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) { diff --git a/internal/service/cloudapi/account/data_source_account_vins_list.go b/internal/service/cloudapi/account/data_source_account_vins_list.go index 403df34..93a7ed3 100644 --- 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) { diff --git a/internal/service/cloudapi/account/flattens/flatten_data_source_account.go b/internal/service/cloudapi/account/flattens/flatten_data_source_account.go index 7a01097..9d3a3d3 100644 --- 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{} diff --git 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 index 8ef0265..f956d39 100644 --- 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{} diff --git 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 index 1042694..bc11680 100644 --- 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{} diff --git 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 index 92d599a..fd9ba27 100644 --- 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{} diff --git 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 index b3cbf79..ee3d79d 100644 --- 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{} diff --git 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 index 142f1d7..48ef4a9 100644 --- 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{} diff --git 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 index 1ef2a44..724f109 100644 --- 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{} diff --git 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 index bbd3fde..71b6a77 100644 --- 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{} diff --git 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 index 646786f..3a6fcaa 100644 --- 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{} diff --git a/internal/service/cloudapi/account/flattens/flatten_data_source_account_list.go b/internal/service/cloudapi/account/flattens/flatten_data_source_account_list.go index b3e8a85..24d5ec1 100644 --- 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{} diff --git 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 index 2b96a19..a6a43d8 100644 --- 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{} diff --git 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 index b7a7a7b..665fc40 100644 --- 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{} diff --git 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 index 520e6c5..7b504d8 100644 --- 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{} diff --git 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 index d0a303f..2948435 100644 --- 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{} diff --git 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 index 24e6f82..149f7d0 100644 --- 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{} diff --git a/internal/service/cloudapi/account/flattens/flatten_resource_account.go b/internal/service/cloudapi/account/flattens/flatten_resource_account.go index 08801b4..12e2b35 100644 --- 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{} diff --git a/internal/service/cloudapi/account/resource_account.go b/internal/service/cloudapi/account/resource_account.go index 129459f..f7d64fc 100644 --- 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. diff --git a/internal/service/cloudapi/account/utilities/utility_data_source_account.go b/internal/service/cloudapi/account/utilities/utility_data_source_account.go index 99216ed..3453419 100644 --- 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}) diff --git 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 index ad5fee3..26544a5 100644 --- 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}) diff --git 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 index 9f79573..357bb85 100644 --- 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{ diff --git 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 index 0563e62..34cc15c 100644 --- 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}) diff --git 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 index 5ff2efa..6d93a4c 100644 --- 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{ diff --git 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 index f924107..c0cffcb 100644 --- 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{ diff --git 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 index 2b2f888..818d7f8 100644 --- 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())} diff --git 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 index 2d0c6f3..ef446cf 100644 --- 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}) diff --git 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 index be21124..56f2875 100644 --- 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) diff --git a/internal/service/cloudapi/account/utilities/utility_data_source_account_list.go b/internal/service/cloudapi/account/utilities/utility_data_source_account_list.go index afcbdab..e223b41 100644 --- 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{} diff --git 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 index 6494286..45586e8 100644 --- 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{} diff --git 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 index 9e6c0d1..8b3a85f 100644 --- 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{ diff --git 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 index 1025567..3388e42 100644 --- 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())} diff --git 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 index f634f99..9b7570d 100644 --- 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{ diff --git 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 index df27ae0..ea45ffd 100644 --- 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{} diff --git a/internal/service/cloudapi/account/utilities/utility_resource_account.go b/internal/service/cloudapi/account/utilities/utility_resource_account.go index ff41bc9..3c61d48 100644 --- 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{} diff --git a/internal/service/cloudapi/audit/data_source_audit.go b/internal/service/cloudapi/audit/data_source_audit.go index a71b0ff..a540cc2 100644 --- 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) { diff --git a/internal/service/cloudapi/audit/flattens/flatten_data_source_audit.go b/internal/service/cloudapi/audit/flattens/flatten_data_source_audit.go index 54ec851..1398d93 100644 --- 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{} diff --git a/internal/service/cloudapi/audit/utilities/utility_data_source_audit.go b/internal/service/cloudapi/audit/utilities/utility_data_source_audit.go index 4b788c8..17c50ca 100644 --- 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{} diff --git a/internal/service/cloudapi/bservice/data_source_bservice.go b/internal/service/cloudapi/bservice/data_source_bservice.go index aba380e..469c938 100644 --- 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) { diff --git a/internal/service/cloudapi/bservice/data_source_bservice__deleted_list.go b/internal/service/cloudapi/bservice/data_source_bservice__deleted_list.go index 01ff6bf..b92fe0c 100644 --- 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) { diff --git a/internal/service/cloudapi/bservice/data_source_bservice_group.go b/internal/service/cloudapi/bservice/data_source_bservice_group.go index cd8ec4c..1edbe33 100644 --- 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) { diff --git a/internal/service/cloudapi/bservice/data_source_bservice_list.go b/internal/service/cloudapi/bservice/data_source_bservice_list.go index be49478..0e1d468 100644 --- 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) { diff --git a/internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go b/internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go index 90fcc9c..fec261f 100644 --- 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) { diff --git a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice.go b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice.go index baffd79..9288c7d 100644 --- 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{} diff --git 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 index dca855f..bcd90f9 100644 --- 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{} diff --git a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_group.go b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_group.go index fba9548..46e95f8 100644 --- 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{} diff --git a/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_list.go b/internal/service/cloudapi/bservice/flattens/flatten_data_source_bservice_list.go index 9fa7c45..850c5b7 100644 --- 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{} diff --git 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 index 9b7ed7c..f43ba5d 100644 --- 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{} diff --git a/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice.go b/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice.go index 1eeef1d..5a2ad1a 100644 --- 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{} diff --git a/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice_group.go b/internal/service/cloudapi/bservice/flattens/flatten_resource_bservice_group.go index 38fa76b..5d837d3 100644 --- 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{} diff --git a/internal/service/cloudapi/bservice/resource_bservice.go b/internal/service/cloudapi/bservice/resource_bservice.go index 9de792f..153469e 100644 --- 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. diff --git a/internal/service/cloudapi/bservice/resource_bservice_group.go b/internal/service/cloudapi/bservice/resource_bservice_group.go index 37ea950..d1350f3 100644 --- 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. diff --git a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice.go b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice.go index a760bd8..433e772 100644 --- 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}) diff --git 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 index 7254d32..711e936 100644 --- 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{} diff --git a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_group.go b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_group.go index 3c8e209..65eeaef 100644 --- 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())} diff --git a/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_list.go b/internal/service/cloudapi/bservice/utilities/utility_data_source_bservice_list.go index 0618858..2f70336 100644 --- 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{} diff --git 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 index 4ba6531..93bd863 100644 --- 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} diff --git a/internal/service/cloudapi/bservice/utilities/utility_resource_bservice.go b/internal/service/cloudapi/bservice/utilities/utility_resource_bservice.go index 13d7bf3..05bd143 100644 --- 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{ diff --git a/internal/service/cloudapi/bservice/utilities/utility_resource_bservice_group.go b/internal/service/cloudapi/bservice/utilities/utility_resource_bservice_group.go index c67ca1f..d5887db 100644 --- 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 diff --git a/internal/service/cloudapi/disks/data_source_disk.go b/internal/service/cloudapi/disks/data_source_disk.go index a2d00fa..cb16c82 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_list.go b/internal/service/cloudapi/disks/data_source_disk_list.go index b1b34b3..867d6c1 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_list_deleted.go b/internal/service/cloudapi/disks/data_source_disk_list_deleted.go index abbb767..df36eab 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_list_types.go b/internal/service/cloudapi/disks/data_source_disk_list_types.go index 2cefb17..0159b8c 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go b/internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go index 287670b..9ac5cbf 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_list_unattached.go b/internal/service/cloudapi/disks/data_source_disk_list_unattached.go index 4440751..9e2b50f 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_replication.go b/internal/service/cloudapi/disks/data_source_disk_replication.go index 791eed7..65100b2 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_snapshot.go b/internal/service/cloudapi/disks/data_source_disk_snapshot.go index fe7e93d..680ad35 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/data_source_disk_snapshot_list.go b/internal/service/cloudapi/disks/data_source_disk_snapshot_list.go index a5c7fd7..f4d2df8 100644 --- 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) { diff --git a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk.go b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk.go index 47baa91..6a98e41 100644 --- 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{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list.go b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list.go index efb3a34..6e3799b 100644 --- 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{} diff --git 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 index 1934994..d413790 100644 --- 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{} diff --git 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 index 1b3de9c..3ab2851 100644 --- 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{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_types_detailed.go b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_types_detailed.go index 4c38322..9863dcd 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_types_detailed.go +++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_types_detailed.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 ( // DiskListTypesDetailedDataSource flattens data source for disk list types detailed. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskListTypesDetailedDataSource(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *decort.DecortClient) diag.Diagnostics { +func DiskListTypesDetailedDataSource(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskListTypesDetailedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_unattached.go b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_unattached.go index 9d16d09..4e2662c 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_unattached.go +++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_list_unattached.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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities" @@ -18,7 +18,7 @@ import ( // DiskListUnattachedDataSource flattens data source for disk list unattached. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskListUnattachedDataSource(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *decort.DecortClient) diag.Diagnostics { +func DiskListUnattachedDataSource(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskListUnattachedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_replication.go b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_replication.go index 16209ee..4c88ea4 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_replication.go +++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_replication.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/flattens" "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 ( // DiskReplicationDataSource flattens data source for disk. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskReplicationDataSource(ctx context.Context, state *models.RecordDiskModel, c *decort.DecortClient) diag.Diagnostics { +func DiskReplicationDataSource(ctx context.Context, state *models.RecordDiskModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskReplicationDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot.go b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot.go index 9f69568..b583f0d 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot.go +++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot.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/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities" ) @@ -15,7 +15,7 @@ import ( // DiskSnapshotDataSource flattens data source for disk snapshot. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskSnapshotDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotModel, c *decort.DecortClient) diag.Diagnostics { +func DiskSnapshotDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskSnapshotDataSource") diskId := uint64(state.DiskID.ValueInt64()) diff --git a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot_list.go b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot_list.go index c4e0b6f..450e302 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot_list.go +++ b/internal/service/cloudapi/disks/flattens/flatten_data_source_disk_snapshot_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/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities" ) @@ -16,7 +16,7 @@ import ( // DiskSnapshotListDataSource flattens data source for disk snapshot list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskSnapshotListDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotListModel, c *decort.DecortClient) diag.Diagnostics { +func DiskSnapshotListDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskSnapshotListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_resource_disk.go b/internal/service/cloudapi/disks/flattens/flatten_resource_disk.go index 4408f6e..59d935f 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_resource_disk.go +++ b/internal/service/cloudapi/disks/flattens/flatten_resource_disk.go @@ -9,8 +9,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/disks" + "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" ) @@ -18,7 +18,7 @@ import ( // DiskResource flattens resource for disk. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func DiskResource(ctx context.Context, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func DiskResource(ctx context.Context, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_resource_disk_replication.go b/internal/service/cloudapi/disks/flattens/flatten_resource_disk_replication.go index 991bfcf..f35b6ce 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_resource_disk_replication.go +++ b/internal/service/cloudapi/disks/flattens/flatten_resource_disk_replication.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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/utilities" @@ -18,7 +18,7 @@ import ( // ReplicationDiskresource flattens resource for disk. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func DiskReplicationResource(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func DiskReplicationResource(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskReplicationresource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/disks/flattens/flatten_resource_disk_snapshot.go b/internal/service/cloudapi/disks/flattens/flatten_resource_disk_snapshot.go index 10dd256..3cf81c1 100644 --- a/internal/service/cloudapi/disks/flattens/flatten_resource_disk_snapshot.go +++ b/internal/service/cloudapi/disks/flattens/flatten_resource_disk_snapshot.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 ( // DiskSnapshotResource flattens resource for disk snapshot. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func DiskSnapshotResource(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *decort.DecortClient) diag.Diagnostics { +func DiskSnapshotResource(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskSnapshotResource", map[string]any{ "disk_id": plan.DiskID.ValueInt64(), "label": plan.Label.ValueString()}) diff --git a/internal/service/cloudapi/disks/input_checks.go b/internal/service/cloudapi/disks/input_checks.go index 42dc495..e508859 100644 --- a/internal/service/cloudapi/disks/input_checks.go +++ b/internal/service/cloudapi/disks/input_checks.go @@ -6,13 +6,13 @@ 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/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/ic" ) // resourceDiskCreateInputChecks checks if user provided account_id and gid exist on the platform during disk creation. -func resourceDiskCreateInputChecks(ctx context.Context, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func resourceDiskCreateInputChecks(ctx context.Context, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} accountId := uint64(plan.AccountID.ValueInt64()) @@ -32,7 +32,7 @@ func resourceDiskCreateInputChecks(ctx context.Context, plan *models.ResourceDis } // resourceDiskReplicationInputChecks checks if user provided disk_id exist on the platform during disk replication. -func resourceDiskReplicationInputChecks(ctx context.Context, plan *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func resourceDiskReplicationInputChecks(ctx context.Context, plan *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(plan.DiskId.ValueInt64()) @@ -49,7 +49,7 @@ func resourceDiskReplicationInputChecks(ctx context.Context, plan *models.Resour // resourceDiskUpdateInputChecks checks if user provided: // account_id and gid exist on the platform during disk creation, // description, pool, sep_id, type are not attempted to be changed. -func resourceDiskUpdateInputChecks(ctx context.Context, plan, state *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func resourceDiskUpdateInputChecks(ctx context.Context, plan, state *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // check accountId and gid diff --git a/internal/service/cloudapi/disks/resource_disk.go b/internal/service/cloudapi/disks/resource_disk.go index 9f150ac..e580b2f 100644 --- a/internal/service/cloudapi/disks/resource_disk.go +++ b/internal/service/cloudapi/disks/resource_disk.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/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -35,7 +34,7 @@ func NewResourceDisk() resource.Resource { // resourceDisk is the resource implementation. type resourceDisk struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/disks/resource_disk_replication.go b/internal/service/cloudapi/disks/resource_disk_replication.go index e9028a5..8c4fc23 100644 --- a/internal/service/cloudapi/disks/resource_disk_replication.go +++ b/internal/service/cloudapi/disks/resource_disk_replication.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceDiskReplications() resource.Resource { // resourceDiskReplication is the resource implementation. type resourceDiskReplication struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/disks/resource_disk_snapshot.go b/internal/service/cloudapi/disks/resource_disk_snapshot.go index 94d0064..9873c9d 100644 --- a/internal/service/cloudapi/disks/resource_disk_snapshot.go +++ b/internal/service/cloudapi/disks/resource_disk_snapshot.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/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -33,7 +32,7 @@ func NewResourceDiskSnapshot() resource.Resource { // resourceDiskSnapshot is the resource implementation. type resourceDiskSnapshot struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk.go index 1e3e812..0e4b6c7 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk.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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func DataSourceDiskCheckPresence(ctx context.Context, diskId uint64, c *decort.DecortClient) (*disks.RecordDisk, error) { +func DataSourceDiskCheckPresence(ctx context.Context, diskId uint64, c *client.Client) (*disks.RecordDisk, error) { tflog.Info(ctx, fmt.Sprintf("DataSourceDiskCheckPresence: Get info about disk with ID - %v", diskId)) recordDisk, err := c.CloudAPI().Disks().Get(ctx, disks.GetRequest{DiskID: diskId}) diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list.go index da29a03..a2451a6 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list.go @@ -5,12 +5,12 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func DataSourceDiskListCheckPresence(ctx context.Context, state *models.DataSourceDiskListModel, c *decort.DecortClient) (*disks.ListDisks, diag.Diagnostics) { +func DataSourceDiskListCheckPresence(ctx context.Context, state *models.DataSourceDiskListModel, c *client.Client) (*disks.ListDisks, diag.Diagnostics) { diags := diag.Diagnostics{} listReq := disks.ListRequest{} diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_deleted.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_deleted.go index 7577d8b..4ed07b1 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_deleted.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_deleted.go @@ -5,12 +5,12 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func DataSourceDiskListDeletedCheckPresence(ctx context.Context, state *models.DataSourceDiskListDeletedModel, c *decort.DecortClient) (*disks.ListDisks, diag.Diagnostics) { +func DataSourceDiskListDeletedCheckPresence(ctx context.Context, state *models.DataSourceDiskListDeletedModel, c *client.Client) (*disks.ListDisks, diag.Diagnostics) { diags := diag.Diagnostics{} listReq := disks.ListDeletedRequest{} diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types.go index ff403e5..a044586 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types.go @@ -5,12 +5,12 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func DataSourceDiskListTypesCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesModel, c *decort.DecortClient) (*disks.ListTypes, diag.Diagnostics) { +func DataSourceDiskListTypesCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesModel, c *client.Client) (*disks.ListTypes, diag.Diagnostics) { diags := diag.Diagnostics{} listTypesReq := disks.ListTypesRequest{Detailed: false} diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types_detailed.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types_detailed.go index e1dba86..4fa66a7 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types_detailed.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_types_detailed.go @@ -5,12 +5,12 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func DataSourceDiskListTypesDetailedCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *decort.DecortClient) (*disks.ListTypes, diag.Diagnostics) { +func DataSourceDiskListTypesDetailedCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *client.Client) (*disks.ListTypes, diag.Diagnostics) { diags := diag.Diagnostics{} listTypesReq := disks.ListTypesRequest{Detailed: true} diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_unattached.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_unattached.go index a7abdfa..a060d4f 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_unattached.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_list_unattached.go @@ -5,12 +5,12 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func DataSourceDiskListUnattachedCheckPresence(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *decort.DecortClient) (*disks.ListDisksUnattached, diag.Diagnostics) { +func DataSourceDiskListUnattachedCheckPresence(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *client.Client) (*disks.ListDisksUnattached, diag.Diagnostics) { diags := diag.Diagnostics{} listReq := disks.ListUnattachedRequest{} diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_replication.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_replication.go index 2df7149..c335693 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_replication.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_replication.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func DataSourceDiskReplicationCheckPresence(ctx context.Context, state *models.RecordDiskModel, c *decort.DecortClient) (*disks.RecordDisk, *string, error) { +func DataSourceDiskReplicationCheckPresence(ctx context.Context, state *models.RecordDiskModel, c *client.Client) (*disks.RecordDisk, *string, error) { status, err := c.CloudAPI().Disks().ReplicationStatus(ctx, disks.ReplicationStatusRequest{DiskID: uint64(state.DiskId.ValueInt64())}) if err != nil { diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_snapshot.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_snapshot.go index e5db92e..9a8fef6 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_snapshot.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_snapshot.go @@ -6,12 +6,12 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func DataSourceDiskSnapshotCheckPresence(ctx context.Context, plan *models.DataSourceDiskSnapshotModel, c *decort.DecortClient) (*disks.ItemSnapshot, diag.Diagnostics) { +func DataSourceDiskSnapshotCheckPresence(ctx context.Context, plan *models.DataSourceDiskSnapshotModel, c *client.Client) (*disks.ItemSnapshot, diag.Diagnostics) { diags := diag.Diagnostics{} diskId := uint64(plan.DiskID.ValueInt64()) diff --git a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_snapshot_list.go b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_snapshot_list.go index f836a0e..3c1d8d0 100644 --- a/internal/service/cloudapi/disks/utilities/utility_data_source_disk_snapshot_list.go +++ b/internal/service/cloudapi/disks/utilities/utility_data_source_disk_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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func DiskSnapshotListCheckPresence(ctx context.Context, diskId uint64, c *decort.DecortClient) (*disks.ListSnapshots, error) { +func DiskSnapshotListCheckPresence(ctx context.Context, diskId uint64, c *client.Client) (*disks.ListSnapshots, error) { tflog.Info(ctx, fmt.Sprintf("DiskSnapshotListCheckPresence: Get info about disk snapshot list with disk ID - %v", diskId)) recordDisk, err := c.CloudAPI().Disks().Get(ctx, disks.GetRequest{DiskID: diskId}) diff --git a/internal/service/cloudapi/disks/utilities/utility_resource_disk.go b/internal/service/cloudapi/disks/utilities/utility_resource_disk.go index 09622cb..6827c13 100644 --- a/internal/service/cloudapi/disks/utilities/utility_resource_disk.go +++ b/internal/service/cloudapi/disks/utilities/utility_resource_disk.go @@ -7,18 +7,18 @@ import ( "time" "github.com/hashicorp/terraform-plugin-framework/types" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" "github.com/hashicorp/terraform-plugin-framework/diag" "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/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) // DiskCheckPresence checks if disk with diskId exists -func DiskCheckPresence(ctx context.Context, diskId uint64, c *decort.DecortClient) (*disks.RecordDisk, error) { +func DiskCheckPresence(ctx context.Context, diskId uint64, c *client.Client) (*disks.RecordDisk, error) { tflog.Info(ctx, fmt.Sprintf("Get info about disk with ID - %v", diskId)) diskRecord, err := c.CloudAPI().Disks().Get(ctx, disks.GetRequest{DiskID: diskId}) @@ -68,7 +68,7 @@ func CreateRequestResourceDisk(ctx context.Context, plan *models.ResourceDiskMod // LimitIOCreateDisk sets IO limits that user specified in iotune field for created resource. // In case of failure returns warnings. -func LimitIOCreateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func LimitIOCreateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} limitIOReq := disks.LimitIORequest{ @@ -119,7 +119,7 @@ func LimitIOCreateDisk(ctx context.Context, diskId uint64, plan *models.Resource // ShareableCreateDisk shares disk. // In case of failure returns warnings. -func ShareableCreateDisk(ctx context.Context, diskId uint64, c *decort.DecortClient) diag.Diagnostics { +func ShareableCreateDisk(ctx context.Context, diskId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "ShareableCreateDisk: before calling CloudAPI().Disks().Share", map[string]any{"disk_id": diskId}) @@ -138,7 +138,7 @@ func ShareableCreateDisk(ctx context.Context, diskId uint64, c *decort.DecortCli // DiskReadStatus loads disk resource by ids id, gets it current status. Performs restore and enable if needed for // Deleted status. // In case of failure returns errors. -func DiskReadStatus(ctx context.Context, state *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func DiskReadStatus(ctx context.Context, state *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "DiskReadStatus: Read status disk with ID", map[string]any{"disk_id": state.Id.ValueString()}) diags := diag.Diagnostics{} @@ -188,7 +188,7 @@ func DiskReadStatus(ctx context.Context, state *models.ResourceDiskModel, c *dec // RestoreDisk performs disk Restore request. // Returns error in case of failures. -func RestoreDisk(ctx context.Context, diskId uint64, c *decort.DecortClient) diag.Diagnostics { +func RestoreDisk(ctx context.Context, diskId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} restoreReq := disks.RestoreRequest{ @@ -212,7 +212,7 @@ func RestoreDisk(ctx context.Context, diskId uint64, c *decort.DecortClient) dia // SizeMaxUpdateDisk resizes disk. // Returns error in case of failures. -func SizeMaxUpdateDisk(ctx context.Context, diskId uint64, plan, state *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func SizeMaxUpdateDisk(ctx context.Context, diskId uint64, plan, state *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { var diags diag.Diagnostics resizeReq := disks.ResizeRequest{ @@ -255,7 +255,7 @@ func SizeMaxUpdateDisk(ctx context.Context, diskId uint64, plan, state *models.R // NameUpdateDisk renames disk. // Returns error in case of failures. -func NameUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func NameUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { var diags diag.Diagnostics renameReq := disks.RenameRequest{ @@ -285,7 +285,7 @@ func NameUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDis // LimitIOUpdateDisk changes IO limits that user specified in iotune field for updated resource. // In case of failure returns errors. -func LimitIOUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func LimitIOUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} limitIOReq := disks.LimitIORequest{ @@ -337,7 +337,7 @@ func LimitIOUpdateDisk(ctx context.Context, diskId uint64, plan *models.Resource // ShareableUpdateDisk shares or unshares disk. // In case of failure returns errors. -func ShareableUpdateDisk(ctx context.Context, diskId uint64, share bool, c *decort.DecortClient) diag.Diagnostics { +func ShareableUpdateDisk(ctx context.Context, diskId uint64, share bool, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // share diff --git a/internal/service/cloudapi/disks/utilities/utility_resource_disk_replication.go b/internal/service/cloudapi/disks/utilities/utility_resource_disk_replication.go index 34d0600..08c37fe 100644 --- a/internal/service/cloudapi/disks/utilities/utility_resource_disk_replication.go +++ b/internal/service/cloudapi/disks/utilities/utility_resource_disk_replication.go @@ -6,12 +6,12 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) -func UtilityDiskReplicationUpdateStartStop(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityDiskReplicationUpdateStartStop(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(state.DiskId.ValueInt64()) @@ -53,7 +53,7 @@ func UtilityDiskReplicationUpdateStartStop(ctx context.Context, state *models.Re return nil } -func UtilityDiskReplicationUpdatePause(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityDiskReplicationUpdatePause(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(state.DiskId.ValueInt64()) @@ -91,7 +91,7 @@ func UtilityDiskReplicationUpdatePause(ctx context.Context, state *models.Resour return nil } -func UtilityDiskReplicationUpdateReverse(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityDiskReplicationUpdateReverse(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(state.DiskId.ValueInt64()) targetDiskId := uint64(state.ReplicationId.ValueInt64()) @@ -131,7 +131,7 @@ func UtilityDiskReplicationUpdateReverse(ctx context.Context, state *models.Reso return nil } -func ResourceDiskReplicationCheckPresence(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) (*disks.RecordDisk, *string, error) { +func ResourceDiskReplicationCheckPresence(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) (*disks.RecordDisk, *string, error) { status, err := c.CloudAPI().Disks().ReplicationStatus(ctx, disks.ReplicationStatusRequest{DiskID: uint64(state.DiskId.ValueInt64())}) if err != nil { @@ -157,7 +157,7 @@ func ResourceDiskReplicationCheckPresence(ctx context.Context, state *models.Res // DiskReadStatus loads disk resource by ids id, gets it current status. // In case of failure returns errors. -func ReplicationDiskReadStatus(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func ReplicationDiskReadStatus(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ReplicationDiskReadStatus: Read status disk with ID", map[string]any{"disk_id": state.DiskId.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/disks/utilities/utility_resource_disk_snapshot.go b/internal/service/cloudapi/disks/utilities/utility_resource_disk_snapshot.go index 40ce1f4..d4d2dea 100644 --- a/internal/service/cloudapi/disks/utilities/utility_resource_disk_snapshot.go +++ b/internal/service/cloudapi/disks/utilities/utility_resource_disk_snapshot.go @@ -8,13 +8,13 @@ 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/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" ) // DiskSnapshotCheckPresence checks if disk snapshot exists -func DiskSnapshotCheckPresence(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *decort.DecortClient) (*disks.ItemSnapshot, diag.Diagnostics) { +func DiskSnapshotCheckPresence(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *client.Client) (*disks.ItemSnapshot, diag.Diagnostics) { diags := diag.Diagnostics{} // take diskId and label from plan @@ -64,7 +64,7 @@ func DiskSnapshotCheckPresence(ctx context.Context, plan *models.ResourceDiskSna // RollbackDiskSnapshot rollbacks disk snapshot. // Returns error in case of failures. -func RollbackDiskSnapshot(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *decort.DecortClient) diag.Diagnostics { +func RollbackDiskSnapshot(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} rollbackReq := disks.SnapshotRollbackRequest{ diff --git a/internal/service/cloudapi/dpdknet/data_source_dpdknet.go b/internal/service/cloudapi/dpdknet/data_source_dpdknet.go index d688e67..11ac9b3 100644 --- a/internal/service/cloudapi/dpdknet/data_source_dpdknet.go +++ b/internal/service/cloudapi/dpdknet/data_source_dpdknet.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/dpdknet/flattens" @@ -26,7 +25,7 @@ func NewDataSourceDPDK() datasource.DataSource { // dataSourceDPDK is the data source implementation. type dataSourceDPDK struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceDPDK) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/dpdknet/data_source_dpdknet_list.go b/internal/service/cloudapi/dpdknet/data_source_dpdknet_list.go index 2a603be..a830aba 100644 --- a/internal/service/cloudapi/dpdknet/data_source_dpdknet_list.go +++ b/internal/service/cloudapi/dpdknet/data_source_dpdknet_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/dpdknet/flattens" @@ -26,7 +25,7 @@ func NewDataSourceDPDKList() datasource.DataSource { // dataSourceDPDKList is the data source implementation. type dataSourceDPDKList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceDPDKList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet.go b/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet.go index 020185f..bb8b78f 100644 --- a/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet.go +++ b/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet.go @@ -7,13 +7,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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/dpdknet/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/dpdknet/utilities" ) -func DPDKDataSource(ctx context.Context, state *models.DataSourceDPDKModel, c *decort.DecortClient) diag.Diagnostics { +func DPDKDataSource(ctx context.Context, state *models.DataSourceDPDKModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DPDKDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet_list.go b/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet_list.go index 7903ee2..e403684 100644 --- a/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet_list.go +++ b/internal/service/cloudapi/dpdknet/flattens/flatten_data_source_dpdknet_list.go @@ -7,13 +7,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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/dpdknet/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/dpdknet/utilities" ) -func DPDKListDataSource(ctx context.Context, state *models.DataSourceDPDKListModel, c *decort.DecortClient) diag.Diagnostics { +func DPDKListDataSource(ctx context.Context, state *models.DataSourceDPDKListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DPDKListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet.go b/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet.go index 0f4ea6c..cfbd1ea 100644 --- a/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet.go +++ b/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet.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/dpdknet" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func DPDKDataSourceCheckPresence(ctx context.Context, dpdkId uint64, c *decort.DecortClient) (*dpdknet.RecordDPDKNet, diag.Diagnostics) { +func DPDKDataSourceCheckPresence(ctx context.Context, dpdkId uint64, c *client.Client) (*dpdknet.RecordDPDKNet, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("DPDKDataSourceCheckPresence: Get info about DPDK net with ID - %d", dpdkId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet_list.go b/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet_list.go index efe037d..369d78d 100644 --- a/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet_list.go +++ b/internal/service/cloudapi/dpdknet/utilities/utility_data_source_dpdknet_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/dpdknet" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/dpdknet/models" ) -func DPDKListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceDPDKListModel, c *decort.DecortClient) (*dpdknet.ListDPDKNet, error) { +func DPDKListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceDPDKListModel, c *client.Client) (*dpdknet.ListDPDKNet, error) { tflog.Info(ctx, fmt.Sprintf("DPDKListDataSourceCheckPresence: Get DPDK list info")) listDPDKReq := dpdknet.ListRequest{} diff --git a/internal/service/cloudapi/extnet/data_source_extnet.go b/internal/service/cloudapi/extnet/data_source_extnet.go index 20d531c..d5775b7 100644 --- a/internal/service/cloudapi/extnet/data_source_extnet.go +++ b/internal/service/cloudapi/extnet/data_source_extnet.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/extnet/flattens" @@ -26,7 +25,7 @@ func NewDataSourceExtNet() datasource.DataSource { // dataSourceExtNet is the data source implementation. type dataSourceExtNet struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceExtNet) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/extnet/data_source_extnet_computes_list.go b/internal/service/cloudapi/extnet/data_source_extnet_computes_list.go index f42bf9e..39cd057 100644 --- a/internal/service/cloudapi/extnet/data_source_extnet_computes_list.go +++ b/internal/service/cloudapi/extnet/data_source_extnet_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/extnet/flattens" @@ -26,7 +25,7 @@ func NewDataSourceExtNetComputesList() datasource.DataSource { // dataSourceExtNetComputesList is the data source implementation. type dataSourceExtNetComputesList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceExtNetComputesList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/extnet/data_source_extnet_default.go b/internal/service/cloudapi/extnet/data_source_extnet_default.go index fdfeed4..56a2508 100644 --- a/internal/service/cloudapi/extnet/data_source_extnet_default.go +++ b/internal/service/cloudapi/extnet/data_source_extnet_default.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/extnet/flattens" @@ -26,7 +25,7 @@ func NewDataSourceExtNetDefault() datasource.DataSource { // dataSourceExtNetDefault is the data source implementation. type dataSourceExtNetDefault struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceExtNetDefault) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/extnet/data_source_extnet_list.go b/internal/service/cloudapi/extnet/data_source_extnet_list.go index 4294b21..8d7af13 100644 --- a/internal/service/cloudapi/extnet/data_source_extnet_list.go +++ b/internal/service/cloudapi/extnet/data_source_extnet_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/extnet/flattens" @@ -26,7 +25,7 @@ func NewDataSourceExtNetList() datasource.DataSource { // dataSourceExtNet is the data source implementation. type dataSourceExtNetList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceExtNetList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/extnet/data_source_extnet_reserved_ip.go b/internal/service/cloudapi/extnet/data_source_extnet_reserved_ip.go new file mode 100644 index 0000000..cf648df --- /dev/null +++ b/internal/service/cloudapi/extnet/data_source_extnet_reserved_ip.go @@ -0,0 +1,87 @@ +package extnet + +import ( + "context" + + "github.com/hashicorp/terraform-plugin-framework-timeouts/datasource/timeouts" + "github.com/hashicorp/terraform-plugin-framework/datasource" + "github.com/hashicorp/terraform-plugin-framework/datasource/schema" + "github.com/hashicorp/terraform-plugin-log/tflog" + "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/extnet/flattens" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/models" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/schemas" +) + +// Ensure the implementation satisfies the expected interfaces. +var ( + _ datasource.DataSource = &dataSourceExtNetReservedIP{} +) + +func NewDataSourceExtNetReservedIP() datasource.DataSource { + return &dataSourceExtNetReservedIP{} +} + +// dataSourceExtNet is the data source implementation. +type dataSourceExtNetReservedIP struct { + client *client.Client +} + +func (d *dataSourceExtNetReservedIP) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { + // Read Terraform configuration data into the model + var state models.DataSourceExtNetReservedIPModel + resp.Diagnostics.Append(req.Config.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + tflog.Error(ctx, "Read dataSourceExtNetReservedIP: Error get state") + return + } + tflog.Info(ctx, "Read dataSourceExtNetReservedIP: got state successfully") + + // Set timeouts + readTimeout, diags := state.Timeouts.Read(ctx, constants.Timeout30s) + resp.Diagnostics.Append(diags...) + if resp.Diagnostics.HasError() { + tflog.Error(ctx, "Read dataSourceExtNetReservedIP: Error set timeout") + return + } + tflog.Info(ctx, "Read dataSourceExtNetReservedIP: set timeouts successfully", map[string]any{"readTimeout": readTimeout}) + + ctx, cancel := context.WithTimeout(ctx, readTimeout) + defer cancel() + + // Map response body to schema + resp.Diagnostics.Append(flattens.ExtNetReservedIPDataSource(ctx, &state, d.client)...) + if resp.Diagnostics.HasError() { + tflog.Error(ctx, "Read dataSourceExtNetReservedIP: Error flatten data source extnet_reserved_ip") + return + } + + // Set refreshed state + resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + if resp.Diagnostics.HasError() { + tflog.Error(ctx, "Read dataSourceExtNetReservedIP: Error set state") + return + } + tflog.Info(ctx, "End read dataSourceExtNetReservedIP") +} + +func (d *dataSourceExtNetReservedIP) Schema(ctx context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) { + resp.Schema = schema.Schema{ + Attributes: schemas.MakeSchemaDataSourceExtNetReservedIP(), + Blocks: map[string]schema.Block{ + "timeouts": timeouts.Block(ctx), + }, + } +} + +func (d *dataSourceExtNetReservedIP) Metadata(_ context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) { + resp.TypeName = req.ProviderTypeName + "_extnet_reserved_ip_list" +} + +// Configure adds the provider configured client to the data source. +func (d *dataSourceExtNetReservedIP) Configure(ctx context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) { + tflog.Info(ctx, "Get Configure dataSourceExtNetReservedIP") + d.client = client.DataSource(ctx, &req, resp) + tflog.Info(ctx, "Getting Configure dataSourceExtNetReservedIP successfully") +} diff --git a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet.go b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet.go index f242414..6dd04e8 100644 --- a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet.go +++ b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet.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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/utilities" @@ -17,7 +17,7 @@ import ( // ExtNetDataSource flattens data source for extnet. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func ExtNetDataSource(ctx context.Context, state *models.DataSourceExtNetModel, c *decort.DecortClient) diag.Diagnostics { +func ExtNetDataSource(ctx context.Context, state *models.DataSourceExtNetModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.ExtNetDataSource") diags := diag.Diagnostics{} @@ -71,6 +71,7 @@ func ExtNetDataSource(ctx context.Context, state *models.DataSourceExtNetModel, reservations := make([]models.ItemReservationModel, 0, len(recordExtNet.Reservations)) for _, item := range recordExtNet.Reservations { r := models.ItemReservationModel{ + AccountID: types.Int64Value(int64(item.AccountID)), ClientType: types.StringValue(item.ClientType), Description: types.StringValue(item.Description), DomainName: types.StringValue(item.DomainName), diff --git a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_computes_list.go b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_computes_list.go index 0f070ac..650accc 100644 --- a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_computes_list.go +++ b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_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/extnet/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/utilities" ) @@ -15,7 +15,7 @@ import ( // ExtNetComputesListDataSource flattens data source for extnet computes list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func ExtNetComputesListDataSource(ctx context.Context, state *models.DataSourceExtNetComputesListModel, c *decort.DecortClient) diag.Diagnostics { +func ExtNetComputesListDataSource(ctx context.Context, state *models.DataSourceExtNetComputesListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.ExtNetComputesListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_default.go b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_default.go index 440ab22..b937050 100644 --- a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_default.go +++ b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_default.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/extnet/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/utilities" ) @@ -15,7 +15,7 @@ import ( // ExtNetDefaultDataSource flattens data source for extnet default. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func ExtNetDefaultDataSource(ctx context.Context, state *models.DataSourceExtNetDefaultModel, c *decort.DecortClient) diag.Diagnostics { +func ExtNetDefaultDataSource(ctx context.Context, state *models.DataSourceExtNetDefaultModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.ExtNetDefaultDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_list.go b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_list.go index 0419cc6..03e20f5 100644 --- a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_list.go +++ b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_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/extnet/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/utilities" ) @@ -15,7 +15,7 @@ import ( // ExtNetListDataSource flattens data source for extnet list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func ExtNetListDataSource(ctx context.Context, state *models.DataSourceExtNetListModel, c *decort.DecortClient) diag.Diagnostics { +func ExtNetListDataSource(ctx context.Context, state *models.DataSourceExtNetListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.ExtNetListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_reserved_ip.go b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_reserved_ip.go new file mode 100644 index 0000000..e099923 --- /dev/null +++ b/internal/service/cloudapi/extnet/flattens/flatten_data_source_extnet_reserved_ip.go @@ -0,0 +1,74 @@ +package flattens + +import ( + "context" + + "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" + "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/models" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/utilities" +) + +// ExtNetReservedIPDataSource flattens data source for extnet reserved ip. +// Return error in case data source is not found on the platform. +// Flatten errors are added to tflog. +func ExtNetReservedIPDataSource(ctx context.Context, state *models.DataSourceExtNetReservedIPModel, c *client.Client) diag.Diagnostics { + tflog.Info(ctx, "Start flattens.ExtNetReservedIPDataSource") + + diags := diag.Diagnostics{} + + extNetReservationIP, err := utilities.ExtNetReservedIPCheckPresence(ctx, state, c) + if err != nil { + diags.AddError("Cannot get info about extnet reserved ip list", err.Error()) + return diags + } + + tflog.Info(ctx, "flattens.ExtNetReservedIPDataSource: before flatten") + + id := uuid.New() + *state = models.DataSourceExtNetReservedIPModel{ + AccountID: state.AccountID, + ExtNetID: state.ExtNetID, + Timeouts: state.Timeouts, + + Id: types.StringValue(id.String()), + } + + items := make([]models.ItemReservedIPModel, 0, len(extNetReservationIP)) + for _, item := range extNetReservationIP { + i := models.ItemReservedIPModel{ + ExtNetID: types.Int64Value(int64(item.ExtnetID)), + Reservations: flattenReservations(ctx, item.Reservations), + } + items = append(items, i) + } + state.Items = items + + tflog.Info(ctx, "End flattens.ExtNetReservedIPDataSource") + return nil +} + +func flattenReservations(ctx context.Context, reservations []extnet.Reservations) []models.ItemReservationsModel { + tflog.Info(ctx, "Start flattenReservations") + tempSlice := make([]models.ItemReservationsModel, 0, len(reservations)) + for _, item := range reservations { + res := models.ItemReservationsModel{ + AccountID: types.Int64Value(int64(item.AccountID)), + ClientType: types.StringValue(item.ClientType), + DomainName: types.StringValue(item.DomainName), + HostName: types.StringValue(item.Hostname), + IP: types.StringValue(item.IP), + MAC: types.StringValue(item.Mac), + Type: types.StringValue(item.Type), + VMID: types.Int64Value(int64(item.VMID)), + } + tempSlice = append(tempSlice, res) + } + + tflog.Info(ctx, "End flattenReservations") + return tempSlice +} diff --git a/internal/service/cloudapi/extnet/models/model_data_source_extnet.go b/internal/service/cloudapi/extnet/models/model_data_source_extnet.go index 3648d5c..4fd9afa 100644 --- a/internal/service/cloudapi/extnet/models/model_data_source_extnet.go +++ b/internal/service/cloudapi/extnet/models/model_data_source_extnet.go @@ -63,6 +63,7 @@ type QOSModel struct { } type ItemReservationModel struct { + AccountID types.Int64 `tfsdk:"account_id"` ClientType types.String `tfsdk:"client_type"` Description types.String `tfsdk:"desc"` DomainName types.String `tfsdk:"domainname"` diff --git a/internal/service/cloudapi/extnet/models/model_data_source_extnet_reserved_lp.go b/internal/service/cloudapi/extnet/models/model_data_source_extnet_reserved_lp.go new file mode 100644 index 0000000..59ae341 --- /dev/null +++ b/internal/service/cloudapi/extnet/models/model_data_source_extnet_reserved_lp.go @@ -0,0 +1,35 @@ +package models + +import ( + "github.com/hashicorp/terraform-plugin-framework-timeouts/datasource/timeouts" + "github.com/hashicorp/terraform-plugin-framework/types" +) + +type DataSourceExtNetReservedIPModel struct { + // required fields + AccountID types.Int64 `tfsdk:"account_id"` + + // optional fields + ExtNetID types.Int64 `tfsdk:"extnet_id"` + Timeouts timeouts.Value `tfsdk:"timeouts"` + + // response fields + Id types.String `tfsdk:"id"` + Items []ItemReservedIPModel `tfsdk:"items"` +} + +type ItemReservedIPModel struct { + ExtNetID types.Int64 `tfsdk:"extnet_id"` + Reservations []ItemReservationsModel `tfsdk:"reservations"` +} + +type ItemReservationsModel struct { + AccountID types.Int64 `tfsdk:"account_id"` + ClientType types.String `tfsdk:"client_type"` + DomainName types.String `tfsdk:"domain_name"` + HostName types.String `tfsdk:"hostname"` + IP types.String `tfsdk:"ip"` + MAC types.String `tfsdk:"mac"` + Type types.String `tfsdk:"type"` + VMID types.Int64 `tfsdk:"vm_id"` +} diff --git a/internal/service/cloudapi/extnet/schemas/schema_data_source_extnet.go b/internal/service/cloudapi/extnet/schemas/schema_data_source_extnet.go index 7b8a5bc..5aed3cd 100644 --- a/internal/service/cloudapi/extnet/schemas/schema_data_source_extnet.go +++ b/internal/service/cloudapi/extnet/schemas/schema_data_source_extnet.go @@ -120,6 +120,9 @@ func MakeSchemaDataSourceExtNet() map[string]schema.Attribute { Computed: true, NestedObject: schema.NestedAttributeObject{ Attributes: map[string]schema.Attribute{ + "account_id": schema.Int64Attribute{ + Computed: true, + }, "client_type": schema.StringAttribute{ Computed: true, }, diff --git a/internal/service/cloudapi/extnet/schemas/schema_data_source_extnet_reserved_ip.go b/internal/service/cloudapi/extnet/schemas/schema_data_source_extnet_reserved_ip.go new file mode 100644 index 0000000..569077d --- /dev/null +++ b/internal/service/cloudapi/extnet/schemas/schema_data_source_extnet_reserved_ip.go @@ -0,0 +1,67 @@ +package schemas + +import ( + "github.com/hashicorp/terraform-plugin-framework/datasource/schema" +) + +func MakeSchemaDataSourceExtNetReservedIP() map[string]schema.Attribute { + return map[string]schema.Attribute{ + // required attributes + "account_id": schema.Int64Attribute{ + Required: true, + Description: "find by account id", + }, + + // optional attributes + "extnet_id": schema.Int64Attribute{ + Optional: true, + Description: "find by account id", + }, + + // computed attributes + "id": schema.StringAttribute{ + Computed: true, + }, + "items": schema.ListNestedAttribute{ + Computed: true, + NestedObject: schema.NestedAttributeObject{ + Attributes: map[string]schema.Attribute{ + "extnet_id": schema.Int64Attribute{ + Computed: true, + }, + "reservations": schema.ListNestedAttribute{ + Computed: true, + NestedObject: schema.NestedAttributeObject{ + Attributes: map[string]schema.Attribute{ + "account_id": schema.Int64Attribute{ + Computed: true, + }, + "client_type": schema.StringAttribute{ + Computed: true, + }, + "domain_name": schema.StringAttribute{ + Computed: true, + }, + "hostname": schema.StringAttribute{ + Computed: true, + }, + "ip": schema.StringAttribute{ + Computed: true, + }, + "mac": schema.StringAttribute{ + Computed: true, + }, + "type": schema.StringAttribute{ + Computed: true, + }, + "vm_id": schema.Int64Attribute{ + Computed: true, + }, + }, + }, + }, + }, + }, + }, + } +} diff --git a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet.go b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet.go index 532b7c7..48e91e3 100644 --- a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet.go +++ b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet.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/extnet" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func ExtNetCheckPresence(ctx context.Context, netId uint64, c *decort.DecortClient) (*extnet.RecordExtNet, error) { +func ExtNetCheckPresence(ctx context.Context, netId uint64, c *client.Client) (*extnet.RecordExtNet, error) { tflog.Info(ctx, fmt.Sprintf("Get info about extnet with ID - %v", netId)) recordExtNet, err := c.CloudAPI().ExtNet().Get(ctx, extnet.GetRequest{NetID: netId}) diff --git a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_computes_list.go b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_computes_list.go index a406494..d724cd2 100644 --- a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_computes_list.go +++ b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_computes_list.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet" ) -func ExtNetComputesListCheckPresence(ctx context.Context, plan *models.DataSourceExtNetComputesListModel, c *decort.DecortClient) (*extnet.ListExtNetComputes, error) { +func ExtNetComputesListCheckPresence(ctx context.Context, plan *models.DataSourceExtNetComputesListModel, c *client.Client) (*extnet.ListExtNetComputes, error) { tflog.Info(ctx, "ExtNetComputesListCheckPresence: Get info about extnet list") listCompReq := extnet.ListComputesRequest{ diff --git a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_default.go b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_default.go index dc9caf5..757b411 100644 --- a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_default.go +++ b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_default.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func ExtNetDefaultCheckPresence(ctx context.Context, c *decort.DecortClient) (uint64, error) { +func ExtNetDefaultCheckPresence(ctx context.Context, c *client.Client) (uint64, error) { tflog.Info(ctx, "ExtNetDefaultCheckPresence: Get info about default extnet with ID - %v") netId, err := c.CloudAPI().ExtNet().GetDefault(ctx) diff --git a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_list.go b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_list.go index b2ec572..42f0475 100644 --- a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_list.go +++ b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_list.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet" ) -func ExtNetListCheckPresence(ctx context.Context, plan *models.DataSourceExtNetListModel, c *decort.DecortClient) (*extnet.ListExtNets, error) { +func ExtNetListCheckPresence(ctx context.Context, plan *models.DataSourceExtNetListModel, c *client.Client) (*extnet.ListExtNets, error) { tflog.Info(ctx, "ExtNetListCheckPresence: Get info about extnet list") extnetListReq := extnet.ListRequest{} diff --git a/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_reserved_ip.go b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_reserved_ip.go new file mode 100644 index 0000000..1e7b668 --- /dev/null +++ b/internal/service/cloudapi/extnet/utilities/utility_data_source_extnet_reserved_ip.go @@ -0,0 +1,34 @@ +package utilities + +import ( + "context" + "fmt" + + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/extnet/models" + + "github.com/hashicorp/terraform-plugin-log/tflog" + "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet" +) + +func ExtNetReservedIPCheckPresence(ctx context.Context, plan *models.DataSourceExtNetReservedIPModel, c *client.Client) ([]extnet.RecordReservedIP, error) { + tflog.Info(ctx, "ExtNetReservedIPCheckPresence: Get info about extnet reserved ip") + + extnetReservedIPReq := extnet.GetReservedIP{ + AccountID: uint64(plan.AccountID.ValueInt64()), + } + + if !plan.ExtNetID.IsNull() { + extnetReservedIPReq.ExtNetID = uint64(plan.ExtNetID.ValueInt64()) + } + + tflog.Info(ctx, "ExtNetReservedIPCheckPresence: before call CloudAPI().ExtNet().GetReservedIP", map[string]any{"req": extnetReservedIPReq}) + extNetReservedIP, err := c.CloudAPI().ExtNet().GetReservedIP(ctx, extnetReservedIPReq) + if err != nil { + return nil, fmt.Errorf("cannot get info about extnet with error: %w", err) + } + + tflog.Info(ctx, "ExtNetReservedIPCheckPresence: response from CloudAPI().ExtNet().GetReservedIP", map[string]any{"response": extnetReservedIPReq}) + + return extNetReservedIP, err +} diff --git a/internal/service/cloudapi/flipgroup/data_source_flipgroup.go b/internal/service/cloudapi/flipgroup/data_source_flipgroup.go index 606dfa3..31c16d6 100644 --- a/internal/service/cloudapi/flipgroup/data_source_flipgroup.go +++ b/internal/service/cloudapi/flipgroup/data_source_flipgroup.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/flipgroup/flattens" @@ -26,7 +25,7 @@ func NewDataSourceFlipgroup() datasource.DataSource { // dataSourceFlipgroup is the data source implementation. type dataSourceFlipgroup struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceFlipgroup) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/flipgroup/data_source_flipgroup_list.go b/internal/service/cloudapi/flipgroup/data_source_flipgroup_list.go index 25a9f18..a99338f 100644 --- a/internal/service/cloudapi/flipgroup/data_source_flipgroup_list.go +++ b/internal/service/cloudapi/flipgroup/data_source_flipgroup_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/flipgroup/flattens" @@ -26,7 +25,7 @@ func NewDataSourceFlipgroupList() datasource.DataSource { // dataSourceFlipgroupList is the data source implementation. type dataSourceFlipgroupList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceFlipgroupList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup.go b/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup.go index ba84a0f..742b519 100644 --- a/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup.go +++ b/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup.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/flipgroup/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/flipgroup/utilities" ) @@ -15,7 +15,7 @@ import ( // FlipgroupDataSource flattens data source for flipgroup. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func FlipgroupDataSource(ctx context.Context, state *models.DataSourceFLIPGroupModel, c *decort.DecortClient) diag.Diagnostics { +func FlipgroupDataSource(ctx context.Context, state *models.DataSourceFLIPGroupModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.FlipgroupDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup_list.go b/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup_list.go index 5c37933..9059ae1 100644 --- a/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup_list.go +++ b/internal/service/cloudapi/flipgroup/flattens/flatten_data_source_flipgroup_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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/flipgroup/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/flipgroup/utilities" @@ -16,7 +16,7 @@ import ( // FlipgroupListDataSource flattens data source for flipgroup. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func FlipgroupListDataSource(ctx context.Context, state *models.DataSourceFLIPGroupModelList, c *decort.DecortClient) diag.Diagnostics { +func FlipgroupListDataSource(ctx context.Context, state *models.DataSourceFLIPGroupModelList, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.FlipgroupListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/flipgroup/flattens/flatten_resource.go b/internal/service/cloudapi/flipgroup/flattens/flatten_resource.go index e367296..bc9c24d 100644 --- a/internal/service/cloudapi/flipgroup/flattens/flatten_resource.go +++ b/internal/service/cloudapi/flipgroup/flattens/flatten_resource.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/flipgroup/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/flipgroup/utilities" @@ -16,7 +16,7 @@ import ( // FlipgroupResource flattens resource for flipgroup. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func FlipgroupResource(ctx context.Context, plan *models.ResourceFLIPGroupModel, c *decort.DecortClient) diag.Diagnostics { +func FlipgroupResource(ctx context.Context, plan *models.ResourceFLIPGroupModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.FlipgroupResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/flipgroup/input_check.go b/internal/service/cloudapi/flipgroup/input_check.go index 236505c..27ea124 100644 --- a/internal/service/cloudapi/flipgroup/input_check.go +++ b/internal/service/cloudapi/flipgroup/input_check.go @@ -7,14 +7,14 @@ 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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/flipgroup/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/ic" ) // resourceFlipgroupInputChecks checks if user provided, account_id and net_id are valid. // It also checks that either account_id or net_id is specified. -func resourceFlipgroupInputChecks(ctx context.Context, plan *models.ResourceFLIPGroupModel, c *decort.DecortClient) diag.Diagnostics { +func resourceFlipgroupInputChecks(ctx context.Context, plan *models.ResourceFLIPGroupModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} accoundID := uint64(plan.AccountID.ValueInt64()) diff --git a/internal/service/cloudapi/flipgroup/resource_flipgroup.go b/internal/service/cloudapi/flipgroup/resource_flipgroup.go index c1a10fd..ed9a268 100644 --- a/internal/service/cloudapi/flipgroup/resource_flipgroup.go +++ b/internal/service/cloudapi/flipgroup/resource_flipgroup.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/flipgroup" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -34,7 +33,7 @@ func NewResourceFlipgroup() resource.Resource { // resourceFlipgroup is the resource implementation. type resourceFlipgroup struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup.go b/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup.go index bf1d8df..c144d36 100644 --- a/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup.go +++ b/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup.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/flipgroup" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func FlipgroupDataSourceCheckPresence(ctx context.Context, fgId uint64, c *decort.DecortClient) (*flipgroup.RecordFLIPGroup, diag.Diagnostics) { +func FlipgroupDataSourceCheckPresence(ctx context.Context, fgId uint64, c *client.Client) (*flipgroup.RecordFLIPGroup, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("FlipgroupDataSourceCheckPresence: Get info about flipgroup with ID - %v", fgId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup_list.go b/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup_list.go index ce5c1b1..1a4a88f 100644 --- a/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup_list.go +++ b/internal/service/cloudapi/flipgroup/utilities/utility_data_source_flipgroup_list.go @@ -7,12 +7,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/decort-golang-sdk/pkg/cloudapi/flipgroup" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/flipgroup/models" ) -func FlipgroupListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceFLIPGroupModelList, c *decort.DecortClient) (*flipgroup.ListFLIPGroups, diag.Diagnostics) { +func FlipgroupListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceFLIPGroupModelList, c *client.Client) (*flipgroup.ListFLIPGroups, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("FlipgroupListDataSourceCheckPresence: Get info about flipgroup list")) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/flipgroup/utilities/utility_resource_flipgroup.go b/internal/service/cloudapi/flipgroup/utilities/utility_resource_flipgroup.go index 60b3154..32e61f3 100644 --- a/internal/service/cloudapi/flipgroup/utilities/utility_resource_flipgroup.go +++ b/internal/service/cloudapi/flipgroup/utilities/utility_resource_flipgroup.go @@ -7,13 +7,13 @@ 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/flipgroup" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/flipgroup/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) -func CreateResourceFlipgroup(ctx context.Context, plan *models.ResourceFLIPGroupModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateResourceFlipgroup(ctx context.Context, plan *models.ResourceFLIPGroupModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("Start create ResourceFlipgroup: flipgroup_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -48,7 +48,7 @@ func CreateResourceFlipgroup(ctx context.Context, plan *models.ResourceFLIPGroup // AddClientsFlipgroup add computes in flipgroup for created resource. // In case of failure returns warnings. -func AddClientsFlipgroup(ctx context.Context, flipgroupID uint64, plan *models.ResourceFLIPGroupModel, c *decort.DecortClient) diag.Diagnostics { +func AddClientsFlipgroup(ctx context.Context, flipgroupID uint64, plan *models.ResourceFLIPGroupModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "AddClientsFlipgroup: start add clients", map[string]any{"flipgroup_id": flipgroupID}) @@ -80,7 +80,7 @@ func AddClientsFlipgroup(ctx context.Context, flipgroupID uint64, plan *models.R // FlipgroupReadStatus loads flipgroup resource by id, gets it current status // In case of failure returns errors. -func FlipgroupReadStatus(ctx context.Context, state *models.ResourceFLIPGroupModel, c *decort.DecortClient) diag.Diagnostics { +func FlipgroupReadStatus(ctx context.Context, state *models.ResourceFLIPGroupModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "FlipgroupReadStatus: Read status flipgroup with ID", map[string]any{"flipgroup_id": state.ID.ValueString()}) diags := diag.Diagnostics{} @@ -117,7 +117,7 @@ func FlipgroupReadStatus(ctx context.Context, state *models.ResourceFLIPGroupMod return nil } -func FlipgroupResourceCheckPresence(ctx context.Context, flipgroupId uint64, c *decort.DecortClient) (*flipgroup.RecordFLIPGroup, diag.Diagnostics) { +func FlipgroupResourceCheckPresence(ctx context.Context, flipgroupId uint64, c *client.Client) (*flipgroup.RecordFLIPGroup, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("FlipgroupResourceCheckPresence: Get info about flipgroup with ID - %v", flipgroupId)) diags := diag.Diagnostics{} @@ -133,7 +133,7 @@ func FlipgroupResourceCheckPresence(ctx context.Context, flipgroupId uint64, c * return recordFG, nil } -func EditFlipgroup(ctx context.Context, flipgroupId uint64, plan, state *models.ResourceFLIPGroupModel, c *decort.DecortClient) diag.Diagnostics { +func EditFlipgroup(ctx context.Context, flipgroupId uint64, plan, state *models.ResourceFLIPGroupModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("EditFlipgroup: Start edit flipgroup with ID - %v", flipgroupId)) diags := diag.Diagnostics{} @@ -161,7 +161,7 @@ func EditFlipgroup(ctx context.Context, flipgroupId uint64, plan, state *models. return nil } -func UpdateClientIDsFlipgroup(ctx context.Context, flipgroupId uint64, plan, state *models.ResourceFLIPGroupModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateClientIDsFlipgroup(ctx context.Context, flipgroupId uint64, plan, state *models.ResourceFLIPGroupModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("UpdateClientIDsFlipgroup: Start update flipgroup with ID - %v", flipgroupId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/ic/input_checks.go b/internal/service/cloudapi/ic/input_checks.go index 2d9d7c1..34738e0 100644 --- a/internal/service/cloudapi/ic/input_checks.go +++ b/internal/service/cloudapi/ic/input_checks.go @@ -5,7 +5,6 @@ import ( "context" "fmt" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" account "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks" @@ -20,9 +19,10 @@ import ( stack "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vfpool" vins "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func ExistRG(ctx context.Context, rgId uint64, c *decort.DecortClient) error { +func ExistRG(ctx context.Context, rgId uint64, c *client.Client) error { req := rg.ListRequest{ ByID: rgId, IncludeDeleted: false, @@ -40,7 +40,7 @@ func ExistRG(ctx context.Context, rgId uint64, c *decort.DecortClient) error { return nil } -func ExistImage(ctx context.Context, imageId uint64, c *decort.DecortClient) error { +func ExistImage(ctx context.Context, imageId uint64, c *client.Client) error { req := image.ListRequest{ ByID: imageId, } @@ -57,7 +57,7 @@ func ExistImage(ctx context.Context, imageId uint64, c *decort.DecortClient) err return nil } -func ExistVins(ctx context.Context, vinsId uint64, c *decort.DecortClient) error { +func ExistVins(ctx context.Context, vinsId uint64, c *client.Client) error { req := vins.ListRequest{ ByID: vinsId, IncludeDeleted: false, @@ -75,7 +75,7 @@ func ExistVins(ctx context.Context, vinsId uint64, c *decort.DecortClient) error return nil } -func ExistVinses(ctx context.Context, vinsIds []uint64, c *decort.DecortClient) []error { +func ExistVinses(ctx context.Context, vinsIds []uint64, c *client.Client) []error { var errs []error req := vins.ListRequest{ @@ -106,7 +106,7 @@ func ExistVinses(ctx context.Context, vinsIds []uint64, c *decort.DecortClient) return errs } -func ExistExtNets(ctx context.Context, extNetIds []uint64, c *decort.DecortClient) []error { +func ExistExtNets(ctx context.Context, extNetIds []uint64, c *client.Client) []error { var errs []error req := extnet.ListRequest{} @@ -135,7 +135,7 @@ func ExistExtNets(ctx context.Context, extNetIds []uint64, c *decort.DecortClien return errs } -func ExistExtNetInLb(ctx context.Context, extNetId uint64, c *decort.DecortClient) error { +func ExistExtNetInLb(ctx context.Context, extNetId uint64, c *client.Client) error { if extNetId == 0 { return nil } @@ -155,7 +155,7 @@ func ExistExtNetInLb(ctx context.Context, extNetId uint64, c *decort.DecortClien return nil } -func ExistExtNetInRG(ctx context.Context, extNetId, accountId uint64, c *decort.DecortClient) error { +func ExistExtNetInRG(ctx context.Context, extNetId, accountId uint64, c *client.Client) error { req := extnet.ListRequest{ AccountID: accountId, ByID: extNetId, @@ -173,7 +173,7 @@ func ExistExtNetInRG(ctx context.Context, extNetId, accountId uint64, c *decort. return nil } -func ExistExtNetInVins(ctx context.Context, extNetId int, c *decort.DecortClient) error { +func ExistExtNetInVins(ctx context.Context, extNetId int, c *client.Client) error { if extNetId == 0 || extNetId == -1 { return nil } @@ -193,7 +193,7 @@ func ExistExtNetInVins(ctx context.Context, extNetId int, c *decort.DecortClient return nil } -func ExistExtNet(ctx context.Context, extNetId uint64, c *decort.DecortClient) error { +func ExistExtNet(ctx context.Context, extNetId uint64, c *client.Client) error { req := extnet.ListRequest{ ByID: extNetId, @@ -212,7 +212,7 @@ func ExistExtNet(ctx context.Context, extNetId uint64, c *decort.DecortClient) e return nil } -func ExistVinsInLb(ctx context.Context, vinsId uint64, c *decort.DecortClient) error { +func ExistVinsInLb(ctx context.Context, vinsId uint64, c *client.Client) error { if vinsId == 0 { return nil } @@ -233,7 +233,7 @@ func ExistVinsInLb(ctx context.Context, vinsId uint64, c *decort.DecortClient) e return nil } -func ExistGID(ctx context.Context, gid uint64, c *decort.DecortClient) error { +func ExistGID(ctx context.Context, gid uint64, c *client.Client) error { req := location.ListRequest{} gridList, err := c.CloudAPI().Locations().List(ctx, req) @@ -250,7 +250,7 @@ func ExistGID(ctx context.Context, gid uint64, c *decort.DecortClient) error { return fmt.Errorf("GID with id %v not found", gid) } -func ExistStack(ctx context.Context, stackId uint64, c *decort.DecortClient) error { +func ExistStack(ctx context.Context, stackId uint64, c *client.Client) error { req := stack.ListRequest{ ByID: stackId, } @@ -268,7 +268,7 @@ func ExistStack(ctx context.Context, stackId uint64, c *decort.DecortClient) err } // // ExistStackInPcidevice checks if compute exists with specified stackId and specified non-deleted rgId. -// func ExistStackInPcidevice(ctx context.Context, stackId, rgId uint64, c *decort.DecortClient) error { +// func ExistStackInPcidevice(ctx context.Context, stackId, rgId uint64, c *client.Client) error { // req := rg.ListRequest{ // ByID: rgId, // IncludeDeleted: false, @@ -297,7 +297,7 @@ func ExistStack(ctx context.Context, stackId uint64, c *decort.DecortClient) err // return fmt.Errorf("no compute found with stack_id %v and rg_id %v", stackId, rgId) // } -func ExistLB(ctx context.Context, lbId uint64, c *decort.DecortClient) error { +func ExistLB(ctx context.Context, lbId uint64, c *client.Client) error { req := lb.ListRequest{ ByID: lbId, @@ -316,7 +316,7 @@ func ExistLB(ctx context.Context, lbId uint64, c *decort.DecortClient) error { } -func ExistDiskID(ctx context.Context, diskId uint64, c *decort.DecortClient) error { +func ExistDiskID(ctx context.Context, diskId uint64, c *client.Client) error { req := disks.ListRequest{ ByID: diskId, @@ -338,7 +338,7 @@ func ExistDiskID(ctx context.Context, diskId uint64, c *decort.DecortClient) err return nil } -func ExistAccount(ctx context.Context, accountId uint64, c *decort.DecortClient) error { +func ExistAccount(ctx context.Context, accountId uint64, c *client.Client) error { req := account.ListRequest{ ByID: accountId, } @@ -355,7 +355,7 @@ func ExistAccount(ctx context.Context, accountId uint64, c *decort.DecortClient) return nil } -func ExistK8CI(ctx context.Context, k8ciId uint64, c *decort.DecortClient) error { +func ExistK8CI(ctx context.Context, k8ciId uint64, c *client.Client) error { req := k8ci.ListRequest{ ByID: k8ciId, } @@ -372,7 +372,7 @@ func ExistK8CI(ctx context.Context, k8ciId uint64, c *decort.DecortClient) error return nil } -func ExistExtNetInK8s(ctx context.Context, extNetId uint64, c *decort.DecortClient) error { +func ExistExtNetInK8s(ctx context.Context, extNetId uint64, c *client.Client) error { if extNetId == 0 { return nil } @@ -392,7 +392,7 @@ func ExistExtNetInK8s(ctx context.Context, extNetId uint64, c *decort.DecortClie return nil } -func ExistVinsInK8s(ctx context.Context, vinsId uint64, c *decort.DecortClient) error { +func ExistVinsInK8s(ctx context.Context, vinsId uint64, c *client.Client) error { if vinsId == 0 { return nil } @@ -413,7 +413,7 @@ func ExistVinsInK8s(ctx context.Context, vinsId uint64, c *decort.DecortClient) return nil } -func ExistK8s(ctx context.Context, k8sId uint64, c *decort.DecortClient) error { +func ExistK8s(ctx context.Context, k8sId uint64, c *client.Client) error { req := k8s.ListRequest{ ByID: k8sId, } @@ -430,7 +430,7 @@ func ExistK8s(ctx context.Context, k8sId uint64, c *decort.DecortClient) error { return nil } -func ExistVFPool(ctx context.Context, vfpoolId uint64, c *decort.DecortClient) error { +func ExistVFPool(ctx context.Context, vfpoolId uint64, c *client.Client) error { req := vfpool.ListRequest{ ByID: vfpoolId, @@ -449,7 +449,7 @@ func ExistVFPool(ctx context.Context, vfpoolId uint64, c *decort.DecortClient) e return nil } -func ExistDPDK(ctx context.Context, dpdkId uint64, c *decort.DecortClient) error { +func ExistDPDK(ctx context.Context, dpdkId uint64, c *client.Client) error { req := dpdknet.ListRequest{ ByID: dpdkId, @@ -473,7 +473,7 @@ func ExistDPDK(ctx context.Context, dpdkId uint64, c *decort.DecortClient) error return nil } -func ExistSnapshotInCompute(ctx context.Context, computeID uint64, label string, c *decort.DecortClient) error { +func ExistSnapshotInCompute(ctx context.Context, computeID uint64, label string, c *client.Client) error { req := compute.SnapshotListRequest{ ComputeID: computeID, } @@ -492,7 +492,7 @@ func ExistSnapshotInCompute(ctx context.Context, computeID uint64, label string, return fmt.Errorf("snapshot with label %v for compute with id %d not found", label, computeID) } -func ExistLBBackend(ctx context.Context, lbId uint64, bName string, c *decort.DecortClient) error { +func ExistLBBackend(ctx context.Context, lbId uint64, bName string, c *client.Client) error { lb, err := c.CloudAPI().LB().Get(ctx, lb.GetRequest{LBID: lbId}) if err != nil { return err @@ -508,7 +508,7 @@ func ExistLBBackend(ctx context.Context, lbId uint64, bName string, c *decort.De return fmt.Errorf("backend with name %v not found", bName) } -func ExistLBFrontend(ctx context.Context, lbId uint64, fName string, c *decort.DecortClient) error { +func ExistLBFrontend(ctx context.Context, lbId uint64, fName string, c *client.Client) error { lb, err := c.CloudAPI().LB().Get(ctx, lb.GetRequest{LBID: lbId}) if err != nil { return err diff --git a/internal/service/cloudapi/image/data_source_image.go b/internal/service/cloudapi/image/data_source_image.go index 5f58c20..af403b1 100644 --- a/internal/service/cloudapi/image/data_source_image.go +++ b/internal/service/cloudapi/image/data_source_image.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/image/flattens" @@ -26,7 +25,7 @@ func NewDataSourceImage() datasource.DataSource { // dataSourceImage is the data source implementation. type dataSourceImage struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceImage) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/image/data_source_image_list.go b/internal/service/cloudapi/image/data_source_image_list.go index ca3717c..05eece4 100644 --- a/internal/service/cloudapi/image/data_source_image_list.go +++ b/internal/service/cloudapi/image/data_source_image_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/image/flattens" @@ -26,7 +25,7 @@ func NewDataSourceImageList() datasource.DataSource { // dataSourceImageList is the data source implementation. type dataSourceImageList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceImageList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/image/flattens/flatten_data_source_image.go b/internal/service/cloudapi/image/flattens/flatten_data_source_image.go index 56ca070..175c7e9 100644 --- a/internal/service/cloudapi/image/flattens/flatten_data_source_image.go +++ b/internal/service/cloudapi/image/flattens/flatten_data_source_image.go @@ -9,13 +9,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/image" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/utilities" ) -func DataSourceImage(ctx context.Context, state *models.RecordImageModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceImage(ctx context.Context, state *models.RecordImageModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceImage", map[string]any{"image_id": state.ImageId.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/image/flattens/flatten_data_source_image_list.go b/internal/service/cloudapi/image/flattens/flatten_data_source_image_list.go index 510e899..11e6c4d 100644 --- a/internal/service/cloudapi/image/flattens/flatten_data_source_image_list.go +++ b/internal/service/cloudapi/image/flattens/flatten_data_source_image_list.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/image" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/utilities" ) -func DataSourceImageList(ctx context.Context, state *models.ListImagesModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceImageList(ctx context.Context, state *models.ListImagesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceImageList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/image/flattens/flatten_resource_image.go b/internal/service/cloudapi/image/flattens/flatten_resource_image.go index e5c190e..6f1ca7a 100644 --- a/internal/service/cloudapi/image/flattens/flatten_resource_image.go +++ b/internal/service/cloudapi/image/flattens/flatten_resource_image.go @@ -9,13 +9,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/image" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/utilities" ) -func ResourceImage(ctx context.Context, plan *models.ImageResourceModel, c *decort.DecortClient) diag.Diagnostics { +func ResourceImage(ctx context.Context, plan *models.ImageResourceModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenResourceImage", map[string]any{"image_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/image/flattens/flatten_resource_image_virtual.go b/internal/service/cloudapi/image/flattens/flatten_resource_image_virtual.go index a9cdb88..2408f3d 100644 --- a/internal/service/cloudapi/image/flattens/flatten_resource_image_virtual.go +++ b/internal/service/cloudapi/image/flattens/flatten_resource_image_virtual.go @@ -8,12 +8,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/image/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/utilities" ) -func ResourceImageVirtual(ctx context.Context, plan *models.ImageVirtualResourceModel, c *decort.DecortClient) diag.Diagnostics { +func ResourceImageVirtual(ctx context.Context, plan *models.ImageVirtualResourceModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenResourceImageVirtual", map[string]any{"image_id": plan.ImageId.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/image/resource_image.go b/internal/service/cloudapi/image/resource_image.go index ac8bf12..cb02da9 100644 --- a/internal/service/cloudapi/image/resource_image.go +++ b/internal/service/cloudapi/image/resource_image.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/image" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -34,7 +33,7 @@ func NewResourceImage() resource.Resource { // resourceImage is the resource implementation. type resourceImage struct { - client *decort.DecortClient + client *client.Client } // Create the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/image/resource_image_virtual.go b/internal/service/cloudapi/image/resource_image_virtual.go index 1dbb9fb..dadc59a 100644 --- a/internal/service/cloudapi/image/resource_image_virtual.go +++ b/internal/service/cloudapi/image/resource_image_virtual.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/image" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -34,7 +33,7 @@ func NewResourceImageVirtual() resource.Resource { // resourceImage is the resource implementation. type resourceImageVirtual struct { - client *decort.DecortClient + client *client.Client } // Create the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/image/utilities/resource_check_input_vales.go b/internal/service/cloudapi/image/utilities/resource_check_input_vales.go index 883d840..3dd6d05 100644 --- a/internal/service/cloudapi/image/utilities/resource_check_input_vales.go +++ b/internal/service/cloudapi/image/utilities/resource_check_input_vales.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/diag" - 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/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" ) -func CheckParamsExistenceImage(ctx context.Context, plan *models.ImageResourceModel, c *decort.DecortClient) diag.Diagnostics { +func CheckParamsExistenceImage(ctx context.Context, plan *models.ImageResourceModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // if err := ic.ExistGID(ctx, uint64(plan.GID.ValueInt64()), c); err != nil { diff --git a/internal/service/cloudapi/image/utilities/utility_data_source_image.go b/internal/service/cloudapi/image/utilities/utility_data_source_image.go index a22fc79..a1782e3 100644 --- a/internal/service/cloudapi/image/utilities/utility_data_source_image.go +++ b/internal/service/cloudapi/image/utilities/utility_data_source_image.go @@ -6,12 +6,12 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" ) -func ImageDataSourceCheckPresence(ctx context.Context, state *models.RecordImageModel, c *decort.DecortClient) (*image.RecordImage, error) { +func ImageDataSourceCheckPresence(ctx context.Context, state *models.RecordImageModel, c *client.Client) (*image.RecordImage, error) { tflog.Info(ctx, "Get info about image with ID", map[string]any{"image_id": state.ImageId.ValueInt64()}) req := image.GetRequest{ImageID: uint64(state.ImageId.ValueInt64())} diff --git a/internal/service/cloudapi/image/utilities/utility_data_source_image_list.go b/internal/service/cloudapi/image/utilities/utility_data_source_image_list.go index 3e6bf24..65f9847 100644 --- a/internal/service/cloudapi/image/utilities/utility_data_source_image_list.go +++ b/internal/service/cloudapi/image/utilities/utility_data_source_image_list.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" ) -func ImageListCheckPresence(ctx context.Context, state *models.ListImagesModel, c *decort.DecortClient) (*image.ListImages, error) { +func ImageListCheckPresence(ctx context.Context, state *models.ListImagesModel, c *client.Client) (*image.ListImages, error) { tflog.Info(ctx, "Get image list info") req := image.ListRequest{} diff --git a/internal/service/cloudapi/image/utilities/utility_resource_image.go b/internal/service/cloudapi/image/utilities/utility_resource_image.go index 7cdde2e..52b8477 100644 --- a/internal/service/cloudapi/image/utilities/utility_resource_image.go +++ b/internal/service/cloudapi/image/utilities/utility_resource_image.go @@ -11,8 +11,8 @@ import ( "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/image" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) @@ -67,7 +67,7 @@ func createRequestResourceImage(ctx context.Context, plan *models.ImageResourceM return req } -func ResourceImageCreate(ctx context.Context, plan *models.ImageResourceModel, c *decort.DecortClient) diag.Diagnostics { +func ResourceImageCreate(ctx context.Context, plan *models.ImageResourceModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start ResourceImageCreate", map[string]any{"name": plan.ImageName.ValueString()}) diags := diag.Diagnostics{} @@ -87,7 +87,7 @@ func ResourceImageCreate(ctx context.Context, plan *models.ImageResourceModel, c return nil } -func ImageResourceCheckPresence(ctx context.Context, imageId uint64, c *decort.DecortClient) (*image.RecordImage, error) { +func ImageResourceCheckPresence(ctx context.Context, imageId uint64, c *client.Client) (*image.RecordImage, error) { tflog.Info(ctx, "Get info about image with ID", map[string]any{"image_id": imageId}) image, err := c.CloudAPI().Image().Get(ctx, image.GetRequest{ImageID: imageId}) @@ -100,7 +100,7 @@ func ImageResourceCheckPresence(ctx context.Context, imageId uint64, c *decort.D return image, nil } -func ImageReadStatus(ctx context.Context, imageId uint64, c *decort.DecortClient) diag.Diagnostics { +func ImageReadStatus(ctx context.Context, imageId uint64, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Read status image with ID", map[string]any{"image": imageId}) diags := diag.Diagnostics{} @@ -127,7 +127,7 @@ func ImageReadStatus(ctx context.Context, imageId uint64, c *decort.DecortClient return nil } -func ImageUpdateName(ctx context.Context, imageId uint64, name string, c *decort.DecortClient) diag.Diagnostics { +func ImageUpdateName(ctx context.Context, imageId uint64, name string, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update name image with ID", map[string]any{"image_id": imageId}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/image/utilities/utility_resource_image_virtual.go b/internal/service/cloudapi/image/utilities/utility_resource_image_virtual.go index 30c324b..0c05cd6 100644 --- a/internal/service/cloudapi/image/utilities/utility_resource_image_virtual.go +++ b/internal/service/cloudapi/image/utilities/utility_resource_image_virtual.go @@ -10,8 +10,8 @@ import ( "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/image" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/image/models" ) @@ -26,7 +26,7 @@ func createRequestResourceImageVirtual(ctx context.Context, plan *models.ImageVi return req } -func ResourceImageVirtualCreate(ctx context.Context, plan *models.ImageVirtualResourceModel, c *decort.DecortClient) diag.Diagnostics { +func ResourceImageVirtualCreate(ctx context.Context, plan *models.ImageVirtualResourceModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start ResourceImageVirtualCreate", map[string]any{"name": plan.ImageName.ValueString()}) diags := diag.Diagnostics{} @@ -46,7 +46,7 @@ func ResourceImageVirtualCreate(ctx context.Context, plan *models.ImageVirtualRe return nil } -func ImageUpdateLink(ctx context.Context, imageId, linkTo uint64, c *decort.DecortClient) diag.Diagnostics { +func ImageUpdateLink(ctx context.Context, imageId, linkTo uint64, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update link_to image virtual with ID", map[string]any{"image_id": imageId}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/data_source_k8ci_list.go b/internal/service/cloudapi/k8s/data_source_k8ci_list.go index b63ca98..6255ee3 100644 --- a/internal/service/cloudapi/k8s/data_source_k8ci_list.go +++ b/internal/service/cloudapi/k8s/data_source_k8ci_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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8ciList() datasource.DataSource { // dataSourceK8ciList is the data source implementation. type dataSourceK8ciList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8ciList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/data_source_k8s.go b/internal/service/cloudapi/k8s/data_source_k8s.go index 2f970b6..dacd66a 100644 --- a/internal/service/cloudapi/k8s/data_source_k8s.go +++ b/internal/service/cloudapi/k8s/data_source_k8s.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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8S() datasource.DataSource { // dataSourceK8S is the data source implementation. type dataSourceK8S struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8S) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/data_source_k8s_computes.go b/internal/service/cloudapi/k8s/data_source_k8s_computes.go index 3c7fe5e..e35b3c0 100644 --- a/internal/service/cloudapi/k8s/data_source_k8s_computes.go +++ b/internal/service/cloudapi/k8s/data_source_k8s_computes.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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8SComputes() datasource.DataSource { // dataSourceK8SComputes is the data source implementation. type dataSourceK8SComputes struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8SComputes) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/data_source_k8s_list.go b/internal/service/cloudapi/k8s/data_source_k8s_list.go index ce4656b..df8e93c 100644 --- a/internal/service/cloudapi/k8s/data_source_k8s_list.go +++ b/internal/service/cloudapi/k8s/data_source_k8s_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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8SList() datasource.DataSource { // dataSourceK8SList is the data source implementation. type dataSourceK8SList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8SList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/data_source_k8s_list_deleted.go b/internal/service/cloudapi/k8s/data_source_k8s_list_deleted.go index e31f378..4326d1e 100644 --- a/internal/service/cloudapi/k8s/data_source_k8s_list_deleted.go +++ b/internal/service/cloudapi/k8s/data_source_k8s_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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8SListDeleted() datasource.DataSource { // dataSourceK8SListDeleted is the data source implementation. type dataSourceK8SListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8SListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/data_source_k8s_wg.go b/internal/service/cloudapi/k8s/data_source_k8s_wg.go index 1ec6823..d86016e 100644 --- a/internal/service/cloudapi/k8s/data_source_k8s_wg.go +++ b/internal/service/cloudapi/k8s/data_source_k8s_wg.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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8SWg() datasource.DataSource { // dataSourceK8SWg is the data source implementation. type dataSourceK8SWg struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8SWg) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/data_source_k8s_wg_cloud_init.go b/internal/service/cloudapi/k8s/data_source_k8s_wg_cloud_init.go index 20702a6..7e39621 100644 --- a/internal/service/cloudapi/k8s/data_source_k8s_wg_cloud_init.go +++ b/internal/service/cloudapi/k8s/data_source_k8s_wg_cloud_init.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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8SWgCloudInit() datasource.DataSource { // dataSourceK8SWgCloudInit is the data source implementation. type dataSourceK8SWgCloudInit struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8SWgCloudInit) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/data_source_k8s_wg_list.go b/internal/service/cloudapi/k8s/data_source_k8s_wg_list.go index 40b6ef3..a428150 100644 --- a/internal/service/cloudapi/k8s/data_source_k8s_wg_list.go +++ b/internal/service/cloudapi/k8s/data_source_k8s_wg_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/k8s/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8SWgList() datasource.DataSource { // dataSourceK8SWgList is the data source implementation. type dataSourceK8SWgList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8SWgList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8ci_list.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8ci_list.go index c0d8441..b0ffb74 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8ci_list.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8ci_list.go @@ -8,15 +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/k8ci" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func DataSourceK8ciList(ctx context.Context, state *models.K8ciListModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8ciList(ctx context.Context, state *models.K8ciListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8ciList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s.go index 9e1539e..1359593 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s.go @@ -9,15 +9,15 @@ 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/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func DataSourceK8s(ctx context.Context, state *models.RecordK8SDataSourceModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8s(ctx context.Context, state *models.RecordK8SDataSourceModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8s", map[string]any{"k8s_id": state.K8SID.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_computes.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_computes.go index 1226f8f..8f6564c 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_computes.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_computes.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/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func DataSourceK8sComputes(ctx context.Context, state *models.K8SComputesModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8sComputes(ctx context.Context, state *models.K8SComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8sComputes", map[string]any{"k8s_id": state.K8SID.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list.go index bb7f496..f9075b8 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list.go @@ -9,13 +9,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/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func DataSourceK8sList(ctx context.Context, state *models.K8SListModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8sList(ctx context.Context, state *models.K8SListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8sList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list_deleted.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list_deleted.go index dd83183..74a5e4c 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list_deleted.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_list_deleted.go @@ -9,13 +9,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/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func DataSourceK8sListDeleted(ctx context.Context, state *models.K8SListDeletedModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8sListDeleted(ctx context.Context, state *models.K8SListDeletedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8sListDeleted") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg.go index f611aa2..2f2a81a 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg.go @@ -9,14 +9,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/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func DataSourceK8sWg(ctx context.Context, state *models.K8SWgModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8sWg(ctx context.Context, state *models.K8SWgModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8sWg", map[string]any{"k8s_id": state.K8SID.ValueInt64(), "worker_group_id": state.WorkerGroupID.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_cloud_init.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_cloud_init.go index a489dab..259d0c8 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_cloud_init.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_cloud_init.go @@ -7,12 +7,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/decort-golang-sdk/pkg/cloudapi/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" ) -func DataSourceK8sWgCloudInit(ctx context.Context, state *models.RecordK8SWgCloudInitDataSourceModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8sWgCloudInit(ctx context.Context, state *models.RecordK8SWgCloudInitDataSourceModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8sWgCloudInit", map[string]any{"k8s_id": state.K8SID.ValueInt64(), "worker_group_id": state.WgId.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_list.go b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_list.go index 7702899..685edf4 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_list.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_data_source_k8s_wg_list.go @@ -9,14 +9,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/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func DataSourceK8sWgList(ctx context.Context, state *models.K8SWgListModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceK8sWgList(ctx context.Context, state *models.K8SWgListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceK8sWgList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_cp.go b/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_cp.go index 7f8c058..6250477 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_cp.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_cp.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/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func K8SCPResource(ctx context.Context, plan *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8SCPResource(ctx context.Context, plan *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenK8SCPResource", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_wg.go b/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_wg.go index 7bc09e9..1ff34b7 100644 --- a/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_wg.go +++ b/internal/service/cloudapi/k8s/flattens/flatten_resource_k8s_wg.go @@ -9,14 +9,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/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/utilities" ) -func K8SWGResource(ctx context.Context, plan *models.ResourceK8SWGModel, c *decort.DecortClient) diag.Diagnostics { +func K8SWGResource(ctx context.Context, plan *models.ResourceK8SWGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenK8SWGResource", map[string]any{"wg_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/k8s/resource_k8s_cp.go b/internal/service/cloudapi/k8s/resource_k8s_cp.go index 99d68bb..244125c 100644 --- a/internal/service/cloudapi/k8s/resource_k8s_cp.go +++ b/internal/service/cloudapi/k8s/resource_k8s_cp.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/k8s" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -33,7 +32,7 @@ func NewResourceK8SCP() resource.Resource { // resourceK8S_CP is the resource implementation. type resourceK8SCP struct { - client *decort.DecortClient + client *client.Client } // Create the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/k8s/resource_k8s_wg.go b/internal/service/cloudapi/k8s/resource_k8s_wg.go index ef52920..9639e63 100644 --- a/internal/service/cloudapi/k8s/resource_k8s_wg.go +++ b/internal/service/cloudapi/k8s/resource_k8s_wg.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/k8s" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -33,7 +32,7 @@ func NewResourceK8SWG() resource.Resource { // resourceK8S_WG is the resource implementation. type resourceK8SWG struct { - client *decort.DecortClient + client *client.Client } // Create the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/k8s/utilities/resource_check_input_vales.go b/internal/service/cloudapi/k8s/utilities/resource_check_input_vales.go index 2f1c0c8..c0d7314 100644 --- a/internal/service/cloudapi/k8s/utilities/resource_check_input_vales.go +++ b/internal/service/cloudapi/k8s/utilities/resource_check_input_vales.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/diag" - 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/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" ) -func CheckParamsExistenceCP(ctx context.Context, plan *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func CheckParamsExistenceCP(ctx context.Context, plan *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if err := ic.ExistRG(ctx, uint64(plan.RGID.ValueInt64()), c); err != nil { @@ -31,7 +31,7 @@ func CheckParamsExistenceCP(ctx context.Context, plan *models.ResourceK8SCPModel return diags } -func CheckParamsExistenceWG(ctx context.Context, plan *models.ResourceK8SWGModel, c *decort.DecortClient) diag.Diagnostics { +func CheckParamsExistenceWG(ctx context.Context, plan *models.ResourceK8SWGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if err := ic.ExistK8s(ctx, uint64(plan.K8SID.ValueInt64()), c); err != nil { diff --git a/internal/service/cloudapi/k8s/utilities/utility_data_source_k8ci_list.go b/internal/service/cloudapi/k8s/utilities/utility_data_source_k8ci_list.go index 739275c..355e6ca 100644 --- a/internal/service/cloudapi/k8s/utilities/utility_data_source_k8ci_list.go +++ b/internal/service/cloudapi/k8s/utilities/utility_data_source_k8ci_list.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8ci" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" ) -func K8ciListCheckPresence(ctx context.Context, state *models.K8ciListModel, c *decort.DecortClient) (*k8ci.ListK8CI, error) { +func K8ciListCheckPresence(ctx context.Context, state *models.K8ciListModel, c *client.Client) (*k8ci.ListK8CI, error) { tflog.Info(ctx, "Get k8ci list info") req := k8ci.ListRequest{} diff --git a/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list.go b/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list.go index c44ae23..f5af582 100644 --- a/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list.go +++ b/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" ) -func K8sListCheckPresence(ctx context.Context, state *models.K8SListModel, c *decort.DecortClient) (*k8s.ListK8SClusters, error) { +func K8sListCheckPresence(ctx context.Context, state *models.K8SListModel, c *client.Client) (*k8s.ListK8SClusters, error) { tflog.Info(ctx, "Get k8s list info") req := k8s.ListRequest{} diff --git a/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list_deleted.go b/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list_deleted.go index 0da48ce..e3ca327 100644 --- a/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list_deleted.go +++ b/internal/service/cloudapi/k8s/utilities/utility_data_source_k8s_list_deleted.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" ) -func K8sListDeletedCheckPresence(ctx context.Context, state *models.K8SListDeletedModel, c *decort.DecortClient) (*k8s.ListK8SClusters, error) { +func K8sListDeletedCheckPresence(ctx context.Context, state *models.K8SListDeletedModel, c *client.Client) (*k8s.ListK8SClusters, error) { tflog.Info(ctx, "Get k8s list deleted info") req := k8s.ListDeletedRequest{} diff --git a/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_cp.go b/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_cp.go index 0c918c4..90e53c8 100644 --- a/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_cp.go +++ b/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_cp.go @@ -11,11 +11,11 @@ import ( "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/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) @@ -130,7 +130,7 @@ func CreateRequestResourceK8CP(ctx context.Context, plan *models.ResourceK8SCPMo return req } -func CheckResourceK8SCPCreateAndDeleteWG(ctx context.Context, plan *models.ResourceK8SCPModel, c *decort.DecortClient, resp string) diag.Diagnostics { +func CheckResourceK8SCPCreateAndDeleteWG(ctx context.Context, plan *models.ResourceK8SCPModel, c *client.Client, resp string) diag.Diagnostics { tflog.Info(ctx, "Start CheckResourceK8CPCreateAndDeleteWG", map[string]any{"name": plan.Name.ValueString()}) diags := diag.Diagnostics{} @@ -205,7 +205,7 @@ func CheckResourceK8SCPCreateAndDeleteWG(ctx context.Context, plan *models.Resou return diags } -func K8SCPResourceCheckPresence(ctx context.Context, k8SID uint64, c *decort.DecortClient) (*k8s.RecordK8S, error) { +func K8SCPResourceCheckPresence(ctx context.Context, k8SID uint64, c *client.Client) (*k8s.RecordK8S, error) { tflog.Info(ctx, "Get info about cluster with ID", map[string]any{"k8s_id": k8SID}) cluster, err := c.CloudAPI().K8S().Get(ctx, k8s.GetRequest{K8SID: k8SID}) @@ -217,7 +217,7 @@ func K8SCPResourceCheckPresence(ctx context.Context, k8SID uint64, c *decort.Dec return cluster, nil } -func K8sListForResourceCheckPresence(ctx context.Context, k8SID uint64, c *decort.DecortClient) (*k8s.ListK8SClusters, error) { +func K8sListForResourceCheckPresence(ctx context.Context, k8SID uint64, c *client.Client) (*k8s.ListK8SClusters, error) { tflog.Info(ctx, "Get info in List about cluster with ID", map[string]any{"k8s_id": k8SID}) req := k8s.ListRequest{ @@ -234,7 +234,7 @@ func K8sListForResourceCheckPresence(ctx context.Context, k8SID uint64, c *decor return k8sList, nil } -func ComputeCheckPresence(ctx context.Context, computeID uint64, c *decort.DecortClient) (*compute.RecordCompute, error) { +func ComputeCheckPresence(ctx context.Context, computeID uint64, c *client.Client) (*compute.RecordCompute, error) { tflog.Info(ctx, "Start utilityComputeCheckPresence", map[string]any{"compute_id": computeID}) req := compute.GetRequest{ @@ -250,7 +250,7 @@ func ComputeCheckPresence(ctx context.Context, computeID uint64, c *decort.Decor return compute, nil } -func K8SCPUpdateNameOrDescription(ctx context.Context, plan, state *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8SCPUpdateNameOrDescription(ctx context.Context, plan, state *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update info about cluster with ID", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -283,7 +283,7 @@ func K8SCPUpdateNameOrDescription(ctx context.Context, plan, state *models.Resou return diags } -func K8SCPReadStatus(ctx context.Context, plan *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8SCPReadStatus(ctx context.Context, plan *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Read status cluster with ID", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -341,7 +341,7 @@ func K8SCPReadStatus(ctx context.Context, plan *models.ResourceK8SCPModel, c *de return diags } -func K8SCPRestore(ctx context.Context, plan *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8SCPRestore(ctx context.Context, plan *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Restore cluster with ID", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -362,7 +362,7 @@ func K8SCPRestore(ctx context.Context, plan *models.ResourceK8SCPModel, c *decor return diags } -func K8SCPEnableDisable(ctx context.Context, plan *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8SCPEnableDisable(ctx context.Context, plan *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Enable/Disable cluster with ID", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -392,7 +392,7 @@ func K8SCPEnableDisable(ctx context.Context, plan *models.ResourceK8SCPModel, c return diags } -func K8SCPStartStop(ctx context.Context, plan *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8SCPStartStop(ctx context.Context, plan *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start/Stop cluster with ID", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -426,7 +426,7 @@ func K8SCPStartStop(ctx context.Context, plan *models.ResourceK8SCPModel, c *dec return diags } -func K8SCPDeleteMaster(ctx context.Context, plan *models.ResourceK8SCPModel, state *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8SCPDeleteMaster(ctx context.Context, plan *models.ResourceK8SCPModel, state *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Delete Master node from cluster with ID", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -463,7 +463,7 @@ func K8SCPDeleteMaster(ctx context.Context, plan *models.ResourceK8SCPModel, sta return diags } -func K8CPUpdateSysctlParams(ctx context.Context, plan *models.ResourceK8SCPModel, state *models.ResourceK8SCPModel, c *decort.DecortClient) diag.Diagnostics { +func K8CPUpdateSysctlParams(ctx context.Context, plan *models.ResourceK8SCPModel, state *models.ResourceK8SCPModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update LB parameters from cluster with ID", map[string]any{"k8s_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} result := make([]map[string]interface{}, 0, len(plan.LBSysctlParams.Elements())) diff --git a/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_wg.go b/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_wg.go index 848c83d..e8516f0 100644 --- a/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_wg.go +++ b/internal/service/cloudapi/k8s/utilities/utility_resource_k8s_wg.go @@ -11,9 +11,9 @@ import ( "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/k8s" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/k8s/models" ) @@ -85,7 +85,7 @@ func CreateRequestResourceK8WG(ctx context.Context, plan *models.ResourceK8SWGMo return req } -func ResourceK8SWGCreate(ctx context.Context, plan *models.ResourceK8SWGModel, c *decort.DecortClient) diag.Diagnostics { +func ResourceK8SWGCreate(ctx context.Context, plan *models.ResourceK8SWGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start ResourceK8SWGCreate", map[string]any{"name": plan.Name.ValueString(), "k8s_id": plan.K8SID.ValueInt64()}) diags := diag.Diagnostics{} @@ -141,7 +141,7 @@ func ResourceK8SWGCreate(ctx context.Context, plan *models.ResourceK8SWGModel, c return diags } -func K8SWGResourceCheckPresence(ctx context.Context, plan *models.ResourceK8SWGModel, c *decort.DecortClient) (*k8s.ItemK8SGroup, uint64, error) { +func K8SWGResourceCheckPresence(ctx context.Context, plan *models.ResourceK8SWGModel, c *client.Client) (*k8s.ItemK8SGroup, uint64, error) { tflog.Info(ctx, "Get info about wg with ID", map[string]any{"wg_id": plan.Id.ValueString()}) var wgId int @@ -182,7 +182,7 @@ func K8SWGResourceCheckPresence(ctx context.Context, plan *models.ResourceK8SWGM return nil, 0, fmt.Errorf("not found wg with id: %d in k8s cluster: %d", wgId, cluster.ID) } -func K8SWGUpdateCloudInit(ctx context.Context, plan, state *models.ResourceK8SWGModel, c *decort.DecortClient) diag.Diagnostics { +func K8SWGUpdateCloudInit(ctx context.Context, plan, state *models.ResourceK8SWGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update cloud init in wg with id", map[string]any{"wg_id": state.WorkerGroupId.ValueInt64(), "k8s_id": state.K8SID.ValueInt64()}) diags := diag.Diagnostics{} @@ -203,7 +203,7 @@ func K8SWGUpdateCloudInit(ctx context.Context, plan, state *models.ResourceK8SWG return diags } -func K8SWGUpdateNumWorkers(ctx context.Context, plan, state *models.ResourceK8SWGModel, c *decort.DecortClient) diag.Diagnostics { +func K8SWGUpdateNumWorkers(ctx context.Context, plan, state *models.ResourceK8SWGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update num workers in wg with id", map[string]any{"wg_id": state.WorkerGroupId.ValueInt64(), "k8s_id": state.K8SID.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/data_source_compute.go b/internal/service/cloudapi/kvmvm/data_source_compute.go index 1b460d9..172e651 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute.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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceCompute() datasource.DataSource { // dataSourceCompute is the data source implementation. type dataSourceCompute struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceCompute) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_audits.go b/internal/service/cloudapi/kvmvm/data_source_compute_audits.go index f06fccf..39f8706 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_audits.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_audits.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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeAudits() datasource.DataSource { // dataSourceComputeAudits is the data source implementation. type dataSourceComputeAudits struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeAudits) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_get_audits.go b/internal/service/cloudapi/kvmvm/data_source_compute_get_audits.go index 16b4db0..caccc31 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_get_audits.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_get_audits.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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeGetAudits() datasource.DataSource { // dataSourceComputeGetAudits is the data source implementation. type dataSourceComputeGetAudits struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeGetAudits) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_get_console_url.go b/internal/service/cloudapi/kvmvm/data_source_compute_get_console_url.go index baf4ab9..1ab071d 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_get_console_url.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_get_console_url.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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeGetConsoleUrl() datasource.DataSource { // dataSourceComputeGetConsoleUrl is the data source implementation. type dataSourceComputeGetConsoleUrl struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeGetConsoleUrl) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_get_log.go b/internal/service/cloudapi/kvmvm/data_source_compute_get_log.go index d697d66..79b4fa8 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_get_log.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_get_log.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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeGetLog() datasource.DataSource { // dataSourceComputeGetLog is the data source implementation. type dataSourceComputeGetLog struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeGetLog) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_list.go b/internal/service/cloudapi/kvmvm/data_source_compute_list.go index 8e7e6ea..f9f4861 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_list.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeList() datasource.DataSource { // dataSourceComputeList is the data source implementation. type dataSourceComputeList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_list_deleted.go b/internal/service/cloudapi/kvmvm/data_source_compute_list_deleted.go index 7b60d33..c234309 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_list_deleted.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeListDeleted() datasource.DataSource { // dataSourceComputeListDeleted is the data source implementation. type dataSourceComputeListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_pci_device_list.go b/internal/service/cloudapi/kvmvm/data_source_compute_pci_device_list.go index 33862e8..784a566 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_pci_device_list.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_pci_device_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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputePciDeviceList() datasource.DataSource { // dataSourceComputePciDeviceList is the data source implementation. type dataSourceComputePciDeviceList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputePciDeviceList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_pfw_list.go b/internal/service/cloudapi/kvmvm/data_source_compute_pfw_list.go index 0db86af..7542d35 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_pfw_list.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_pfw_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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputePFWList() datasource.DataSource { // dataSourceComputePFWList is the data source implementation. type dataSourceComputePFWList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputePFWList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_snapshot_usage.go b/internal/service/cloudapi/kvmvm/data_source_compute_snapshot_usage.go index b4d5892..040508a 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_snapshot_usage.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_snapshot_usage.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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeSnapshotUsage() datasource.DataSource { // dataSourceComputeSnapshotUsage is the data source implementation. type dataSourceComputeSnapshotUsage struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeSnapshotUsage) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_user_list.go b/internal/service/cloudapi/kvmvm/data_source_compute_user_list.go index 9d9b5ca..fb6b090 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_user_list.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_user_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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeUserList() datasource.DataSource { // dataSourceComputeUserList is the data source implementation. type dataSourceComputeUserList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeUserList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/data_source_compute_vgpu_list.go b/internal/service/cloudapi/kvmvm/data_source_compute_vgpu_list.go index c473e89..89d8fcd 100644 --- a/internal/service/cloudapi/kvmvm/data_source_compute_vgpu_list.go +++ b/internal/service/cloudapi/kvmvm/data_source_compute_vgpu_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/kvmvm/flattens" @@ -26,7 +25,7 @@ func NewDataSourceComputeVGPUList() datasource.DataSource { // dataSourceComputeVGPUList is the data source implementation. type dataSourceComputeVGPUList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceComputeVGPUList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute.go index 008f471..324527e 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute.go @@ -9,14 +9,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/compute" + "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/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceCompute(ctx context.Context, state *models.RecordComputeModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceCompute(ctx context.Context, state *models.RecordComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceCompute") diags := diag.Diagnostics{} @@ -47,6 +47,7 @@ func DataSourceCompute(ctx context.Context, state *models.RecordComputeModel, c AffinityWeight: types.Int64Value(int64(computeRecord.AffinityWeight)), AntiAffinityRules: flattenAffinityRule(ctx, &computeRecord.AntiAffinityRules), Architecture: types.StringValue(computeRecord.Architecture), + AutoStartWithNode: types.BoolValue(computeRecord.AutoStart), Chipset: types.StringValue(computeRecord.Chipset), BootDiskSize: types.Int64Value(int64(computeRecord.BootDiskSize)), CdImageId: types.Int64Value(int64(computeRecord.CdImageId)), @@ -103,6 +104,7 @@ func DataSourceCompute(ctx context.Context, state *models.RecordComputeModel, c Userdata: types.StringValue(string(userdata)), VirtualImageID: types.Int64Value(int64(computeRecord.VirtualImageID)), VirtualImageName: types.StringValue(computeRecord.VirtualImageName), + VNCPassword: types.StringValue(computeRecord.VNCPassword), } state.BootOrder, diags = types.ListValueFrom(ctx, types.StringType, computeRecord.BootOrder) if diags != nil { diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_audits.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_audits.go index 1a9134b..7595379 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_audits.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_audits.go @@ -7,13 +7,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeAudits(ctx context.Context, state *models.ListAuditsModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeAudits(ctx context.Context, state *models.ListAuditsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeAudits") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_audits.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_audits.go index 835ef2a..c5e3d8d 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_audits.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_audits.go @@ -7,13 +7,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeGetAudits(ctx context.Context, state *models.GetAuditsModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeGetAudits(ctx context.Context, state *models.GetAuditsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeGetAudits") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_console_url.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_console_url.go index ed28fad..c9c7443 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_console_url.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_console_url.go @@ -7,12 +7,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/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeGetConsoleUrl(ctx context.Context, state *models.GetConsoleUrlModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeGetConsoleUrl(ctx context.Context, state *models.GetConsoleUrlModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeGetConsoleUrl") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_log.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_log.go index fa62861..b96fe96 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_log.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_get_log.go @@ -7,12 +7,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/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeGetLog(ctx context.Context, state *models.GetLogModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeGetLog(ctx context.Context, state *models.GetLogModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeGetLog") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list.go index a895034..808111b 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list.go @@ -9,13 +9,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeList(ctx context.Context, state *models.ListComputesModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeList(ctx context.Context, state *models.ListComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeList") diags := diag.Diagnostics{} @@ -72,6 +72,7 @@ func flattenItemsList(ctx context.Context, computes *compute.ListComputes) []mod AffinityWeight: types.Int64Value(int64(item.AffinityWeight)), AntiAffinityRules: flattenAffinityRuleInList(ctx, &item.AntiAffinityRules), Architecture: types.StringValue(item.Architecture), + AutoStartWithNode: types.BoolValue(item.AutoStart), BootDiskSize: types.Int64Value(int64(item.BootDiskSize)), CdImageId: types.Int64Value(int64(item.CdImageId)), CloneReference: types.Int64Value(int64(item.CloneReference)), diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list_deleted.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list_deleted.go index fbcaaa4..df04c88 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list_deleted.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_list_deleted.go @@ -9,13 +9,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeListDeleted(ctx context.Context, state *models.ListDeletedComputesModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeListDeleted(ctx context.Context, state *models.ListDeletedComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeListDeleted") diags := diag.Diagnostics{} @@ -70,6 +70,7 @@ func flattenItemsListDeleted(ctx context.Context, computes *compute.ListComputes AffinityWeight: types.Int64Value(int64(item.AffinityWeight)), AntiAffinityRules: flattenAffinityRuleInListDeleted(ctx, &item.AntiAffinityRules), Architecture: types.StringValue(item.Architecture), + AutoStartWithNode: types.BoolValue(item.AutoStart), BootDiskSize: types.Int64Value(int64(item.BootDiskSize)), CdImageId: types.Int64Value(int64(item.CdImageId)), Chipset: types.StringValue(item.Chipset), diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pci_device_list.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pci_device_list.go index f8f4afb..26f1f7b 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pci_device_list.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pci_device_list.go @@ -7,13 +7,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputePciDeviceList(ctx context.Context, state *models.ListPCIDevicesModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputePciDeviceList(ctx context.Context, state *models.ListPCIDevicesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputePciDeviceList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pfw_list.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pfw_list.go index 4aa1f49..5b5ee8d 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pfw_list.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_pfw_list.go @@ -7,13 +7,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputePFWList(ctx context.Context, state *models.ListPFWsModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputePFWList(ctx context.Context, state *models.ListPFWsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputePFWList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_snapshot_usage.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_snapshot_usage.go index 1284ee9..5cf0867 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_snapshot_usage.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_snapshot_usage.go @@ -7,13 +7,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeSnapshotUsage(ctx context.Context, state *models.ListSnapShotsModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeSnapshotUsage(ctx context.Context, state *models.ListSnapShotsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeSnapshotUsage") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_user_list.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_user_list.go index 4085bfc..4e26a3d 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_user_list.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_user_list.go @@ -7,13 +7,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeUserList(ctx context.Context, state *models.ListUsersModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeUserList(ctx context.Context, state *models.ListUsersModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeUserList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_vgpu_list.go b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_vgpu_list.go index fe1e6f3..b00e62d 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_vgpu_list.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_data_source_compute_vgpu_list.go @@ -7,13 +7,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func DataSourceComputeVGPUList(ctx context.Context, state *models.ListVGPUsModel, c *decort.DecortClient) diag.Diagnostics { +func DataSourceComputeVGPUList(ctx context.Context, state *models.ListVGPUsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start FlattenDataSourceComputeVGPUList") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/kvmvm/flattens/flatten_resource_compute.go b/internal/service/cloudapi/kvmvm/flattens/flatten_resource_compute.go index 743f303..e44ddaf 100644 --- a/internal/service/cloudapi/kvmvm/flattens/flatten_resource_compute.go +++ b/internal/service/cloudapi/kvmvm/flattens/flatten_resource_compute.go @@ -8,15 +8,15 @@ 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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens" disks "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/utilities" ) -func ComputeResource(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResource(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.ComputeResource") diags := diag.Diagnostics{} @@ -48,6 +48,7 @@ func ComputeResource(ctx context.Context, plan *models.ResourceComputeModel, c * AffinityLabel: types.StringValue(recordItemCompute.AffinityLabel), AffinityRules: plan.AffinityRules, AntiAffinityRules: plan.AntiAffinityRules, + AutoStartWithNode: types.BoolValue(recordItemCompute.AutoStart), CustomFields: types.StringValue(string(customFields)), Chipset: types.StringValue(recordItemCompute.Chipset), Stateless: plan.Stateless, @@ -137,6 +138,7 @@ func ComputeResource(ctx context.Context, plan *models.ResourceComputeModel, c * VGPUs: flattens.FlattenSimpleTypeToList(ctx, types.Int64Type, recordItemCompute.VGPUs), VirtualImageID: types.Int64Value(int64(recordItemCompute.VirtualImageID)), VirtualImageName: types.StringValue(recordItemCompute.VirtualImageName), + VNCPassword: types.StringValue(recordItemCompute.VNCPassword), } tflog.Info(ctx, "End flattens.ComputeResource", map[string]any{"id": plan.ID.ValueString()}) diff --git a/internal/service/cloudapi/kvmvm/input_check.go b/internal/service/cloudapi/kvmvm/input_check.go index cf847c3..9f2eee0 100644 --- a/internal/service/cloudapi/kvmvm/input_check.go +++ b/internal/service/cloudapi/kvmvm/input_check.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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) // resourceComputeInputChecks checks if rg_id and image_id are valid. -func resourceComputeInputChecks(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func resourceComputeInputChecks(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} rgID := uint64(plan.RGID.ValueInt64()) diff --git a/internal/service/cloudapi/kvmvm/models/model_data_source_compute.go b/internal/service/cloudapi/kvmvm/models/model_data_source_compute.go index 89ccee6..ba1b599 100644 --- a/internal/service/cloudapi/kvmvm/models/model_data_source_compute.go +++ b/internal/service/cloudapi/kvmvm/models/model_data_source_compute.go @@ -19,6 +19,7 @@ type RecordComputeModel struct { AffinityWeight types.Int64 `tfsdk:"affinity_weight"` AntiAffinityRules []ItemRuleModel `tfsdk:"anti_affinity_rules"` Architecture types.String `tfsdk:"arch"` + AutoStartWithNode types.Bool `tfsdk:"auto_start_w_node"` Chipset types.String `tfsdk:"chipset"` BootOrder types.List `tfsdk:"boot_order"` BootDiskSize types.Int64 `tfsdk:"bootdisk_size"` @@ -80,6 +81,7 @@ type RecordComputeModel struct { VGPUs types.List `tfsdk:"vgpus"` VirtualImageID types.Int64 `tfsdk:"virtual_image_id"` VirtualImageName types.String `tfsdk:"virtual_image_name"` + VNCPassword types.String `tfsdk:"vnc_password"` } type RecordACLModel struct { diff --git a/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list.go b/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list.go index 6aa8138..a64c695 100644 --- a/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list.go +++ b/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list.go @@ -38,6 +38,7 @@ type ItemComputeModel struct { AffinityWeight types.Int64 `tfsdk:"affinity_weight"` AntiAffinityRules []ItemRuleInListModel `tfsdk:"anti_affinity_rules"` Architecture types.String `tfsdk:"arch"` + AutoStartWithNode types.Bool `tfsdk:"auto_start_w_node"` BootOrder types.List `tfsdk:"boot_order"` BootDiskSize types.Int64 `tfsdk:"bootdisk_size"` CdImageId types.Int64 `tfsdk:"cd_image_id"` diff --git a/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list_deleted.go b/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list_deleted.go index 55fcc96..a21455a 100644 --- a/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list_deleted.go +++ b/internal/service/cloudapi/kvmvm/models/model_data_source_compute_list_deleted.go @@ -36,6 +36,7 @@ type ItemListDeletedComputeModel struct { AffinityWeight types.Int64 `tfsdk:"affinity_weight"` AntiAffinityRules []ItemRuleInListDeletedModel `tfsdk:"anti_affinity_rules"` Architecture types.String `tfsdk:"arch"` + AutoStartWithNode types.Bool `tfsdk:"auto_start_w_node"` BootOrder types.List `tfsdk:"boot_order"` BootDiskSize types.Int64 `tfsdk:"bootdisk_size"` CdImageId types.Int64 `tfsdk:"cd_image_id"` diff --git a/internal/service/cloudapi/kvmvm/models/model_resource_compute.go b/internal/service/cloudapi/kvmvm/models/model_resource_compute.go index 75bfbaa..5b3d0da 100644 --- a/internal/service/cloudapi/kvmvm/models/model_resource_compute.go +++ b/internal/service/cloudapi/kvmvm/models/model_resource_compute.go @@ -22,6 +22,7 @@ type ResourceComputeModel struct { AffinityLabel types.String `tfsdk:"affinity_label"` AffinityRules types.Set `tfsdk:"affinity_rules"` AntiAffinityRules types.Set `tfsdk:"anti_affinity_rules"` + AutoStartWithNode types.Bool `tfsdk:"auto_start_w_node"` CustomFields types.String `tfsdk:"custom_fields"` Chipset types.String `tfsdk:"chipset"` Stateless types.Bool `tfsdk:"stateless"` @@ -113,6 +114,7 @@ type ResourceComputeModel struct { VGPUs types.List `tfsdk:"vgpus"` VirtualImageID types.Int64 `tfsdk:"virtual_image_id"` VirtualImageName types.String `tfsdk:"virtual_image_name"` + VNCPassword types.String `tfsdk:"vnc_password"` } type RecordResourceACLModel struct { diff --git a/internal/service/cloudapi/kvmvm/resource_compute.go b/internal/service/cloudapi/kvmvm/resource_compute.go index 7ef118c..3181d1c 100644 --- a/internal/service/cloudapi/kvmvm/resource_compute.go +++ b/internal/service/cloudapi/kvmvm/resource_compute.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/compute" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" @@ -33,7 +32,7 @@ func NewResourceCompute() resource.Resource { // resourceCompute is the resource implementation. type resourceCompute struct { - client *decort.DecortClient + client *client.Client } func (r *resourceCompute) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { @@ -148,10 +147,15 @@ func (r *resourceCompute) Create(ctx context.Context, req resource.CreateRequest } // pin to stack if needed, warnings added to resp.Diagnostics in case of failure. - if !plan.PinToStack.IsNull() && plan.PinToStack.ValueBool() { + if plan.PinToStack.ValueBool() { resp.Diagnostics.Append(utilities.ComputeResourcePinToStack(ctx, &plan, r.client)...) } + // set auto start_w_node if pin_to_stack == false + if !plan.PinToStack.ValueBool() && plan.AutoStartWithNode.ValueBool() { + resp.Diagnostics.Append(utilities.ComputeResourceAutoStartWithNode(ctx, &plan, r.client)...) + } + // pause if needed, warnings added to resp.Diagnostics in case of failure. if !plan.Pause.IsNull() && plan.Pause.ValueBool() { resp.Diagnostics.Append(utilities.ComputeResourcePause(ctx, &plan, r.client)...) @@ -335,7 +339,8 @@ func (r *resourceCompute) Update(ctx context.Context, req resource.UpdateRequest // Compute parameters update if needed if (!plan.Description.IsUnknown() && !plan.Description.Equal(state.Description)) || !plan.Name.Equal(state.Name) || - !plan.NumaAffinity.Equal(state.NumaAffinity) || !plan.CPUPin.Equal(state.CPUPin) || !plan.HPBacked.Equal(state.HPBacked) || (!plan.Chipset.IsUnknown() && !plan.Chipset.Equal(state.Chipset)) { + !plan.NumaAffinity.Equal(state.NumaAffinity) || !plan.CPUPin.Equal(state.CPUPin) || !plan.HPBacked.Equal(state.HPBacked) || (!plan.Chipset.IsUnknown() && !plan.Chipset.Equal(state.Chipset)) || + !plan.AutoStartWithNode.Equal(state.AutoStartWithNode) { resp.Diagnostics.Append(utilities.ComputeResourceComputeUpdate(ctx, &state, &plan, r.client)...) if resp.Diagnostics.HasError() { tflog.Error(ctx, "Update resourceCompute: Error update compute parameters") @@ -425,7 +430,7 @@ func (r *resourceCompute) Update(ctx context.Context, req resource.UpdateRequest } // pin to stack if needed - if !plan.PinToStack.Equal(state.PinToStack) && !plan.PinToStack.IsNull() { + if !plan.PinToStack.Equal(state.PinToStack) { resp.Diagnostics.Append(utilities.ComputeResourcePinToStackUpdate(ctx, &plan, r.client)...) if resp.Diagnostics.HasError() { tflog.Error(ctx, "Update resourceCompute: Error pin/unpin to stack compute") diff --git a/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute.go b/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute.go index 4791bfa..de9f97b 100644 --- a/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute.go +++ b/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute.go @@ -160,6 +160,9 @@ func MakeSchemaDataSourceCompute() map[string]schema.Attribute { "arch": schema.StringAttribute{ Computed: true, }, + "auto_start_w_node": schema.BoolAttribute{ + Computed: true, + }, "chipset": schema.StringAttribute{ Computed: true, }, @@ -708,5 +711,8 @@ func MakeSchemaDataSourceCompute() map[string]schema.Attribute { "virtual_image_name": schema.StringAttribute{ Computed: true, }, + "vnc_password": schema.StringAttribute{ + Computed: true, + }, } } diff --git a/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list.go b/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list.go index a7d29e5..75f970c 100644 --- a/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list.go +++ b/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list.go @@ -166,6 +166,9 @@ func MakeSchemaDataSourceComputeList() map[string]schema.Attribute { "arch": schema.StringAttribute{ Computed: true, }, + "auto_start_w_node": schema.BoolAttribute{ + Computed: true, + }, "chipset": schema.StringAttribute{ Computed: true, }, diff --git a/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list_deleted.go b/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list_deleted.go index 623a1f2..c37d3a8 100644 --- a/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list_deleted.go +++ b/internal/service/cloudapi/kvmvm/schemas/schema_data_source_compute_list_deleted.go @@ -158,6 +158,9 @@ func MakeSchemaDataSourceComputeListDeleted() map[string]schema.Attribute { "arch": schema.StringAttribute{ Computed: true, }, + "auto_start_w_node": schema.BoolAttribute{ + Computed: true, + }, "chipset": schema.StringAttribute{ Computed: true, }, diff --git a/internal/service/cloudapi/kvmvm/schemas/schema_resource_compute.go b/internal/service/cloudapi/kvmvm/schemas/schema_resource_compute.go index 0fe7092..3f8fa8a 100644 --- a/internal/service/cloudapi/kvmvm/schemas/schema_resource_compute.go +++ b/internal/service/cloudapi/kvmvm/schemas/schema_resource_compute.go @@ -291,6 +291,8 @@ func MakeSchemaResourceCompute() map[string]schema.Attribute { }, "pin_to_stack": schema.BoolAttribute{ Optional: true, + Computed: true, + Default: booldefault.StaticBool(false), }, "description": schema.StringAttribute{ Optional: true, @@ -345,23 +347,20 @@ func MakeSchemaResourceCompute() map[string]schema.Attribute { Description: "Flag for redeploy compute", }, "started": schema.BoolAttribute{ - Optional: true, - Computed: true, - Default: booldefault.StaticBool(true), - //Default: true, + Optional: true, + Computed: true, + Default: booldefault.StaticBool(true), Description: "Is compute started.", }, "detach_disks": schema.BoolAttribute{ Optional: true, Computed: true, Default: booldefault.StaticBool(true), - //Default: true, }, "permanently": schema.BoolAttribute{ Optional: true, Computed: true, Default: booldefault.StaticBool(true), - //Default: true, }, "is": schema.StringAttribute{ Optional: true, @@ -380,13 +379,15 @@ func MakeSchemaResourceCompute() map[string]schema.Attribute { Description: "Rule for VM placement with NUMA affinity.", }, "cpu_pin": schema.BoolAttribute{ - Optional: true, - //Default: false, + Optional: true, + Computed: true, + Default: booldefault.StaticBool(false), Description: "Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node.", }, "hp_backed": schema.BoolAttribute{ - Optional: true, - //Default: false, + Optional: true, + Computed: true, + Default: booldefault.StaticBool(false), Description: "Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node.", }, "pci_devices": schema.SetAttribute{ @@ -402,6 +403,12 @@ func MakeSchemaResourceCompute() map[string]schema.Attribute { }, Description: "Type of the emulated system, Q35 or i440fx", }, + "auto_start_w_node": schema.BoolAttribute{ + Optional: true, + Computed: true, + Description: "Flag for start compute after node exits from MAINTENANCE state", + Default: booldefault.StaticBool(false), + }, // computed attributes "compute_id": schema.Int64Attribute{ @@ -801,6 +808,9 @@ func MakeSchemaResourceCompute() map[string]schema.Attribute { "virtual_image_name": schema.StringAttribute{ Computed: true, }, + "vnc_password": schema.StringAttribute{ + Computed: true, + }, } } diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute.go index 55dab3a..b9b337b 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeCheckPresence(ctx context.Context, state *models.RecordComputeModel, c *decort.DecortClient) (*compute.RecordCompute, error) { +func ComputeCheckPresence(ctx context.Context, state *models.RecordComputeModel, c *client.Client) (*compute.RecordCompute, error) { tflog.Info(ctx, "Get compute info") req := compute.GetRequest{ @@ -27,7 +27,7 @@ func ComputeCheckPresence(ctx context.Context, state *models.RecordComputeModel, return computeRecord, nil } -func ComputePCIDevicesListCheckPresence(ctx context.Context, state *models.RecordComputeModel, c *decort.DecortClient) (*compute.ListPCIDevices, error) { +func ComputePCIDevicesListCheckPresence(ctx context.Context, state *models.RecordComputeModel, c *client.Client) (*compute.ListPCIDevices, error) { tflog.Info(ctx, "Get PCI devices info") req := compute.ListPCIDeviceRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_audits.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_audits.go index 4c06436..00e16a7 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_audits.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_audits.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeGetAuditsCheckPresence(ctx context.Context, state *models.GetAuditsModel, c *decort.DecortClient) (*compute.ListShortAudits, error) { +func ComputeGetAuditsCheckPresence(ctx context.Context, state *models.GetAuditsModel, c *client.Client) (*compute.ListShortAudits, error) { tflog.Info(ctx, "Get compute short audits info") req := compute.GetAuditsRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_audits.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_audits.go index aa66193..129f908 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_audits.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_audits.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeAuditsCheckPresence(ctx context.Context, state *models.ListAuditsModel, c *decort.DecortClient) (*compute.ListAudits, error) { +func ComputeAuditsCheckPresence(ctx context.Context, state *models.ListAuditsModel, c *client.Client) (*compute.ListAudits, error) { tflog.Info(ctx, "Get compute audits list info") req := compute.AuditsRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_console_url.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_console_url.go index df95d30..37f021e 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_console_url.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_console_url.go @@ -5,12 +5,12 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeGetConsoleUrlCheckPresence(ctx context.Context, state *models.GetConsoleUrlModel, c *decort.DecortClient) (string, error) { +func ComputeGetConsoleUrlCheckPresence(ctx context.Context, state *models.GetConsoleUrlModel, c *client.Client) (string, error) { tflog.Info(ctx, "Get compute console url") req := compute.GetConsoleURLRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_log.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_log.go index 75db074..39b38c6 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_log.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_get_log.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeGetLogCheckPresence(ctx context.Context, state *models.GetLogModel, c *decort.DecortClient) (string, error) { +func ComputeGetLogCheckPresence(ctx context.Context, state *models.GetLogModel, c *client.Client) (string, error) { tflog.Info(ctx, "Get compute log") req := compute.GetLogRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list.go index adaeae3..253b0de 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list.go @@ -5,12 +5,12 @@ import ( "regexp" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeListCheckPresence(ctx context.Context, state *models.ListComputesModel, c *decort.DecortClient) (*compute.ListComputes, error) { +func ComputeListCheckPresence(ctx context.Context, state *models.ListComputesModel, c *client.Client) (*compute.ListComputes, error) { tflog.Info(ctx, "Get compute list info") req := compute.ListRequest{} diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list_deleted.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list_deleted.go index 20a034d..92e6b46 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list_deleted.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_list_deleted.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeListDeletedCheckPresence(ctx context.Context, state *models.ListDeletedComputesModel, c *decort.DecortClient) (*compute.ListComputes, error) { +func ComputeListDeletedCheckPresence(ctx context.Context, state *models.ListDeletedComputesModel, c *client.Client) (*compute.ListComputes, error) { tflog.Info(ctx, "Get compute list deleted info") req := compute.ListDeletedRequest{} diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_device_list.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_device_list.go index 0228c72..21fa4c8 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_device_list.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_device_list.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputePciDeviceListCheckPresence(ctx context.Context, state *models.ListPCIDevicesModel, c *decort.DecortClient) (*compute.ListPCIDevices, error) { +func ComputePciDeviceListCheckPresence(ctx context.Context, state *models.ListPCIDevicesModel, c *client.Client) (*compute.ListPCIDevices, error) { tflog.Info(ctx, "Get compute pci device list info") req := compute.ListPCIDeviceRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_pfw_list.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_pfw_list.go index 0587e35..8a109af 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_pfw_list.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_pci_pfw_list.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputePFWListCheckPresence(ctx context.Context, state *models.ListPFWsModel, c *decort.DecortClient) (*compute.ListPFWs, error) { +func ComputePFWListCheckPresence(ctx context.Context, state *models.ListPFWsModel, c *client.Client) (*compute.ListPFWs, error) { tflog.Info(ctx, "Get compute pfw list info") req := compute.PFWListRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_snapshot_usage.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_snapshot_usage.go index 19aa4ce..0e35268 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_snapshot_usage.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_snapshot_usage.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeSnapshotUsageCheckPresence(ctx context.Context, state *models.ListSnapShotsModel, c *decort.DecortClient) (*compute.ListUsageSnapshots, error) { +func ComputeSnapshotUsageCheckPresence(ctx context.Context, state *models.ListSnapShotsModel, c *client.Client) (*compute.ListUsageSnapshots, error) { tflog.Info(ctx, "Get compute snapshot usage info") req := compute.SnapshotUsageRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_user_list.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_user_list.go index fbf1e47..d036063 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_user_list.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_user_list.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeUserListCheckPresence(ctx context.Context, state *models.ListUsersModel, c *decort.DecortClient) (*compute.ListUsers, error) { +func ComputeUserListCheckPresence(ctx context.Context, state *models.ListUsersModel, c *client.Client) (*compute.ListUsers, error) { tflog.Info(ctx, "Get compute user list info") req := compute.UserListRequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_vgpu_list.go b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_vgpu_list.go index eb88bce..bd78307 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_vgpu_list.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_data_source_compute_vgpu_list.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeVGPUListCheckPresence(ctx context.Context, state *models.ListVGPUsModel, c *decort.DecortClient) (*compute.ListVGPUs, error) { +func ComputeVGPUListCheckPresence(ctx context.Context, state *models.ListVGPUsModel, c *client.Client) (*compute.ListVGPUs, error) { tflog.Info(ctx, "Get compute vgpu list info") req := compute.ListVGPURequest{ diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_create.go b/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_create.go index c21b577..ec16204 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_create.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_create.go @@ -10,14 +10,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/compute" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmx86" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) -func ComputeResourceCheckPresence(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) (*compute.RecordCompute, diag.Diagnostics) { +func ComputeResourceCheckPresence(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) (*compute.RecordCompute, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("ComputeResourceCheckPresence: Get info about compute with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -54,7 +54,7 @@ func ComputeResourceCheckDetachDisks(state *models.ResourceComputeModel, recordC return true } -func ComputeResourceBootDiskCheckPresence(ctx context.Context, state *models.ResourceComputeModel, c *decort.DecortClient) (*compute.ItemComputeDisk, diag.Diagnostics) { +func ComputeResourceBootDiskCheckPresence(ctx context.Context, state *models.ResourceComputeModel, c *client.Client) (*compute.ItemComputeDisk, diag.Diagnostics) { tflog.Info(ctx, "ComputeResourceBootDiskCheckPresence: Get info about boot disk") diags := diag.Diagnostics{} @@ -75,7 +75,7 @@ func ComputeResourceBootDiskCheckPresence(ctx context.Context, state *models.Res return bootDisk, nil } -func CreateResourceCompute(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateResourceCompute(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("CreateResourceCompute: Start create ResourceCompute: name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -183,11 +183,11 @@ func CreateResourceCompute(ctx context.Context, plan *models.ResourceComputeMode createReqX86.NumaAffinity = strings.ToLower(plan.NumaAffinity.ValueString()) } - if !plan.CPUPin.IsNull() && plan.CPUPin.ValueBool() { + if plan.CPUPin.ValueBool() { createReqX86.CPUPin = true } - if !plan.HPBacked.IsNull() && plan.HPBacked.ValueBool() { + if plan.HPBacked.ValueBool() { createReqX86.HPBacked = true } @@ -201,7 +201,7 @@ func CreateResourceCompute(ctx context.Context, plan *models.ResourceComputeMode } -func CleanupResourceCompute(ctx context.Context, computeId uint64, c *decort.DecortClient) { +func CleanupResourceCompute(ctx context.Context, computeId uint64, c *client.Client) { tflog.Info(ctx, fmt.Sprintf("CleanupResourceCompute: Start delete ResourceCompute: id %d", computeId)) req := compute.DeleteRequest{ ComputeID: computeId, @@ -214,7 +214,7 @@ func CleanupResourceCompute(ctx context.Context, computeId uint64, c *decort.Dec } } -func ComputeResourceExtraDiskCreate(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceExtraDiskCreate(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeExtraDiskCreate: Start added extra disk(s) from compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -243,7 +243,7 @@ func ComputeResourceExtraDiskCreate(ctx context.Context, plan *models.ResourceCo return diags } -func ComputeResourceEnableDisable(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceEnableDisable(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeEnableDisable: Start enabled/disabled compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -283,7 +283,7 @@ func ComputeResourceEnableDisable(ctx context.Context, plan *models.ResourceComp return nil } -func ComputeResourceStartStop(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceStartStop(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeStartStop: Start started/stopped compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -323,7 +323,7 @@ func ComputeResourceStartStop(ctx context.Context, plan *models.ResourceComputeM return nil } -func ComputeResourceAffinityLabel(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceAffinityLabel(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeAffinityLabel: Start added affinity label to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -351,7 +351,7 @@ func ComputeResourceAffinityLabel(ctx context.Context, plan *models.ResourceComp return nil } -func ComputeResourceAffinityRules(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceAffinityRules(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeAffinityRules: Start added affinity rules to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -401,7 +401,7 @@ func ComputeResourceAffinityRules(ctx context.Context, plan *models.ResourceComp return nil } -func ComputeResourceAntiAffinityRules(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceAntiAffinityRules(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeAntiAffinityRules: Start added anti affinity rules to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -451,7 +451,7 @@ func ComputeResourceAntiAffinityRules(ctx context.Context, plan *models.Resource return nil } -func ComputeResourceTags(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceTags(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceTags: Start added tags to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -485,7 +485,7 @@ func ComputeResourceTags(ctx context.Context, plan *models.ResourceComputeModel, return nil } -func ComputeResourcePortForwarding(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePortForwarding(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePortForwarding: Start added port forwarding to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -537,7 +537,7 @@ func ComputeResourcePortForwarding(ctx context.Context, plan *models.ResourceCom return nil } -func ComputeResourceUserAccess(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceUserAccess(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceUserAccess: Start added user(s) access to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -571,7 +571,7 @@ func ComputeResourceUserAccess(ctx context.Context, plan *models.ResourceCompute return nil } -func ComputeResourceSnapshot(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceSnapshot(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceSnapshot: Start added snapshot to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -604,7 +604,7 @@ func ComputeResourceSnapshot(ctx context.Context, plan *models.ResourceComputeMo return nil } -func ComputeResourcePCIDevice(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePCIDevice(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePCIDevice: Start added PCI devices(s) to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -639,7 +639,7 @@ func ComputeResourcePCIDevice(ctx context.Context, plan *models.ResourceComputeM return nil } -func ComputeResourceCDInsert(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceCDInsert(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceCDInsert: Start added cd to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -666,7 +666,7 @@ func ComputeResourceCDInsert(ctx context.Context, plan *models.ResourceComputeMo return nil } -func ComputeResourcePinToStack(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePinToStack(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePinToStack: Start pin to stack compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -676,7 +676,12 @@ func ComputeResourcePinToStack(ctx context.Context, plan *models.ResourceCompute return diags } - _, err = c.CloudAPI().Compute().PinToStack(ctx, compute.PinToStackRequest{ComputeID: computeId}) + req := compute.PinToStackRequest{ + ComputeID: computeId, + AutoStart: plan.AutoStartWithNode.ValueBool(), + } + + _, err = c.CloudAPI().Compute().PinToStack(ctx, req) if err != nil { diags.AddWarning( "ComputeResourcePinToStack: cannot pin to stack compute", err.Error(), @@ -688,7 +693,7 @@ func ComputeResourcePinToStack(ctx context.Context, plan *models.ResourceCompute return nil } -func ComputeResourcePause(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePause(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePause: Start pause compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -709,7 +714,7 @@ func ComputeResourcePause(ctx context.Context, plan *models.ResourceComputeModel tflog.Info(ctx, "ComputeResourcePause: compute is successfully pause", map[string]any{"compute_id": computeId}) return nil } -func ComputeReadStatus(ctx context.Context, state *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeReadStatus(ctx context.Context, state *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeReadStatus: Read status compute with ID", map[string]any{"rg_id": state.ID.ValueString()}) diags := diag.Diagnostics{} @@ -783,7 +788,7 @@ func ComputeReadStatus(ctx context.Context, state *models.ResourceComputeModel, return nil } -func RestoreCompute(ctx context.Context, computeId uint64, c *decort.DecortClient) diag.Diagnostics { +func RestoreCompute(ctx context.Context, computeId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} restoreReq := compute.RestoreRequest{ComputeID: computeId} @@ -802,3 +807,32 @@ func RestoreCompute(ctx context.Context, computeId uint64, c *decort.DecortClien return nil } + +func ComputeResourceAutoStartWithNode(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { + tflog.Info(ctx, "ComputeResourceAutoStartWithNode: Start set auto start with node to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) + diags := diag.Diagnostics{} + + computeId, err := strconv.ParseUint(plan.ID.ValueString(), 10, 64) + if err != nil { + diags.AddError("ComputeResourceAutoStartWithNode: cannot parsed ID compute from plan", err.Error()) + return diags + } + + req := compute.UpdateRequest{ + ComputeID: computeId, + AutoStart: plan.AutoStartWithNode.ValueBool(), + CPUPin: plan.CPUPin.ValueBool(), + HPBacked: plan.HPBacked.ValueBool(), + } + + _, err = c.CloudAPI().Compute().Update(ctx, req) + if err != nil { + diags.AddWarning( + "ComputeResourceAutoStartWithNode: cannot update compute", err.Error(), + ) + return diags + } + + tflog.Info(ctx, "ComputeResourceAutoStartWithNode: auto start with node set is successfully", map[string]any{"compute_id": computeId}) + return nil +} diff --git a/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_update.go b/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_update.go index 33c46fe..6458186 100644 --- a/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_update.go +++ b/internal/service/cloudapi/kvmvm/utilities/utility_resource_compute_update.go @@ -12,13 +12,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/compute" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/kvmvm/models" ) -func ComputeResourceResize(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceResize(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceResize: start resize compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -68,7 +68,7 @@ func ComputeResourceResize(ctx context.Context, state *models.ResourceComputeMod return nil } -func ComputeResourceBootDiskResize(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceBootDiskResize(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceBootDiskResize: start resize boot disk size", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -115,7 +115,7 @@ func ComputeResourceBootDiskResize(ctx context.Context, state *models.ResourceCo return nil } -func ComputeResourceExtraDiskUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceExtraDiskUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceExtraDiskUpdate: start update extra disk(s) list to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -183,7 +183,7 @@ func ComputeResourceExtraDiskUpdate(ctx context.Context, state *models.ResourceC return nil } -func ComputeResourcePCIDeviceUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePCIDeviceUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePCIDeviceUpdate: start update PCI device(s) list to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -232,7 +232,7 @@ func ComputeResourcePCIDeviceUpdate(ctx context.Context, state *models.ResourceC return nil } -func ComputeResourceNetworkUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceNetworkUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceNetworkUpdate: start update network rules to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -358,7 +358,7 @@ func hasDPDKnetwork(networkAttachMap []map[string]attr.Value) bool { return false } -func ComputeResourceComputeUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceComputeUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceComputeUpdate: start update compute parameters", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -384,17 +384,9 @@ func ComputeResourceComputeUpdate(ctx context.Context, state *models.ResourceCom req.NumaAffinity = plan.NumaAffinity.ValueString() } - if !plan.CPUPin.Equal(state.CPUPin) { - req.CPUPin = plan.CPUPin.ValueBool() - } else if state.CPUPin.ValueBool() { - req.CPUPin = state.CPUPin.ValueBool() - } - - if !plan.HPBacked.Equal(state.HPBacked) { - req.HPBacked = plan.HPBacked.ValueBool() - } else if state.HPBacked.ValueBool() { - req.HPBacked = state.HPBacked.ValueBool() - } + req.CPUPin = plan.CPUPin.ValueBool() + req.HPBacked = plan.HPBacked.ValueBool() + req.AutoStart = plan.AutoStartWithNode.ValueBool() if !plan.Chipset.IsUnknown() && !plan.Chipset.Equal(state.Chipset) { req.Chipset = plan.Chipset.ValueString() @@ -404,7 +396,7 @@ func ComputeResourceComputeUpdate(ctx context.Context, state *models.ResourceCom // If STARTED, we need to stop it before update var isStopRequred bool - if !plan.NumaAffinity.Equal(state.NumaAffinity) || !plan.CPUPin.Equal(state.CPUPin) || !plan.HPBacked.Equal(state.HPBacked) { + if !plan.NumaAffinity.Equal(state.NumaAffinity) || !plan.CPUPin.Equal(state.CPUPin) || !plan.HPBacked.Equal(state.HPBacked) || !plan.Chipset.Equal(state.Chipset) { isStopRequred = true tflog.Info(ctx, "ComputeResourceComputeUpdate: stop compute", map[string]any{"compute_id": computeId}) _, err = c.CloudAPI().Compute().Stop(ctx, compute.StopRequest{ComputeID: computeId}) @@ -440,7 +432,7 @@ func ComputeResourceComputeUpdate(ctx context.Context, state *models.ResourceCom return nil } -func ComputeResourceAffinityLabelUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceAffinityLabelUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceAffinityLabelUpdate: start resize boot disk size", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -485,7 +477,7 @@ func ComputeResourceAffinityLabelUpdate(ctx context.Context, plan *models.Resour return nil } -func ComputeResourceAffinityRulesUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceAffinityRulesUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceAffinityRulesUpdate: start update affinity rules to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -585,7 +577,7 @@ func ComputeResourceAffinityRulesUpdate(ctx context.Context, state *models.Resou return nil } -func ComputeResourceAntiAffinityRulesUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceAntiAffinityRulesUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceAntiAffinityRulesUpdate: start update affinity rules to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -685,7 +677,7 @@ func ComputeResourceAntiAffinityRulesUpdate(ctx context.Context, state *models.R return nil } -func ComputeResourceTagsUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceTagsUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceTagsUpdate: start update tags to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -742,7 +734,7 @@ func ComputeResourceTagsUpdate(ctx context.Context, state *models.ResourceComput return nil } -func ComputeResourcePortForwardingUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePortForwardingUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePortForwardingUpdate: start update port forwarding rules to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -834,7 +826,7 @@ func ComputeResourcePortForwardingUpdate(ctx context.Context, state *models.Reso return nil } -func ComputeResourceUserAccessUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceUserAccessUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceUserAccessUpdate: start update user access rules to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -891,7 +883,7 @@ func ComputeResourceUserAccessUpdate(ctx context.Context, state *models.Resource return nil } -func ComputeResourceSnapshotUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceSnapshotUpdate(ctx context.Context, state *models.ResourceComputeModel, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceSnapshotUpdate: start update snapshot(s) to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -947,7 +939,7 @@ func ComputeResourceSnapshotUpdate(ctx context.Context, state *models.ResourceCo return nil } -func ComputeResourceRollback(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceRollback(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceRollback: start rollback to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -1000,7 +992,7 @@ func ComputeResourceRollback(ctx context.Context, plan *models.ResourceComputeMo return nil } -func ComputeResourceCDUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceCDUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceCDUpdate: start update cd list to compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -1039,7 +1031,7 @@ func ComputeResourceCDUpdate(ctx context.Context, plan *models.ResourceComputeMo return nil } -func ComputeResourcePinToStackUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePinToStackUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePinToStackUpdate: Start pin/unpin to stack compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -1056,7 +1048,11 @@ func ComputeResourcePinToStackUpdate(ctx context.Context, plan *models.ResourceC "pin_to_stack": pinToStack}) if pinToStack { - _, err = c.CloudAPI().Compute().PinToStack(ctx, compute.PinToStackRequest{ComputeID: computeId}) + req := compute.PinToStackRequest{ + ComputeID: computeId, + AutoStart: plan.AutoStartWithNode.ValueBool(), + } + _, err = c.CloudAPI().Compute().PinToStack(ctx, req) tflog.Info(ctx, "ComputeResourcePinToStackUpdate: response from CloudAPI().Compute().PinToStack", map[string]any{"compute_id": computeId}) if err != nil { diags.AddError( @@ -1065,6 +1061,12 @@ func ComputeResourcePinToStackUpdate(ctx context.Context, plan *models.ResourceC return diags } } else { + if plan.AutoStartWithNode.ValueBool() { + diags.AddError( + "ComputeResourcePinToStackUpdate: for unpin compute the auto_start_w_node parameter must be false", "", + ) + return diags + } _, err = c.CloudAPI().Compute().UnpinFromStack(ctx, compute.UnpinFromStackRequest{ComputeID: computeId}) tflog.Info(ctx, "ComputeResourcePinToStackUpdate: response from CloudAPI().Compute().UnpinFromStack", map[string]any{"compute_id": computeId}) if err != nil { @@ -1079,7 +1081,7 @@ func ComputeResourcePinToStackUpdate(ctx context.Context, plan *models.ResourceC return nil } -func ComputeResourcePauseResumeCompute(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourcePauseResumeCompute(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourcePauseResumeCompute: Start pause/resume compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -1119,7 +1121,7 @@ func ComputeResourcePauseResumeCompute(ctx context.Context, plan *models.Resourc return nil } -func ComputeResourceResetCompute(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceResetCompute(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceResetCompute: Start reset compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -1143,7 +1145,7 @@ func ComputeResourceResetCompute(ctx context.Context, plan *models.ResourceCompu return nil } -func ComputeResourceRedeploy(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceRedeploy(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceRedeploy: Start redeploy compute with ID", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -1203,7 +1205,7 @@ func ComputeResourceRedeploy(ctx context.Context, plan *models.ResourceComputeMo return nil } -func ComputeResourceCustomFieldUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *decort.DecortClient) diag.Diagnostics { +func ComputeResourceCustomFieldUpdate(ctx context.Context, plan *models.ResourceComputeModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ComputeResourceCustomFieldUpdate: start update custom fields", map[string]any{"compute_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/data_source_lb.go b/internal/service/cloudapi/lb/data_source_lb.go index 1a0a3c9..cc5f3f2 100644 --- a/internal/service/cloudapi/lb/data_source_lb.go +++ b/internal/service/cloudapi/lb/data_source_lb.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/lb/flattens" @@ -26,7 +25,7 @@ func NewDataSourceLB() datasource.DataSource { // dataSourceLB is the data source implementation. type dataSourceLB struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceLB) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/lb/data_source_lb_list.go b/internal/service/cloudapi/lb/data_source_lb_list.go index 8e2de69..303dfda 100644 --- a/internal/service/cloudapi/lb/data_source_lb_list.go +++ b/internal/service/cloudapi/lb/data_source_lb_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/lb/flattens" @@ -26,7 +25,7 @@ func NewDataSourceLBList() datasource.DataSource { // dataSourceLBList is the data source implementation. type dataSourceLBList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceLBList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/lb/data_source_lb_list_deleted.go b/internal/service/cloudapi/lb/data_source_lb_list_deleted.go index 47313d1..1d2db3f 100644 --- a/internal/service/cloudapi/lb/data_source_lb_list_deleted.go +++ b/internal/service/cloudapi/lb/data_source_lb_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/lb/flattens" @@ -26,7 +25,7 @@ func NewDataSourceLBListDeleted() datasource.DataSource { // dataSourceLBListDeleted is the data source implementation. type dataSourceLBListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceLBListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/lb/flattens/flatten_data_source_lb.go b/internal/service/cloudapi/lb/flattens/flatten_data_source_lb.go index e48f629..6707008 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_data_source_lb.go +++ b/internal/service/cloudapi/lb/flattens/flatten_data_source_lb.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/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) @@ -15,7 +15,7 @@ import ( // LBDataSource flattens data source for lb. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func LBDataSource(ctx context.Context, state *models.DataSourceLB, c *decort.DecortClient) diag.Diagnostics { +func LBDataSource(ctx context.Context, state *models.DataSourceLB, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list.go b/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list.go index 92bb927..04f2f24 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list.go +++ b/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list.go @@ -8,12 +8,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/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) -func LBListDataSource(ctx context.Context, state *models.DataSourceLBList, c *decort.DecortClient) diag.Diagnostics { +func LBListDataSource(ctx context.Context, state *models.DataSourceLBList, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBListDataSource") diags := diag.Diagnostics{} @@ -48,7 +48,7 @@ func LBListDataSource(ctx context.Context, state *models.DataSourceLBList, c *de items := make([]models.ItemsLBListModel, 0, len(lbList.Data)) for _, lbItem := range lbList.Data { acl, _ := json.Marshal(lbItem.ACL) - + item := models.ItemsLBListModel{ HAMode: types.BoolValue(lbItem.HAMode), ACL: types.StringValue(string(acl)), diff --git a/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list_deleted.go b/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list_deleted.go index e49c8a6..fe39870 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list_deleted.go +++ b/internal/service/cloudapi/lb/flattens/flatten_data_source_lb_list_deleted.go @@ -8,12 +8,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/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) -func LBListDeletedDataSource(ctx context.Context, state *models.DataSourceLBListDeleted, c *decort.DecortClient) diag.Diagnostics { +func LBListDeletedDataSource(ctx context.Context, state *models.DataSourceLBListDeleted, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBListDeletedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/flattens/flatten_resource_lb.go b/internal/service/cloudapi/lb/flattens/flatten_resource_lb.go index c7301d0..3835106 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_resource_lb.go +++ b/internal/service/cloudapi/lb/flattens/flatten_resource_lb.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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) -func LBResource(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBResource(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend.go b/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend.go index 192aca4..cf24adc 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend.go +++ b/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend.go @@ -7,13 +7,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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) -func LBBackendResource(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func LBBackendResource(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBBackendResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend_server.go b/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend_server.go index 3dd9340..f894e5c 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend_server.go +++ b/internal/service/cloudapi/lb/flattens/flatten_resource_lb_backend_server.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/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) -func LBBackendServerResource(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func LBBackendServerResource(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBBackendServerResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend.go b/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend.go index 4c5339d..fedd59a 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend.go +++ b/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend.go @@ -7,13 +7,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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) -func LBFrontendResource(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) diag.Diagnostics { +func LBFrontendResource(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBFrontendResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend_bind.go b/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend_bind.go index a9146b5..f325436 100644 --- a/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend_bind.go +++ b/internal/service/cloudapi/lb/flattens/flatten_resoursce_lb_frontend_bind.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/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/utilities" ) -func LBFrontendBindResource(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func LBFrontendBindResource(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBFrontendBindResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/input_check.go b/internal/service/cloudapi/lb/input_check.go index f0d2e98..ad1ffd8 100644 --- a/internal/service/cloudapi/lb/input_check.go +++ b/internal/service/cloudapi/lb/input_check.go @@ -6,13 +6,13 @@ 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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" ) // resourceLBInputChecks checks if rg_id, extnet_id and vins_id are valid. -func resourceLBInputChecks(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBInputChecks(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} rgID := uint64(plan.RGID.ValueInt64()) @@ -41,7 +41,7 @@ func resourceLBInputChecks(ctx context.Context, plan *models.ResourceLBModel, c } // resourceLBBackendInputChecks checks if lb_id are valid. -func resourceLBBackendInputChecks(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBBackendInputChecks(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) @@ -55,7 +55,7 @@ func resourceLBBackendInputChecks(ctx context.Context, plan *models.ResourceLBBa } // resourceLBFrontendInputChecks checks if lb_id and backend_name are valid. -func resourceLBFrontendInputChecks(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBFrontendInputChecks(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) @@ -76,7 +76,7 @@ func resourceLBFrontendInputChecks(ctx context.Context, plan *models.ResourceLBF } // resourceLBFrontendBindInputChecks checks if lb_id and backend_name are valid. -func resourceLBFrontendBindInputChecks(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBFrontendBindInputChecks(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) @@ -97,7 +97,7 @@ func resourceLBFrontendBindInputChecks(ctx context.Context, plan *models.Resourc } // resourceLBBackendServerInputChecks checks if lb_id and backend_name are valid. -func resourceLBBackendServerInputChecks(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBBackendServerInputChecks(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) diff --git a/internal/service/cloudapi/lb/resource_lb.go b/internal/service/cloudapi/lb/resource_lb.go index 76e5d4a..16fe367 100644 --- a/internal/service/cloudapi/lb/resource_lb.go +++ b/internal/service/cloudapi/lb/resource_lb.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/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -33,7 +32,7 @@ func NewResourceLB() resource.Resource { // resourceLB is the resource implementation. type resourceLB struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLB) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudapi/lb/resource_lb_backend.go b/internal/service/cloudapi/lb/resource_lb_backend.go index 7909034..749c574 100644 --- a/internal/service/cloudapi/lb/resource_lb_backend.go +++ b/internal/service/cloudapi/lb/resource_lb_backend.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/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBBackend() resource.Resource { // resourceLBBackend is the resource implementation. type resourceLBBackend struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBBackend) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudapi/lb/resource_lb_backend_server.go b/internal/service/cloudapi/lb/resource_lb_backend_server.go index 2fa0643..a362228 100644 --- a/internal/service/cloudapi/lb/resource_lb_backend_server.go +++ b/internal/service/cloudapi/lb/resource_lb_backend_server.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/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBBackendServer() resource.Resource { // resourceLBBackendServer is the resource implementation. type resourceLBBackendServer struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBBackendServer) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudapi/lb/resource_lb_frontend.go b/internal/service/cloudapi/lb/resource_lb_frontend.go index e7345f9..96698d2 100644 --- a/internal/service/cloudapi/lb/resource_lb_frontend.go +++ b/internal/service/cloudapi/lb/resource_lb_frontend.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/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBFrontend() resource.Resource { // resourceLBFrontend is the resource implementation. type resourceLBFrontend struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBFrontend) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudapi/lb/resource_lb_frontend_bind.go b/internal/service/cloudapi/lb/resource_lb_frontend_bind.go index 5ffe619..b896a51 100644 --- a/internal/service/cloudapi/lb/resource_lb_frontend_bind.go +++ b/internal/service/cloudapi/lb/resource_lb_frontend_bind.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/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBFrontendBind() resource.Resource { // resourceLBFrontendBind is the resource implementation. type resourceLBFrontendBind struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBFrontendBind) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudapi/lb/utilities/utility_data_source_lb.go b/internal/service/cloudapi/lb/utilities/utility_data_source_lb.go index 50afade..6f3558c 100644 --- a/internal/service/cloudapi/lb/utilities/utility_data_source_lb.go +++ b/internal/service/cloudapi/lb/utilities/utility_data_source_lb.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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func LBDataSourceCheckPresence(ctx context.Context, lbId uint64, c *decort.DecortClient) (*lb.RecordLB, diag.Diagnostics) { +func LBDataSourceCheckPresence(ctx context.Context, lbId uint64, c *client.Client) (*lb.RecordLB, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBDataSourceCheckPresence: Get info about lb with ID - %v", lbId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/utilities/utility_data_source_lb_list.go b/internal/service/cloudapi/lb/utilities/utility_data_source_lb_list.go index 9c6fdb1..14783e3 100644 --- a/internal/service/cloudapi/lb/utilities/utility_data_source_lb_list.go +++ b/internal/service/cloudapi/lb/utilities/utility_data_source_lb_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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" ) -func LBListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBList, c *decort.DecortClient) (*lb.ListLB, error) { +func LBListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBList, c *client.Client) (*lb.ListLB, error) { listLBReq := lb.ListRequest{} diff --git a/internal/service/cloudapi/lb/utilities/utility_data_source_lb_list_deleted.go b/internal/service/cloudapi/lb/utilities/utility_data_source_lb_list_deleted.go index 0ed789e..2987e73 100644 --- a/internal/service/cloudapi/lb/utilities/utility_data_source_lb_list_deleted.go +++ b/internal/service/cloudapi/lb/utilities/utility_data_source_lb_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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" ) -func LBListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBListDeleted, c *decort.DecortClient) (*lb.ListLB, error) { +func LBListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBListDeleted, c *client.Client) (*lb.ListLB, error) { req := lb.ListDeletedRequest{} diff --git a/internal/service/cloudapi/lb/utilities/utility_resource_lb.go b/internal/service/cloudapi/lb/utilities/utility_resource_lb.go index ab88f17..d5ca2c6 100644 --- a/internal/service/cloudapi/lb/utilities/utility_resource_lb.go +++ b/internal/service/cloudapi/lb/utilities/utility_resource_lb.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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) -func CreateResourceLB(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateResourceLB(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLB: name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -63,7 +63,7 @@ func CreateResourceLB(ctx context.Context, plan *models.ResourceLBModel, c *deco return lbId, nil } -func LBResourceCheckPresence(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) (*lb.RecordLB, diag.Diagnostics) { +func LBResourceCheckPresence(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) (*lb.RecordLB, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBCheckPresence: Get info about LB with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -83,7 +83,7 @@ func LBResourceCheckPresence(ctx context.Context, plan *models.ResourceLBModel, return lbItem, nil } -func LBEnableDisable(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBEnableDisable(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "EnableDisable lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} lbId, err := strconv.ParseUint(plan.ID.ValueString(), 10, 64) @@ -109,7 +109,7 @@ func LBEnableDisable(ctx context.Context, plan *models.ResourceLBModel, c *decor return diags } -func LBReadStatus(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBReadStatus(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Read status lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -167,7 +167,7 @@ func LBReadStatus(ctx context.Context, plan *models.ResourceLBModel, c *decort.D return diags } -func LBRestore(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBRestore(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Restore lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -188,7 +188,7 @@ func LBRestore(ctx context.Context, plan *models.ResourceLBModel, c *decort.Deco return diags } -func LBStartStop(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBStartStop(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "StartStop lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} lbId, err := strconv.ParseUint(plan.ID.ValueString(), 10, 64) @@ -220,7 +220,7 @@ func LBStartStop(ctx context.Context, plan *models.ResourceLBModel, c *decort.De return diags } -func LBUpdateHaMode(ctx context.Context, state *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBUpdateHaMode(ctx context.Context, state *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update ha mode from lb with ID", map[string]any{"id": state.ID.ValueString()}) diags := diag.Diagnostics{} @@ -242,7 +242,7 @@ func LBUpdateHaMode(ctx context.Context, state *models.ResourceLBModel, c *decor return diags } -func LBUpdateSysctlParams(ctx context.Context, plan *models.ResourceLBModel, state *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBUpdateSysctlParams(ctx context.Context, plan *models.ResourceLBModel, state *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update sysctl parameters from LB with ID", map[string]any{"id": state.ID.ValueString()}) diags := diag.Diagnostics{} @@ -279,7 +279,7 @@ func LBUpdateSysctlParams(ctx context.Context, plan *models.ResourceLBModel, sta return diags } -func LBUpdateDescription(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBUpdateDescription(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update description from lb with ID", map[string]any{"id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -301,7 +301,7 @@ func LBUpdateDescription(ctx context.Context, plan *models.ResourceLBModel, c *d return diags } -func LBRestart(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBRestart(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Restart lb with ID", map[string]any{"id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -332,7 +332,7 @@ func LBRestart(ctx context.Context, plan *models.ResourceLBModel, c *decort.Deco return diags } -func LBConfigReset(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBConfigReset(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Reset config from lb with ID", map[string]any{"id": plan.ID.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend.go b/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend.go index 74f975a..d06d25f 100644 --- a/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend.go +++ b/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend.go @@ -8,12 +8,12 @@ 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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" ) -func CreateResourceLBBackend(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBBackend(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBBackend: backend_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -71,7 +71,7 @@ func CreateResourceLBBackend(ctx context.Context, plan *models.ResourceLBBackend return nil } -func LBBackendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) (*lb.ItemBackend, diag.Diagnostics) { +func LBBackendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) (*lb.ItemBackend, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBBackendCheckPresence: Get info about LB Backend with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -109,7 +109,7 @@ func LBBackendResourceCheckPresence(ctx context.Context, plan *models.ResourceLB return nil, diags } -func UpdateLBBackend(ctx context.Context, plan, state *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateLBBackend(ctx context.Context, plan, state *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("UpdateLBBackend: Start edit lb backend with ID - %v", state.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend_server.go b/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend_server.go index 6a36be2..3383bb2 100644 --- a/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend_server.go +++ b/internal/service/cloudapi/lb/utilities/utility_resource_lb_backend_server.go @@ -8,12 +8,12 @@ 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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" ) -func CreateResourceLBBackendServer(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBBackendServer(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBBackendServer: name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -74,7 +74,7 @@ func CreateResourceLBBackendServer(ctx context.Context, plan *models.ResourceLBB return nil } -func LBBackendServerResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) (*lb.ItemServer, diag.Diagnostics) { +func LBBackendServerResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) (*lb.ItemServer, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBBackendServerCheckPresence: Get info about LB Backend Server with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -126,7 +126,7 @@ func LBBackendServerResourceCheckPresence(ctx context.Context, plan *models.Reso return nil, diags } -func UpdateLBBackendServer(ctx context.Context, plan, state *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateLBBackendServer(ctx context.Context, plan, state *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("UpdateLBBackendServer: Start edit lb backend server with ID - %v", state.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend.go b/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend.go index ae6ee19..4c8e499 100644 --- a/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend.go +++ b/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend.go @@ -8,12 +8,12 @@ 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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" ) -func CreateResourceLBFrontend(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBFrontend(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBFrontend: frontend_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -36,7 +36,7 @@ func CreateResourceLBFrontend(ctx context.Context, plan *models.ResourceLBFronte return nil } -func LBFrontendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) (*lb.ItemFrontend, diag.Diagnostics) { +func LBFrontendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) (*lb.ItemFrontend, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBFrontendCheckPresence: Get info about LB Frontend with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend_bind.go b/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend_bind.go index 7b95336..4c75a6a 100644 --- a/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend_bind.go +++ b/internal/service/cloudapi/lb/utilities/utility_resource_lb_frontend_bind.go @@ -8,12 +8,12 @@ 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/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/lb/models" ) -func CreateResourceLBFrontendBind(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBFrontendBind(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBFrontendBind: frontend_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -38,7 +38,7 @@ func CreateResourceLBFrontendBind(ctx context.Context, plan *models.ResourceLBFr return nil } -func LBFrontendBindResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) (*lb.ItemBinding, diag.Diagnostics) { +func LBFrontendBindResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) (*lb.ItemBinding, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBFrontendBindCheckPresence: Get info about LB Frontend Bind with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -90,7 +90,7 @@ func LBFrontendBindResourceCheckPresence(ctx context.Context, plan *models.Resou return nil, diags } -func UpdateLBFrontendBind(ctx context.Context, plan, state *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateLBFrontendBind(ctx context.Context, plan, state *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("UpdateLBFrontendBind: Start edit lb frontend bind with ID - %v", state.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/data_source_rg.go b/internal/service/cloudapi/rg/data_source_rg.go index d36ebaa..9a878fe 100644 --- a/internal/service/cloudapi/rg/data_source_rg.go +++ b/internal/service/cloudapi/rg/data_source_rg.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRG() datasource.DataSource { // dataSourceRG is the data source implementation. type dataSourceRG struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRG) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_affinity_group_computes.go b/internal/service/cloudapi/rg/data_source_rg_affinity_group_computes.go index ded5d96..02c9082 100644 --- a/internal/service/cloudapi/rg/data_source_rg_affinity_group_computes.go +++ b/internal/service/cloudapi/rg/data_source_rg_affinity_group_computes.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAffinityGroupComputes() datasource.DataSource { // dataSourceRGAffinityGroupComputes is the data source implementation. type dataSourceRGAffinityGroupComputes struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAffinityGroupComputes) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_affinity_groups_get.go b/internal/service/cloudapi/rg/data_source_rg_affinity_groups_get.go index 55cd8a4..b1f062b 100644 --- a/internal/service/cloudapi/rg/data_source_rg_affinity_groups_get.go +++ b/internal/service/cloudapi/rg/data_source_rg_affinity_groups_get.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAffinityGroupsGet() datasource.DataSource { // dataSourceRGAffinityGroupsGet is the data source implementation. type dataSourceRGAffinityGroupsGet struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAffinityGroupsGet) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go b/internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go index f790a98..79790bf 100644 --- a/internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go +++ b/internal/service/cloudapi/rg/data_source_rg_affinity_groups_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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAffinityGroupsList() datasource.DataSource { // dataSourceRGAffinityGroupsList is the data source implementation. type dataSourceRGAffinityGroupsList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAffinityGroupsList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_audits.go b/internal/service/cloudapi/rg/data_source_rg_audits.go index 4cd8864..f208ecf 100644 --- a/internal/service/cloudapi/rg/data_source_rg_audits.go +++ b/internal/service/cloudapi/rg/data_source_rg_audits.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAudits() datasource.DataSource { // dataSourceRGAudits is the data source implementation. type dataSourceRGAudits struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAudits) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_get_resource_consumption.go b/internal/service/cloudapi/rg/data_source_rg_get_resource_consumption.go index fd33cac..1c75d65 100644 --- a/internal/service/cloudapi/rg/data_source_rg_get_resource_consumption.go +++ b/internal/service/cloudapi/rg/data_source_rg_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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGGetResourceConsumption() datasource.DataSource { // dataSourceRGGetResourceConsumption is the data source implementation. type dataSourceRGGetResourceConsumption struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGGetResourceConsumption) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_list.go b/internal/service/cloudapi/rg/data_source_rg_list.go index bbc521b..6ae7b8b 100644 --- a/internal/service/cloudapi/rg/data_source_rg_list.go +++ b/internal/service/cloudapi/rg/data_source_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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGList() datasource.DataSource { // dataSourceRGList is the data source implementation. type dataSourceRGList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_list_computes.go b/internal/service/cloudapi/rg/data_source_rg_list_computes.go index c7a07d1..89bdefb 100644 --- a/internal/service/cloudapi/rg/data_source_rg_list_computes.go +++ b/internal/service/cloudapi/rg/data_source_rg_list_computes.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListComputes() datasource.DataSource { // dataSourceRGListComputes is the data source implementation. type dataSourceRGListComputes struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListComputes) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_list_deleted.go b/internal/service/cloudapi/rg/data_source_rg_list_deleted.go index 20085e5..c5598b2 100644 --- a/internal/service/cloudapi/rg/data_source_rg_list_deleted.go +++ b/internal/service/cloudapi/rg/data_source_rg_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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListDeleted() datasource.DataSource { // dataSourceRGListDeleted is the data source implementation. type dataSourceRGListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_list_lb.go b/internal/service/cloudapi/rg/data_source_rg_list_lb.go index aa01689..7253a69 100644 --- a/internal/service/cloudapi/rg/data_source_rg_list_lb.go +++ b/internal/service/cloudapi/rg/data_source_rg_list_lb.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListLB() datasource.DataSource { // dataSourceRGListLB is the data source implementation. type dataSourceRGListLB struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListLB) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_list_pfw.go b/internal/service/cloudapi/rg/data_source_rg_list_pfw.go index 336a10e..40c3221 100644 --- a/internal/service/cloudapi/rg/data_source_rg_list_pfw.go +++ b/internal/service/cloudapi/rg/data_source_rg_list_pfw.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListPFW() datasource.DataSource { // dataSourceRGListPFW is the data source implementation. type dataSourceRGListPFW struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListPFW) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_list_vins.go b/internal/service/cloudapi/rg/data_source_rg_list_vins.go index f1329bb..ddf20db 100644 --- a/internal/service/cloudapi/rg/data_source_rg_list_vins.go +++ b/internal/service/cloudapi/rg/data_source_rg_list_vins.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListVins() datasource.DataSource { // dataSourceRGListVins is the data source implementation. type dataSourceRGListVins struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListVins) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_resource_consumption_list.go b/internal/service/cloudapi/rg/data_source_rg_resource_consumption_list.go index c8f65b8..01341bf 100644 --- a/internal/service/cloudapi/rg/data_source_rg_resource_consumption_list.go +++ b/internal/service/cloudapi/rg/data_source_rg_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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGResourceConsumptionList() datasource.DataSource { // dataSourceRGResourceConsumptionList is the data source implementation. type dataSourceRGResourceConsumptionList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGResourceConsumptionList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/data_source_rg_usage.go b/internal/service/cloudapi/rg/data_source_rg_usage.go index 2923871..adb095e 100644 --- a/internal/service/cloudapi/rg/data_source_rg_usage.go +++ b/internal/service/cloudapi/rg/data_source_rg_usage.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/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGUsage() datasource.DataSource { // dataSourceRGUsage is the data source implementation. type dataSourceRGUsage struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGUsage) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg.go index 1ba149c..619a476 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGDataSource flattens data source for rg (resource group). // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGDataSource(ctx context.Context, state *models.DataSourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func RGDataSource(ctx context.Context, state *models.DataSourceRGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_group_computes.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_group_computes.go index 24d328f..1e693bb 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_group_computes.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_group_computes.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGAffinityGroupComputesDataSource flattens data source for rg affinity group computes. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAffinityGroupComputesDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupComputesModel, c *decort.DecortClient) diag.Diagnostics { +func RGAffinityGroupComputesDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAffinityGroupComputesDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_get.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_get.go index afb8f52..46d511f 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_get.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_get.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGAffinityGroupsGetDataSource flattens data source for rg affinity groups get. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAffinityGroupsGetDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsGetModel, c *decort.DecortClient) diag.Diagnostics { +func RGAffinityGroupsGetDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsGetModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAffinityGroupsGetDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_list.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_list.go index fe3971a..e078a3d 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_list.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_affinity_groups_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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGAffinityGroupsListDataSource flattens data source for rg affinity groups list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAffinityGroupsListDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsListModel, c *decort.DecortClient) diag.Diagnostics { +func RGAffinityGroupsListDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAffinityGroupsListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_audits.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_audits.go index 73406bc..cbf0282 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_audits.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_audits.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGAuditsDataSource flattens data source for rg audits. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAuditsDataSource(ctx context.Context, state *models.DataSourceRGAuditsModel, c *decort.DecortClient) diag.Diagnostics { +func RGAuditsDataSource(ctx context.Context, state *models.DataSourceRGAuditsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAuditsDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_get_resource_consumption.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_get_resource_consumption.go index 18de051..b96cb16 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_get_resource_consumption.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_get_resource_consumption.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGGetResourceConsumptionDataSource 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 RGGetResourceConsumptionDataSource(ctx context.Context, state *models.DataSourceRGGetResourceConsumptionModel, c *decort.DecortClient) diag.Diagnostics { +func RGGetResourceConsumptionDataSource(ctx context.Context, state *models.DataSourceRGGetResourceConsumptionModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGGetResourceConsumptionDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list.go index 7fa5514..fc8be65 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGListDataSource flattens data source for rg list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListDataSource(ctx context.Context, state *models.DataSourceRGListModel, c *decort.DecortClient) diag.Diagnostics { +func RGListDataSource(ctx context.Context, state *models.DataSourceRGListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_computes.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_computes.go index ded95b3..c85d90b 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_computes.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_computes.go @@ -10,7 +10,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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -18,7 +18,7 @@ import ( // RGListComputesDataSource flattens data source for rg list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListComputesDataSource(ctx context.Context, state *models.DataSourceRGListComputesModel, c *decort.DecortClient) diag.Diagnostics { +func RGListComputesDataSource(ctx context.Context, state *models.DataSourceRGListComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListComputesDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_deleted.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_deleted.go index 3ea13ed..9489861 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_deleted.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGListDeletedDataSource flattens data source for rg list deleted. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListDeletedDataSource(ctx context.Context, state *models.DataSourceRGListDeletedModel, c *decort.DecortClient) diag.Diagnostics { +func RGListDeletedDataSource(ctx context.Context, state *models.DataSourceRGListDeletedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListDeletedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_lb.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_lb.go index 1ca9a26..6e6e078 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_lb.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_lb.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGListLBDataSource flattens data source for rg list lb. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListLBDataSource(ctx context.Context, state *models.DataSourceRGListLBModel, c *decort.DecortClient) diag.Diagnostics { +func RGListLBDataSource(ctx context.Context, state *models.DataSourceRGListLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListLBDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_pfw.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_pfw.go index 93d731d..9f6b9bd 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_pfw.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_pfw.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGListPFWDataSource flattens data source for rg list pfw. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListPFWDataSource(ctx context.Context, state *models.DataSourceRGListPFWModel, c *decort.DecortClient) diag.Diagnostics { +func RGListPFWDataSource(ctx context.Context, state *models.DataSourceRGListPFWModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListPFWDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_vins.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_vins.go index a52847b..e73a1d8 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_vins.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_list_vins.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGListVinsDataSource flattens data source for rg list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListVinsDataSource(ctx context.Context, state *models.DataSourceRGListVinsModel, c *decort.DecortClient) diag.Diagnostics { +func RGListVinsDataSource(ctx context.Context, state *models.DataSourceRGListVinsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListVinsDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_resource_consumption_list.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_resource_consumption_list.go index a8b70a9..4c73ccb 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_resource_consumption_list.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_resource_consumption_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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGResourceConsumptionListDataSource flattens data source for rg resource consumption list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGResourceConsumptionListDataSource(ctx context.Context, state *models.DataSourceRGResourceConsumptionListModel, c *decort.DecortClient) diag.Diagnostics { +func RGResourceConsumptionListDataSource(ctx context.Context, state *models.DataSourceRGResourceConsumptionListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGResourceConsumptionListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_usage.go b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_usage.go index 6e92d1b..2bf1c96 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_usage.go +++ b/internal/service/cloudapi/rg/flattens/flatten_data_source_rg_usage.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/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGUsageDataSource flattens data source for rg usage. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGUsageDataSource(ctx context.Context, state *models.DataSourceRGUsageModel, c *decort.DecortClient) diag.Diagnostics { +func RGUsageDataSource(ctx context.Context, state *models.DataSourceRGUsageModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGUsageDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/flattens/flatten_resource_rg.go b/internal/service/cloudapi/rg/flattens/flatten_resource_rg.go index b74f21e..0dab912 100644 --- a/internal/service/cloudapi/rg/flattens/flatten_resource_rg.go +++ b/internal/service/cloudapi/rg/flattens/flatten_resource_rg.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/utilities" ) @@ -17,7 +17,7 @@ import ( // RGResource flattens resource for rg (resource group). // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func RGResource(ctx context.Context, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func RGResource(ctx context.Context, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/rg/input_checks.go b/internal/service/cloudapi/rg/input_checks.go index 9e61b95..6be78ad 100644 --- a/internal/service/cloudapi/rg/input_checks.go +++ b/internal/service/cloudapi/rg/input_checks.go @@ -6,12 +6,12 @@ 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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func resourceRgInputChecks(ctx context.Context, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func resourceRgInputChecks(ctx context.Context, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} accountId := uint64(plan.AccountID.ValueInt64()) diff --git a/internal/service/cloudapi/rg/resource_rg.go b/internal/service/cloudapi/rg/resource_rg.go index 0b20b3f..66a6217 100644 --- a/internal/service/cloudapi/rg/resource_rg.go +++ b/internal/service/cloudapi/rg/resource_rg.go @@ -13,7 +13,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/rg" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -36,7 +35,7 @@ func NewResourceRG() resource.Resource { // resourceRG is the resource implementation. type resourceRG struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_group_computes.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_group_computes.go index 4ed086e..4c169b1 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_group_computes.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_group_computes.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg" ) -func RGAffinityGroupComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupComputesModel, c *decort.DecortClient) (*rg.ListAffinityGroupsComputes, error) { +func RGAffinityGroupComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupComputesModel, c *client.Client) (*rg.ListAffinityGroupsComputes, error) { agCompsReq := rg.AffinityGroupComputesRequest{ RGID: uint64(plan.RGID.ValueInt64()), AffinityGroup: plan.AffinityGroup.ValueString(), diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_get.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_get.go index aca796f..1c0b193 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_get.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_get.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg" ) -func RGAffinityGroupsGetCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsGetModel, c *decort.DecortClient) ([]uint64, error) { +func RGAffinityGroupsGetCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsGetModel, c *client.Client) ([]uint64, error) { agReq := rg.AffinityGroupsGetRequest{ RGID: uint64(plan.RGID.ValueInt64()), AffinityGroup: plan.AffinityGroup.ValueString(), diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_list.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_list.go index 22e759e..f7ae7e0 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_list.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_affinity_groups_list.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg" ) -func RGAffinityGroupsListCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsListModel, c *decort.DecortClient) (*rg.ListAffinityGroups, error) { +func RGAffinityGroupsListCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsListModel, c *client.Client) (*rg.ListAffinityGroups, error) { agListReq := rg.AffinityGroupsListRequest{RGID: uint64(plan.RGID.ValueInt64())} if !plan.Page.IsNull() { diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_audits.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_audits.go index 65e9693..a5071a3 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_audits.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_audits.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGAuditsCheckPresence(ctx context.Context, plan *models.DataSourceRGAuditsModel, c *decort.DecortClient) (*rg.ListAudits, error) { +func RGAuditsCheckPresence(ctx context.Context, plan *models.DataSourceRGAuditsModel, c *client.Client) (*rg.ListAudits, error) { auditsReq := rg.AuditsRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_get_resource_consumption.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_get_resource_consumption.go index 5a936cc..e4a8770 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_get_resource_consumption.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_get_resource_consumption.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGGetResourceConsumptionCheckPresence(ctx context.Context, plan *models.DataSourceRGGetResourceConsumptionModel, c *decort.DecortClient) (*rg.ItemResourceConsumption, error) { +func RGGetResourceConsumptionCheckPresence(ctx context.Context, plan *models.DataSourceRGGetResourceConsumptionModel, c *client.Client) (*rg.ItemResourceConsumption, error) { resConsReq := rg.GetResourceConsumptionRequest{RGID: uint64(plan.RGID.ValueInt64())} tflog.Info(ctx, "RGGetResourceConsumptionCheckPresence: before call CloudAPI().RG().GetResourceConsumption", map[string]any{"response": resConsReq}) diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list.go index ba62922..3ea1a34 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGListCheckPresence(ctx context.Context, plan *models.DataSourceRGListModel, c *decort.DecortClient) (*rg.ListResourceGroups, error) { +func RGListCheckPresence(ctx context.Context, plan *models.DataSourceRGListModel, c *client.Client) (*rg.ListResourceGroups, error) { listReq := rg.ListRequest{} if !plan.ById.IsNull() { diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_computes.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_computes.go index 0636135..2f0c342 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_computes.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_computes.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGListComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGListComputesModel, c *decort.DecortClient) (*rg.ListComputes, error) { +func RGListComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGListComputesModel, c *client.Client) (*rg.ListComputes, error) { listCompReq := rg.ListComputesRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_deleted.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_deleted.go index 7ac3241..d6f7ea7 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_deleted.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGListDeletedCheckPresence(ctx context.Context, plan *models.DataSourceRGListDeletedModel, c *decort.DecortClient) (*rg.ListResourceGroups, error) { +func RGListDeletedCheckPresence(ctx context.Context, plan *models.DataSourceRGListDeletedModel, c *client.Client) (*rg.ListResourceGroups, error) { listDelReq := rg.ListDeletedRequest{} if !plan.ById.IsNull() { diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_lb.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_lb.go index a9b7158..9e46dfd 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_lb.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_lb.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGListLBCheckPresence(ctx context.Context, plan *models.DataSourceRGListLBModel, c *decort.DecortClient) (*rg.ListLB, error) { +func RGListLBCheckPresence(ctx context.Context, plan *models.DataSourceRGListLBModel, c *client.Client) (*rg.ListLB, error) { listLBReq := rg.ListLBRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_pfw.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_pfw.go index 9a83b13..c2f7181 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_pfw.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_pfw.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGListPFWCheckPresence(ctx context.Context, plan *models.DataSourceRGListPFWModel, c *decort.DecortClient) (*rg.ListPortForwards, error) { +func RGListPFWCheckPresence(ctx context.Context, plan *models.DataSourceRGListPFWModel, c *client.Client) (*rg.ListPortForwards, error) { listPFWReq := rg.ListPFWRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_vins.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_vins.go index 29ebb8d..17df410 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_vins.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_list_vins.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGListVinsCheckPresence(ctx context.Context, plan *models.DataSourceRGListVinsModel, c *decort.DecortClient) (*rg.ListVINS, error) { +func RGListVinsCheckPresence(ctx context.Context, plan *models.DataSourceRGListVinsModel, c *client.Client) (*rg.ListVINS, error) { listVinsReq := rg.ListVINSRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_resource_consumption_list.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_resource_consumption_list.go index c8c74f4..54d5e72 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_resource_consumption_list.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func RGResourceConsumptionListCheckPresence(ctx context.Context, c *decort.DecortClient) (*rg.ListResourceConsumption, error) { +func RGResourceConsumptionListCheckPresence(ctx context.Context, c *client.Client) (*rg.ListResourceConsumption, error) { tflog.Info(ctx, "RGResourceConsumptionListCheckPresence: before call CloudAPI().RG().ListResourceConsumption") resConsList, err := c.CloudAPI().RG().ListResourceConsumption(ctx) if err != nil { diff --git a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_usage.go b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_usage.go index 5ce5619..dd53be3 100644 --- a/internal/service/cloudapi/rg/utilities/utility_data_source_rg_usage.go +++ b/internal/service/cloudapi/rg/utilities/utility_data_source_rg_usage.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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" ) -func RGUsageCheckPresence(ctx context.Context, plan *models.DataSourceRGUsageModel, c *decort.DecortClient) (*rg.RecordResourceUsage, error) { +func RGUsageCheckPresence(ctx context.Context, plan *models.DataSourceRGUsageModel, c *client.Client) (*rg.RecordResourceUsage, error) { usageReq := rg.UsageRequest{RGID: uint64(plan.RGID.ValueInt64())} tflog.Info(ctx, "RGUsageCheckPresence: before call CloudAPI().RG().Usage", map[string]any{"response": usageReq}) diff --git a/internal/service/cloudapi/rg/utilities/utility_resource_rg.go b/internal/service/cloudapi/rg/utilities/utility_resource_rg.go index 91e2d5d..34d611c 100644 --- a/internal/service/cloudapi/rg/utilities/utility_resource_rg.go +++ b/internal/service/cloudapi/rg/utilities/utility_resource_rg.go @@ -10,8 +10,8 @@ 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/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) @@ -101,7 +101,7 @@ func CreateRequestResourceRG(ctx context.Context, plan *models.ResourceRGModel) return createReq, nil } -func RGCheckPresence(ctx context.Context, rgId uint64, c *decort.DecortClient) (*rg.RecordResourceGroup, error) { +func RGCheckPresence(ctx context.Context, rgId uint64, c *client.Client) (*rg.RecordResourceGroup, error) { tflog.Info(ctx, fmt.Sprintf("Get info about resource group with ID - %v", rgId)) recordRG, err := c.CloudAPI().RG().Get(ctx, rg.GetRequest{RGID: rgId}) @@ -115,7 +115,7 @@ func RGCheckPresence(ctx context.Context, rgId uint64, c *decort.DecortClient) ( } // RestoreRG performs resource group Restore request. Returns error in case of failures. -func RestoreRG(ctx context.Context, rgId uint64, c *decort.DecortClient) diag.Diagnostics { +func RestoreRG(ctx context.Context, rgId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} restoreReq := rg.RestoreRequest{RGID: rgId} @@ -136,7 +136,7 @@ func RestoreRG(ctx context.Context, rgId uint64, c *decort.DecortClient) diag.Di } // EnableRG performs resource group Enable request -func EnableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) error { +func EnableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) error { enableReq := rg.EnableRequest{RGID: rgId} tflog.Info(ctx, "utilityEnableRG: before calling CloudAPI().RG().Enable", map[string]any{"rg_id": rgId, "req": enableReq}) @@ -149,7 +149,7 @@ func EnableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c } // DisableRG performs resource group Disable request -func DisableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) error { +func DisableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) error { disableReq := rg.DisableRequest{RGID: rgId} tflog.Info(ctx, "utilityDisableRG: before calling CloudAPI().RG().Disable", map[string]any{"rg_id": rgId, "req": disableReq}) @@ -162,7 +162,7 @@ func DisableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c // UpdateRG compares plan and state for resource group fields name, description, quota, register_computes. // If any changes are detected, Update request is performed. If not, no update is performed. -func UpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { var updateNeeded bool var diags diag.Diagnostics @@ -304,7 +304,7 @@ func UpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGMo // EnableDisableCreateRG performs Enable request is enable is true, and Disable request otherwise. // In case of failure returns warnings. -func EnableDisableCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func EnableDisableCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} var enable bool @@ -346,7 +346,7 @@ func EnableDisableCreateRG(ctx context.Context, rgId uint64, plan *models.Resour // EnableDisableUpdateRG performs Enable request is enable is true, and Disable request otherwise. // In case of failure returns errors. -func EnableDisableUpdateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func EnableDisableUpdateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} var enable bool @@ -390,7 +390,7 @@ func EnableDisableUpdateRG(ctx context.Context, rgId uint64, plan *models.Resour // If changes are detected, AccessRevoke request is performed for each deleted access user and AccessGrant request is // performed for each added access user. If no changes are detected, no requests performed. // Returns errors in case of failures. -func AccessUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func AccessUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} itemsAccessPlan := make([]models.AccessModel, 0, len(plan.Access.Elements())) @@ -481,7 +481,7 @@ func AccessUpdateRG(ctx context.Context, rgId uint64, plan, state *models.Resour // AccessCreateRG grants access to users specified in access field for created resource. // In case of failure returns warnings. -func AccessCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func AccessCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if len(plan.Access.Elements()) != 0 { @@ -532,7 +532,7 @@ func AccessCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGMod // SetDefNetUpdateRG compares plan and state for resource group update field def_net. // If any changes are detected, SetDefNet request is performed. If not, no SetDefNet is performed. // Returns error in case of failures. -func SetDefNetUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func SetDefNetUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} var setDefNetNeeded bool @@ -617,7 +617,7 @@ func SetDefNetUpdateRG(ctx context.Context, rgId uint64, plan, state *models.Res // SetDefNetCreateRG performs SetDefNet request if def_net field is not empty. Otherwise, no SetDefNet request is performed. // In case of failure returns warnings. -func SetDefNetCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func SetDefNetCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} setDefNetReq := rg.SetDefNetRequest{RGID: rgId} @@ -669,7 +669,7 @@ func SetDefNetCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRG // RGReadStatus loads rg resource by ids id, gets it current status. Performs restore and enable if needed for // Deleted status. // In case of failure returns errors. -func RGReadStatus(ctx context.Context, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func RGReadStatus(ctx context.Context, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "RGReadStatus: Read status rg with ID", map[string]any{"rg_id": state.Id.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/stack/data_source_stack.go b/internal/service/cloudapi/stack/data_source_stack.go index f4b523b..526166a 100644 --- a/internal/service/cloudapi/stack/data_source_stack.go +++ b/internal/service/cloudapi/stack/data_source_stack.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/stack/flattens" @@ -26,7 +25,7 @@ func NewDataSourceStack() datasource.DataSource { // dataSourceStack is the data source implementation. type dataSourceStack struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceStack) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/stack/data_source_stack_list.go b/internal/service/cloudapi/stack/data_source_stack_list.go index d00264d..677babb 100644 --- a/internal/service/cloudapi/stack/data_source_stack_list.go +++ b/internal/service/cloudapi/stack/data_source_stack_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/stack/flattens" @@ -26,7 +25,7 @@ func NewDataSourceStackList() datasource.DataSource { // dataSourceStackList is the data source implementation. type dataSourceStackList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceStackList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/stack/flattens/flatten_schema_data_source_stack.go b/internal/service/cloudapi/stack/flattens/flatten_schema_data_source_stack.go index 0ac40e6..d910dac 100644 --- a/internal/service/cloudapi/stack/flattens/flatten_schema_data_source_stack.go +++ b/internal/service/cloudapi/stack/flattens/flatten_schema_data_source_stack.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/stack/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/stack/utilities" @@ -16,7 +16,7 @@ import ( // StackDataSource flattens data source for stack. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func StackDataSource(ctx context.Context, state *models.InfoStackModel, c *decort.DecortClient) diag.Diagnostics { +func StackDataSource(ctx context.Context, state *models.InfoStackModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.StackDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/stack/flattens/flatten_utility_stack_list.go b/internal/service/cloudapi/stack/flattens/flatten_utility_stack_list.go index 0249481..902cd6e 100644 --- a/internal/service/cloudapi/stack/flattens/flatten_utility_stack_list.go +++ b/internal/service/cloudapi/stack/flattens/flatten_utility_stack_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/stack/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/stack/utilities" ) @@ -14,7 +14,7 @@ import ( // StackListDataSource flattens data source for stack list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func StackListDataSource(ctx context.Context, state *models.ListStacksModel, c *decort.DecortClient) diag.Diagnostics { +func StackListDataSource(ctx context.Context, state *models.ListStacksModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.StackListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/stack/utilities/utility_data_source_stack.go b/internal/service/cloudapi/stack/utilities/utility_data_source_stack.go index f01a3a4..da561b3 100644 --- a/internal/service/cloudapi/stack/utilities/utility_data_source_stack.go +++ b/internal/service/cloudapi/stack/utilities/utility_data_source_stack.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/stack" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func StackCheckPresence(ctx context.Context, stackID uint64, c *decort.DecortClient) (*stack.InfoStack, +func StackCheckPresence(ctx context.Context, stackID uint64, c *client.Client) (*stack.InfoStack, error) { req := stack.GetRequest{ StackId: stackID, diff --git a/internal/service/cloudapi/stack/utilities/utility_utility_stack_list.go b/internal/service/cloudapi/stack/utilities/utility_utility_stack_list.go index c1a8c95..235882d 100644 --- a/internal/service/cloudapi/stack/utilities/utility_utility_stack_list.go +++ b/internal/service/cloudapi/stack/utilities/utility_utility_stack_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/stack" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/stack/models" ) -func StackListCheckPresence(ctx context.Context, plan *models.ListStacksModel, c *decort.DecortClient) (*stack.ListStacks, +func StackListCheckPresence(ctx context.Context, plan *models.ListStacksModel, c *client.Client) (*stack.ListStacks, error) { req := stack.ListRequest{} diff --git a/internal/service/cloudapi/vfpool/data_source_vfpool.go b/internal/service/cloudapi/vfpool/data_source_vfpool.go index d96445d..ad7f326 100644 --- a/internal/service/cloudapi/vfpool/data_source_vfpool.go +++ b/internal/service/cloudapi/vfpool/data_source_vfpool.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/vfpool/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVFPool() datasource.DataSource { // dataSourceVFPool is the data source implementation. type dataSourceVFPool struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVFPool) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vfpool/data_source_vfpool_list.go b/internal/service/cloudapi/vfpool/data_source_vfpool_list.go index 3a978ba..6d4406a 100644 --- a/internal/service/cloudapi/vfpool/data_source_vfpool_list.go +++ b/internal/service/cloudapi/vfpool/data_source_vfpool_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/vfpool/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVFPoolList() datasource.DataSource { // dataSourceVFPoolList is the data source implementation. type dataSourceVFPoolList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVFPoolList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool.go b/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool.go index c02ae18..d0e343e 100644 --- a/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool.go +++ b/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool.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/vfpool/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vfpool/utilities" @@ -16,7 +16,7 @@ import ( // VFPoolDataSource flattens data source for vfpool. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VFPoolDataSource(ctx context.Context, state *models.ItemVFPoolModel, c *decort.DecortClient) diag.Diagnostics { +func VFPoolDataSource(ctx context.Context, state *models.ItemVFPoolModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VFPoolDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool_list.go b/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool_list.go index 3f62abd..8a0bd23 100644 --- a/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool_list.go +++ b/internal/service/cloudapi/vfpool/flattens/flatten_data_source_vfpool_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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vfpool/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vfpool/utilities" @@ -15,7 +15,7 @@ import ( // VFPoolListDataSource flattens data source for vfpool list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VFPoolListDataSource(ctx context.Context, state *models.ListVFPoolModel, c *decort.DecortClient) diag.Diagnostics { +func VFPoolListDataSource(ctx context.Context, state *models.ListVFPoolModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VFPoolListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool.go b/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool.go index 8f84d02..f6b7de0 100644 --- a/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool.go +++ b/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool.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/vfpool" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VFPoolCheckPresence(ctx context.Context, vfPoolID uint64, c *decort.DecortClient) (*vfpool.RecordVFPool, +func VFPoolCheckPresence(ctx context.Context, vfPoolID uint64, c *client.Client) (*vfpool.RecordVFPool, error) { req := vfpool.GetRequest{VFPoolID: vfPoolID} diff --git a/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool_list.go b/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool_list.go index bc1bd04..e06b3aa 100644 --- a/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool_list.go +++ b/internal/service/cloudapi/vfpool/utilities/utility_data_source_vfpool_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/vfpool" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vfpool/models" ) -func VFPoolListCheckPresence(ctx context.Context, plan *models.ListVFPoolModel, c *decort.DecortClient) (*vfpool.ListVFPool, +func VFPoolListCheckPresence(ctx context.Context, plan *models.ListVFPoolModel, c *client.Client) (*vfpool.ListVFPool, error) { req := vfpool.ListRequest{} diff --git a/internal/service/cloudapi/vins/data_source_vins.go b/internal/service/cloudapi/vins/data_source_vins.go index 09d29fa..43eba8a 100644 --- a/internal/service/cloudapi/vins/data_source_vins.go +++ b/internal/service/cloudapi/vins/data_source_vins.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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINS() datasource.DataSource { // dataSourceVINS is the data source implementation. type dataSourceVINS struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINS) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_audits.go b/internal/service/cloudapi/vins/data_source_vins_audits.go index 159096c..1620c5c 100644 --- a/internal/service/cloudapi/vins/data_source_vins_audits.go +++ b/internal/service/cloudapi/vins/data_source_vins_audits.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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSAudits() datasource.DataSource { // dataSourceVINSAudits is the data source implementation. type dataSourceVINSAudits struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSAudits) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_ext_net_list.go b/internal/service/cloudapi/vins/data_source_vins_ext_net_list.go index 116a41a..5af25e7 100644 --- a/internal/service/cloudapi/vins/data_source_vins_ext_net_list.go +++ b/internal/service/cloudapi/vins/data_source_vins_ext_net_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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSExtNetList() datasource.DataSource { // dataSourceVINSExtNetList is the data source implementation. type dataSourceVINSExtNetList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSExtNetList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_ip_list.go b/internal/service/cloudapi/vins/data_source_vins_ip_list.go index 110602a..7c4149e 100644 --- a/internal/service/cloudapi/vins/data_source_vins_ip_list.go +++ b/internal/service/cloudapi/vins/data_source_vins_ip_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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSIPList() datasource.DataSource { // dataSourceVINSIPList is the data source implementation. type dataSourceVINSIPList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSIPList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_list.go b/internal/service/cloudapi/vins/data_source_vins_list.go index 0425f1d..2130fc5 100644 --- a/internal/service/cloudapi/vins/data_source_vins_list.go +++ b/internal/service/cloudapi/vins/data_source_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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSList() datasource.DataSource { // dataSourceVINSList is the data source implementation. type dataSourceVINSList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_list_deleted.go b/internal/service/cloudapi/vins/data_source_vins_list_deleted.go index 5580ab8..9cfd067 100644 --- a/internal/service/cloudapi/vins/data_source_vins_list_deleted.go +++ b/internal/service/cloudapi/vins/data_source_vins_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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSListDeleted() datasource.DataSource { // dataSourceVINSListDeleted is the data source implementation. type dataSourceVINSListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_nat_rule_list.go b/internal/service/cloudapi/vins/data_source_vins_nat_rule_list.go index f76b5cb..cd22598 100644 --- a/internal/service/cloudapi/vins/data_source_vins_nat_rule_list.go +++ b/internal/service/cloudapi/vins/data_source_vins_nat_rule_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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSNATRuleList() datasource.DataSource { // dataSourceVINSNATRuleList is the data source implementation. type dataSourceVINSNATRuleList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSNATRuleList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_static_route.go b/internal/service/cloudapi/vins/data_source_vins_static_route.go index 9be01f4..e727088 100644 --- a/internal/service/cloudapi/vins/data_source_vins_static_route.go +++ b/internal/service/cloudapi/vins/data_source_vins_static_route.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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSStaticRoute() datasource.DataSource { // dataSourceVINSStaticRoute is the data source implementation. type dataSourceVINSStaticRoute struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSStaticRoute) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/data_source_vins_static_route_list.go b/internal/service/cloudapi/vins/data_source_vins_static_route_list.go index 7f7b859..170c9cd 100644 --- a/internal/service/cloudapi/vins/data_source_vins_static_route_list.go +++ b/internal/service/cloudapi/vins/data_source_vins_static_route_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/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSStaticRouteList() datasource.DataSource { // dataSourceVINSStaticRouteList is the data source implementation. type dataSourceVINSStaticRouteList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSStaticRouteList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins.go index 6ba07f8..f29b20d 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins.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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -17,7 +17,7 @@ import ( // VINSDataSource flattens data source for vins. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSDataSource(ctx context.Context, state *models.DataSourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VINSDataSource(ctx context.Context, state *models.DataSourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSDataSource") diags := diag.Diagnostics{} @@ -99,6 +99,7 @@ func flattenVNFDev(ctx context.Context, vnfdev *vins.RecordVNFDev) types.Object Status: types.StringValue(vnfdev.Status), TechStatus: types.StringValue(vnfdev.TechStatus), Type: types.StringValue(vnfdev.Type), + VNCPassword: types.StringValue(vnfdev.VNCPassword), } temp.Capabilities, diags = types.ListValueFrom(ctx, types.StringType, vnfdev.Capabilities) @@ -367,14 +368,11 @@ func flattenReservations(ctx context.Context, items *vins.ListReservations) type tempSlice := make([]types.Object, 0, len(*items)) for _, item := range *items { temp := models.ReservationModel{ - ClientType: types.StringValue(item.ClientType), - Description: types.StringValue(item.Description), - DomainName: types.StringValue(item.DomainName), - Hostname: types.StringValue(item.Hostname), - IP: types.StringValue(item.IP), - MAC: types.StringValue(item.MAC), - Type: types.StringValue(item.Type), - VMID: types.Int64Value(int64(item.VMID)), + AccountID: types.Int64Value(int64(item.AccountID)), + IP: types.StringValue(item.IP), + MAC: types.StringValue(item.MAC), + Type: types.StringValue(item.Type), + VMID: types.Int64Value(int64(item.VMID)), } obj, diags := types.ObjectValueFrom(ctx, models.ItemReservations, temp) diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_audits.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_audits.go index b9552ce..790bc20 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_audits.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_audits.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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSAuditsDataSource flattens data source for vins audits. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSAuditsDataSource(ctx context.Context, state *models.DataSourceVINSAuditsModel, c *decort.DecortClient) diag.Diagnostics { +func VINSAuditsDataSource(ctx context.Context, state *models.DataSourceVINSAuditsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSAuditsDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ext_net_list.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ext_net_list.go index 369a6eb..9ebe99c 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ext_net_list.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ext_net_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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSExtNetListDataSource flattens data source for vins ext net list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSExtNetListDataSource(ctx context.Context, state *models.DataSourceVINSExtNetListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSExtNetListDataSource(ctx context.Context, state *models.DataSourceVINSExtNetListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSExtNetListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ip_list.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ip_list.go index 7fd63a0..abc7fef 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ip_list.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_ip_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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSIPListDataSource flattens data source for vins ip list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSIPListDataSource(ctx context.Context, state *models.DataSourceVINSIPListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSIPListDataSource(ctx context.Context, state *models.DataSourceVINSIPListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSIPListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_list.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_list.go index ba6ec82..a685418 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_list.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSListDataSource flattens data source for vins list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSListDataSource(ctx context.Context, state *models.DataSourceVINSListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSListDataSource(ctx context.Context, state *models.DataSourceVINSListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_list_deleted.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_list_deleted.go index b8a4804..eca34e7 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_list_deleted.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_list_deleted.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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSListDeletedDataSource flattens data source for vins list deleted. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSListDeletedDataSource(ctx context.Context, state *models.DataSourceVINSListDeletedModel, c *decort.DecortClient) diag.Diagnostics { +func VINSListDeletedDataSource(ctx context.Context, state *models.DataSourceVINSListDeletedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSListDeletedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_nat_rule_list.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_nat_rule_list.go index 91a79ee..082ca04 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_nat_rule_list.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_nat_rule_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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSNATRuleListDataSource flattens data source for vins nat rule list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSNATRuleListDataSource(ctx context.Context, state *models.DataSourceVINSNATRuleListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSNATRuleListDataSource(ctx context.Context, state *models.DataSourceVINSNATRuleListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSNATRuleListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route.go index c6bbe28..ffbe557 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route.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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -16,7 +16,7 @@ import ( // VINSStaticRouteDataSource flattens data source for vins static route. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSStaticRouteDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { +func VINSStaticRouteDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSStaticRouteDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route_list.go b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route_list.go index ae2c303..80ca3a8 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route_list.go +++ b/internal/service/cloudapi/vins/flattens/flatten_data_source_vins_static_route_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/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -16,7 +16,7 @@ import ( // VINSStaticRouteListDataSource flattens data source for vins static route list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSStaticRouteListDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSStaticRouteListDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSStaticRouteListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_resource_vins.go b/internal/service/cloudapi/vins/flattens/flatten_resource_vins.go index 35a1076..d110022 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_resource_vins.go +++ b/internal/service/cloudapi/vins/flattens/flatten_resource_vins.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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -17,7 +17,7 @@ import ( // VINSResource flattens resource for vins. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func VINSResource(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VINSResource(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/flattens/flatten_resource_vins_static_route.go b/internal/service/cloudapi/vins/flattens/flatten_resource_vins_static_route.go index c24fdc4..330709a 100644 --- a/internal/service/cloudapi/vins/flattens/flatten_resource_vins_static_route.go +++ b/internal/service/cloudapi/vins/flattens/flatten_resource_vins_static_route.go @@ -8,7 +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/terraform-provider-dynamix/internal/client" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/utilities" ) @@ -16,7 +17,7 @@ import ( // VINSStaticRouteResource flattens resource for vins static route. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func VINSStaticRouteResource(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { +func VINSStaticRouteResource(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSStaticRouteResource") vinsId, routeId, diags := utilities.GetVinsIDAndRouteID(ctx, plan) @@ -39,20 +40,13 @@ func VINSStaticRouteResource(ctx context.Context, plan *models.ResourceVINSStati Timeouts: plan.Timeouts, RouteID: types.Int64Value(int64(routeId)), - ComputeIDs: plan.ComputeIDs, + ComputeIDs: flattens.FlattenSimpleTypeToList(ctx, types.Int64Type, recordRoute.ComputeIds), Id: plan.Id, LastUpdated: plan.LastUpdated, GUID: types.StringValue(recordRoute.GUID), } - if plan.ComputeIDs.IsUnknown() { - plan.ComputeIDs, diags = types.ListValueFrom(ctx, types.Int64Type, recordRoute.ComputeIds) - if diags.HasError() { - tflog.Error(ctx, fmt.Sprint("Error VINSStaticRouteResource: cannot flatten recordRoute.ComputeIds to plan.ComputeIDs", diags)) - } - } - if plan.Id.IsUnknown() { plan.Id = types.StringValue(fmt.Sprintf("%d#%d", vinsId, routeId)) } diff --git a/internal/service/cloudapi/vins/input_checks.go b/internal/service/cloudapi/vins/input_checks.go index 44d4f68..0644825 100644 --- a/internal/service/cloudapi/vins/input_checks.go +++ b/internal/service/cloudapi/vins/input_checks.go @@ -7,14 +7,14 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" ) // resourceVINSInputChecks checks if user provided rg_id, account_id, ext_net_id and gid are valid. // It also checks that either rg_id or account_id is specified. -func resourceVINSInputChecks(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func resourceVINSInputChecks(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if !plan.RGID.IsUnknown() { // RGID is optional & computed @@ -81,7 +81,7 @@ func resourceVINSInputChecks(ctx context.Context, plan *models.ResourceVINSModel } // resourceVINSStaticRouteInputChecks checks if user provided vins_id is valid. -func resourceVINSStaticRouteInputChecks(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { +func resourceVINSStaticRouteInputChecks(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} vinsId := uint64(plan.VinsID.ValueInt64()) diff --git a/internal/service/cloudapi/vins/models/model_data_source_vins.go b/internal/service/cloudapi/vins/models/model_data_source_vins.go index 2daed16..d0e79a3 100644 --- a/internal/service/cloudapi/vins/models/model_data_source_vins.go +++ b/internal/service/cloudapi/vins/models/model_data_source_vins.go @@ -66,6 +66,7 @@ type RecordVNFDevModel struct { Status types.String `tfsdk:"status"` TechStatus types.String `tfsdk:"tech_status"` Type types.String `tfsdk:"type"` + VNCPassword types.String `tfsdk:"vnc_password"` VINS types.List `tfsdk:"vins"` } @@ -202,14 +203,11 @@ type RecordDHCPConfigModel struct { } type ReservationModel struct { - ClientType types.String `tfsdk:"client_type"` - Description types.String `tfsdk:"desc"` - DomainName types.String `tfsdk:"domainname"` - Hostname types.String `tfsdk:"hostname"` - IP types.String `tfsdk:"ip"` - MAC types.String `tfsdk:"mac"` - Type types.String `tfsdk:"type"` - VMID types.Int64 `tfsdk:"vm_id"` + AccountID types.Int64 `tfsdk:"account_id"` + IP types.String `tfsdk:"ip"` + MAC types.String `tfsdk:"mac"` + Type types.String `tfsdk:"type"` + VMID types.Int64 `tfsdk:"vm_id"` } type RecordNATModel struct { @@ -297,6 +295,7 @@ var ItemVNFDev = map[string]attr.Type{ "status": types.StringType, "tech_status": types.StringType, "type": types.StringType, + "vnc_password": types.StringType, "vins": types.ListType{ElemType: types.Int64Type}, } @@ -407,14 +406,11 @@ var ItemDHCPConfig = map[string]attr.Type{ } var ItemReservations = map[string]attr.Type{ - "client_type": types.StringType, - "desc": types.StringType, - "domainname": types.StringType, - "hostname": types.StringType, - "ip": types.StringType, - "mac": types.StringType, - "type": types.StringType, - "vm_id": types.Int64Type, + "account_id": types.Int64Type, + "ip": types.StringType, + "mac": types.StringType, + "type": types.StringType, + "vm_id": types.Int64Type, } var ItemGW = map[string]attr.Type{ diff --git a/internal/service/cloudapi/vins/models/model_resource_vins_static_route.go b/internal/service/cloudapi/vins/models/model_resource_vins_static_route.go index f235de5..f1de618 100644 --- a/internal/service/cloudapi/vins/models/model_resource_vins_static_route.go +++ b/internal/service/cloudapi/vins/models/model_resource_vins_static_route.go @@ -13,12 +13,12 @@ type ResourceVINSStaticRouteModel struct { Gateway types.String `tfsdk:"gateway"` // optional fields - RouteID types.Int64 `tfsdk:"route_id"` - ComputeIDs types.List `tfsdk:"compute_ids"` - Timeouts timeouts.Value `tfsdk:"timeouts"` + RouteID types.Int64 `tfsdk:"route_id"` + Timeouts timeouts.Value `tfsdk:"timeouts"` // response fields Id types.String `tfsdk:"id"` LastUpdated types.String `tfsdk:"last_updated"` + ComputeIDs types.List `tfsdk:"compute_ids"` GUID types.String `tfsdk:"guid"` } diff --git a/internal/service/cloudapi/vins/resource_vins.go b/internal/service/cloudapi/vins/resource_vins.go index 746b7c8..b3f1469 100644 --- a/internal/service/cloudapi/vins/resource_vins.go +++ b/internal/service/cloudapi/vins/resource_vins.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/vins" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -35,7 +34,7 @@ func NewResourceVINS() resource.Resource { // resourceVINS is the resource implementation. type resourceVINS struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudapi/vins/resource_vins_static_route.go b/internal/service/cloudapi/vins/resource_vins_static_route.go index cc5ccbd..992c9c7 100644 --- a/internal/service/cloudapi/vins/resource_vins_static_route.go +++ b/internal/service/cloudapi/vins/resource_vins_static_route.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/vins" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -34,7 +33,7 @@ func NewResourceVINSStaticRoute() resource.Resource { // resourceVINSStaticRoute is the resource implementation. type resourceVINSStaticRoute struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. @@ -80,17 +79,6 @@ func (r *resourceVINSStaticRoute) Create(ctx context.Context, req resource.Creat Gateway: plan.Gateway.ValueString(), } - if !plan.ComputeIDs.IsUnknown() { - computes := make([]uint64, 0, len(plan.ComputeIDs.Elements())) - diags = plan.ComputeIDs.ElementsAs(ctx, &computes, false) - if diags.HasError() { - resp.Diagnostics.Append(diags...) - tflog.Error(ctx, "Create resourceVINSStaticRoute: cannot populate computes with plan.ComputeIDs List elements") - return - } - staticReq.ComputeIds = computes - } - _, err := r.client.CloudAPI().VINS().StaticRouteAdd(ctx, staticReq) if err != nil { resp.Diagnostics.AddError("Create resourceVINSStaticRoute: Error adding static route to vins", err.Error()) @@ -166,72 +154,9 @@ func (r *resourceVINSStaticRoute) Read(ctx context.Context, req resource.ReadReq // Update updates the resource and sets the updated Terraform state on success. func (r *resourceVINSStaticRoute) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - // Retrieve values from plan - var plan models.ResourceVINSStaticRouteModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINSStaticRoute: Error receiving the plan") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: got plan successfully", map[string]any{"id": plan.Id.ValueString()}) - - // Retrieve values from state - var state models.ResourceVINSStaticRouteModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINSStaticRoute: Error receiving the state") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: got state successfully", map[string]any{"id": state.Id.ValueString()}) - - // Set timeouts - updateTimeout, diags := plan.Timeouts.Update(ctx, constants.Timeout20m) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Error set timeout") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: set timeouts successfully", map[string]any{ - "id": state.Id.ValueString(), - "updateTimeout": updateTimeout}) - - ctx, cancel := context.WithTimeout(ctx, updateTimeout) - defer cancel() - - // Checking for values in the platform - tflog.Info(ctx, "Update resourceVINSStaticRoute: starting input checks", map[string]any{"id": plan.Id.ValueString()}) - resp.Diagnostics.Append(resourceVINSStaticRouteInputChecks(ctx, &plan, r.client)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINS: Error input checks") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: input checks successful", map[string]any{"id": state.Id.ValueString()}) - - // change compute_ids, if needed - if !plan.ComputeIDs.Equal(state.ComputeIDs) { - resp.Diagnostics.Append(utilities.UpdateComputeIDsVINSStaticRoute(ctx, &plan, &state, r.client)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINSStaticRoute: Error updating compute_ids") - return - } - } - - tflog.Info(ctx, "Update resourceVINSStaticRoute: resource update is completed", map[string]any{"id": plan.Id.ValueString()}) - - // Map response body to schema and populate Computed attribute values - resp.Diagnostics.Append(flattens.VINSStaticRouteResource(ctx, &plan, r.client)...) - if resp.Diagnostics.HasError() { - return - } - - // Set data last update - plan.LastUpdated = types.StringValue(time.Now().Format(time.RFC850)) - - // Set state to fully populated data - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) - if resp.Diagnostics.HasError() { - return - } + tflog.Error(ctx, "Update resourceVINSStaticRoute: This resource cannot be updated") + resp.Diagnostics.AddError("This resource cannot be updated", "") + return } // Delete deletes the resource and removes the Terraform state on success. diff --git a/internal/service/cloudapi/vins/schemas/schema_data_source_vins.go b/internal/service/cloudapi/vins/schemas/schema_data_source_vins.go index e0cb6d0..50438d8 100644 --- a/internal/service/cloudapi/vins/schemas/schema_data_source_vins.go +++ b/internal/service/cloudapi/vins/schemas/schema_data_source_vins.go @@ -204,6 +204,9 @@ func MakeSchemaDataSourceVINS() map[string]schema.Attribute { "milestones": schema.Int64Attribute{ Computed: true, }, + "vnc_password": schema.StringAttribute{ + Computed: true, + }, "vnf_name": schema.StringAttribute{ Computed: true, }, @@ -371,16 +374,7 @@ func MakeSchemaDataSourceVINS() map[string]schema.Attribute { Computed: true, NestedObject: schema.NestedAttributeObject{ Attributes: map[string]schema.Attribute{ - "client_type": schema.StringAttribute{ - Computed: true, - }, - "desc": schema.StringAttribute{ - Computed: true, - }, - "domainname": schema.StringAttribute{ - Computed: true, - }, - "hostname": schema.StringAttribute{ + "account_id": schema.Int64Attribute{ Computed: true, }, "ip": schema.StringAttribute{ diff --git a/internal/service/cloudapi/vins/schemas/schema_resource_vins.go b/internal/service/cloudapi/vins/schemas/schema_resource_vins.go index eee3d66..ba328b6 100644 --- a/internal/service/cloudapi/vins/schemas/schema_resource_vins.go +++ b/internal/service/cloudapi/vins/schemas/schema_resource_vins.go @@ -374,6 +374,9 @@ func MakeSchemaResourceVINS() map[string]schema.Attribute { "vnf_name": schema.StringAttribute{ Computed: true, }, + "vnc_password": schema.StringAttribute{ + Computed: true, + }, "status": schema.StringAttribute{ Computed: true, }, diff --git a/internal/service/cloudapi/vins/schemas/schema_resource_vins_static_route.go b/internal/service/cloudapi/vins/schemas/schema_resource_vins_static_route.go index 30f017b..62a7887 100644 --- a/internal/service/cloudapi/vins/schemas/schema_resource_vins_static_route.go +++ b/internal/service/cloudapi/vins/schemas/schema_resource_vins_static_route.go @@ -29,11 +29,6 @@ func MakeSchemaResourceVINSStaticRoute() map[string]schema.Attribute { Computed: true, Optional: true, }, - "compute_ids": schema.ListAttribute{ - Computed: true, - Optional: true, - ElementType: types.Int64Type, - }, // computed attributes "id": schema.StringAttribute{ @@ -48,5 +43,9 @@ func MakeSchemaResourceVINSStaticRoute() map[string]schema.Attribute { "guid": schema.StringAttribute{ Computed: true, }, + "compute_ids": schema.ListAttribute{ + Computed: true, + ElementType: types.Int64Type, + }, } } diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins.go index c14222d..dc30d91 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins.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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.RecordVINS, diag.Diagnostics) { +func VINSDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.RecordVINS, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSDataSourceCheckPresence: Get info about vins with ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_audits.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_audits.go index 8c33c43..43a3459 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_audits.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_audits.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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSAuditsDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListAudits, diag.Diagnostics) { +func VINSAuditsDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListAudits, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSAuditsDataSourceCheckPresence: Get info about vins audit with vins ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ext_net_list.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ext_net_list.go index 0199d60..930553c 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ext_net_list.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ext_net_list.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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSExtNetListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListExtNets, diag.Diagnostics) { +func VINSExtNetListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListExtNets, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSExtNetListDataSourceCheckPresence: Get info about vins audit with vins ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ip_list.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ip_list.go index 23175ac..ea6e55a 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ip_list.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_ip_list.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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSIPListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListIPs, diag.Diagnostics) { +func VINSIPListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListIPs, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSIPListDataSourceCheckPresence: Get info about vins audit with vins ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list.go index 86dfe66..335529c 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list.go @@ -5,12 +5,12 @@ 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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" ) -func VINSListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListModel, c *decort.DecortClient) (*vins.ListVINS, diag.Diagnostics) { +func VINSListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListModel, c *client.Client) (*vins.ListVINS, diag.Diagnostics) { tflog.Info(ctx, "VINSListDataSourceCheckPresence: Get info about vins list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list_deleted.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list_deleted.go index dcd21e1..4c171a3 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list_deleted.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_list_deleted.go @@ -5,12 +5,12 @@ 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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" ) -func VINSListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListDeletedModel, c *decort.DecortClient) (*vins.ListVINS, diag.Diagnostics) { +func VINSListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListDeletedModel, c *client.Client) (*vins.ListVINS, diag.Diagnostics) { tflog.Info(ctx, "VINSListDeletedDataSourceCheckPresence: Get info about vins list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_nat_rule_list.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_nat_rule_list.go index 2be7a56..d712762 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_nat_rule_list.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_nat_rule_list.go @@ -5,11 +5,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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSNATRuleListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListNATRules, diag.Diagnostics) { +func VINSNATRuleListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListNATRules, diag.Diagnostics) { tflog.Info(ctx, "VINSNATRuleListDataSourceCheckPresence: Get info about vins nat rule list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route.go index f283564..8a9e2b4 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route.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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSStaticRouteDataSourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *decort.DecortClient) (*vins.ItemRoutes, diag.Diagnostics) { +func VINSStaticRouteDataSourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *client.Client) (*vins.ItemRoutes, diag.Diagnostics) { tflog.Info(ctx, "VINSStaticRouteDataSourceCheckPresence: Get info about vins static route", map[string]any{ "vins_id": vinsId, "route_id": routeId, diff --git a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route_list.go b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route_list.go index 542deb5..61f8a17 100644 --- a/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route_list.go +++ b/internal/service/cloudapi/vins/utilities/utility_data_source_vins_static_route_list.go @@ -5,11 +5,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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSStaticRouteListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListStaticRoutes, diag.Diagnostics) { +func VINSStaticRouteListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListStaticRoutes, diag.Diagnostics) { tflog.Info(ctx, "VINSStaticRouteListDataSourceCheckPresence: Get info about vins static route list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudapi/vins/utilities/utility_resource_vins.go b/internal/service/cloudapi/vins/utilities/utility_resource_vins.go index 63c3403..2b18524 100644 --- a/internal/service/cloudapi/vins/utilities/utility_resource_vins.go +++ b/internal/service/cloudapi/vins/utilities/utility_resource_vins.go @@ -11,13 +11,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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) -func VINSResourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.RecordVINS, diag.Diagnostics) { +func VINSResourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.RecordVINS, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSResourceCheckPresence: Get info about vins with ID - %v", vinsId)) diags := diag.Diagnostics{} @@ -35,7 +35,7 @@ func VINSResourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.Dec // CreateInRGResourceVINS creates vins in resource group based on plan. // Returns vins_id for created vins and errors in case of failures. -func CreateInRGResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateInRGResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("Start CreateInRGResourceVINS: vins_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -104,7 +104,7 @@ func CreateInRGResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, // CreateInAccountResourceVINS creates vins in account based on plan. // Returns vins_id for created vins and errors in case of failures. -func CreateInAccountResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateInAccountResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("Start CreateInAccountResourceVINS: vins_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -157,7 +157,7 @@ func CreateInAccountResourceVINS(ctx context.Context, plan *models.ResourceVINSM // IPCreateVINS reserves ips that user specified in ip field for created resource. // In case of failure returns warnings. -func IPCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func IPCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // plan.IP is not null as it was checked before call @@ -205,7 +205,7 @@ func IPCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSM // IPUpdateVINS reserves/releases ips that user specified in ip field for updated resource. // In case of failure returns errors. -func IPUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func IPUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start IPUpdateVINS: new ip specified", map[string]any{"vins_id": vinsId}) diags := diag.Diagnostics{} @@ -309,7 +309,7 @@ func IPUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.Resour // ExtNetUpdateVINS updates ext_net_id and/or ext_net_ip that user specified in ext_net block for updated resource. // In case of failure returns errors. -func ExtNetUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func ExtNetUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start ExtNetUpdateVINS: new ext_net specified", map[string]any{ "vins_id": vinsId, }) @@ -363,7 +363,7 @@ func ExtNetUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.Re // NATRuleCreateVINS adds nat rules that user specified in nat_rule field for created resource. // In case of failure returns warnings. -func NATRuleCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func NATRuleCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // plan.NatRule is not null as it was checked before call @@ -410,7 +410,7 @@ func NATRuleCreateVINS(ctx context.Context, vinsId uint64, plan *models.Resource // NATRuleUpdateVINS adds/deleted nat rules that user specified in nat_rule field for updated resource. // In case of failure returns errors. -func NATRuleUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func NATRuleUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start NATRuleUpdateVINS: new natRule specified", map[string]any{"vins_id": vinsId}) diags := diag.Diagnostics{} @@ -511,7 +511,7 @@ func NATRuleUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.R // VINSReadStatus loads vins resource by ids id, gets it current status. Performs restore and enable if needed for // Deleted status. // In case of failure returns errors. -func VINSReadStatus(ctx context.Context, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VINSReadStatus(ctx context.Context, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "VINSReadStatus: Read status vins with ID", map[string]any{"vins_id": state.Id.ValueString()}) diags := diag.Diagnostics{} @@ -599,7 +599,7 @@ func VINSReadStatus(ctx context.Context, state *models.ResourceVINSModel, c *dec // RestoreVINS performs vins Restore request. // Returns error in case of failures. -func RestoreVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func RestoreVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "RestoreVINS: before calling CloudAPI().VINS().Restore", map[string]any{"vinsId": vinsId, "req": vins.RestoreRequest{VINSID: vinsId}}) @@ -619,7 +619,7 @@ func RestoreVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) dia // DisableVINS performs vins Disable request. // Returns error in case of failures. -func DisableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func DisableVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "DisableVINS: before calling CloudAPI().VINS().Disable", map[string]any{"vinsId": vinsId}) @@ -639,7 +639,7 @@ func DisableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) dia // EnableVINS performs vins Enable request. // Returns error in case of failures. -func EnableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func EnableVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "EnableVINS: before calling CloudAPI().VINS().Enable", map[string]any{"vinsId": vinsId}) @@ -659,7 +659,7 @@ func EnableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag // EnableDisableUpdateVINS performs vins Enable/disable request. // Returns errors in case of failures. -func EnableDisableUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func EnableDisableUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} enable := plan.Enable.ValueBool() tflog.Info(ctx, "Start EnableDisableUpdateVINS", map[string]any{"vinsId": vinsId, "enable": enable}) @@ -679,7 +679,7 @@ func EnableDisableUpdateVINS(ctx context.Context, vinsId uint64, plan *models.Re // VnfdevRestartUpdateVINS restarts vnf_dev for vins. // Returns error in case of failures. -func VnfdevRestartUpdateVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func VnfdevRestartUpdateVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "VnfdevRestartUpdateVINS: before calling CloudAPI().VINS().VNFDevRestart", map[string]any{"vinsId": vinsId}) @@ -699,7 +699,7 @@ func VnfdevRestartUpdateVINS(ctx context.Context, vinsId uint64, c *decort.Decor // VnfdevRedeployUpdateVINS redeploys vnf_dev for vins. // Returns error in case of failures. -func VnfdevRedeployUpdateVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func VnfdevRedeployUpdateVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "VnfdevRedeployUpdateVINS: before calling CloudAPI().VINS().VNFDevRedeploy", map[string]any{"vinsId": vinsId}) @@ -719,7 +719,7 @@ func VnfdevRedeployUpdateVINS(ctx context.Context, vinsId uint64, c *decort.Deco // UpdateDNSlistVINS apply new DNS list in VINS // Returns error in case of failures. -func UpdateDNSlistVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateDNSlistVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} req := vins.DNSApplyRequest{ diff --git a/internal/service/cloudapi/vins/utilities/utility_resource_vins_static_route.go b/internal/service/cloudapi/vins/utilities/utility_resource_vins_static_route.go index 08eb707..6607783 100644 --- a/internal/service/cloudapi/vins/utilities/utility_resource_vins_static_route.go +++ b/internal/service/cloudapi/vins/utilities/utility_resource_vins_static_route.go @@ -8,12 +8,12 @@ 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/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudapi/vins/models" ) -func VINSStaticRouteResourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *decort.DecortClient) (*vins.ItemRoutes, diag.Diagnostics) { +func VINSStaticRouteResourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *client.Client) (*vins.ItemRoutes, diag.Diagnostics) { tflog.Info(ctx, "VINSStaticRouteResourceCheckPresence: Get info about vins static route") diags := diag.Diagnostics{} @@ -79,7 +79,7 @@ func GetVinsIDAndRouteID(ctx context.Context, plan *models.ResourceVINSStaticRou return vinsId, routeId, nil } -func GetStaticRouteID(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func GetStaticRouteID(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, "Start GetStaticRouteID") diags := diag.Diagnostics{} @@ -115,75 +115,6 @@ func GetStaticRouteID(ctx context.Context, plan *models.ResourceVINSStaticRouteM return 0, diags } -func UpdateComputeIDsVINSStaticRoute(ctx context.Context, plan, state *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { - tflog.Info(ctx, "Start UpdateComputeIDsVINSStaticRoute", map[string]any{"id": plan.Id.ValueString()}) - - vinsId, routeId, diags := GetVinsIDAndRouteID(ctx, plan) - if diags.HasError() { - return diags - } - - computesPlan := make([]uint64, 0, len(plan.ComputeIDs.Elements())) - diags = plan.ComputeIDs.ElementsAs(ctx, &computesPlan, false) - if diags.HasError() { - tflog.Error(ctx, "UpdateComputeIDsVINSStaticRoute: cannot populate computes with plan.ComputeIDs List elements") - return diags - } - - computesState := make([]uint64, 0, len(state.ComputeIDs.Elements())) - diags = state.ComputeIDs.ElementsAs(ctx, &computesState, false) - if diags.HasError() { - tflog.Error(ctx, "UpdateComputeIDsVINSStaticRoute: cannot populate computes with state.ComputeIDs List elements") - return diags - } - - var deletedComputes []uint64 - for _, comp := range computesState { - if !contains(comp, computesPlan) { - deletedComputes = append(deletedComputes, comp) - } - } - if len(deletedComputes) != 0 { - revokeReq := vins.StaticRouteAccessRevokeRequest{ - VINSID: vinsId, - RouteId: routeId, - ComputeIds: deletedComputes, - } - - tflog.Info(ctx, "UpdateComputeIDsVINSStaticRoute: before call to CloudAPI().VINS().StaticRouteAccessRevoke", map[string]any{"revokeReq": revokeReq}) - _, err := c.CloudAPI().VINS().StaticRouteAccessRevoke(ctx, revokeReq) - if err != nil { - diags.AddError( - fmt.Sprintf("UpdateComputeIDsVINSStaticRoute: Cannot revoke static routes for vins with id %v", vinsId), - err.Error()) - } - } - - var addedComputes []uint64 - for _, comp := range computesPlan { - if !contains(comp, computesState) { - addedComputes = append(addedComputes, comp) - } - } - if len(addedComputes) != 0 { - grantReq := vins.StaticRouteAccessGrantRequest{ - VINSID: vinsId, - RouteId: routeId, - ComputeIds: addedComputes, - } - - tflog.Info(ctx, "UpdateComputeIDsVINSStaticRoute: before call to CloudAPI().VINS().StaticRouteAccessGrant", map[string]any{"grantReq": grantReq}) - _, err := c.CloudAPI().VINS().StaticRouteAccessGrant(ctx, grantReq) - if err != nil { - diags.AddError( - fmt.Sprintf("UpdateComputeIDsVINSStaticRoute: Cannot grant static routes for vins with id %v", vinsId), - err.Error()) - } - } - - return diags -} - // contains returns true if slice contains element. Otherwise it returns false. func contains(element uint64, slice []uint64) bool { for _, s := range slice { diff --git a/internal/service/cloudbroker/account/data_source_cb_account.go b/internal/service/cloudbroker/account/data_source_cb_account.go index acfc2ea..8fb6d76 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_audits_list.go b/internal/service/cloudbroker/account/data_source_cb_account_audits_list.go index 664c165..855fffb 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_audits_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_available_templates_list.go b/internal/service/cloudbroker/account/data_source_cb_account_available_templates_list.go index bbcb1d6..49754dc 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_available_templates_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_account_available_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/cloudbroker/account/flattens" @@ -26,7 +25,7 @@ func NewDataSourceAccountAvailableTemplatesListDataSource() datasource.DataSourc // dataSourceAccountAvailableTemplatesListDataSource is the data source implementation. type dataSourceAccountAvailableTemplatesListDataSource struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceAccountAvailableTemplatesListDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_computes_list.go b/internal/service/cloudbroker/account/data_source_cb_account_computes_list.go index 05fb091..bc199e3 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_computes_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/account/flattens" @@ -26,7 +25,7 @@ func NewDataSourceAccountComputesList() datasource.DataSource { // NewDataSourceAccountComputesList 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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_disks_list.go b/internal/service/cloudbroker/account/data_source_cb_account_disks_list.go index a89440d..699e30f 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_disks_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_flipgroups_list.go b/internal/service/cloudbroker/account/data_source_cb_account_flipgroups_list.go index e0fec9c..73e9e15 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_flipgroups_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_get_resource_consumption.go b/internal/service/cloudbroker/account/data_source_cb_account_get_resource_consumption.go index 9a7badd..d84b482 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_get_resource_consumption.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_list.go b/internal/service/cloudbroker/account/data_source_cb_account_list.go index 0ffcd46..1663b8c 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/account/flattens" @@ -26,7 +25,7 @@ func NewDataSourceAccountList() datasource.DataSource { // NewDataSourceAccountList 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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_list_deleted.go b/internal/service/cloudbroker/account/data_source_cb_account_list_deleted.go index 7c71fd8..c127b6c 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_list_deleted.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_resource_consumption_list.go b/internal/service/cloudbroker/account/data_source_cb_account_resource_consumption_list.go index b3f3f40..fe3a48c 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_resource_consumption_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_account_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_rg_list.go b/internal/service/cloudbroker/account/data_source_cb_account_rg_list.go index 9799155..e24cf6a 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_rg_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/data_source_cb_account_vins_list.go b/internal/service/cloudbroker/account/data_source_cb_account_vins_list.go index ab9b9a2..b6b9e8b 100644 --- a/internal/service/cloudbroker/account/data_source_cb_account_vins_list.go +++ b/internal/service/cloudbroker/account/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account.go index 12e72a8..aa3bc5d 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account.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/cloudbroker/account" + "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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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.CbAccountDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_audits_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_audits_list.go index d0a6395..72b33f4 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_audits_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_available_templates_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_available_templates_list.go index 8e262a7..9c3cce2 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_available_templates_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_available_templates_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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/utilities" @@ -15,7 +15,7 @@ import ( // AccountAvailableTemplatesListDataSource flattens data source for templates list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func AccountAvailableTemplatesListDataSource(ctx context.Context, state *models.DataSourceAccountAvailableTemplatesListModel, c *decort.DecortClient) diag.Diagnostics { +func AccountAvailableTemplatesListDataSource(ctx context.Context, state *models.DataSourceAccountAvailableTemplatesListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.AccountAvailableTemplatesListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_computes_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_computes_list.go index 8d4d9a2..4498723 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_computes_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_computes_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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/utilities" ) @@ -14,7 +14,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.ListComputesModel, c *decort.DecortClient) diag.Diagnostics { +func AccountComputesListDataSource(ctx context.Context, state *models.ListComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.AccountComputesListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_disks_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_disks_list.go index c7732c8..3db08ce 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_disks_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_flipgroups_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_flipgroups_list.go index da159e1..2234f92 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_flipgroups_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_get_resource_consumption.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_get_resource_consumption.go index 353c669..555576d 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_get_resource_consumption.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list.go index 1b8f6f3..e3ab2e6 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list.go @@ -9,8 +9,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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/utilities" ) @@ -18,7 +18,7 @@ import ( // AccountListDataSource flattens data source for account. // 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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list_deleted.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list_deleted.go index eb41e69..19c9226 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list_deleted.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_list_deleted.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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_resource_consumption_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_resource_consumption_list.go index 8e422aa..fb1b95d 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_resource_consumption_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_rg_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_rg_list.go index 7225d87..8a6fe3e 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_rg_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_rg_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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_vins_list.go b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_vins_list.go index 034128b..a80b749 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_account_vins_list.go +++ b/internal/service/cloudbroker/account/flattens/flatten_data_source_cb_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/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/flattens/flatten_resource_cb_account.go b/internal/service/cloudbroker/account/flattens/flatten_resource_cb_account.go index fb9a790..91129b1 100644 --- a/internal/service/cloudbroker/account/flattens/flatten_resource_cb_account.go +++ b/internal/service/cloudbroker/account/flattens/flatten_resource_cb_account.go @@ -10,8 +10,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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/resource_cb_account.go b/internal/service/cloudbroker/account/resource_cb_account.go index 0b66a6d..1fd60b4 100644 --- a/internal/service/cloudbroker/account/resource_cb_account.go +++ b/internal/service/cloudbroker/account/resource_cb_account.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/cloudbroker/account" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -33,7 +32,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. diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account.go index 249e09e..c71fc77 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func AccountDataSourceCheckPresence(ctx context.Context, accountId uint64, c *decort.DecortClient) (*account.InfoAccount, error) { +func AccountDataSourceCheckPresence(ctx context.Context, accountId uint64, c *client.Client) (*account.InfoAccount, error) { tflog.Info(ctx, fmt.Sprintf("CbAccountDataSourceCheckPresence: Get info about account with ID - %v", accountId)) recordAccount, err := c.CloudBroker().Account().Get(ctx, account.GetRequest{AccountID: accountId}) diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_audits_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_audits_list.go index f3a54d3..7a2ed73 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_audits_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/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.CloudBroker().Account().Audits(ctx, account.AuditsRequest{AccountID: accountId}) diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_available_templates_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_available_templates_list.go index c0232ae..fb722b8 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_available_templates_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_available_templates_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func AccountAvailableTemplatesListDataSourceCheckPresence(ctx context.Context, accountId uint64, c *decort.DecortClient) ([]uint64, error) { +func AccountAvailableTemplatesListDataSourceCheckPresence(ctx context.Context, accountId uint64, c *client.Client) ([]uint64, error) { tflog.Info(ctx, fmt.Sprintf("AccountAvailableTemplatesListDataSourceCheckPresence: Get info about templates with account ID - %v", accountId)) templatesList, err := c.CloudBroker().Account().ListAvailableTemplates(ctx, account.ListAvailableTemplatesRequest{AccountID: accountId}) diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_computes_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_computes_list.go index c5a8a19..ed266df 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_computes_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/models" ) -func AccountComputesListDataSourceCheckPresence(ctx context.Context, plan *models.ListComputesModel, c *decort.DecortClient) (*account.ListComputes, error) { +func AccountComputesListDataSourceCheckPresence(ctx context.Context, plan *models.ListComputesModel, c *client.Client) (*account.ListComputes, error) { tflog.Info(ctx, "AccountComputesListDataSourceCheckPresence: Get info about list accounts") req := account.ListComputesRequest{ AccountID: uint64(plan.AccountID.ValueInt64()), diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_disks_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_disks_list.go index 5d1ffe2..fb2217a 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_disks_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{ diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_flipgroups_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_flipgroups_list.go index 239d266..8716f99 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_flipgroups_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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())} diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_get_resource_consumption.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_get_resource_consumption.go index bc96d41..daa5624 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_get_resource_consumption.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/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.CloudBroker().Account().GetResourceConsumption(ctx, account.GetResourceConsumptionRequest{AccountID: accountId}) diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_list.go index eee8b2a..6bae42f 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/models" ) -func AccountListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceAccountListModel, c *decort.DecortClient) (*account.ListAccounts, error) { +func AccountListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceAccountListModel, c *client.Client) (*account.ListAccounts, error) { tflog.Info(ctx, "AccountListDataSourceCheckPresence: Get info about list accounts") req := account.ListRequest{} diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_list_deleted.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_list_deleted.go index cc62fd3..2dfcbf8 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_list_deleted.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_resource_consumption_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_resource_consumption_list.go index 171b278..cc2c8a4 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_resource_consumption_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func AccountGetResourceConsumptionListDataSourceCheckPresence(ctx context.Context, c *decort.DecortClient) (*account.ListResources, error) { +func AccountGetResourceConsumptionListDataSourceCheckPresence(ctx context.Context, c *client.Client) (*account.ListResources, error) { tflog.Info(ctx, "AccountGetResourceConsumptionListDataSourceCheckPresence: Get info about account resource consumption list") record, err := c.CloudBroker().Account().ListResourceConsumption(ctx) diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_rg_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_rg_list.go index e5ab2b3..133f16c 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_rg_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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())} diff --git a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_vins_list.go b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_vins_list.go index bb36316..00cf034 100644 --- a/internal/service/cloudbroker/account/utilities/utility_data_source_cb_account_vins_list.go +++ b/internal/service/cloudbroker/account/utilities/utility_data_source_cb_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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/account/utilities/utility_resource_cb_account.go b/internal/service/cloudbroker/account/utilities/utility_resource_cb_account.go index 7b27694..a352f99 100644 --- a/internal/service/cloudbroker/account/utilities/utility_resource_cb_account.go +++ b/internal/service/cloudbroker/account/utilities/utility_resource_cb_account.go @@ -8,15 +8,15 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "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/cloudbroker/account" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/account/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/ic" "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.CloudBroker().Account().Get(ctx, account.GetRequest{AccountID: accountId}) @@ -32,7 +32,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{} @@ -94,7 +94,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{ @@ -118,7 +118,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{} @@ -152,7 +152,7 @@ func EnableDisableAccount(ctx context.Context, accountId uint64, enable bool, c return nil } -func UtilityAccountCreate(ctx context.Context, plan *models.ResourceAccountModel, c *decort.DecortClient) (diag.Diagnostics, *uint64) { +func UtilityAccountCreate(ctx context.Context, plan *models.ResourceAccountModel, c *client.Client) (diag.Diagnostics, *uint64) { tflog.Info(ctx, "Start UtilityAccountCreate", map[string]any{"account_id": plan.AccountID}) diags := diag.Diagnostics{} @@ -309,7 +309,7 @@ func UtilityAccountCreate(ctx context.Context, plan *models.ResourceAccountModel // 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 @@ -407,7 +407,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{} @@ -543,7 +543,7 @@ func isChangedUser(users []models.UsersModel, target models.UsersModel) bool { return false } -func UtilityAccountCPUParameterUpdate(ctx context.Context, accountID uint64, plan *models.ResourceAccountModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityAccountCPUParameterUpdate(ctx context.Context, accountID uint64, plan *models.ResourceAccountModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start utilityAccountCPUParameterUpdate", map[string]any{"account_id": plan.AccountID}) diags := diag.Diagnostics{} @@ -561,7 +561,7 @@ func UtilityAccountCPUParameterUpdate(ctx context.Context, accountID uint64, pla return diags } -func UtilityAccountCPURatioUpdate(ctx context.Context, accountID uint64, plan *models.ResourceAccountModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityAccountCPURatioUpdate(ctx context.Context, accountID uint64, plan *models.ResourceAccountModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start utilityAccountCPURatioUpdate", map[string]any{"account_id": plan.AccountID}) diags := diag.Diagnostics{} @@ -577,7 +577,7 @@ func UtilityAccountCPURatioUpdate(ctx context.Context, accountID uint64, plan *m return diags } -func UtilityAccountAvailiableTemplatesUpdate(ctx context.Context, state, plan *models.ResourceAccountModel, afterCreate bool, c *decort.DecortClient) diag.Diagnostics { +func UtilityAccountAvailiableTemplatesUpdate(ctx context.Context, state, plan *models.ResourceAccountModel, afterCreate bool, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start utilityAccountAvailiableTemplatesUpdate", map[string]any{"account_id": plan.AccountID}) diags := diag.Diagnostics{} @@ -698,7 +698,7 @@ func setDifference(set, check []int) []uint64 { return diff } -func UtilityAccountComputeFeaturesUpdate(ctx context.Context, accountID uint64, plan *models.ResourceAccountModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityAccountComputeFeaturesUpdate(ctx context.Context, accountID uint64, plan *models.ResourceAccountModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} var compFeatures []string diff --git a/internal/service/cloudbroker/audit/data_source_cb_audit.go b/internal/service/cloudbroker/audit/data_source_cb_audit.go index 365776e..18bf0f4 100644 --- a/internal/service/cloudbroker/audit/data_source_cb_audit.go +++ b/internal/service/cloudbroker/audit/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/audit/data_source_cb_audit_linked_jobs.go b/internal/service/cloudbroker/audit/data_source_cb_audit_linked_jobs.go index 098fd75..9fc1866 100644 --- a/internal/service/cloudbroker/audit/data_source_cb_audit_linked_jobs.go +++ b/internal/service/cloudbroker/audit/data_source_cb_audit_linked_jobs.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/cloudbroker/audit/flattens" @@ -26,7 +25,7 @@ func NewDataSourceAuditLinkedJobs() datasource.DataSource { // dataSourceAuditLinkedJobs is the data source implementation. type dataSourceAuditLinkedJobs struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceAuditLinkedJobs) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/audit/data_source_cb_audit_list.go b/internal/service/cloudbroker/audit/data_source_cb_audit_list.go index 873d425..f6ba1a1 100644 --- a/internal/service/cloudbroker/audit/data_source_cb_audit_list.go +++ b/internal/service/cloudbroker/audit/data_source_cb_audit_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/cloudbroker/audit/flattens" @@ -26,7 +25,7 @@ func NewDataSourceAuditList() datasource.DataSource { // dataSourceAuditList is the data source implementation. type dataSourceAuditList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceAuditList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit.go b/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit.go index 8f55921..d893abf 100644 --- a/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit.go +++ b/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_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/cloudbroker/audit/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_linked_jobs.go b/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_linked_jobs.go index b052f40..f0a845c 100644 --- a/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_linked_jobs.go +++ b/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_linked_jobs.go @@ -7,13 +7,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/cloudbroker/audit" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/audit/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/audit/utilities" ) -func AuditLinkedJobsDataSource(ctx context.Context, state *models.DataSourceAuditLinkedJobs, c *decort.DecortClient) diag.Diagnostics { +func AuditLinkedJobsDataSource(ctx context.Context, state *models.DataSourceAuditLinkedJobs, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.AuditLinkedJobsDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_list.go b/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_list.go index bfac2e0..b247a43 100644 --- a/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_list.go +++ b/internal/service/cloudbroker/audit/flattens/flatten_data_source_cb_audit_list.go @@ -6,13 +6,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/cloudbroker/audit" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/audit/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/audit/utilities" ) -func AuditListDataSource(ctx context.Context, state *models.DataSourceAuditList, c *decort.DecortClient) diag.Diagnostics { +func AuditListDataSource(ctx context.Context, state *models.DataSourceAuditList, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.AuditListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit.go b/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit.go index 494b658..df1cf60 100644 --- a/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit.go +++ b/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_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/cloudbroker/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{} diff --git a/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_linked_jobs.go b/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_linked_jobs.go index 1b5742e..dacb68e 100644 --- a/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_linked_jobs.go +++ b/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_linked_jobs.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/cloudbroker/audit" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func AuditLinkedJobsDataSourceCheckPresence(ctx context.Context, auditGuid string, c *decort.DecortClient) (*audit.ListLinkedJobs, diag.Diagnostics) { +func AuditLinkedJobsDataSourceCheckPresence(ctx context.Context, auditGuid string, c *client.Client) (*audit.ListLinkedJobs, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("AuditLinkedJobsDataSourceCheckPresence: Get info about audit linked jobs with ID - %v", auditGuid)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_list.go b/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_list.go index f9402e9..2c8cd65 100644 --- a/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_list.go +++ b/internal/service/cloudbroker/audit/utilities/utility_data_source_cb_audit_list.go @@ -6,12 +6,12 @@ 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/cloudbroker/audit" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/audit/models" ) -func AuditListDataSourceCheckPresence(ctx context.Context, state *models.DataSourceAuditList, c *decort.DecortClient) (*audit.ListAudits, diag.Diagnostics) { +func AuditListDataSourceCheckPresence(ctx context.Context, state *models.DataSourceAuditList, c *client.Client) (*audit.ListAudits, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("AuditListDataSourceCheckPresence: Get info about audit list")) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk.go b/internal/service/cloudbroker/disks/data_source_cb_disk.go index d65de39..8268efe 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_list.go b/internal/service/cloudbroker/disks/data_source_cb_disk_list.go index e7d16a8..2c471da 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_list.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_list_deleted.go b/internal/service/cloudbroker/disks/data_source_cb_disk_list_deleted.go index 7e9c3b7..daf1a87 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_list_deleted.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_list_types.go b/internal/service/cloudbroker/disks/data_source_cb_disk_list_types.go index ae30f4b..e6ec346 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_list_types.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_list_types_detailed.go b/internal/service/cloudbroker/disks/data_source_cb_disk_list_types_detailed.go index 46df7cb..21b9240 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_list_types_detailed.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_list_unattached.go b/internal/service/cloudbroker/disks/data_source_cb_disk_list_unattached.go index 510c12e..2fe77f9 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_list_unattached.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_replication.go b/internal/service/cloudbroker/disks/data_source_cb_disk_replication.go index 624fb07..6f7994e 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_replication.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_snapshot.go b/internal/service/cloudbroker/disks/data_source_cb_disk_snapshot.go index 0d0ffff..f21b341 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_snapshot.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/data_source_cb_disk_snapshot_list.go b/internal/service/cloudbroker/disks/data_source_cb_disk_snapshot_list.go index 65031a5..f3ac8a0 100644 --- a/internal/service/cloudbroker/disks/data_source_cb_disk_snapshot_list.go +++ b/internal/service/cloudbroker/disks/data_source_cb_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/cloudbroker/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) { diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk.go index 5faa22e..033e179 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk.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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" ) @@ -16,7 +16,7 @@ import ( // DiskDataSource 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 DiskDataSource(ctx context.Context, state *models.DiskModel, c *decort.DecortClient) diag.Diagnostics { +func DiskDataSource(ctx context.Context, state *models.DiskModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list.go index 6466247..65f4556 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list.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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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.DisksModel, c *decort.DecortClient) diag.Diagnostics { +func DiskListDataSource(ctx context.Context, state *models.DisksModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_deleted.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_deleted.go index bd4497d..70fdddf 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_deleted.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_deleted.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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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.ListDisksModel, c *decort.DecortClient) diag.Diagnostics { +func DiskListDeletedDataSource(ctx context.Context, state *models.ListDisksModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskListDeletedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_types.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_types.go index 24aaecc..2784b76 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_types.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/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{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_types_detailed.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_types_detailed.go index a1b8cbf..290ea1c 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_types_detailed.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_types_detailed.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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" ) @@ -16,7 +16,7 @@ import ( // DiskListTypesDetailedDataSource flattens data source for disk list types detailed. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskListTypesDetailedDataSource(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *decort.DecortClient) diag.Diagnostics { +func DiskListTypesDetailedDataSource(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskListTypesDetailedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_unattached.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_unattached.go index 5ed177a..516b18e 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_unattached.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_list_unattached.go @@ -9,8 +9,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/cloudbroker/disks" + "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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" @@ -19,7 +19,7 @@ import ( // DiskListUnattachedDataSource flattens data source for disk list unattached. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskListUnattachedDataSource(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *decort.DecortClient) diag.Diagnostics { +func DiskListUnattachedDataSource(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskListUnattachedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_replication.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_replication.go index c6a94c3..f324646 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_replication.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_replication.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/cloudbroker/disks" + "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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" @@ -18,7 +18,7 @@ import ( // DiskReplicationDataSource flattens data source for disk. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskReplicationDataSource(ctx context.Context, state *models.RecordDiskModel, c *decort.DecortClient) diag.Diagnostics { +func DiskReplicationDataSource(ctx context.Context, state *models.RecordDiskModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskReplicationDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot.go index af97e28..86f6e19 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot.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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" ) @@ -15,7 +15,7 @@ import ( // DiskSnapshotDataSource flattens data source for disk snapshot. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskSnapshotDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotModel, c *decort.DecortClient) diag.Diagnostics { +func DiskSnapshotDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskSnapshotDataSource") diskId := uint64(state.DiskID.ValueInt64()) diff --git a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot_list.go b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot_list.go index bc06d84..0127d9f 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot_list.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_data_source_cb_disk_snapshot_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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" ) @@ -16,7 +16,7 @@ import ( // DiskSnapshotListDataSource flattens data source for disk snapshot list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func DiskSnapshotListDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotListModel, c *decort.DecortClient) diag.Diagnostics { +func DiskSnapshotListDataSource(ctx context.Context, state *models.DataSourceDiskSnapshotListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskSnapshotListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk.go b/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk.go index d16bbd3..0081c68 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk.go @@ -9,8 +9,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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" ) @@ -18,7 +18,7 @@ import ( // DiskResource flattens resource for disk. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func DiskResource(ctx context.Context, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func DiskResource(ctx context.Context, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_replication.go b/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_replication.go index 61b8f49..49747ba 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_replication.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_replication.go @@ -9,8 +9,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/cloudbroker/disks" + "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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" @@ -19,7 +19,7 @@ import ( // DiskReplicationResource flattens resource for disk. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func DiskReplicationResource(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func DiskReplicationResource(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskReplicationresource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_snapshot.go b/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_snapshot.go index dd0da6c..29d85ce 100644 --- a/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_snapshot.go +++ b/internal/service/cloudbroker/disks/flattens/flatten_resource_cb_disk_snapshot.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/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/utilities" ) @@ -16,7 +16,7 @@ import ( // DiskSnapshotResource flattens resource for disk snapshot. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func DiskSnapshotResource(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *decort.DecortClient) diag.Diagnostics { +func DiskSnapshotResource(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.DiskSnapshotResource", map[string]any{ "disk_id": plan.DiskID.ValueInt64(), "label": plan.Label.ValueString()}) diff --git a/internal/service/cloudbroker/disks/input_checks.go b/internal/service/cloudbroker/disks/input_checks.go index df7f223..be14af0 100644 --- a/internal/service/cloudbroker/disks/input_checks.go +++ b/internal/service/cloudbroker/disks/input_checks.go @@ -6,14 +6,14 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/ic" ) // resourceDiskReplicationInputChecks checks if user provided disk_id exist on the platform during disk replication. -func resourceDiskReplicationInputChecks(ctx context.Context, plan *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func resourceDiskReplicationInputChecks(ctx context.Context, plan *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(plan.DiskId.ValueInt64()) @@ -30,7 +30,7 @@ func resourceDiskReplicationInputChecks(ctx context.Context, plan *models.Resour // resourceDiskUpdateInputChecks checks if user provided: // account_id and gid exist on the platform during disk creation, // description, pool, sep_id, type are not attempted to be changed. -func resourceDiskUpdateInputChecks(ctx context.Context, plan, state *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func resourceDiskUpdateInputChecks(ctx context.Context, plan, state *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // check accountId and gid @@ -80,7 +80,7 @@ func resourceDiskUpdateInputChecks(ctx context.Context, plan, state *models.Reso } // resourceDiskCreateInputChecks checks if user provided account_id and gid exist on the platform during disk creation. -func resourceDiskCreateInputChecks(ctx context.Context, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func resourceDiskCreateInputChecks(ctx context.Context, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} accountId := uint64(plan.AccountID.ValueInt64()) @@ -99,7 +99,7 @@ func resourceDiskCreateInputChecks(ctx context.Context, plan *models.ResourceDis return diags } -func CheckTatlinDiskID(ctx context.Context, diskId uint64, c *decort.DecortClient) error { +func CheckTatlinDiskID(ctx context.Context, diskId uint64, c *client.Client) error { req := disks.ListRequest{ ByID: diskId, diff --git a/internal/service/cloudbroker/disks/resource_cb_disk.go b/internal/service/cloudbroker/disks/resource_cb_disk.go index 2642dcc..544ed1e 100644 --- a/internal/service/cloudbroker/disks/resource_cb_disk.go +++ b/internal/service/cloudbroker/disks/resource_cb_disk.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/cloudbroker/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -35,7 +34,7 @@ func NewResourceDisk() resource.Resource { // resourceDisk is the resource implementation. type resourceDisk struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudbroker/disks/resource_cb_disk_replication.go b/internal/service/cloudbroker/disks/resource_cb_disk_replication.go index 818a0d1..c8cdae2 100644 --- a/internal/service/cloudbroker/disks/resource_cb_disk_replication.go +++ b/internal/service/cloudbroker/disks/resource_cb_disk_replication.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceDiskReplications() resource.Resource { // resourceDiskReplication is the resource implementation. type resourceDiskReplication struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudbroker/disks/resource_cb_disk_snapshot.go b/internal/service/cloudbroker/disks/resource_cb_disk_snapshot.go index 6c58d2a..9361f22 100644 --- a/internal/service/cloudbroker/disks/resource_cb_disk_snapshot.go +++ b/internal/service/cloudbroker/disks/resource_cb_disk_snapshot.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/cloudbroker/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -33,7 +32,7 @@ func NewResourceDiskSnapshot() resource.Resource { // resourceDiskSnapshot is the resource implementation. type resourceDiskSnapshot struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk.go index 46eec54..9abe22e 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk.go @@ -5,12 +5,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskCheckPresence(ctx context.Context, state *models.DiskModel, c *decort.DecortClient) (*disks.RecordDisk, diag.Diagnostics) { +func DataSourceDiskCheckPresence(ctx context.Context, state *models.DiskModel, c *client.Client) (*disks.RecordDisk, diag.Diagnostics) { diags := diag.Diagnostics{} listReq := disks.GetRequest{DiskID: uint64(state.DiskID.ValueInt64())} diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list.go index 4c12f60..bf90174 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list.go @@ -5,12 +5,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskListCheckPresence(ctx context.Context, state *models.DisksModel, c *decort.DecortClient) (*disks.ListDisks, diag.Diagnostics) { +func DataSourceDiskListCheckPresence(ctx context.Context, state *models.DisksModel, c *client.Client) (*disks.ListDisks, diag.Diagnostics) { diags := diag.Diagnostics{} listReq := disks.ListRequest{} diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_deleted.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_deleted.go index 77d7651..74e4908 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_deleted.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_deleted.go @@ -5,12 +5,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskListDeletedCheckPresence(ctx context.Context, state *models.ListDisksModel, c *decort.DecortClient) (*disks.ListDisks, diag.Diagnostics) { +func DataSourceDiskListDeletedCheckPresence(ctx context.Context, state *models.ListDisksModel, c *client.Client) (*disks.ListDisks, diag.Diagnostics) { diags := diag.Diagnostics{} listReq := disks.ListDeletedRequest{} diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types.go index 0ebbb1d..2839e34 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types.go @@ -5,12 +5,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskListTypesCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesModel, c *decort.DecortClient) (*disks.ListTypes, diag.Diagnostics) { +func DataSourceDiskListTypesCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesModel, c *client.Client) (*disks.ListTypes, diag.Diagnostics) { diags := diag.Diagnostics{} listTypesReq := disks.ListTypesRequest{Detailed: false} diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types_detailed.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types_detailed.go index f7a371f..6fcc836 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types_detailed.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_types_detailed.go @@ -5,12 +5,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskListTypesDetailedCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *decort.DecortClient) (*disks.ListTypes, diag.Diagnostics) { +func DataSourceDiskListTypesDetailedCheckPresence(ctx context.Context, state *models.DataSourceDiskListTypesDetailedModel, c *client.Client) (*disks.ListTypes, diag.Diagnostics) { diags := diag.Diagnostics{} listTypesReq := disks.ListTypesRequest{Detailed: true} diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_unattached.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_unattached.go index d5eed51..8fb6f42 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_unattached.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_list_unattached.go @@ -5,12 +5,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskListUnattachedCheckPresence(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *decort.DecortClient) (*disks.ListUnattachedDisks, diag.Diagnostics) { +func DataSourceDiskListUnattachedCheckPresence(ctx context.Context, state *models.DataSourceDiskListUnattachedModel, c *client.Client) (*disks.ListUnattachedDisks, diag.Diagnostics) { diags := diag.Diagnostics{} listReq := disks.ListUnattachedRequest{} diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_replication.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_replication.go index a3c20ba..c5f5b8e 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_replication.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_replication.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskReplicationCheckPresence(ctx context.Context, state *models.RecordDiskModel, c *decort.DecortClient) (*disks.RecordDisk, *string, error) { +func DataSourceDiskReplicationCheckPresence(ctx context.Context, state *models.RecordDiskModel, c *client.Client) (*disks.RecordDisk, *string, error) { status, err := c.CloudBroker().Disks().ReplicationStatus(ctx, disks.ReplicationStatusRequest{DiskID: uint64(state.DiskId.ValueInt64())}) if err != nil { diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_snapshot.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_snapshot.go index 274d372..096c7eb 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_snapshot.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_snapshot.go @@ -6,12 +6,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func DataSourceDiskSnapshotCheckPresence(ctx context.Context, plan *models.DataSourceDiskSnapshotModel, c *decort.DecortClient) (*disks.ItemSnapshot, diag.Diagnostics) { +func DataSourceDiskSnapshotCheckPresence(ctx context.Context, plan *models.DataSourceDiskSnapshotModel, c *client.Client) (*disks.ItemSnapshot, diag.Diagnostics) { diags := diag.Diagnostics{} diskId := uint64(plan.DiskID.ValueInt64()) diff --git a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_snapshot_list.go b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_snapshot_list.go index 1b35e3e..09e4ad3 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_snapshot_list.go +++ b/internal/service/cloudbroker/disks/utilities/utility_data_source_cb_disk_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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func DiskSnapshotListCheckPresence(ctx context.Context, diskId uint64, c *decort.DecortClient) (*disks.ListSnapshots, error) { +func DiskSnapshotListCheckPresence(ctx context.Context, diskId uint64, c *client.Client) (*disks.ListSnapshots, error) { tflog.Info(ctx, fmt.Sprintf("DiskSnapshotListCheckPresence: Get info about disk snapshot list with disk ID - %v", diskId)) recordDisk, err := c.CloudBroker().Disks().Get(ctx, disks.GetRequest{DiskID: diskId}) diff --git a/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk.go b/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk.go index 955f79d..a0a5680 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk.go +++ b/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk.go @@ -7,18 +7,18 @@ import ( "time" "github.com/hashicorp/terraform-plugin-framework/types" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" "github.com/hashicorp/terraform-plugin-framework/diag" "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/cloudbroker/disks" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) // DiskCheckPresence checks if disk with diskId exists -func DiskCheckPresence(ctx context.Context, diskId uint64, c *decort.DecortClient) (*disks.RecordDisk, error) { +func DiskCheckPresence(ctx context.Context, diskId uint64, c *client.Client) (*disks.RecordDisk, error) { tflog.Info(ctx, fmt.Sprintf("Get info about disk with ID - %v", diskId)) diskRecord, err := c.CloudBroker().Disks().Get(ctx, disks.GetRequest{DiskID: diskId}) @@ -71,7 +71,7 @@ func CreateRequestResourceDisk(ctx context.Context, plan *models.ResourceDiskMod // LimitIOCreateDisk sets IO limits that user specified in iotune field for created resource. // In case of failure returns warnings. -func LimitIOCreateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func LimitIOCreateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} limitIOReq := disks.LimitIORequest{ @@ -122,7 +122,7 @@ func LimitIOCreateDisk(ctx context.Context, diskId uint64, plan *models.Resource // ShareableCreateDisk shares disk. // In case of failure returns warnings. -func ShareableCreateDisk(ctx context.Context, diskId uint64, c *decort.DecortClient) diag.Diagnostics { +func ShareableCreateDisk(ctx context.Context, diskId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "ShareableCreateDisk: before calling CloudBroker().Disks().Share", map[string]any{"disk_id": diskId}) @@ -141,7 +141,7 @@ func ShareableCreateDisk(ctx context.Context, diskId uint64, c *decort.DecortCli // DiskReadStatus loads disk resource by ids id, gets it current status. Performs restore and enable if needed for // Deleted status. // In case of failure returns errors. -func DiskReadStatus(ctx context.Context, state *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func DiskReadStatus(ctx context.Context, state *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "DiskReadStatus: Read status disk with ID", map[string]any{"disk_id": state.Id.ValueString()}) diags := diag.Diagnostics{} @@ -191,7 +191,7 @@ func DiskReadStatus(ctx context.Context, state *models.ResourceDiskModel, c *dec // RestoreDisk performs disk Restore request. // Returns error in case of failures. -func RestoreDisk(ctx context.Context, diskId uint64, c *decort.DecortClient) diag.Diagnostics { +func RestoreDisk(ctx context.Context, diskId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} restoreReq := disks.RestoreRequest{ @@ -215,7 +215,7 @@ func RestoreDisk(ctx context.Context, diskId uint64, c *decort.DecortClient) dia // SizeMaxUpdateDisk resizes disk. // Returns error in case of failures. -func SizeMaxUpdateDisk(ctx context.Context, diskId uint64, plan, state *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func SizeMaxUpdateDisk(ctx context.Context, diskId uint64, plan, state *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { var diags diag.Diagnostics resizeReq := disks.ResizeRequest{ @@ -258,7 +258,7 @@ func SizeMaxUpdateDisk(ctx context.Context, diskId uint64, plan, state *models.R // NameUpdateDisk renames disk. // Returns error in case of failures. -func NameUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func NameUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { var diags diag.Diagnostics renameReq := disks.RenameRequest{ @@ -288,7 +288,7 @@ func NameUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDis // LimitIOUpdateDisk changes IO limits that user specified in iotune field for updated resource. // In case of failure returns errors. -func LimitIOUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *decort.DecortClient) diag.Diagnostics { +func LimitIOUpdateDisk(ctx context.Context, diskId uint64, plan *models.ResourceDiskModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} limitIOReq := disks.LimitIORequest{ @@ -340,7 +340,7 @@ func LimitIOUpdateDisk(ctx context.Context, diskId uint64, plan *models.Resource // ShareableUpdateDisk shares or unshares disk. // In case of failure returns errors. -func ShareableUpdateDisk(ctx context.Context, diskId uint64, share bool, c *decort.DecortClient) diag.Diagnostics { +func ShareableUpdateDisk(ctx context.Context, diskId uint64, share bool, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // share @@ -374,7 +374,7 @@ func ShareableUpdateDisk(ctx context.Context, diskId uint64, share bool, c *deco return nil } -func ResourceDiskChangeNodes(ctx context.Context, diskID uint64, state, plan *models.ResourceDiskModel, afterCreate bool, c *decort.DecortClient) diag.Diagnostics { +func ResourceDiskChangeNodes(ctx context.Context, diskID uint64, state, plan *models.ResourceDiskModel, afterCreate bool, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} presentIDs := make([]uint64, 0) diff --git a/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_replication.go b/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_replication.go index 695f1d7..b3012f1 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_replication.go +++ b/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_replication.go @@ -6,12 +6,12 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) -func UtilityDiskReplicationUpdateStartStop(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityDiskReplicationUpdateStartStop(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(state.DiskId.ValueInt64()) @@ -53,7 +53,7 @@ func UtilityDiskReplicationUpdateStartStop(ctx context.Context, state *models.Re return nil } -func UtilityDiskReplicationUpdatePause(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityDiskReplicationUpdatePause(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(state.DiskId.ValueInt64()) @@ -91,7 +91,7 @@ func UtilityDiskReplicationUpdatePause(ctx context.Context, state *models.Resour return nil } -func UtilityDiskReplicationUpdateReverse(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func UtilityDiskReplicationUpdateReverse(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} diskId := uint64(state.DiskId.ValueInt64()) targetDiskId := uint64(state.ReplicationId.ValueInt64()) @@ -131,7 +131,7 @@ func UtilityDiskReplicationUpdateReverse(ctx context.Context, state *models.Reso return nil } -func ResourceDiskReplicationCheckPresence(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) (*disks.RecordDisk, *string, error) { +func ResourceDiskReplicationCheckPresence(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) (*disks.RecordDisk, *string, error) { status, err := c.CloudBroker().Disks().ReplicationStatus(ctx, disks.ReplicationStatusRequest{DiskID: uint64(state.DiskId.ValueInt64())}) if err != nil { @@ -157,7 +157,7 @@ func ResourceDiskReplicationCheckPresence(ctx context.Context, state *models.Res // DiskReadStatus loads disk resource by ids id, gets it current status. // In case of failure returns errors. -func ReplicationDiskReadStatus(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *decort.DecortClient) diag.Diagnostics { +func ReplicationDiskReadStatus(ctx context.Context, state *models.ResourceRecordDiskReplicationModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "ReplicationDiskReadStatus: Read status disk with ID", map[string]any{"disk_id": state.DiskId.ValueInt64()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_snapshot.go b/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_snapshot.go index 2ae3de3..be46b5d 100644 --- a/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_snapshot.go +++ b/internal/service/cloudbroker/disks/utilities/utility_resource_cb_disk_snapshot.go @@ -8,13 +8,13 @@ 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/cloudbroker/disks" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/disks/models" ) // DiskSnapshotCheckPresence checks if disk snapshot exists -func DiskSnapshotCheckPresence(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *decort.DecortClient) (*disks.ItemSnapshot, diag.Diagnostics) { +func DiskSnapshotCheckPresence(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *client.Client) (*disks.ItemSnapshot, diag.Diagnostics) { diags := diag.Diagnostics{} // take diskId and label from plan @@ -64,7 +64,7 @@ func DiskSnapshotCheckPresence(ctx context.Context, plan *models.ResourceDiskSna // RollbackDiskSnapshot rollbacks disk snapshot. // Returns error in case of failures. -func RollbackDiskSnapshot(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *decort.DecortClient) diag.Diagnostics { +func RollbackDiskSnapshot(ctx context.Context, plan *models.ResourceDiskSnapshotModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} rollbackReq := disks.SnapshotRollbackRequest{ diff --git a/internal/service/cloudbroker/ic/input_checks.go b/internal/service/cloudbroker/ic/input_checks.go index e104bec..a957ff2 100644 --- a/internal/service/cloudbroker/ic/input_checks.go +++ b/internal/service/cloudbroker/ic/input_checks.go @@ -5,7 +5,6 @@ import ( "context" "fmt" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" account "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account" extnet "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet" grid "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid" @@ -13,9 +12,10 @@ import ( lb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/lb" rg "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg" vins "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func ExistRG(ctx context.Context, rgId uint64, c *decort.DecortClient) error { +func ExistRG(ctx context.Context, rgId uint64, c *client.Client) error { req := rg.ListRequest{ ByID: rgId, IncludeDeleted: false, @@ -33,7 +33,7 @@ func ExistRG(ctx context.Context, rgId uint64, c *decort.DecortClient) error { return nil } -func ExistAccount(ctx context.Context, accountId uint64, c *decort.DecortClient) error { +func ExistAccount(ctx context.Context, accountId uint64, c *client.Client) error { req := account.ListRequest{ ByID: accountId, } @@ -50,7 +50,7 @@ func ExistAccount(ctx context.Context, accountId uint64, c *decort.DecortClient) return nil } -func ExistAccounts(ctx context.Context, accountIds []uint64, c *decort.DecortClient) error { +func ExistAccounts(ctx context.Context, accountIds []uint64, c *client.Client) error { req := account.ListRequest{} accountList, err := c.CloudBroker().Account().List(ctx, req) @@ -85,7 +85,7 @@ func ExistAccounts(ctx context.Context, accountIds []uint64, c *decort.DecortCli return nil } -func ExistRGs(ctx context.Context, rgIDs []uint64, c *decort.DecortClient) error { +func ExistRGs(ctx context.Context, rgIDs []uint64, c *client.Client) error { req := rg.ListRequest{ IncludeDeleted: false, } @@ -123,7 +123,7 @@ func ExistRGs(ctx context.Context, rgIDs []uint64, c *decort.DecortClient) error return nil } -func ExistLB(ctx context.Context, lbId uint64, c *decort.DecortClient) error { +func ExistLB(ctx context.Context, lbId uint64, c *client.Client) error { req := lb.ListRequest{ ByID: lbId, } @@ -140,7 +140,7 @@ func ExistLB(ctx context.Context, lbId uint64, c *decort.DecortClient) error { return nil } -func ExistLBFrontend(ctx context.Context, lbId uint64, fName string, c *decort.DecortClient) error { +func ExistLBFrontend(ctx context.Context, lbId uint64, fName string, c *client.Client) error { lb, err := c.CloudBroker().LB().Get(ctx, lb.GetRequest{LBID: lbId}) if err != nil { return err @@ -156,7 +156,7 @@ func ExistLBFrontend(ctx context.Context, lbId uint64, fName string, c *decort.D return fmt.Errorf("frontend with name %v not found", fName) } -func ExistLBBackend(ctx context.Context, lbId uint64, bName string, c *decort.DecortClient) error { +func ExistLBBackend(ctx context.Context, lbId uint64, bName string, c *client.Client) error { lb, err := c.CloudBroker().LB().Get(ctx, lb.GetRequest{LBID: lbId}) if err != nil { return err @@ -172,7 +172,7 @@ func ExistLBBackend(ctx context.Context, lbId uint64, bName string, c *decort.De return fmt.Errorf("backend with name %v not found", bName) } -func ExistExtNetInLb(ctx context.Context, extNetId uint64, c *decort.DecortClient) error { +func ExistExtNetInLb(ctx context.Context, extNetId uint64, c *client.Client) error { if extNetId == 0 { return nil } @@ -192,7 +192,7 @@ func ExistExtNetInLb(ctx context.Context, extNetId uint64, c *decort.DecortClien return nil } -func ExistVinsInLb(ctx context.Context, vinsId uint64, c *decort.DecortClient) error { +func ExistVinsInLb(ctx context.Context, vinsId uint64, c *client.Client) error { if vinsId == 0 { return nil } @@ -213,7 +213,7 @@ func ExistVinsInLb(ctx context.Context, vinsId uint64, c *decort.DecortClient) e return nil } -func ExistExtNetInVins(ctx context.Context, extNetId int, c *decort.DecortClient) error { +func ExistExtNetInVins(ctx context.Context, extNetId int, c *client.Client) error { if extNetId == 0 || extNetId == -1 { return nil } @@ -233,7 +233,7 @@ func ExistExtNetInVins(ctx context.Context, extNetId int, c *decort.DecortClient return nil } -func ExistGID(ctx context.Context, gid uint64, c *decort.DecortClient) error { +func ExistGID(ctx context.Context, gid uint64, c *client.Client) error { req := grid.ListRequest{} gridList, err := c.CloudBroker().Grid().List(ctx, req) @@ -250,7 +250,7 @@ func ExistGID(ctx context.Context, gid uint64, c *decort.DecortClient) error { return fmt.Errorf("GID with id %v not found", gid) } -func ExistVins(ctx context.Context, vinsId uint64, c *decort.DecortClient) error { +func ExistVins(ctx context.Context, vinsId uint64, c *client.Client) error { req := vins.ListRequest{ ByID: vinsId, IncludeDeleted: false, @@ -268,7 +268,7 @@ func ExistVins(ctx context.Context, vinsId uint64, c *decort.DecortClient) error return nil } -func ExistImages(ctx context.Context, imageIDs []uint64, c *decort.DecortClient) error { +func ExistImages(ctx context.Context, imageIDs []uint64, c *client.Client) error { req := image.ListRequest{} listImages, err := c.CloudBroker().Image().List(ctx, req) @@ -304,7 +304,7 @@ func ExistImages(ctx context.Context, imageIDs []uint64, c *decort.DecortClient) return nil } -func ExistExtNetInRG(ctx context.Context, extNetId, accountId uint64, c *decort.DecortClient) error { +func ExistExtNetInRG(ctx context.Context, extNetId, accountId uint64, c *client.Client) error { req := extnet.ListRequest{ AccountID: accountId, ByID: extNetId, diff --git a/internal/service/cloudbroker/k8ci/data_source_k8ci.go b/internal/service/cloudbroker/k8ci/data_source_k8ci.go index bed7003..29015ca 100644 --- a/internal/service/cloudbroker/k8ci/data_source_k8ci.go +++ b/internal/service/cloudbroker/k8ci/data_source_k8ci.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/cloudbroker/k8ci/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8CI() datasource.DataSource { // dataSourceK8CI is the data source implementation. type dataSourceK8CI struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8CI) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/k8ci/data_source_k8ci_list.go b/internal/service/cloudbroker/k8ci/data_source_k8ci_list.go index 35afaeb..3d7eed1 100644 --- a/internal/service/cloudbroker/k8ci/data_source_k8ci_list.go +++ b/internal/service/cloudbroker/k8ci/data_source_k8ci_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/cloudbroker/k8ci/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8CIList() datasource.DataSource { // dataSourceK8CIList is the data source implementation. type dataSourceK8CIList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8CIList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/k8ci/data_source_k8ci_list_deleted.go b/internal/service/cloudbroker/k8ci/data_source_k8ci_list_deleted.go index f75ed25..b0cd6fb 100644 --- a/internal/service/cloudbroker/k8ci/data_source_k8ci_list_deleted.go +++ b/internal/service/cloudbroker/k8ci/data_source_k8ci_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/cloudbroker/k8ci/flattens" @@ -26,7 +25,7 @@ func NewDataSourceK8CIListDeleted() datasource.DataSource { // dataSourceK8CIListDeleted is the data source implementation. type dataSourceK8CIListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceK8CIListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci.go b/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci.go index 6dafdfb..13112a7 100644 --- a/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci.go +++ b/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci.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/cloudbroker/k8ci/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/utilities" @@ -16,7 +16,7 @@ import ( // K8CIDataSource flattens data source for K8CI. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func K8CIDataSource(ctx context.Context, state *models.DataSourceK8CIModel, c *decort.DecortClient) diag.Diagnostics { +func K8CIDataSource(ctx context.Context, state *models.DataSourceK8CIModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.K8CIDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_list.go b/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_list.go index b3c0835..f66dfc8 100644 --- a/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_list.go +++ b/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/utilities" @@ -16,7 +16,7 @@ import ( // K8CIListDataSource flattens data source for k8ci list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func K8CIListDataSource(ctx context.Context, state *models.DataSourceK8CIListModel, c *decort.DecortClient) diag.Diagnostics { +func K8CIListDataSource(ctx context.Context, state *models.DataSourceK8CIListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.K8CIListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_list_deleted.go b/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_list_deleted.go index 5e97f5d..bbd2d91 100644 --- a/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_list_deleted.go +++ b/internal/service/cloudbroker/k8ci/flattens/flatten_data_source_k8ci_list_deleted.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/cloudbroker/k8ci/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/utilities" @@ -16,7 +16,7 @@ import ( // K8CIListDeletedDataSource flattens data source for k8ci deleted list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func K8CIListDeletedDataSource(ctx context.Context, state *models.DataSourceK8CIListDeletedModel, c *decort.DecortClient) diag.Diagnostics { +func K8CIListDeletedDataSource(ctx context.Context, state *models.DataSourceK8CIListDeletedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.K8CIListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/k8ci/flattens/flatten_recource_k8ci.go b/internal/service/cloudbroker/k8ci/flattens/flatten_recource_k8ci.go index 7549aa8..d656302 100644 --- a/internal/service/cloudbroker/k8ci/flattens/flatten_recource_k8ci.go +++ b/internal/service/cloudbroker/k8ci/flattens/flatten_recource_k8ci.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/cloudbroker/k8ci/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/utilities" ) @@ -15,7 +15,7 @@ import ( // K8CIResource flattens resource for K8CI. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func K8CIResource(ctx context.Context, state *models.ResourceK8CIModel, c *decort.DecortClient) diag.Diagnostics { +func K8CIResource(ctx context.Context, state *models.ResourceK8CIModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.K8CIResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/k8ci/input_checks.go b/internal/service/cloudbroker/k8ci/input_checks.go index f90ee1e..a7efc4a 100644 --- a/internal/service/cloudbroker/k8ci/input_checks.go +++ b/internal/service/cloudbroker/k8ci/input_checks.go @@ -6,12 +6,12 @@ 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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/models" ) -func resourceK8CIInputChecks(ctx context.Context, plan *models.ResourceK8CIModel, c *decort.DecortClient) diag.Diagnostics { +func resourceK8CIInputChecks(ctx context.Context, plan *models.ResourceK8CIModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} masterImageId := uint64(plan.MasterImageId.ValueInt64()) diff --git a/internal/service/cloudbroker/k8ci/resource_k8ci.go b/internal/service/cloudbroker/k8ci/resource_k8ci.go index 3a16ff3..abab104 100644 --- a/internal/service/cloudbroker/k8ci/resource_k8ci.go +++ b/internal/service/cloudbroker/k8ci/resource_k8ci.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/cloudbroker/k8ci" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -35,7 +34,7 @@ func NewResourceK8Ci() resource.Resource { // resourceK8CI is the resource implementation. type resourceK8CI struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci.go b/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci.go index a232402..9c0cfaa 100644 --- a/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci.go +++ b/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci.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/cloudbroker/k8ci" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func K8ciDataSourceCheckPresence(ctx context.Context, k8ciID uint64, c *decort.DecortClient) (*k8ci.RecordK8CI, diag.Diagnostics) { +func K8ciDataSourceCheckPresence(ctx context.Context, k8ciID uint64, c *client.Client) (*k8ci.RecordK8CI, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("K8ciDataSourceCheckPresence: Get info about k8ci with ID - %v", k8ciID)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list.go b/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list.go index f4a9b27..c296e60 100644 --- a/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list.go +++ b/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list.go @@ -5,12 +5,12 @@ 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/cloudbroker/k8ci" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/models" ) -func K8CIListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceK8CIListModel, c *decort.DecortClient) (*k8ci.ListK8CI, diag.Diagnostics) { +func K8CIListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceK8CIListModel, c *client.Client) (*k8ci.ListK8CI, diag.Diagnostics) { tflog.Info(ctx, "K8CIListDataSourceCheckPresence: Get info about k8ci list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list_deleted.go b/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list_deleted.go index ea6df85..891de5b 100644 --- a/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list_deleted.go +++ b/internal/service/cloudbroker/k8ci/utilities/utility_data_source_k8ci_list_deleted.go @@ -5,12 +5,12 @@ 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/cloudbroker/k8ci" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/models" ) -func K8CIListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceK8CIListDeletedModel, c *decort.DecortClient) (*k8ci.ListK8CI, diag.Diagnostics) { +func K8CIListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceK8CIListDeletedModel, c *client.Client) (*k8ci.ListK8CI, diag.Diagnostics) { tflog.Info(ctx, "K8CIListDeletedDataSourceCheckPresence: Get info about k8ci list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/k8ci/utilities/utility_resource_k8ci.go b/internal/service/cloudbroker/k8ci/utilities/utility_resource_k8ci.go index 4250d81..d712ed2 100644 --- a/internal/service/cloudbroker/k8ci/utilities/utility_resource_k8ci.go +++ b/internal/service/cloudbroker/k8ci/utilities/utility_resource_k8ci.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/cloudbroker/k8ci" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/k8ci/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) @@ -52,7 +52,7 @@ func CreateRequestResourceK8CI(ctx context.Context, plan *models.ResourceK8CIMod return createReq, nil } -func K8CIResourceEnableDisable(ctx context.Context, plan *models.ResourceK8CIModel, c *decort.DecortClient) diag.Diagnostics { +func K8CIResourceEnableDisable(ctx context.Context, plan *models.ResourceK8CIModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "EnableDisable k8ci with ID", map[string]any{"k8ci_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} k8ciid, err := strconv.ParseUint(plan.Id.ValueString(), 10, 64) @@ -78,7 +78,7 @@ func K8CIResourceEnableDisable(ctx context.Context, plan *models.ResourceK8CIMod return diags } -func K8CIResourceCheckPresence(ctx context.Context, plan *models.ResourceK8CIModel, c *decort.DecortClient) (*k8ci.RecordK8CI, diag.Diagnostics) { +func K8CIResourceCheckPresence(ctx context.Context, plan *models.ResourceK8CIModel, c *client.Client) (*k8ci.RecordK8CI, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("K8CIResourceCheckPresence: Get info about k8ci with ID - %v", plan.Id.ValueString())) diags := diag.Diagnostics{} @@ -100,7 +100,7 @@ func K8CIResourceCheckPresence(ctx context.Context, plan *models.ResourceK8CIMod return recordK8ci, nil } -func K8CIReadStatus(ctx context.Context, plan *models.ResourceK8CIModel, c *decort.DecortClient) diag.Diagnostics { +func K8CIReadStatus(ctx context.Context, plan *models.ResourceK8CIModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Read status k8ci with ID", map[string]any{"k8ci_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -149,7 +149,7 @@ func K8CIReadStatus(ctx context.Context, plan *models.ResourceK8CIModel, c *deco return diags } -func K8CIRestore(ctx context.Context, plan *models.ResourceK8CIModel, c *decort.DecortClient) diag.Diagnostics { +func K8CIRestore(ctx context.Context, plan *models.ResourceK8CIModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Restore k8ci with ID", map[string]any{"k8ci_id": plan.Id.ValueString()}) diags := diag.Diagnostics{} @@ -249,7 +249,7 @@ func K8CIIUpdateVarChecks(plan *models.ResourceK8CIModel, state *models.Resource return nil } -func K8CISharedWithUpdate(ctx context.Context, plan *models.ResourceK8CIModel, state *models.ResourceK8CIModel, c *decort.DecortClient) diag.Diagnostics { +func K8CISharedWithUpdate(ctx context.Context, plan *models.ResourceK8CIModel, state *models.ResourceK8CIModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} k8ciid, err := strconv.ParseUint(state.Id.ValueString(), 10, 64) diff --git a/internal/service/cloudbroker/lb/data_source_lb.go b/internal/service/cloudbroker/lb/data_source_lb.go index 4c7a1b2..f621c29 100644 --- a/internal/service/cloudbroker/lb/data_source_lb.go +++ b/internal/service/cloudbroker/lb/data_source_lb.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/cloudbroker/lb/flattens" @@ -26,7 +25,7 @@ func NewDataSourceLB() datasource.DataSource { // dataSourceLB is the data source implementation. type dataSourceLB struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceLB) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/lb/data_source_lb_list.go b/internal/service/cloudbroker/lb/data_source_lb_list.go index 129d52b..7b5b817 100644 --- a/internal/service/cloudbroker/lb/data_source_lb_list.go +++ b/internal/service/cloudbroker/lb/data_source_lb_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/cloudbroker/lb/flattens" @@ -26,7 +25,7 @@ func NewDataSourceLBList() datasource.DataSource { // dataSourceLBList is the data source implementation. type dataSourceLBList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceLBList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/lb/data_source_lb_list_deleted.go b/internal/service/cloudbroker/lb/data_source_lb_list_deleted.go index 11605c5..d8b6a5e 100644 --- a/internal/service/cloudbroker/lb/data_source_lb_list_deleted.go +++ b/internal/service/cloudbroker/lb/data_source_lb_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/cloudbroker/lb/flattens" @@ -26,7 +25,7 @@ func NewDataSourceLBListDeleted() datasource.DataSource { // dataSourceLBListDeleted is the data source implementation. type dataSourceLBListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceLBListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb.go b/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb.go index 890717a..dafa573 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb.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/cloudbroker/lb" + "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/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" @@ -18,7 +18,7 @@ import ( // LBDataSource flattens data source for lb. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func LBDataSource(ctx context.Context, state *models.DataSourceLB, c *decort.DecortClient) diag.Diagnostics { +func LBDataSource(ctx context.Context, state *models.DataSourceLB, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list.go b/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list.go index f4bf653..01a2b0c 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list.go @@ -8,12 +8,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/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" ) -func LBListDataSource(ctx context.Context, state *models.DataSourceLBList, c *decort.DecortClient) diag.Diagnostics { +func LBListDataSource(ctx context.Context, state *models.DataSourceLBList, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list_deleted.go b/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list_deleted.go index 31a6677..2a70aac 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list_deleted.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_data_source_lb_list_deleted.go @@ -8,12 +8,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/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" ) -func LBListDeletedDataSource(ctx context.Context, state *models.DataSourceLBListDeleted, c *decort.DecortClient) diag.Diagnostics { +func LBListDeletedDataSource(ctx context.Context, state *models.DataSourceLBListDeleted, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBListDeletedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/flattens/flatten_resource_lb.go b/internal/service/cloudbroker/lb/flattens/flatten_resource_lb.go index c360b18..4242a62 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_resource_lb.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_resource_lb.go @@ -7,13 +7,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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" ) -func LBResource(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBResource(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend.go b/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend.go index 449fd56..01242c8 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend.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/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" ) -func LBBackendResource(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func LBBackendResource(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBBackendResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend_server.go b/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend_server.go index 2485f65..d693c1c 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend_server.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_resource_lb_backend_server.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/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" ) -func LBBackendServerResource(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func LBBackendServerResource(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBBackendServerResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend.go b/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend.go index 7b99717..c31e24f 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend.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/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" ) -func LBFrontendResource(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) diag.Diagnostics { +func LBFrontendResource(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBFrontendResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend_bind.go b/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend_bind.go index 7cb1178..faa8a21 100644 --- a/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend_bind.go +++ b/internal/service/cloudbroker/lb/flattens/flatten_resoursce_lb_frontend_bind.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/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/utilities" ) -func LBFrontendBindResource(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func LBFrontendBindResource(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.LBFrontendBindResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/input_check.go b/internal/service/cloudbroker/lb/input_check.go index e4bd7a6..b5dca71 100644 --- a/internal/service/cloudbroker/lb/input_check.go +++ b/internal/service/cloudbroker/lb/input_check.go @@ -6,13 +6,13 @@ 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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" ) // resourceLBInputChecks checks if rg_id, extnet_id and vins_id are valid. -func resourceLBInputChecks(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBInputChecks(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} extNetId := uint64(plan.ExtNetID.ValueInt64()) @@ -46,7 +46,7 @@ func resourceLBInputChecks(ctx context.Context, plan *models.ResourceLBModel, c } // resourceLBFrontendBindInputChecks checks if lb_id and backend_name are valid. -func resourceLBFrontendBindInputChecks(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBFrontendBindInputChecks(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) @@ -68,7 +68,7 @@ func resourceLBFrontendBindInputChecks(ctx context.Context, plan *models.Resourc } // resourceLBFrontendInputChecks checks if lb_id and backend_name are valid. -func resourceLBFrontendInputChecks(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBFrontendInputChecks(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) @@ -90,7 +90,7 @@ func resourceLBFrontendInputChecks(ctx context.Context, plan *models.ResourceLBF } // resourceLBBackendServerInputChecks checks if lb_id and backend_name are valid. -func resourceLBBackendServerInputChecks(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBBackendServerInputChecks(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) @@ -111,7 +111,7 @@ func resourceLBBackendServerInputChecks(ctx context.Context, plan *models.Resour } // resourceLBBackendInputChecks checks if lb_id are valid. -func resourceLBBackendInputChecks(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func resourceLBBackendInputChecks(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} lbID := uint64(plan.LBID.ValueInt64()) diff --git a/internal/service/cloudbroker/lb/resource_lb.go b/internal/service/cloudbroker/lb/resource_lb.go index f29e49a..50be384 100644 --- a/internal/service/cloudbroker/lb/resource_lb.go +++ b/internal/service/cloudbroker/lb/resource_lb.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/cloudbroker/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -33,7 +32,7 @@ func NewResourceLB() resource.Resource { // resourceLB is the resource implementation. type resourceLB struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLB) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudbroker/lb/resource_lb_backend.go b/internal/service/cloudbroker/lb/resource_lb_backend.go index 4dbad17..846bd28 100644 --- a/internal/service/cloudbroker/lb/resource_lb_backend.go +++ b/internal/service/cloudbroker/lb/resource_lb_backend.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/cloudbroker/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBBackend() resource.Resource { // resourceLBBackend is the resource implementation. type resourceLBBackend struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBBackend) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudbroker/lb/resource_lb_backend_server.go b/internal/service/cloudbroker/lb/resource_lb_backend_server.go index 1e9945e..c215a43 100644 --- a/internal/service/cloudbroker/lb/resource_lb_backend_server.go +++ b/internal/service/cloudbroker/lb/resource_lb_backend_server.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/cloudbroker/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBBackendServer() resource.Resource { // resourceLBBackendServer is the resource implementation. type resourceLBBackendServer struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBBackendServer) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudbroker/lb/resource_lb_frontend.go b/internal/service/cloudbroker/lb/resource_lb_frontend.go index a982681..a01ecb0 100644 --- a/internal/service/cloudbroker/lb/resource_lb_frontend.go +++ b/internal/service/cloudbroker/lb/resource_lb_frontend.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/cloudbroker/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBFrontend() resource.Resource { // resourceLBFrontend is the resource implementation. type resourceLBFrontend struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBFrontend) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudbroker/lb/resource_lb_frontend_bind.go b/internal/service/cloudbroker/lb/resource_lb_frontend_bind.go index a5af402..cd5fe9e 100644 --- a/internal/service/cloudbroker/lb/resource_lb_frontend_bind.go +++ b/internal/service/cloudbroker/lb/resource_lb_frontend_bind.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/cloudbroker/lb" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -32,7 +31,7 @@ func NewResourceLBFrontendBind() resource.Resource { // resourceLBFrontendBind is the resource implementation. type resourceLBFrontendBind struct { - client *decort.DecortClient + client *client.Client } func (r *resourceLBFrontendBind) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/service/cloudbroker/lb/utilities/utility_data_source_lb.go b/internal/service/cloudbroker/lb/utilities/utility_data_source_lb.go index 446cc77..b0c24c4 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_data_source_lb.go +++ b/internal/service/cloudbroker/lb/utilities/utility_data_source_lb.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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func LBDataSourceCheckPresence(ctx context.Context, lbId uint64, c *decort.DecortClient) (*lb.RecordLB, diag.Diagnostics) { +func LBDataSourceCheckPresence(ctx context.Context, lbId uint64, c *client.Client) (*lb.RecordLB, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBDataSourceCheckPresence: Get info about lb with ID - %v", lbId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_list.go b/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_list.go index 60090df..65b8d97 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_list.go +++ b/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" ) -func LBListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBList, c *decort.DecortClient) (*lb.ListLB, error) { +func LBListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBList, c *client.Client) (*lb.ListLB, error) { listLBReq := lb.ListRequest{} diff --git a/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_list_deleted.go b/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_list_deleted.go index f3a9b1c..0a7f005 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_list_deleted.go +++ b/internal/service/cloudbroker/lb/utilities/utility_data_source_lb_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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" ) -func LBListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBListDeleted, c *decort.DecortClient) (*lb.ListLB, error) { +func LBListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceLBListDeleted, c *client.Client) (*lb.ListLB, error) { req := lb.ListDeletedRequest{} diff --git a/internal/service/cloudbroker/lb/utilities/utility_resource_lb.go b/internal/service/cloudbroker/lb/utilities/utility_resource_lb.go index 6cf45b6..40c40c9 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_resource_lb.go +++ b/internal/service/cloudbroker/lb/utilities/utility_resource_lb.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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) -func CreateResourceLB(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateResourceLB(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLB: name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -63,7 +63,7 @@ func CreateResourceLB(ctx context.Context, plan *models.ResourceLBModel, c *deco return lbId, nil } -func LBResourceCheckPresence(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) (*lb.RecordLB, diag.Diagnostics) { +func LBResourceCheckPresence(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) (*lb.RecordLB, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBCheckPresence: Get info about LB with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -83,7 +83,7 @@ func LBResourceCheckPresence(ctx context.Context, plan *models.ResourceLBModel, return lbItem, nil } -func LBEnableDisable(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBEnableDisable(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "EnableDisable lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} lbId, err := strconv.ParseUint(plan.ID.ValueString(), 10, 64) @@ -109,7 +109,7 @@ func LBEnableDisable(ctx context.Context, plan *models.ResourceLBModel, c *decor return diags } -func LBReadStatus(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBReadStatus(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Read status lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -167,7 +167,7 @@ func LBReadStatus(ctx context.Context, plan *models.ResourceLBModel, c *decort.D return diags } -func LBRestore(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBRestore(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Restore lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -188,7 +188,7 @@ func LBRestore(ctx context.Context, plan *models.ResourceLBModel, c *decort.Deco return diags } -func LBStartStop(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBStartStop(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "StartStop lb with ID", map[string]any{"lb_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} lbId, err := strconv.ParseUint(plan.ID.ValueString(), 10, 64) @@ -217,7 +217,7 @@ func LBStartStop(ctx context.Context, plan *models.ResourceLBModel, c *decort.De return diags } -func LBUpdateHaMode(ctx context.Context, state *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBUpdateHaMode(ctx context.Context, state *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update ha mode from lb with ID", map[string]any{"id": state.ID.ValueString()}) diags := diag.Diagnostics{} @@ -239,7 +239,7 @@ func LBUpdateHaMode(ctx context.Context, state *models.ResourceLBModel, c *decor return diags } -func LBUpdateSysctlParams(ctx context.Context, plan *models.ResourceLBModel, state *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBUpdateSysctlParams(ctx context.Context, plan *models.ResourceLBModel, state *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update sysctl parameters from LB with ID", map[string]any{"id": state.ID.ValueString()}) diags := diag.Diagnostics{} @@ -276,7 +276,7 @@ func LBUpdateSysctlParams(ctx context.Context, plan *models.ResourceLBModel, sta return diags } -func LBUpdateDescription(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBUpdateDescription(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Update description from lb with ID", map[string]any{"id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -298,7 +298,7 @@ func LBUpdateDescription(ctx context.Context, plan *models.ResourceLBModel, c *d return diags } -func LBRestart(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBRestart(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Restart lb with ID", map[string]any{"id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -329,7 +329,7 @@ func LBRestart(ctx context.Context, plan *models.ResourceLBModel, c *decort.Deco return diags } -func LBConfigReset(ctx context.Context, plan *models.ResourceLBModel, c *decort.DecortClient) diag.Diagnostics { +func LBConfigReset(ctx context.Context, plan *models.ResourceLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Reset config from lb with ID", map[string]any{"id": plan.ID.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend.go b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend.go index 451ba46..4b46629 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend.go +++ b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend.go @@ -8,12 +8,12 @@ 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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" ) -func CreateResourceLBBackend(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBBackend(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBBackend: backend_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -71,7 +71,7 @@ func CreateResourceLBBackend(ctx context.Context, plan *models.ResourceLBBackend return nil } -func LBBackendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendModel, c *decort.DecortClient) (*lb.ItemBackend, diag.Diagnostics) { +func LBBackendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendModel, c *client.Client) (*lb.ItemBackend, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBBackendCheckPresence: Get info about LB Backend with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -109,7 +109,7 @@ func LBBackendResourceCheckPresence(ctx context.Context, plan *models.ResourceLB return nil, diags } -func UpdateLBBackend(ctx context.Context, plan, state *models.ResourceLBBackendModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateLBBackend(ctx context.Context, plan, state *models.ResourceLBBackendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("UpdateLBBackend: Start edit lb backend with ID - %v", state.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend_server.go b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend_server.go index 0853370..230bfc0 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend_server.go +++ b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_backend_server.go @@ -8,12 +8,12 @@ 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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" ) -func CreateResourceLBBackendServer(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBBackendServer(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBBackendServer: name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -74,7 +74,7 @@ func CreateResourceLBBackendServer(ctx context.Context, plan *models.ResourceLBB return nil } -func LBBackendServerResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *decort.DecortClient) (*lb.ItemServer, diag.Diagnostics) { +func LBBackendServerResourceCheckPresence(ctx context.Context, plan *models.ResourceLBBackendServerModel, c *client.Client) (*lb.ItemServer, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBBackendServerCheckPresence: Get info about LB Backend Server with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -126,7 +126,7 @@ func LBBackendServerResourceCheckPresence(ctx context.Context, plan *models.Reso return nil, diags } -func UpdateLBBackendServer(ctx context.Context, plan, state *models.ResourceLBBackendServerModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateLBBackendServer(ctx context.Context, plan, state *models.ResourceLBBackendServerModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("UpdateLBBackendServer: Start edit lb backend server with ID - %v", state.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend.go b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend.go index f35128c..8cb4692 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend.go +++ b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend.go @@ -8,12 +8,12 @@ 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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" ) -func CreateResourceLBFrontend(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBFrontend(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBFrontend: frontend_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -36,7 +36,7 @@ func CreateResourceLBFrontend(ctx context.Context, plan *models.ResourceLBFronte return nil } -func LBFrontendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendModel, c *decort.DecortClient) (*lb.ItemFrontend, diag.Diagnostics) { +func LBFrontendResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendModel, c *client.Client) (*lb.ItemFrontend, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBFrontendCheckPresence: Get info about LB Frontend with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend_bind.go b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend_bind.go index 38699d6..1071508 100644 --- a/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend_bind.go +++ b/internal/service/cloudbroker/lb/utilities/utility_resource_lb_frontend_bind.go @@ -8,12 +8,12 @@ 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/cloudbroker/lb" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/lb/models" ) -func CreateResourceLBFrontendBind(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func CreateResourceLBFrontendBind(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("Start create ResourceLBFrontendBind: frontend_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -38,7 +38,7 @@ func CreateResourceLBFrontendBind(ctx context.Context, plan *models.ResourceLBFr return nil } -func LBFrontendBindResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *decort.DecortClient) (*lb.ItemBinding, diag.Diagnostics) { +func LBFrontendBindResourceCheckPresence(ctx context.Context, plan *models.ResourceLBFrontendBindModel, c *client.Client) (*lb.ItemBinding, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("LBFrontendBindCheckPresence: Get info about LB Frontend Bind with ID - %v", plan.ID.ValueString())) diags := diag.Diagnostics{} @@ -90,7 +90,7 @@ func LBFrontendBindResourceCheckPresence(ctx context.Context, plan *models.Resou return nil, diags } -func UpdateLBFrontendBind(ctx context.Context, plan, state *models.ResourceLBFrontendBindModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateLBFrontendBind(ctx context.Context, plan, state *models.ResourceLBFrontendBindModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, fmt.Sprintf("UpdateLBFrontendBind: Start edit lb frontend bind with ID - %v", state.ID.ValueString())) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/node/data_source_cb_node.go b/internal/service/cloudbroker/node/data_source_cb_node.go index 1a5f22f..49267ce 100644 --- a/internal/service/cloudbroker/node/data_source_cb_node.go +++ b/internal/service/cloudbroker/node/data_source_cb_node.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/cloudbroker/node/flattens" @@ -26,7 +25,7 @@ func NewDataSourceNode() datasource.DataSource { // dataSourceNode is the data source implementation. type dataSourceNode struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceNode) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/node/data_source_cb_node_list.go b/internal/service/cloudbroker/node/data_source_cb_node_list.go index 71576b1..d928217 100644 --- a/internal/service/cloudbroker/node/data_source_cb_node_list.go +++ b/internal/service/cloudbroker/node/data_source_cb_node_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/cloudbroker/node/flattens" @@ -26,7 +25,7 @@ func NewDataSourceNodeList() datasource.DataSource { // dataSourceNodeList is the data source implementation. type dataSourceNodeList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceNodeList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node.go b/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node.go index 348086b..e242895 100644 --- a/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node.go +++ b/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node.go @@ -7,14 +7,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/cloudbroker/node" + "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/cloudbroker/node/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/node/utilities" ) -func NodeDataSource(ctx context.Context, state *models.DataSourceNode, c *decort.DecortClient) diag.Diagnostics { +func NodeDataSource(ctx context.Context, state *models.DataSourceNode, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.NodeDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node_list.go b/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node_list.go index 627578f..3ab65b3 100644 --- a/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node_list.go +++ b/internal/service/cloudbroker/node/flattens/flatten_data_source_cb_node_list.go @@ -7,14 +7,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/cloudbroker/node" + "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/cloudbroker/node/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/node/utilities" ) -func NodeListDataSource(ctx context.Context, state *models.DataSourceNodeList, c *decort.DecortClient) diag.Diagnostics { +func NodeListDataSource(ctx context.Context, state *models.DataSourceNodeList, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.NodeDataListSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node.go b/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node.go index 83f493e..fae8dda 100644 --- a/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node.go +++ b/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node.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/cloudbroker/node" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func NodeDataSourceCheckPresence(ctx context.Context, nodeId uint64, c *decort.DecortClient) (*node.RecordNode, diag.Diagnostics) { +func NodeDataSourceCheckPresence(ctx context.Context, nodeId uint64, c *client.Client) (*node.RecordNode, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("NodeDataSourceCheckPresence: Get info about Node with ID - %v", nodeId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node_list.go b/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node_list.go index 877eaa7..706732d 100644 --- a/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node_list.go +++ b/internal/service/cloudbroker/node/utilities/utility_data_source_cb_node_list.go @@ -5,12 +5,12 @@ 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/cloudbroker/node" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/node/models" ) -func NodeListDataSourceCheckPresence(ctx context.Context, state *models.DataSourceNodeList, c *decort.DecortClient) (*node.ListNodes, diag.Diagnostics) { +func NodeListDataSourceCheckPresence(ctx context.Context, state *models.DataSourceNodeList, c *client.Client) (*node.ListNodes, diag.Diagnostics) { tflog.Info(ctx, "NodeListDataSourceCheckPresence: Get node list info") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/data_source_rg.go b/internal/service/cloudbroker/rg/data_source_rg.go index 0f33759..55067f4 100644 --- a/internal/service/cloudbroker/rg/data_source_rg.go +++ b/internal/service/cloudbroker/rg/data_source_rg.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRG() datasource.DataSource { // dataSourceRG is the data source implementation. type dataSourceRG struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRG) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_affinity_group_computes.go b/internal/service/cloudbroker/rg/data_source_rg_affinity_group_computes.go index 7c8bb90..cc8597d 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_affinity_group_computes.go +++ b/internal/service/cloudbroker/rg/data_source_rg_affinity_group_computes.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAffinityGroupComputes() datasource.DataSource { // dataSourceRGAffinityGroupComputes is the data source implementation. type dataSourceRGAffinityGroupComputes struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAffinityGroupComputes) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_get.go b/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_get.go index 81ac2dd..de6779b 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_get.go +++ b/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_get.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAffinityGroupsGet() datasource.DataSource { // dataSourceRGAffinityGroupsGet is the data source implementation. type dataSourceRGAffinityGroupsGet struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAffinityGroupsGet) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_list.go b/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_list.go index 21dc619..9fa020c 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_list.go +++ b/internal/service/cloudbroker/rg/data_source_rg_affinity_groups_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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAffinityGroupsList() datasource.DataSource { // dataSourceRGAffinityGroupsList is the data source implementation. type dataSourceRGAffinityGroupsList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAffinityGroupsList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_audits.go b/internal/service/cloudbroker/rg/data_source_rg_audits.go index b7f75ca..eb75b07 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_audits.go +++ b/internal/service/cloudbroker/rg/data_source_rg_audits.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGAudits() datasource.DataSource { // dataSourceRGAudits is the data source implementation. type dataSourceRGAudits struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGAudits) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_get_resource_consumption.go b/internal/service/cloudbroker/rg/data_source_rg_get_resource_consumption.go index b7f7327..43039d0 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_get_resource_consumption.go +++ b/internal/service/cloudbroker/rg/data_source_rg_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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGGetResourceConsumption() datasource.DataSource { // dataSourceRGGetResourceConsumption is the data source implementation. type dataSourceRGGetResourceConsumption struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGGetResourceConsumption) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_list.go b/internal/service/cloudbroker/rg/data_source_rg_list.go index 1c046bd..783b701 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_list.go +++ b/internal/service/cloudbroker/rg/data_source_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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGList() datasource.DataSource { // dataSourceRGList is the data source implementation. type dataSourceRGList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_list_computes.go b/internal/service/cloudbroker/rg/data_source_rg_list_computes.go index aa5d382..3d6800c 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_list_computes.go +++ b/internal/service/cloudbroker/rg/data_source_rg_list_computes.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListComputes() datasource.DataSource { // dataSourceRGListComputes is the data source implementation. type dataSourceRGListComputes struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListComputes) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_list_deleted.go b/internal/service/cloudbroker/rg/data_source_rg_list_deleted.go index addb810..c5e05d5 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_list_deleted.go +++ b/internal/service/cloudbroker/rg/data_source_rg_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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListDeleted() datasource.DataSource { // dataSourceRGListDeleted is the data source implementation. type dataSourceRGListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_list_lb.go b/internal/service/cloudbroker/rg/data_source_rg_list_lb.go index 8523a81..3579e13 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_list_lb.go +++ b/internal/service/cloudbroker/rg/data_source_rg_list_lb.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListLB() datasource.DataSource { // dataSourceRGListLB is the data source implementation. type dataSourceRGListLB struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListLB) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_list_pfw.go b/internal/service/cloudbroker/rg/data_source_rg_list_pfw.go index e9b9bd6..4961156 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_list_pfw.go +++ b/internal/service/cloudbroker/rg/data_source_rg_list_pfw.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListPFW() datasource.DataSource { // dataSourceRGListPFW is the data source implementation. type dataSourceRGListPFW struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListPFW) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_list_vins.go b/internal/service/cloudbroker/rg/data_source_rg_list_vins.go index 9039f03..46b7277 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_list_vins.go +++ b/internal/service/cloudbroker/rg/data_source_rg_list_vins.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGListVins() datasource.DataSource { // dataSourceRGListVins is the data source implementation. type dataSourceRGListVins struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGListVins) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_resource_consumption_list.go b/internal/service/cloudbroker/rg/data_source_rg_resource_consumption_list.go index 6b62813..deabfc5 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_resource_consumption_list.go +++ b/internal/service/cloudbroker/rg/data_source_rg_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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGResourceConsumptionList() datasource.DataSource { // dataSourceRGResourceConsumptionList is the data source implementation. type dataSourceRGResourceConsumptionList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGResourceConsumptionList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/data_source_rg_usage.go b/internal/service/cloudbroker/rg/data_source_rg_usage.go index 343a3f3..e28afd9 100644 --- a/internal/service/cloudbroker/rg/data_source_rg_usage.go +++ b/internal/service/cloudbroker/rg/data_source_rg_usage.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/cloudbroker/rg/flattens" @@ -26,7 +25,7 @@ func NewDataSourceRGUsage() datasource.DataSource { // dataSourceRGUsage is the data source implementation. type dataSourceRGUsage struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceRGUsage) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg.go index 7dc65a0..d2a7325 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg.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/cloudbroker/rg" + "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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" @@ -18,7 +18,7 @@ import ( // RGDataSource flattens data source for rg (resource group). // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGDataSource(ctx context.Context, state *models.DataSourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func RGDataSource(ctx context.Context, state *models.DataSourceRGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_group_computes.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_group_computes.go index d9db610..f10ca34 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_group_computes.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_group_computes.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGAffinityGroupComputesDataSource flattens data source for rg affinity group computes. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAffinityGroupComputesDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupComputesModel, c *decort.DecortClient) diag.Diagnostics { +func RGAffinityGroupComputesDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAffinityGroupComputesDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_get.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_get.go index 22ad5ac..664b557 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_get.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_get.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGAffinityGroupsGetDataSource flattens data source for rg affinity groups get. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAffinityGroupsGetDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsGetModel, c *decort.DecortClient) diag.Diagnostics { +func RGAffinityGroupsGetDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsGetModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAffinityGroupsGetDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_list.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_list.go index 5186717..8d6c167 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_list.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_affinity_groups_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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGAffinityGroupsListDataSource flattens data source for rg affinity groups list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAffinityGroupsListDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsListModel, c *decort.DecortClient) diag.Diagnostics { +func RGAffinityGroupsListDataSource(ctx context.Context, state *models.DataSourceRGAffinityGroupsListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAffinityGroupsListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_audits.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_audits.go index e87d158..457b616 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_audits.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_audits.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGAuditsDataSource flattens data source for rg audits. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGAuditsDataSource(ctx context.Context, state *models.DataSourceRGAuditsModel, c *decort.DecortClient) diag.Diagnostics { +func RGAuditsDataSource(ctx context.Context, state *models.DataSourceRGAuditsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGAuditsDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_get_resource_consumption.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_get_resource_consumption.go index d573009..dc4c073 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_get_resource_consumption.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_get_resource_consumption.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -17,7 +17,7 @@ import ( // RGGetResourceConsumptionDataSource 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 RGGetResourceConsumptionDataSource(ctx context.Context, state *models.DataSourceRGGetResourceConsumptionModel, c *decort.DecortClient) diag.Diagnostics { +func RGGetResourceConsumptionDataSource(ctx context.Context, state *models.DataSourceRGGetResourceConsumptionModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGGetResourceConsumptionDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list.go index 1a6687b..750605a 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" @@ -16,7 +16,7 @@ import ( // RGListDataSource flattens data source for rg list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListDataSource(ctx context.Context, state *models.DataSourceRGListModel, c *decort.DecortClient) diag.Diagnostics { +func RGListDataSource(ctx context.Context, state *models.DataSourceRGListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_computes.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_computes.go index baec43a..7a531c3 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_computes.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_computes.go @@ -10,7 +10,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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -18,7 +18,7 @@ import ( // RGListComputesDataSource flattens data source for rg list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListComputesDataSource(ctx context.Context, state *models.DataSourceRGListComputesModel, c *decort.DecortClient) diag.Diagnostics { +func RGListComputesDataSource(ctx context.Context, state *models.DataSourceRGListComputesModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListComputesDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_deleted.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_deleted.go index 3cced28..bb2c5f9 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_deleted.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_deleted.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" @@ -16,7 +16,7 @@ import ( // RGListDeletedDataSource flattens data source for rg list deleted. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListDeletedDataSource(ctx context.Context, state *models.DataSourceRGListDeletedModel, c *decort.DecortClient) diag.Diagnostics { +func RGListDeletedDataSource(ctx context.Context, state *models.DataSourceRGListDeletedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListDeletedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_lb.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_lb.go index 11d8e9a..e5d111f 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_lb.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_lb.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -16,7 +16,7 @@ import ( // RGListLBDataSource flattens data source for rg list lb. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListLBDataSource(ctx context.Context, state *models.DataSourceRGListLBModel, c *decort.DecortClient) diag.Diagnostics { +func RGListLBDataSource(ctx context.Context, state *models.DataSourceRGListLBModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListLBDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_pfw.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_pfw.go index 3a16276..07b32a0 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_pfw.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_pfw.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGListPFWDataSource flattens data source for rg list pfw. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListPFWDataSource(ctx context.Context, state *models.DataSourceRGListPFWModel, c *decort.DecortClient) diag.Diagnostics { +func RGListPFWDataSource(ctx context.Context, state *models.DataSourceRGListPFWModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListPFWDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_vins.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_vins.go index a6c8390..86aecb6 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_vins.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_list_vins.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGListVinsDataSource flattens data source for rg list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGListVinsDataSource(ctx context.Context, state *models.DataSourceRGListVinsModel, c *decort.DecortClient) diag.Diagnostics { +func RGListVinsDataSource(ctx context.Context, state *models.DataSourceRGListVinsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGListVinsDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_resource_consumption_list.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_resource_consumption_list.go index 192cf7f..336e9c2 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_resource_consumption_list.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_resource_consumption_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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGResourceConsumptionListDataSource flattens data source for rg resource consumption list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGResourceConsumptionListDataSource(ctx context.Context, state *models.DataSourceRGResourceConsumptionListModel, c *decort.DecortClient) diag.Diagnostics { +func RGResourceConsumptionListDataSource(ctx context.Context, state *models.DataSourceRGResourceConsumptionListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGResourceConsumptionListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_usage.go b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_usage.go index 4253fec..2d37a7b 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_usage.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_data_source_rg_usage.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/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" ) @@ -15,7 +15,7 @@ import ( // RGUsageDataSource flattens data source for rg usage. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func RGUsageDataSource(ctx context.Context, state *models.DataSourceRGUsageModel, c *decort.DecortClient) diag.Diagnostics { +func RGUsageDataSource(ctx context.Context, state *models.DataSourceRGUsageModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGUsageDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/flattens/flatten_resource_rg.go b/internal/service/cloudbroker/rg/flattens/flatten_resource_rg.go index 188017f..be7d15c 100644 --- a/internal/service/cloudbroker/rg/flattens/flatten_resource_rg.go +++ b/internal/service/cloudbroker/rg/flattens/flatten_resource_rg.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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/utilities" @@ -17,7 +17,7 @@ import ( // RGResource flattens resource for rg (resource group). // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func RGResource(ctx context.Context, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func RGResource(ctx context.Context, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.RGResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/rg/input_checks.go b/internal/service/cloudbroker/rg/input_checks.go index f26403d..d459bcd 100644 --- a/internal/service/cloudbroker/rg/input_checks.go +++ b/internal/service/cloudbroker/rg/input_checks.go @@ -6,12 +6,12 @@ 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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func resourceRgInputChecks(ctx context.Context, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func resourceRgInputChecks(ctx context.Context, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} accountId := uint64(plan.AccountID.ValueInt64()) diff --git a/internal/service/cloudbroker/rg/resource_rg.go b/internal/service/cloudbroker/rg/resource_rg.go index e57e143..575a671 100644 --- a/internal/service/cloudbroker/rg/resource_rg.go +++ b/internal/service/cloudbroker/rg/resource_rg.go @@ -14,7 +14,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/rg" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -37,7 +36,7 @@ func NewResourceRG() resource.Resource { // resourceRG is the resource implementation. type resourceRG struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg.go index 175acbc..ccd4da5 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func RGCheckPresence(ctx context.Context, rgId uint64, c *decort.DecortClient) (*rg.RecordRG, error) { +func RGCheckPresence(ctx context.Context, rgId uint64, c *client.Client) (*rg.RecordRG, error) { tflog.Info(ctx, fmt.Sprintf("Get info about resource group with ID - %v", rgId)) recordRG, err := c.CloudBroker().RG().Get(ctx, rg.GetRequest{RGID: rgId}) diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_group_computes.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_group_computes.go index e98a383..7ca781f 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_group_computes.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_group_computes.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg" ) -func RGAffinityGroupComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupComputesModel, c *decort.DecortClient) (*rg.ListAffinityGroupCompute, error) { +func RGAffinityGroupComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupComputesModel, c *client.Client) (*rg.ListAffinityGroupCompute, error) { agCompsReq := rg.AffinityGroupComputesRequest{ RGID: uint64(plan.RGID.ValueInt64()), AffinityGroup: plan.AffinityGroup.ValueString(), diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_get.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_get.go index 4c30592..b15b7dd 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_get.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_get.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg" ) -func RGAffinityGroupsGetCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsGetModel, c *decort.DecortClient) ([]uint64, error) { +func RGAffinityGroupsGetCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsGetModel, c *client.Client) ([]uint64, error) { agReq := rg.AffinityGroupsGetRequest{ RGID: uint64(plan.RGID.ValueInt64()), AffinityGroup: plan.AffinityGroup.ValueString(), diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_list.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_list.go index 8e6b72c..2865bbb 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_list.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_affinity_groups_list.go @@ -4,14 +4,14 @@ import ( "context" "fmt" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" "github.com/hashicorp/terraform-plugin-log/tflog" - decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg" ) -func RGAffinityGroupsListCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsListModel, c *decort.DecortClient) (*rg.ListAffinityGroup, error) { +func RGAffinityGroupsListCheckPresence(ctx context.Context, plan *models.DataSourceRGAffinityGroupsListModel, c *client.Client) (*rg.ListAffinityGroup, error) { agListReq := rg.AffinityGroupsListRequest{RGID: uint64(plan.RGID.ValueInt64())} if !plan.Page.IsNull() { diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_audits.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_audits.go index 6e7c58f..d492f78 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_audits.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_audits.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGAuditsCheckPresence(ctx context.Context, plan *models.DataSourceRGAuditsModel, c *decort.DecortClient) (*rg.ListAudits, error) { +func RGAuditsCheckPresence(ctx context.Context, plan *models.DataSourceRGAuditsModel, c *client.Client) (*rg.ListAudits, error) { auditsReq := rg.AuditsRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_get_resource_consumption.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_get_resource_consumption.go index 5f6d8b4..0e29bf0 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_get_resource_consumption.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_get_resource_consumption.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGGetResourceConsumptionCheckPresence(ctx context.Context, plan *models.DataSourceRGGetResourceConsumptionModel, c *decort.DecortClient) (*rg.ItemResourceConsumption, error) { +func RGGetResourceConsumptionCheckPresence(ctx context.Context, plan *models.DataSourceRGGetResourceConsumptionModel, c *client.Client) (*rg.ItemResourceConsumption, error) { resConsReq := rg.GetResourceConsumptionRequest{RGID: uint64(plan.RGID.ValueInt64())} tflog.Info(ctx, "RGGetResourceConsumptionCheckPresence: before call CloudBroker().RG().GetResourceConsumption", map[string]any{"response": resConsReq}) diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list.go index ddf7575..1789785 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGListCheckPresence(ctx context.Context, plan *models.DataSourceRGListModel, c *decort.DecortClient) (*rg.ListRG, error) { +func RGListCheckPresence(ctx context.Context, plan *models.DataSourceRGListModel, c *client.Client) (*rg.ListRG, error) { listReq := rg.ListRequest{} if !plan.ById.IsNull() { diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_computes.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_computes.go index 02e6577..e203ecb 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_computes.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_computes.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGListComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGListComputesModel, c *decort.DecortClient) (*rg.ListComputes, error) { +func RGListComputesCheckPresence(ctx context.Context, plan *models.DataSourceRGListComputesModel, c *client.Client) (*rg.ListComputes, error) { listCompReq := rg.ListComputesRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_deleted.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_deleted.go index cafe0ef..da04f7a 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_deleted.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGListDeletedCheckPresence(ctx context.Context, plan *models.DataSourceRGListDeletedModel, c *decort.DecortClient) (*rg.ListRG, error) { +func RGListDeletedCheckPresence(ctx context.Context, plan *models.DataSourceRGListDeletedModel, c *client.Client) (*rg.ListRG, error) { listDelReq := rg.ListDeletedRequest{} if !plan.ById.IsNull() { diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_lb.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_lb.go index 669565a..2019077 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_lb.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_lb.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGListLBCheckPresence(ctx context.Context, plan *models.DataSourceRGListLBModel, c *decort.DecortClient) (*rg.ListLB, error) { +func RGListLBCheckPresence(ctx context.Context, plan *models.DataSourceRGListLBModel, c *client.Client) (*rg.ListLB, error) { listLBReq := rg.ListLBRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_pfw.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_pfw.go index 3f72509..b43ebd8 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_pfw.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_pfw.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGListPFWCheckPresence(ctx context.Context, plan *models.DataSourceRGListPFWModel, c *decort.DecortClient) (*rg.ListPFW, error) { +func RGListPFWCheckPresence(ctx context.Context, plan *models.DataSourceRGListPFWModel, c *client.Client) (*rg.ListPFW, error) { listPFWReq := rg.ListPFWRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_vins.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_vins.go index 9742126..657a964 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_vins.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_list_vins.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGListVinsCheckPresence(ctx context.Context, plan *models.DataSourceRGListVinsModel, c *decort.DecortClient) (*rg.ListVINS, error) { +func RGListVinsCheckPresence(ctx context.Context, plan *models.DataSourceRGListVinsModel, c *client.Client) (*rg.ListVINS, error) { listVinsReq := rg.ListVINSRequest{ RGID: uint64(plan.RGID.ValueInt64()), } diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_resource_consumption_list.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_resource_consumption_list.go index 1c3e733..f4b44bd 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_resource_consumption_list.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func RGResourceConsumptionListCheckPresence(ctx context.Context, c *decort.DecortClient) (*rg.ListResourceConsumption, error) { +func RGResourceConsumptionListCheckPresence(ctx context.Context, c *client.Client) (*rg.ListResourceConsumption, error) { tflog.Info(ctx, "RGResourceConsumptionListCheckPresence: before call CloudBroker().RG().ListResourceConsumption") resConsList, err := c.CloudBroker().RG().ListResourceConsumption(ctx) if err != nil { diff --git a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_usage.go b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_usage.go index 3a8c8f2..e3a8463 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_usage.go +++ b/internal/service/cloudbroker/rg/utilities/utility_data_source_rg_usage.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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" ) -func RGUsageCheckPresence(ctx context.Context, plan *models.DataSourceRGUsageModel, c *decort.DecortClient) (*rg.Reservation, error) { +func RGUsageCheckPresence(ctx context.Context, plan *models.DataSourceRGUsageModel, c *client.Client) (*rg.Reservation, error) { usageReq := rg.UsageRequest{RGID: uint64(plan.RGID.ValueInt64())} tflog.Info(ctx, "RGUsageCheckPresence: before call CloudBroker().RG().Usage", map[string]any{"response": usageReq}) diff --git a/internal/service/cloudbroker/rg/utilities/utility_resource_rg.go b/internal/service/cloudbroker/rg/utilities/utility_resource_rg.go index 2b3a8dc..3a066eb 100644 --- a/internal/service/cloudbroker/rg/utilities/utility_resource_rg.go +++ b/internal/service/cloudbroker/rg/utilities/utility_resource_rg.go @@ -10,8 +10,8 @@ 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/cloudbroker/rg" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/rg/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) @@ -103,7 +103,7 @@ func CreateRequestResourceRG(ctx context.Context, plan *models.ResourceRGModel) } // RestoreRG performs resource group Restore request. Returns error in case of failures. -func RestoreRG(ctx context.Context, rgId uint64, c *decort.DecortClient) diag.Diagnostics { +func RestoreRG(ctx context.Context, rgId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} restoreReq := rg.RestoreRequest{RGID: rgId} @@ -124,7 +124,7 @@ func RestoreRG(ctx context.Context, rgId uint64, c *decort.DecortClient) diag.Di } // EnableRG performs resource group Enable request -func EnableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) error { +func EnableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) error { enableReq := rg.EnableRequest{RGID: rgId} tflog.Info(ctx, "utilityEnableRG: before calling CloudBroker().RG().Enable", map[string]any{"rg_id": rgId, "req": enableReq}) @@ -137,7 +137,7 @@ func EnableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c } // DisableRG performs resource group Disable request -func DisableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) error { +func DisableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) error { disableReq := rg.DisableRequest{RGID: rgId} tflog.Info(ctx, "utilityDisableRG: before calling CloudBroker().RG().Disable", map[string]any{"rg_id": rgId, "req": disableReq}) @@ -151,7 +151,7 @@ func DisableRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c // UpdateRG compares plan and state for resource group fields name, description, quota, register_computes. // If any changes are detected, Update request is performed. If not, no update is performed. -func UpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { var updateNeeded bool var diags diag.Diagnostics @@ -265,7 +265,7 @@ func UpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGMo // EnableDisableCreateRG performs Enable request is enable is true, and Disable request otherwise. // In case of failure returns warnings. -func EnableDisableCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func EnableDisableCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} var enable bool @@ -307,7 +307,7 @@ func EnableDisableCreateRG(ctx context.Context, rgId uint64, plan *models.Resour // EnableDisableUpdateRG performs Enable request is enable is true, and Disable request otherwise. // In case of failure returns errors. -func EnableDisableUpdateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func EnableDisableUpdateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} var enable bool @@ -351,7 +351,7 @@ func EnableDisableUpdateRG(ctx context.Context, rgId uint64, plan *models.Resour // If changes are detected, AccessRevoke request is performed for each deleted access user and AccessGrant request is // performed for each added access user. If no changes are detected, no requests performed. // Returns errors in case of failures. -func AccessUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func AccessUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} itemsAccessPlan := make([]models.AccessModel, 0, len(plan.Access.Elements())) @@ -442,7 +442,7 @@ func AccessUpdateRG(ctx context.Context, rgId uint64, plan, state *models.Resour // AccessCreateRG grants access to users specified in access field for created resource. // In case of failure returns warnings. -func AccessCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func AccessCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if len(plan.Access.Elements()) != 0 { @@ -493,7 +493,7 @@ func AccessCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGMod // SetDefNetUpdateRG compares plan and state for resource group update field def_net. // If any changes are detected, SetDefNet request is performed. If not, no SetDefNet is performed. // Returns error in case of failures. -func SetDefNetUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func SetDefNetUpdateRG(ctx context.Context, rgId uint64, plan, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} var setDefNetNeeded bool @@ -564,7 +564,7 @@ func SetDefNetUpdateRG(ctx context.Context, rgId uint64, plan, state *models.Res // SetDefNetCreateRG performs SetDefNet request if def_net field is not empty. Otherwise, no SetDefNet request is performed. // In case of failure returns warnings. -func SetDefNetCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func SetDefNetCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} setDefNetReq := rg.SetDefNetRequest{RGID: rgId} @@ -615,7 +615,7 @@ func SetDefNetCreateRG(ctx context.Context, rgId uint64, plan *models.ResourceRG // UpdateComputeFeature performs СomputeFeatureUpdate request if compute_feature field is not empty and need update. // In case of failure returns error. -func UpdateComputeFeature(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateComputeFeature(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} req := rg.UpdateComputeFeaturesRequest{RGID: rgId} @@ -642,7 +642,7 @@ func UpdateComputeFeature(ctx context.Context, rgId uint64, plan *models.Resourc // UpdateCpuAllocationParameter performs setCpuAllocationParameter request if cpu_allocation_parameter field is not empty and need update. // In case of failure returns error. -func UpdateCpuAllocationParameter(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateCpuAllocationParameter(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} req := rg.SetCPUAllocationParameterRequest{ RGID: rgId, @@ -663,7 +663,7 @@ func UpdateCpuAllocationParameter(ctx context.Context, rgId uint64, plan *models // UpdateCpuAllocationRatio performs setCpuAllocationRatio request if ratio field is not empty and need update. // In case of failure returns error. -func UpdateCpuAllocationRatio(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateCpuAllocationRatio(ctx context.Context, rgId uint64, plan *models.ResourceRGModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} req := rg.SetCPUAllocationRatioRequest{ RGID: rgId, @@ -685,7 +685,7 @@ func UpdateCpuAllocationRatio(ctx context.Context, rgId uint64, plan *models.Res // RGReadStatus loads rg resource by ids id, gets it current status. Performs restore and enable if needed for // Deleted status. // In case of failure returns errors. -func RGReadStatus(ctx context.Context, state *models.ResourceRGModel, c *decort.DecortClient) diag.Diagnostics { +func RGReadStatus(ctx context.Context, state *models.ResourceRGModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "RGReadStatus: Read status rg with ID", map[string]any{"rg_id": state.Id.ValueString()}) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/stack/data_sourse_stack.go b/internal/service/cloudbroker/stack/data_sourse_stack.go index 366fef7..62298af 100644 --- a/internal/service/cloudbroker/stack/data_sourse_stack.go +++ b/internal/service/cloudbroker/stack/data_sourse_stack.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/cloudbroker/stack/flattens" @@ -26,7 +25,7 @@ func NewDataSourceStack() datasource.DataSource { // dataSourceStack is the data source implementation. type dataSourceStack struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceStack) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/stack/data_sourse_stack_list.go b/internal/service/cloudbroker/stack/data_sourse_stack_list.go index 6735a58..db670e1 100644 --- a/internal/service/cloudbroker/stack/data_sourse_stack_list.go +++ b/internal/service/cloudbroker/stack/data_sourse_stack_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/cloudbroker/stack/flattens" @@ -26,7 +25,7 @@ func NewDataSourceStackList() datasource.DataSource { // dataSourceStackList is the data source implementation. type dataSourceStackList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceStackList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack.go b/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack.go index f2e3945..aeda17d 100644 --- a/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack.go +++ b/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack.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/cloudbroker/stack/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/stack/utilities" @@ -16,7 +16,7 @@ import ( // StackDataSource flattens data source for Stack. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func StackDataSource(ctx context.Context, state *models.InfoStackModel, c *decort.DecortClient) diag.Diagnostics { +func StackDataSource(ctx context.Context, state *models.InfoStackModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.StackDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack_list.go b/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack_list.go index cba802d..3970cf6 100644 --- a/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack_list.go +++ b/internal/service/cloudbroker/stack/flattens/flatten_data_sourse_stack_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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/stack/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/stack/utilities" @@ -16,7 +16,7 @@ import ( // StackListDataSource flattens data source for Stacks list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func StackListDataSource(ctx context.Context, state *models.DataSourceStackListModel, c *decort.DecortClient) diag.Diagnostics { +func StackListDataSource(ctx context.Context, state *models.DataSourceStackListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.StackListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack.go b/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack.go index ed6d567..f96f46f 100644 --- a/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack.go +++ b/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack.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/cloudbroker/stack" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func StackDataSourceCheckPresence(ctx context.Context, stackID uint64, c *decort.DecortClient) (*stack.InfoStack, error) { +func StackDataSourceCheckPresence(ctx context.Context, stackID uint64, c *client.Client) (*stack.InfoStack, error) { tflog.Info(ctx, fmt.Sprintf("StackDataSourceCheckPresence: Get info about stack with ID - %v", stackID)) record, err := c.CloudBroker().Stack().Get(ctx, stack.GetRequest{StackId: stackID}) diff --git a/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack_list.go b/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack_list.go index c054693..8ef8443 100644 --- a/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack_list.go +++ b/internal/service/cloudbroker/stack/utilities/utility_data_sourse_stack_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/cloudbroker/stack" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/stack/models" ) -func StackListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceStackListModel, c *decort.DecortClient) (*stack.ListStacks, error) { +func StackListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceStackListModel, c *client.Client) (*stack.ListStacks, error) { tflog.Info(ctx, "StackListDataSourceCheckPresence: Get info about list stacks") req := stack.ListRequest{} diff --git a/internal/service/cloudbroker/vfpool/data_source_cb_vfpool.go b/internal/service/cloudbroker/vfpool/data_source_cb_vfpool.go index dbb6c04..373f95a 100644 --- a/internal/service/cloudbroker/vfpool/data_source_cb_vfpool.go +++ b/internal/service/cloudbroker/vfpool/data_source_cb_vfpool.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/cloudbroker/vfpool/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVFPool() datasource.DataSource { // dataSourceVFPool is the data source implementation. type dataSourceVFPool struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVFPool) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vfpool/data_source_cb_vfpool_list.go b/internal/service/cloudbroker/vfpool/data_source_cb_vfpool_list.go index 628fd5a..2b49f8d 100644 --- a/internal/service/cloudbroker/vfpool/data_source_cb_vfpool_list.go +++ b/internal/service/cloudbroker/vfpool/data_source_cb_vfpool_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/cloudbroker/vfpool/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVFPoolList() datasource.DataSource { // dataSourceVFPoolList is the data source implementation. type dataSourceVFPoolList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVFPoolList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool.go b/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool.go index ea786ba..5f9510b 100644 --- a/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool.go +++ b/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool.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/cloudbroker/vfpool/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vfpool/utilities" @@ -16,7 +16,7 @@ import ( // VFPoolDataSource flattens data source for vfpool. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VFPoolDataSource(ctx context.Context, state *models.ItemVFPoolModel, c *decort.DecortClient) diag.Diagnostics { +func VFPoolDataSource(ctx context.Context, state *models.ItemVFPoolModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VFPoolDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool_list.go b/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool_list.go index f647bf3..bdd4e56 100644 --- a/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool_list.go +++ b/internal/service/cloudbroker/vfpool/flattens/flatten_data_source_cb_vfpool_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/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vfpool/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vfpool/utilities" @@ -15,7 +15,7 @@ import ( // VFPoolListDataSource flattens data source for vfpool list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VFPoolListDataSource(ctx context.Context, state *models.ListVFPoolModel, c *decort.DecortClient) diag.Diagnostics { +func VFPoolListDataSource(ctx context.Context, state *models.ListVFPoolModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VFPoolListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vfpool/flattens/flatten_resource_cb_vfpool.go b/internal/service/cloudbroker/vfpool/flattens/flatten_resource_cb_vfpool.go index bc157b7..7625c43 100644 --- a/internal/service/cloudbroker/vfpool/flattens/flatten_resource_cb_vfpool.go +++ b/internal/service/cloudbroker/vfpool/flattens/flatten_resource_cb_vfpool.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/cloudbroker/vfpool" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vfpool/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vfpool/utilities" ) @@ -17,7 +17,7 @@ import ( // VFPoolResource flattens data source for vfpool. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VFPoolResource(ctx context.Context, state *models.ResourceItemVFPoolModel, c *decort.DecortClient) diag.Diagnostics { +func VFPoolResource(ctx context.Context, state *models.ResourceItemVFPoolModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VFPoolResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vfpool/resource_cb_vfpool.go b/internal/service/cloudbroker/vfpool/resource_cb_vfpool.go index e62abcf..ca6560c 100644 --- a/internal/service/cloudbroker/vfpool/resource_cb_vfpool.go +++ b/internal/service/cloudbroker/vfpool/resource_cb_vfpool.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/cloudbroker/vfpool" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -34,7 +33,7 @@ func NewResourceVFPool() resource.Resource { // resourceVFPool is the resource implementation. type resourceVFPool struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool.go b/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool.go index 56d8086..b9c5e54 100644 --- a/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool.go +++ b/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool.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/cloudbroker/vfpool" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VFPoolCheckPresence(ctx context.Context, vfPoolID uint64, c *decort.DecortClient) (*vfpool.RecordVFPool, +func VFPoolCheckPresence(ctx context.Context, vfPoolID uint64, c *client.Client) (*vfpool.RecordVFPool, error) { req := vfpool.GetRequest{VFPoolID: vfPoolID} diff --git a/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool_list.go b/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool_list.go index 9798cb9..5b2899b 100644 --- a/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool_list.go +++ b/internal/service/cloudbroker/vfpool/utilities/utility_data_source_cb_vfpool_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/cloudbroker/vfpool" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vfpool/models" ) -func VFPoolListCheckPresence(ctx context.Context, plan *models.ListVFPoolModel, c *decort.DecortClient) (*vfpool.ListVFPool, +func VFPoolListCheckPresence(ctx context.Context, plan *models.ListVFPoolModel, c *client.Client) (*vfpool.ListVFPool, error) { req := vfpool.ListRequest{} diff --git a/internal/service/cloudbroker/vfpool/utilities/utility_resource_cb_vfpool.go b/internal/service/cloudbroker/vfpool/utilities/utility_resource_cb_vfpool.go index 6725683..bec9961 100644 --- a/internal/service/cloudbroker/vfpool/utilities/utility_resource_cb_vfpool.go +++ b/internal/service/cloudbroker/vfpool/utilities/utility_resource_cb_vfpool.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/cloudbroker/vfpool" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vfpool/models" ) -func ResourceVFPoolCheckPresence(ctx context.Context, vfPoolID uint64, c *decort.DecortClient) (*vfpool.RecordVFPool, +func ResourceVFPoolCheckPresence(ctx context.Context, vfPoolID uint64, c *client.Client) (*vfpool.RecordVFPool, error) { req := vfpool.GetRequest{VFPoolID: vfPoolID} @@ -29,7 +29,7 @@ func ResourceVFPoolCheckPresence(ctx context.Context, vfPoolID uint64, c *decort return vfPool, err } -func VFpoolResourceCreate(ctx context.Context, plan *models.ResourceItemVFPoolModel, c *decort.DecortClient) (*uint64, diag.Diagnostics) { +func VFpoolResourceCreate(ctx context.Context, plan *models.ResourceItemVFPoolModel, c *client.Client) (*uint64, diag.Diagnostics) { tflog.Info(ctx, "Start VFpoolResourceCreate", map[string]any{"name": plan.Name.ValueString()}) diags := diag.Diagnostics{} @@ -120,7 +120,7 @@ func VFpoolResourceCreate(ctx context.Context, plan *models.ResourceItemVFPoolMo // EnableDisableVFpool performs VFpool Enable/Disable request. // Returns error in case of failures. -func EnableDisableVFpool(ctx context.Context, plan *models.ResourceItemVFPoolModel, c *decort.DecortClient) diag.Diagnostics { +func EnableDisableVFpool(ctx context.Context, plan *models.ResourceItemVFPoolModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start EnableDisableVFpool", map[string]any{"vfpool_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -159,7 +159,7 @@ func EnableDisableVFpool(ctx context.Context, plan *models.ResourceItemVFPoolMod return nil } -func UpdateVFpool(ctx context.Context, state *models.ResourceItemVFPoolModel, plan *models.ResourceItemVFPoolModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateVFpool(ctx context.Context, state *models.ResourceItemVFPoolModel, plan *models.ResourceItemVFPoolModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start UpdateVFpool", map[string]any{"vfpool_id": plan.ID.ValueString()}) diags := diag.Diagnostics{} @@ -279,7 +279,7 @@ func UpdateVFpool(ctx context.Context, state *models.ResourceItemVFPoolModel, pl return nil } -func checkParamsExistence(ctx context.Context, accountIDs, rgIDs []uint64, c *decort.DecortClient) diag.Diagnostics { +func checkParamsExistence(ctx context.Context, accountIDs, rgIDs []uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if err := ic.ExistAccounts(ctx, accountIDs, c); err != nil { diff --git a/internal/service/cloudbroker/vins/data_source_vins.go b/internal/service/cloudbroker/vins/data_source_vins.go index a026800..20cefaf 100644 --- a/internal/service/cloudbroker/vins/data_source_vins.go +++ b/internal/service/cloudbroker/vins/data_source_vins.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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINS() datasource.DataSource { // dataSourceVINS is the data source implementation. type dataSourceVINS struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINS) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_audits.go b/internal/service/cloudbroker/vins/data_source_vins_audits.go index e5607fa..13d16a9 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_audits.go +++ b/internal/service/cloudbroker/vins/data_source_vins_audits.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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSAudits() datasource.DataSource { // dataSourceVINSAudits is the data source implementation. type dataSourceVINSAudits struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSAudits) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_ext_net_list.go b/internal/service/cloudbroker/vins/data_source_vins_ext_net_list.go index 780f3e1..6e78ddc 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_ext_net_list.go +++ b/internal/service/cloudbroker/vins/data_source_vins_ext_net_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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSExtNetList() datasource.DataSource { // dataSourceVINSExtNetList is the data source implementation. type dataSourceVINSExtNetList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSExtNetList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_ip_list.go b/internal/service/cloudbroker/vins/data_source_vins_ip_list.go index a344a79..e6070ef 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_ip_list.go +++ b/internal/service/cloudbroker/vins/data_source_vins_ip_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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSIPList() datasource.DataSource { // dataSourceVINSIPList is the data source implementation. type dataSourceVINSIPList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSIPList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_list.go b/internal/service/cloudbroker/vins/data_source_vins_list.go index f7445de..ae55b3f 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_list.go +++ b/internal/service/cloudbroker/vins/data_source_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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSList() datasource.DataSource { // dataSourceVINSList is the data source implementation. type dataSourceVINSList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_list_deleted.go b/internal/service/cloudbroker/vins/data_source_vins_list_deleted.go index 52d0924..3b3eb0c 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_list_deleted.go +++ b/internal/service/cloudbroker/vins/data_source_vins_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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSListDeleted() datasource.DataSource { // dataSourceVINSListDeleted is the data source implementation. type dataSourceVINSListDeleted struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSListDeleted) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_nat_rule_list.go b/internal/service/cloudbroker/vins/data_source_vins_nat_rule_list.go index bbb2716..f8bec0b 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_nat_rule_list.go +++ b/internal/service/cloudbroker/vins/data_source_vins_nat_rule_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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSNATRuleList() datasource.DataSource { // dataSourceVINSNATRuleList is the data source implementation. type dataSourceVINSNATRuleList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSNATRuleList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_static_route.go b/internal/service/cloudbroker/vins/data_source_vins_static_route.go index 061f7a5..80635d7 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_static_route.go +++ b/internal/service/cloudbroker/vins/data_source_vins_static_route.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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSStaticRoute() datasource.DataSource { // dataSourceVINSStaticRoute is the data source implementation. type dataSourceVINSStaticRoute struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSStaticRoute) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/data_source_vins_static_route_list.go b/internal/service/cloudbroker/vins/data_source_vins_static_route_list.go index a58061f..b8256fa 100644 --- a/internal/service/cloudbroker/vins/data_source_vins_static_route_list.go +++ b/internal/service/cloudbroker/vins/data_source_vins_static_route_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/cloudbroker/vins/flattens" @@ -26,7 +25,7 @@ func NewDataSourceVINSStaticRouteList() datasource.DataSource { // dataSourceVINSStaticRouteList is the data source implementation. type dataSourceVINSStaticRouteList struct { - client *decort.DecortClient + client *client.Client } func (d *dataSourceVINSStaticRouteList) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins.go index b4e9db3..fc0cb0d 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins.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/cloudbroker/vins" + "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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" @@ -18,7 +18,7 @@ import ( // VINSDataSource flattens data source for vins. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSDataSource(ctx context.Context, state *models.DataSourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VINSDataSource(ctx context.Context, state *models.DataSourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSDataSource") diags := diag.Diagnostics{} @@ -101,6 +101,7 @@ func flattenVNFDev(ctx context.Context, vnfdev *vins.VNFDev) types.Object { Status: types.StringValue(vnfdev.Status), TechStatus: types.StringValue(vnfdev.TechStatus), Type: types.StringValue(vnfdev.Type), + VNCPassword: types.StringValue(vnfdev.VNCPassword), VINS: flattens.FlattenSimpleTypeToList(ctx, types.Int64Type, &vnfdev.VINS), } @@ -336,14 +337,10 @@ func flattenReservations(ctx context.Context, items *vins.ListReservations) type tempSlice := make([]types.Object, 0, len(*items)) for _, item := range *items { temp := models.ReservationModel{ - ClientType: types.StringValue(item.ClientType), - Description: types.StringValue(item.Description), - DomainName: types.StringValue(item.DomainName), - Hostname: types.StringValue(item.Hostname), - IP: types.StringValue(item.IP), - MAC: types.StringValue(item.MAC), - Type: types.StringValue(item.Type), - VMID: types.Int64Value(int64(item.VMID)), + IP: types.StringValue(item.IP), + MAC: types.StringValue(item.MAC), + Type: types.StringValue(item.Type), + VMID: types.Int64Value(int64(item.VMID)), } obj, diags := types.ObjectValueFrom(ctx, models.ItemReservations, temp) diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_audits.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_audits.go index 15e23a5..ee59016 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_audits.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_audits.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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSAuditsDataSource flattens data source for vins audits. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSAuditsDataSource(ctx context.Context, state *models.DataSourceVINSAuditsModel, c *decort.DecortClient) diag.Diagnostics { +func VINSAuditsDataSource(ctx context.Context, state *models.DataSourceVINSAuditsModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSAuditsDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ext_net_list.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ext_net_list.go index e34fb6f..a196ef8 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ext_net_list.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ext_net_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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSExtNetListDataSource flattens data source for vins ext net list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSExtNetListDataSource(ctx context.Context, state *models.DataSourceVINSExtNetListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSExtNetListDataSource(ctx context.Context, state *models.DataSourceVINSExtNetListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSExtNetListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ip_list.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ip_list.go index 0d2e7e3..ea3dde5 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ip_list.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_ip_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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSIPListDataSource flattens data source for vins ip list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSIPListDataSource(ctx context.Context, state *models.DataSourceVINSIPListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSIPListDataSource(ctx context.Context, state *models.DataSourceVINSIPListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSIPListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list.go index 8db3feb..d402d8d 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list.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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -17,7 +17,7 @@ import ( // VINSListDataSource flattens data source for vins list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSListDataSource(ctx context.Context, state *models.DataSourceVINSListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSListDataSource(ctx context.Context, state *models.DataSourceVINSListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list_deleted.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list_deleted.go index 34740b9..a121bf3 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list_deleted.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_list_deleted.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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSListDeletedDataSource flattens data source for vins list deleted. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSListDeletedDataSource(ctx context.Context, state *models.DataSourceVINSListDeletedModel, c *decort.DecortClient) diag.Diagnostics { +func VINSListDeletedDataSource(ctx context.Context, state *models.DataSourceVINSListDeletedModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSListDeletedDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_nat_rule_list.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_nat_rule_list.go index 889a607..d24c57c 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_nat_rule_list.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_nat_rule_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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -15,7 +15,7 @@ import ( // VINSNATRuleListDataSource flattens data source for vins nat rule list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSNATRuleListDataSource(ctx context.Context, state *models.DataSourceVINSNATRuleListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSNATRuleListDataSource(ctx context.Context, state *models.DataSourceVINSNATRuleListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSNATRuleListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route.go index 259e83b..586dd10 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route.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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -16,7 +16,7 @@ import ( // VINSStaticRouteDataSource flattens data source for vins static route. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSStaticRouteDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { +func VINSStaticRouteDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSStaticRouteDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route_list.go b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route_list.go index 7b93620..b256bf3 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route_list.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_data_source_vins_static_route_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/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -16,7 +16,7 @@ import ( // VINSStaticRouteListDataSource flattens data source for vins static route list. // Return error in case data source is not found on the platform. // Flatten errors are added to tflog. -func VINSStaticRouteListDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteListModel, c *decort.DecortClient) diag.Diagnostics { +func VINSStaticRouteListDataSource(ctx context.Context, state *models.DataSourceVINSStaticRouteListModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSStaticRouteListDataSource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_resource_vins.go b/internal/service/cloudbroker/vins/flattens/flatten_resource_vins.go index 21edc75..95728a9 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_resource_vins.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_resource_vins.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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -17,7 +17,7 @@ import ( // VINSResource flattens resource for vins. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func VINSResource(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VINSResource(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSResource") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/flattens/flatten_resource_vins_static_route.go b/internal/service/cloudbroker/vins/flattens/flatten_resource_vins_static_route.go index b4fb9a8..284321f 100644 --- a/internal/service/cloudbroker/vins/flattens/flatten_resource_vins_static_route.go +++ b/internal/service/cloudbroker/vins/flattens/flatten_resource_vins_static_route.go @@ -8,7 +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/terraform-provider-dynamix/internal/client" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/flattens" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/utilities" ) @@ -16,7 +17,7 @@ import ( // VINSStaticRouteResource flattens resource for vins static route. // Return error in case resource is not found on the platform. // Flatten errors are added to tflog. -func VINSStaticRouteResource(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { +func VINSStaticRouteResource(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start flattens.VINSStaticRouteResource") vinsId, routeId, diags := utilities.GetVinsIDAndRouteID(ctx, plan) @@ -39,7 +40,7 @@ func VINSStaticRouteResource(ctx context.Context, plan *models.ResourceVINSStati Timeouts: plan.Timeouts, RouteID: types.Int64Value(int64(routeId)), - ComputeIDs: plan.ComputeIDs, + ComputeIDs: flattens.FlattenSimpleTypeToList(ctx, types.Int64Type, recordRoute.ComputeIds), Id: plan.Id, LastUpdated: plan.LastUpdated, diff --git a/internal/service/cloudbroker/vins/input_checks.go b/internal/service/cloudbroker/vins/input_checks.go index 79a0b53..2c57025 100644 --- a/internal/service/cloudbroker/vins/input_checks.go +++ b/internal/service/cloudbroker/vins/input_checks.go @@ -7,14 +7,14 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "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/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/ic" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" ) // resourceVINSInputChecks checks if user provided rg_id, account_id, ext_net_id and gid are valid. // It also checks that either rg_id or account_id is specified. -func resourceVINSInputChecks(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func resourceVINSInputChecks(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if plan.RGID.IsUnknown() && plan.AccountID.IsUnknown() { @@ -77,7 +77,7 @@ func resourceVINSInputChecks(ctx context.Context, plan *models.ResourceVINSModel } // resourceVINSStaticRouteInputChecks checks if user provided vins_id is valid. -func resourceVINSStaticRouteInputChecks(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { +func resourceVINSStaticRouteInputChecks(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} vinsId := uint64(plan.VinsID.ValueInt64()) diff --git a/internal/service/cloudbroker/vins/models/model_data_source_vins.go b/internal/service/cloudbroker/vins/models/model_data_source_vins.go index d7ffbd1..6eb2be3 100644 --- a/internal/service/cloudbroker/vins/models/model_data_source_vins.go +++ b/internal/service/cloudbroker/vins/models/model_data_source_vins.go @@ -66,6 +66,7 @@ type RecordVNFDevModel struct { Status types.String `tfsdk:"status"` TechStatus types.String `tfsdk:"tech_status"` Type types.String `tfsdk:"type"` + VNCPassword types.String `tfsdk:"vnc_password"` VINS types.List `tfsdk:"vins"` } @@ -174,14 +175,10 @@ type RecordDHCPConfigModel struct { } type ReservationModel struct { - ClientType types.String `tfsdk:"client_type"` - Description types.String `tfsdk:"desc"` - DomainName types.String `tfsdk:"domainname"` - Hostname types.String `tfsdk:"hostname"` - IP types.String `tfsdk:"ip"` - MAC types.String `tfsdk:"mac"` - Type types.String `tfsdk:"type"` - VMID types.Int64 `tfsdk:"vm_id"` + IP types.String `tfsdk:"ip"` + MAC types.String `tfsdk:"mac"` + Type types.String `tfsdk:"type"` + VMID types.Int64 `tfsdk:"vm_id"` } type RecordNATModel struct { @@ -270,6 +267,7 @@ var ItemVNFDev = map[string]attr.Type{ "status": types.StringType, "tech_status": types.StringType, "type": types.StringType, + "vnc_password": types.StringType, "vins": types.ListType{ElemType: types.Int64Type}, } @@ -377,14 +375,10 @@ var ItemDHCPConfig = map[string]attr.Type{ } var ItemReservations = map[string]attr.Type{ - "client_type": types.StringType, - "desc": types.StringType, - "domainname": types.StringType, - "hostname": types.StringType, - "ip": types.StringType, - "mac": types.StringType, - "type": types.StringType, - "vm_id": types.Int64Type, + "ip": types.StringType, + "mac": types.StringType, + "type": types.StringType, + "vm_id": types.Int64Type, } var ItemGW = map[string]attr.Type{ diff --git a/internal/service/cloudbroker/vins/models/model_resource_vins_static_route.go b/internal/service/cloudbroker/vins/models/model_resource_vins_static_route.go index f235de5..f1de618 100644 --- a/internal/service/cloudbroker/vins/models/model_resource_vins_static_route.go +++ b/internal/service/cloudbroker/vins/models/model_resource_vins_static_route.go @@ -13,12 +13,12 @@ type ResourceVINSStaticRouteModel struct { Gateway types.String `tfsdk:"gateway"` // optional fields - RouteID types.Int64 `tfsdk:"route_id"` - ComputeIDs types.List `tfsdk:"compute_ids"` - Timeouts timeouts.Value `tfsdk:"timeouts"` + RouteID types.Int64 `tfsdk:"route_id"` + Timeouts timeouts.Value `tfsdk:"timeouts"` // response fields Id types.String `tfsdk:"id"` LastUpdated types.String `tfsdk:"last_updated"` + ComputeIDs types.List `tfsdk:"compute_ids"` GUID types.String `tfsdk:"guid"` } diff --git a/internal/service/cloudbroker/vins/resource_vins.go b/internal/service/cloudbroker/vins/resource_vins.go index 1807027..3fb3f47 100644 --- a/internal/service/cloudbroker/vins/resource_vins.go +++ b/internal/service/cloudbroker/vins/resource_vins.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/cloudbroker/vins" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -35,7 +34,7 @@ func NewResourceVINS() resource.Resource { // resourceVINS is the resource implementation. type resourceVINS struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. diff --git a/internal/service/cloudbroker/vins/resource_vins_static_route.go b/internal/service/cloudbroker/vins/resource_vins_static_route.go index baf9fce..766b3d5 100644 --- a/internal/service/cloudbroker/vins/resource_vins_static_route.go +++ b/internal/service/cloudbroker/vins/resource_vins_static_route.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/cloudbroker/vins" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/constants" @@ -34,7 +33,7 @@ func NewResourceVINSStaticRoute() resource.Resource { // resourceVINSStaticRoute is the resource implementation. type resourceVINSStaticRoute struct { - client *decort.DecortClient + client *client.Client } // Create creates the resource and sets the initial Terraform state. @@ -80,17 +79,6 @@ func (r *resourceVINSStaticRoute) Create(ctx context.Context, req resource.Creat Gateway: plan.Gateway.ValueString(), } - if !plan.ComputeIDs.IsUnknown() { - computes := make([]uint64, 0, len(plan.ComputeIDs.Elements())) - diags = plan.ComputeIDs.ElementsAs(ctx, &computes, false) - if diags.HasError() { - resp.Diagnostics.Append(diags...) - tflog.Error(ctx, "Create resourceVINSStaticRoute: cannot populate computes with plan.ComputeIDs List elements") - return - } - staticReq.ComputeIds = computes - } - _, err := r.client.CloudBroker().VINS().StaticRouteAdd(ctx, staticReq) if err != nil { resp.Diagnostics.AddError("Create resourceVINSStaticRoute: Error adding static route to vins", err.Error()) @@ -166,72 +154,9 @@ func (r *resourceVINSStaticRoute) Read(ctx context.Context, req resource.ReadReq // Update updates the resource and sets the updated Terraform state on success. func (r *resourceVINSStaticRoute) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - // Retrieve values from plan - var plan models.ResourceVINSStaticRouteModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINSStaticRoute: Error receiving the plan") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: got plan successfully", map[string]any{"id": plan.Id.ValueString()}) - - // Retrieve values from state - var state models.ResourceVINSStaticRouteModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINSStaticRoute: Error receiving the state") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: got state successfully", map[string]any{"id": state.Id.ValueString()}) - - // Set timeouts - updateTimeout, diags := plan.Timeouts.Update(ctx, constants.Timeout20m) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Error set timeout") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: set timeouts successfully", map[string]any{ - "id": state.Id.ValueString(), - "updateTimeout": updateTimeout}) - - ctx, cancel := context.WithTimeout(ctx, updateTimeout) - defer cancel() - - // Checking for values in the platform - tflog.Info(ctx, "Update resourceVINSStaticRoute: starting input checks", map[string]any{"id": plan.Id.ValueString()}) - resp.Diagnostics.Append(resourceVINSStaticRouteInputChecks(ctx, &plan, r.client)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINS: Error input checks") - return - } - tflog.Info(ctx, "Update resourceVINSStaticRoute: input checks successful", map[string]any{"id": state.Id.ValueString()}) - - // change compute_ids, if needed - if !plan.ComputeIDs.Equal(state.ComputeIDs) { - resp.Diagnostics.Append(utilities.UpdateComputeIDsVINSStaticRoute(ctx, &plan, &state, r.client)...) - if resp.Diagnostics.HasError() { - tflog.Error(ctx, "Update resourceVINSStaticRoute: Error updating compute_ids") - return - } - } - - tflog.Info(ctx, "Update resourceVINSStaticRoute: resource update is completed", map[string]any{"id": plan.Id.ValueString()}) - - // Map response body to schema and populate Computed attribute values - resp.Diagnostics.Append(flattens.VINSStaticRouteResource(ctx, &plan, r.client)...) - if resp.Diagnostics.HasError() { - return - } - - // Set data last update - plan.LastUpdated = types.StringValue(time.Now().Format(time.RFC850)) - - // Set state to fully populated data - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) - if resp.Diagnostics.HasError() { - return - } + tflog.Error(ctx, "Update resourceVINSStaticRoute: This resource cannot be updated") + resp.Diagnostics.AddError("This resource cannot be updated", "") + return } // Delete deletes the resource and removes the Terraform state on success. diff --git a/internal/service/cloudbroker/vins/schemas/schema_data_source_vins.go b/internal/service/cloudbroker/vins/schemas/schema_data_source_vins.go index 787ddc8..22410ed 100644 --- a/internal/service/cloudbroker/vins/schemas/schema_data_source_vins.go +++ b/internal/service/cloudbroker/vins/schemas/schema_data_source_vins.go @@ -188,6 +188,9 @@ func MakeSchemaDataSourceVINS() map[string]schema.Attribute { "type": schema.StringAttribute{ Computed: true, }, + "vnc_password": schema.StringAttribute{ + Computed: true, + }, "vins": schema.ListAttribute{ Computed: true, ElementType: types.Int64Type, @@ -330,18 +333,6 @@ func MakeSchemaDataSourceVINS() map[string]schema.Attribute { Computed: true, NestedObject: schema.NestedAttributeObject{ Attributes: map[string]schema.Attribute{ - "client_type": schema.StringAttribute{ - Computed: true, - }, - "desc": schema.StringAttribute{ - Computed: true, - }, - "domainname": schema.StringAttribute{ - Computed: true, - }, - "hostname": schema.StringAttribute{ - Computed: true, - }, "ip": schema.StringAttribute{ Computed: true, }, diff --git a/internal/service/cloudbroker/vins/schemas/schema_resource_vins.go b/internal/service/cloudbroker/vins/schemas/schema_resource_vins.go index abcc1ae..fdd3519 100644 --- a/internal/service/cloudbroker/vins/schemas/schema_resource_vins.go +++ b/internal/service/cloudbroker/vins/schemas/schema_resource_vins.go @@ -386,6 +386,9 @@ func MakeSchemaResourceVINS() map[string]schema.Attribute { "type": schema.StringAttribute{ Computed: true, }, + "vnc_password": schema.StringAttribute{ + Computed: true, + }, "vins": schema.ListAttribute{ Computed: true, ElementType: types.Int64Type, diff --git a/internal/service/cloudbroker/vins/schemas/schema_resource_vins_static_route.go b/internal/service/cloudbroker/vins/schemas/schema_resource_vins_static_route.go index 5d26853..0d86e21 100644 --- a/internal/service/cloudbroker/vins/schemas/schema_resource_vins_static_route.go +++ b/internal/service/cloudbroker/vins/schemas/schema_resource_vins_static_route.go @@ -24,13 +24,6 @@ func MakeSchemaResourceVINSStaticRoute() map[string]schema.Attribute { Required: true, }, - // optional attributes - "compute_ids": schema.ListAttribute{ - Computed: true, - Optional: true, - ElementType: types.Int64Type, - }, - // computed attributes "id": schema.StringAttribute{ Computed: true, @@ -47,5 +40,9 @@ func MakeSchemaResourceVINSStaticRoute() map[string]schema.Attribute { "route_id": schema.Int64Attribute{ Computed: true, }, + "compute_ids": schema.ListAttribute{ + Computed: true, + ElementType: types.Int64Type, + }, } } diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins.go index 6baeef3..373c8f8 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins.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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.RecordVINS, diag.Diagnostics) { +func VINSDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.RecordVINS, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSDataSourceCheckPresence: Get info about vins with ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_audits.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_audits.go index 804760d..18b5354 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_audits.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_audits.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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSAuditsDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListAudits, diag.Diagnostics) { +func VINSAuditsDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListAudits, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSAuditsDataSourceCheckPresence: Get info about vins audit with vins ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ext_net_list.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ext_net_list.go index b1a8ae5..c3b0685 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ext_net_list.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ext_net_list.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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSExtNetListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListExtNets, diag.Diagnostics) { +func VINSExtNetListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListExtNets, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSExtNetListDataSourceCheckPresence: Get info about vins audit with vins ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ip_list.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ip_list.go index 3e8c6e1..eb6ba64 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ip_list.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_ip_list.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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSIPListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListIPs, diag.Diagnostics) { +func VINSIPListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListIPs, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSIPListDataSourceCheckPresence: Get info about vins audit with vins ID - %v", vinsId)) diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list.go index b7b3734..a508a74 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list.go @@ -5,12 +5,12 @@ 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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" ) -func VINSListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListModel, c *decort.DecortClient) (*vins.ListVINS, diag.Diagnostics) { +func VINSListDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListModel, c *client.Client) (*vins.ListVINS, diag.Diagnostics) { tflog.Info(ctx, "VINSListDataSourceCheckPresence: Get info about vins list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list_deleted.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list_deleted.go index 5383168..661ba61 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list_deleted.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_list_deleted.go @@ -5,12 +5,12 @@ 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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" ) -func VINSListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListDeletedModel, c *decort.DecortClient) (*vins.ListVINS, diag.Diagnostics) { +func VINSListDeletedDataSourceCheckPresence(ctx context.Context, plan *models.DataSourceVINSListDeletedModel, c *client.Client) (*vins.ListVINS, diag.Diagnostics) { tflog.Info(ctx, "VINSListDeletedDataSourceCheckPresence: Get info about vins list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_nat_rule_list.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_nat_rule_list.go index 222a233..f5df940 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_nat_rule_list.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_nat_rule_list.go @@ -5,12 +5,12 @@ 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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" ) -func VINSNATRuleListDataSourceCheckPresence(ctx context.Context, state *models.DataSourceVINSNATRuleListModel, c *decort.DecortClient) (*vins.ListNATRules, diag.Diagnostics) { +func VINSNATRuleListDataSourceCheckPresence(ctx context.Context, state *models.DataSourceVINSNATRuleListModel, c *client.Client) (*vins.ListNATRules, diag.Diagnostics) { tflog.Info(ctx, "VINSNATRuleListDataSourceCheckPresence: Get info about vins nat rule list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route.go index f2c383d..e0fcaa0 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route.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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSStaticRouteDataSourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *decort.DecortClient) (*vins.ItemRoutes, diag.Diagnostics) { +func VINSStaticRouteDataSourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *client.Client) (*vins.ItemRoutes, diag.Diagnostics) { tflog.Info(ctx, "VINSStaticRouteDataSourceCheckPresence: Get info about vins static route", map[string]any{ "vins_id": vinsId, "route_id": routeId, diff --git a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route_list.go b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route_list.go index 92217a1..73bdca5 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route_list.go +++ b/internal/service/cloudbroker/vins/utilities/utility_data_source_vins_static_route_list.go @@ -5,11 +5,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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" ) -func VINSStaticRouteListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.ListStaticRoutes, diag.Diagnostics) { +func VINSStaticRouteListDataSourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.ListStaticRoutes, diag.Diagnostics) { tflog.Info(ctx, "VINSStaticRouteListDataSourceCheckPresence: Get info about vins static route list") diags := diag.Diagnostics{} diff --git a/internal/service/cloudbroker/vins/utilities/utility_resource_vins.go b/internal/service/cloudbroker/vins/utilities/utility_resource_vins.go index 311ae11..b13e8ec 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_resource_vins.go +++ b/internal/service/cloudbroker/vins/utilities/utility_resource_vins.go @@ -11,13 +11,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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/status" ) -func VINSResourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.DecortClient) (*vins.RecordVINS, diag.Diagnostics) { +func VINSResourceCheckPresence(ctx context.Context, vinsId uint64, c *client.Client) (*vins.RecordVINS, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("VINSResourceCheckPresence: Get info about vins with ID - %v", vinsId)) diags := diag.Diagnostics{} @@ -35,7 +35,7 @@ func VINSResourceCheckPresence(ctx context.Context, vinsId uint64, c *decort.Dec // CreateInRGResourceVINS creates vins in resource group based on plan. // Returns vins_id for created vins and errors in case of failures. -func CreateInRGResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateInRGResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("Start CreateInRGResourceVINS: vins_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -105,7 +105,7 @@ func CreateInRGResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, // CreateInAccountResourceVINS creates vins in account based on plan. // Returns vins_id for created vins and errors in case of failures. -func CreateInAccountResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func CreateInAccountResourceVINS(ctx context.Context, plan *models.ResourceVINSModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, fmt.Sprintf("Start CreateInAccountResourceVINS: vins_name %s", plan.Name.ValueString())) diags := diag.Diagnostics{} @@ -158,7 +158,7 @@ func CreateInAccountResourceVINS(ctx context.Context, plan *models.ResourceVINSM // IPCreateVINS reserves ips that user specified in ip field for created resource. // In case of failure returns warnings. -func IPCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func IPCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // plan.IP is not null as it was checked before call @@ -206,7 +206,7 @@ func IPCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSM // IPUpdateVINS reserves/releases ips that user specified in ip field for updated resource. // In case of failure returns errors. -func IPUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func IPUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start IPUpdateVINS: new ip specified", map[string]any{"vins_id": vinsId}) diags := diag.Diagnostics{} @@ -310,7 +310,7 @@ func IPUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.Resour // ExtNetUpdateVINS updates ext_net_id and/or ext_net_ip that user specified in ext_net block for updated resource. // In case of failure returns errors. -func ExtNetUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func ExtNetUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start ExtNetUpdateVINS: new ext_net specified", map[string]any{ "vins_id": vinsId, }) @@ -364,7 +364,7 @@ func ExtNetUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.Re // NATRuleCreateVINS adds nat rules that user specified in nat_rule field for created resource. // In case of failure returns warnings. -func NATRuleCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func NATRuleCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // plan.NatRule is not null as it was checked before call @@ -411,7 +411,7 @@ func NATRuleCreateVINS(ctx context.Context, vinsId uint64, plan *models.Resource // DefaultQosCreateVINS update qos that user specified in defaultQos field for created resource. // In case of failure returns warnings. -func DefaultQosCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func DefaultQosCreateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // plan.DefaultQOS is not null as it was checked before call @@ -456,7 +456,7 @@ func DefaultQosCreateVINS(ctx context.Context, vinsId uint64, plan *models.Resou // NATRuleUpdateVINS adds/deleted nat rules that user specified in nat_rule field for updated resource. // In case of failure returns errors. -func NATRuleUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func NATRuleUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "Start NATRuleUpdateVINS: new natRule specified", map[string]any{"vins_id": vinsId}) diags := diag.Diagnostics{} @@ -557,7 +557,7 @@ func NATRuleUpdateVINS(ctx context.Context, vinsId uint64, plan, state *models.R // VINSReadStatus loads vins resource by ids id, gets it current status. Performs restore and enable if needed for // Deleted status. // In case of failure returns errors. -func VINSReadStatus(ctx context.Context, state *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VINSReadStatus(ctx context.Context, state *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { tflog.Info(ctx, "VINSReadStatus: Read status vins with ID", map[string]any{"vins_id": state.Id.ValueString()}) diags := diag.Diagnostics{} @@ -645,7 +645,7 @@ func VINSReadStatus(ctx context.Context, state *models.ResourceVINSModel, c *dec // RestoreVINS performs vins Restore request. // Returns error in case of failures. -func RestoreVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func RestoreVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "RestoreVINS: before calling CloudBroker().VINS().Restore", map[string]any{"vinsId": vinsId, "req": vins.RestoreRequest{VINSID: vinsId}}) @@ -665,7 +665,7 @@ func RestoreVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) dia // DisableVINS performs vins Disable request. // Returns error in case of failures. -func DisableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func DisableVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "DisableVINS: before calling CloudBroker().VINS().Disable", map[string]any{"vinsId": vinsId}) @@ -685,7 +685,7 @@ func DisableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) dia // EnableVINS performs vins Enable request. // Returns error in case of failures. -func EnableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag.Diagnostics { +func EnableVINS(ctx context.Context, vinsId uint64, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "EnableVINS: before calling CloudBroker().VINS().Enable", map[string]any{"vinsId": vinsId}) @@ -705,7 +705,7 @@ func EnableVINS(ctx context.Context, vinsId uint64, c *decort.DecortClient) diag // EnableDisableUpdateVINS performs vins Enable/disable request. // Returns errors in case of failures. -func EnableDisableUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func EnableDisableUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} enable := plan.Enable.ValueBool() tflog.Info(ctx, "Start EnableDisableUpdateVINS", map[string]any{"vinsId": vinsId, "enable": enable}) @@ -725,7 +725,7 @@ func EnableDisableUpdateVINS(ctx context.Context, vinsId uint64, plan *models.Re // VnfdevRestartUpdateVINS restarts vnf_dev for vins. // Returns error in case of failures. -func VnfdevRestartUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VnfdevRestartUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "VnfdevRestartUpdateVINS: before calling CloudBroker().VINS().VNFDevRestart", map[string]any{"vinsId": vinsId}) @@ -749,7 +749,7 @@ func VnfdevRestartUpdateVINS(ctx context.Context, vinsId uint64, plan *models.Re // VnfdevRedeployUpdateVINS redeploys vnf_dev for vins. // Returns error in case of failures. -func VnfdevRedeployUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VnfdevRedeployUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "VnfdevRedeployUpdateVINS: before calling CloudBroker().VINS().VNFDevRedeploy", map[string]any{"vinsId": vinsId}) @@ -773,7 +773,7 @@ func VnfdevRedeployUpdateVINS(ctx context.Context, vinsId uint64, plan *models.R // VnfdevResetUpdateVINS reset vnf_dev for vins. // Returns error in case of failures. -func VnfdevResetUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VnfdevResetUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} tflog.Info(ctx, "VnfdevResetUpdateVINS: before calling CloudBroker().VINS().VNFDevReset", map[string]any{"vinsId": vinsId}) @@ -797,7 +797,7 @@ func VnfdevResetUpdateVINS(ctx context.Context, vinsId uint64, plan *models.Reso // VnfdevStartStopUpdateVINS start/stop vnf_dev for vins. // Returns error in case of failures. -func VnfdevStartStopUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func VnfdevStartStopUpdateVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} if plan.VnfdevStart.ValueBool() { @@ -838,7 +838,7 @@ func VnfdevStartStopUpdateVINS(ctx context.Context, vinsId uint64, plan *models. // UpdateDNSlistVINS apply new DNS list in VINS // Returns error in case of failures. -func UpdateDNSlistVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateDNSlistVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} req := vins.DNSApplyRequest{ @@ -868,7 +868,7 @@ func UpdateDNSlistVINS(ctx context.Context, vinsId uint64, plan *models.Resource // UpdateDefaultQosVINS update qos that user specified in defaultQos field for update resource. // In case of failure returns error. -func UpdateDefaultQosVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *decort.DecortClient) diag.Diagnostics { +func UpdateDefaultQosVINS(ctx context.Context, vinsId uint64, plan *models.ResourceVINSModel, c *client.Client) diag.Diagnostics { diags := diag.Diagnostics{} // plan.DefaultQOS is not null as it was checked before call diff --git a/internal/service/cloudbroker/vins/utilities/utility_resource_vins_static_route.go b/internal/service/cloudbroker/vins/utilities/utility_resource_vins_static_route.go index 8b22dad..48e6883 100644 --- a/internal/service/cloudbroker/vins/utilities/utility_resource_vins_static_route.go +++ b/internal/service/cloudbroker/vins/utilities/utility_resource_vins_static_route.go @@ -8,12 +8,12 @@ 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/cloudbroker/vins" + "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/client" "repository.basistech.ru/BASIS/terraform-provider-dynamix/internal/service/cloudbroker/vins/models" ) -func VINSStaticRouteResourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *decort.DecortClient) (*vins.ItemRoutes, diag.Diagnostics) { +func VINSStaticRouteResourceCheckPresence(ctx context.Context, vinsId, routeId uint64, c *client.Client) (*vins.ItemRoutes, diag.Diagnostics) { tflog.Info(ctx, "VINSStaticRouteResourceCheckPresence: Get info about vins static route") diags := diag.Diagnostics{} @@ -79,7 +79,7 @@ func GetVinsIDAndRouteID(ctx context.Context, plan *models.ResourceVINSStaticRou return vinsId, routeId, nil } -func GetStaticRouteID(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) (uint64, diag.Diagnostics) { +func GetStaticRouteID(ctx context.Context, plan *models.ResourceVINSStaticRouteModel, c *client.Client) (uint64, diag.Diagnostics) { tflog.Info(ctx, "Start GetStaticRouteID") diags := diag.Diagnostics{} @@ -115,75 +115,6 @@ func GetStaticRouteID(ctx context.Context, plan *models.ResourceVINSStaticRouteM return 0, diags } -func UpdateComputeIDsVINSStaticRoute(ctx context.Context, plan, state *models.ResourceVINSStaticRouteModel, c *decort.DecortClient) diag.Diagnostics { - tflog.Info(ctx, "Start UpdateComputeIDsVINSStaticRoute", map[string]any{"id": plan.Id.ValueString()}) - - vinsId, routeId, diags := GetVinsIDAndRouteID(ctx, plan) - if diags.HasError() { - return diags - } - - computesPlan := make([]uint64, 0, len(plan.ComputeIDs.Elements())) - diags = plan.ComputeIDs.ElementsAs(ctx, &computesPlan, false) - if diags.HasError() { - tflog.Error(ctx, "UpdateComputeIDsVINSStaticRoute: cannot populate computes with plan.ComputeIDs List elements") - return diags - } - - computesState := make([]uint64, 0, len(state.ComputeIDs.Elements())) - diags = state.ComputeIDs.ElementsAs(ctx, &computesState, false) - if diags.HasError() { - tflog.Error(ctx, "UpdateComputeIDsVINSStaticRoute: cannot populate computes with state.ComputeIDs List elements") - return diags - } - - var deletedComputes []uint64 - for _, comp := range computesState { - if !contains(comp, computesPlan) { - deletedComputes = append(deletedComputes, comp) - } - } - if len(deletedComputes) != 0 { - revokeReq := vins.StaticRouteAccessRevokeRequest{ - VINSID: vinsId, - RouteId: routeId, - ComputeIds: deletedComputes, - } - - tflog.Info(ctx, "UpdateComputeIDsVINSStaticRoute: before call to CloudBroker().VINS().StaticRouteAccessRevoke", map[string]any{"revokeReq": revokeReq}) - _, err := c.CloudBroker().VINS().StaticRouteAccessRevoke(ctx, revokeReq) - if err != nil { - diags.AddError( - fmt.Sprintf("UpdateComputeIDsVINSStaticRoute: Cannot revoke static routes for vins with id %v", vinsId), - err.Error()) - } - } - - var addedComputes []uint64 - for _, comp := range computesPlan { - if !contains(comp, computesState) { - addedComputes = append(addedComputes, comp) - } - } - if len(addedComputes) != 0 { - grantReq := vins.StaticRouteAccessGrantRequest{ - VINSID: vinsId, - RouteId: routeId, - ComputeIds: addedComputes, - } - - tflog.Info(ctx, "UpdateComputeIDsVINSStaticRoute: before call to CloudBroker().VINS().StaticRouteAccessGrant", map[string]any{"grantReq": grantReq}) - _, err := c.CloudBroker().VINS().StaticRouteAccessGrant(ctx, grantReq) - if err != nil { - diags.AddError( - fmt.Sprintf("UpdateComputeIDsVINSStaticRoute: Cannot grant static routes for vins with id %v", vinsId), - err.Error()) - } - } - - return diags -} - // contains returns true if slice contains element. Otherwise it returns false. func contains(element uint64, slice []uint64) bool { for _, s := range slice { diff --git a/samples/cloudapi/extnet/data_extnet_reserved_ip_list/main.tf b/samples/cloudapi/extnet/data_extnet_reserved_ip_list/main.tf new file mode 100644 index 0000000..250849c --- /dev/null +++ b/samples/cloudapi/extnet/data_extnet_reserved_ip_list/main.tf @@ -0,0 +1,43 @@ +/* +Пример использования +Получение информации о зарезервированных IP адресах или пуле адресов +*/ + +#Раскомментируйте этот код, +#и внесите необходимые правки в версию и путь, +#чтобы работать с установленным вручную (не через hashicorp provider registry) провайдером +/* +terraform { + required_providers { + dynamix = { + source = "basistech.ru/tf/dynamix" + version = "" + } + } +} +*/ + +provider "dynamix" { + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true +} + +data "dynamix_extnet_reserved_ip_list" "ex_reserved_ip" { + #идентификатор аккаунта, для которого зарезервированны ресурсы + #обязательный параметр + #тип - целое число + account_id = 1111 + + #идентификатор сети + #опциональный параметр + #тип - целое число + #extnet_id = 1111 +} + +output "test" { + value = data.dynamix_extnet_reserved_ip_list.ex_reserved_ip +} diff --git a/samples/cloudapi/kvmvm/resource_kvmvm/main.tf b/samples/cloudapi/kvmvm/resource_kvmvm/main.tf index e76b6bd..edf7c55 100644 --- a/samples/cloudapi/kvmvm/resource_kvmvm/main.tf +++ b/samples/cloudapi/kvmvm/resource_kvmvm/main.tf @@ -350,6 +350,11 @@ resource "dynamix_kvmvm" "comp" { #тип - булев pin_to_stack = true + #флаг для старта компьюта при рестарте ноды + #опциональный параметр + #тип - булев + auto_start_w_node = true + #флаг доступности компьюта для проведения с ним операций #опциональный параметр #тип - булев diff --git a/samples/cloudapi/vins/resource_vins_static_route/main.tf b/samples/cloudapi/vins/resource_vins_static_route/main.tf index f2a69a6..5f5cf03 100644 --- a/samples/cloudapi/vins/resource_vins_static_route/main.tf +++ b/samples/cloudapi/vins/resource_vins_static_route/main.tf @@ -51,11 +51,6 @@ resource "dynamix_vins_static_route" "sr" { #обязательный параметр #тип - строка gateway = "192.168.201.40" - - #список виртуальных машин, которым будет предоставлен доступ к роуту - #опциональный параметр - #тип - массив целых чисел - compute_ids = [111, 222] } output "sr" { diff --git a/wiki/1.1.0/01.-Введение.md b/wiki/1.1.0/01.-Введение.md index e185aca..b825292 100644 --- a/wiki/1.1.0/01.-Введение.md +++ b/wiki/1.1.0/01.-Введение.md @@ -4,4 +4,4 @@ DYNAMIX Terraform Provider версии 1.1.x позволяет управля Если вы хорошо знакомы с инструментом Terraform и хотите максимально быстро начать использовать платформу DYNAMIX в своих Terraform-проектах, то можете сразу перейти к разделу [Пример работы](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/02.-Пример-работы.md), где приведён подробно откомментированный пример работы с основными видами ресурсов платформы. Если у вас всё же возникнут вопросы по облачной платформе DYNAMIX и порядку авторизации в ней, то обратитесь к главе [«Обзор облачной платформы DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/03.-Обзор-облачной-платформы-DYNAMIX.md). Также может оказаться полезной глава [«Инициализация Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md). -Если вы только начинаете использовать инструмент Terraform и облачную платформу DYNAMIX, то рекомендуем вам начать с главы [«Обзор облачной платформы DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/03.-Обзор-облачной-платформы-DYNAMIX.md), после чего изучить главы [«_Data source_ функции Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.-Data-source-функции-Terraform-провайдера-DYNAMIX.md) и [«_Resource_ функции Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/07.-Resource-функции-Terraform-провайдера-DYNAMIX.md). Примеры, приведенные в этих разделах, помогут вам быстро освоить базовые приёмы работы с инструментом Terraform и провайдером DYNAMIX. +Если вы только начинаете использовать инструмент Terraform и облачную платформу DYNAMIX, то рекомендуем вам начать с главы [«Обзор облачной платформы DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/03.-Обзор-облачной-платформы-DYNAMIX.md), после чего изучить главы [«_Data source_ функции Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.-Data-source-функции-Terraform-провайдера-DYNAMIX.md) и [«_Resource_ функции Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/07.-Resource-функции-Terraform-провайдера-dynamix.md). Примеры, приведенные в этих разделах, помогут вам быстро освоить базовые приёмы работы с инструментом Terraform и провайдером DYNAMIX. diff --git a/wiki/1.1.0/04.01-Установка-Terraform-провайдера-DYNAMIX.md b/wiki/1.1.0/04.01-Установка-Terraform-провайдера-DYNAMIX.md index 9e311db..ad4a268 100644 --- a/wiki/1.1.0/04.01-Установка-Terraform-провайдера-DYNAMIX.md +++ b/wiki/1.1.0/04.01-Установка-Terraform-провайдера-DYNAMIX.md @@ -2,7 +2,7 @@ Для запуска провайдера вам потребуется машина, на которой установлен Terraform. -Кроме того, в связи с тем, что начиная с версии 0.12 Terraform изменил алгоритм поиска и инициализации локальных провайдеров, настройка данного провайдера для работы с Terraform 0.12 или более новыми версиями потребует выполнения ряда дополнительных действий. Подробнее см. [8.3 Настройка локального провайдера для работы с новыми версиями Terraform](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/08.-Полезные-советы#user-content-8-3-настройка-локального-провайдера-для-работы-с-новыми-версиями-terraform.md). +Кроме того, в связи с тем, что начиная с версии 0.12 Terraform изменил алгоритм поиска и инициализации локальных провайдеров, настройка данного провайдера для работы с Terraform 0.12 или более новыми версиями потребует выполнения ряда дополнительных действий. Подробнее см. [8.3 Настройка локального провайдера для работы с новыми версиями Terraform](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/08.-Полезные-советы.md#8-3-настройка-локального-провайдера-для-работы-с-новыми-версиями-terraform). ## Установка В релизном архиве находятся скрипты-инсталляторы. diff --git a/wiki/1.1.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md b/wiki/1.1.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md index b2390bf..7985db9 100644 --- a/wiki/1.1.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md +++ b/wiki/1.1.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md @@ -1,7 +1,7 @@ ## Список аргументов для инициализации Перед началом использования любой Terraform провайдер должен быть инициализирован. -В процессе инициализации Terraform провайдера DYNAMIX проверяется корректность переданных аргументов и выполняется авторизация в указанном контроллере облачной инфраструктуры. Подробнее о способах авторизации в платформе DYNAMIX смотри соответствующий [раздел](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/03.-Обзор-облачной-платформы-DYNAMIX#user-content-способы-авторизации.md). +В процессе инициализации Terraform провайдера DYNAMIX проверяется корректность переданных аргументов и выполняется авторизация в указанном контроллере облачной инфраструктуры. Подробнее о способах авторизации в платформе DYNAMIX смотри соответствующий [раздел](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/03.-Обзор-облачной-платформы-DYNAMIX.md#способы-авторизации). При инициализации Terraform провайдера DYNAMIX используются следующие аргументы: diff --git a/wiki/1.1.0/07.01.22-Resource_dynamix_vins_static_route.md b/wiki/1.1.0/07.01.22-Resource_dynamix_vins_static_route.md index d85e918..aebaabb 100644 --- a/wiki/1.1.0/07.01.22-Resource_dynamix_vins_static_route.md +++ b/wiki/1.1.0/07.01.22-Resource_dynamix_vins_static_route.md @@ -53,7 +53,6 @@ resource "dynamix_vins_static_route" "sr" { #опциональный параметр #тип - массив целых чисел compute_ids = [111, 222] - } ``` diff --git a/wiki/1.1.0/Home.md b/wiki/1.1.0/Home.md index 3b1a863..34879d0 100644 --- a/wiki/1.1.0/Home.md +++ b/wiki/1.1.0/Home.md @@ -115,7 +115,7 @@ Terraform провайдер версии 1.1.0, для платформы DYNAM - [**dynamix_stack**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.01.89-Data_dynamix_stack.md) - получение информации о вычислительном узле (stack) - [**dynamix_stack_list**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.01.90-Data_dynamix_stack_list.md) - получение информации о списке вычислительных узлов (stack) - [**dynamix_disk_replication**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.01.87-Data_dynamix_disk_replication.md) - получение информации о реплике диска - - [**dynamix_audit**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.01.91-Data_decort_audit.md) - получение информации о событии системы + - [**dynamix_audit**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.01.91-Data_dynamix_audit.md) - получение информации о событии системы - [**dynamix_dpdknet**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.01.92-Data_dynamix_dpdknet.md) - получение информации о DPDK сети - [**dynamix_cb_dpdknet_list**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.01.93-Data_dynamix_dpdknet_list.md) - получение информации о списке DPDK сетей @@ -230,7 +230,7 @@ Terraform провайдер версии 1.1.0, для платформы DYNAM - [**dynamix_cb_vfpool_list**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.02.109-Data_dynamix_cb_vfpool_list.md) - получение информации о списке всех доступных vfpool - [**dynamix_cb_disk_replication**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/06.02.110-Data_dynamix_cb_disk_replication.md) - получение информации о реплике диска --> -7. [Resource функции Terraform провайдера DYNAMIX](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/07.-Resource-функции-Terraform-провайдера-DYNAMIX.md) +7. [Resource функции Terraform провайдера DYNAMIX](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/07.-Resource-функции-Terraform-провайдера-dynamix.md) - [Пользовательская группа API](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/07.01-Пользовательская-группа-API.md) - [**dynamix_kvmvm**](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.1.0/07.01.01-Resource_dynamix_kvmvm.md) - управление виртуальными серверами, создаваемыми на базе системы виртуализации KVM diff --git a/wiki/1.2.0/01.-Введение.md b/wiki/1.2.0/01.-Введение.md new file mode 100644 index 0000000..15c93de --- /dev/null +++ b/wiki/1.2.0/01.-Введение.md @@ -0,0 +1,7 @@ +DYNAMIX Terraform Provider версии 1.2.x позволяет управлять облачными ресурсами на платформе DYNAMIX версии 4.2.x и выше посредством Terraform. + +С помощью данного провайдера можно организовать программное управление вычислительными ресурсами (_compute_), ресурсными группами, сетевыми и дисковыми ресурсами, образами дисков, кластером, а также другими параметрами облачной платформы DYNAMIX. + +Если вы хорошо знакомы с инструментом Terraform и хотите максимально быстро начать использовать платформу DYNAMIX в своих Terraform-проектах, то можете сразу перейти к разделу [Пример работы](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/02.-Пример-работы.md), где приведён подробно откомментированный пример работы с основными видами ресурсов платформы. Если у вас всё же возникнут вопросы по облачной платформе DYNAMIX и порядку авторизации в ней, то обратитесь к главе [«Обзор облачной платформы DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/03.-Обзор-облачной-платформы-DYNAMIX.md). Также может оказаться полезной глава [«Инициализация Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md). + +Если вы только начинаете использовать инструмент Terraform и облачную платформу DYNAMIX, то рекомендуем вам начать с главы [«Обзор облачной платформы DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/03.-Обзор-облачной-платформы-DYNAMIX.md), после чего изучить главы [«_Data source_ функции Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/06.-Data-source-функции-Terraform-провайдера-DYNAMIX.md) и [«_Resource_ функции Terraform провайдера DYNAMIX»](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/07.-Resource-функции-Terraform-провайдера-dynamix.md). Примеры, приведенные в этих разделах, помогут вам быстро освоить базовые приёмы работы с инструментом Terraform и провайдером DYNAMIX. diff --git a/wiki/1.2.0/02.-Пример-работы.md b/wiki/1.2.0/02.-Пример-работы.md new file mode 100644 index 0000000..80cc82b --- /dev/null +++ b/wiki/1.2.0/02.-Пример-работы.md @@ -0,0 +1,92 @@ +Данный раздел предназначен для тех, кто хорошо знаком с инструментом Terraform, а также имеет представление об основных понятиях и способах авторизации в облачной платформе DYNAMIX. + +Ниже приведён подробно откомментированный пример, показывающий, как создать виртуальный сервер (aka _compute_ на базе системы виртуализации KVM x86) в облачной платформе DYNAMIX с помощью соответствующего Terraform провайдера. Сервер будет создан в новой ресурсной группе, к нему будет подключён один предварительно созданный диск, у сервера будет прямое сетевое подключение во внешнюю сеть. + +Идентификатор образа операционной системы, на базе которого должен быть создан виртуальный сервер, считывается из облачной платформы с помощью _data source_ функции `dynamix_image`. + +Далее мы с помощью _resource_ функции `dynamix_resgroup` создаём новую ресурсную группу, в которую будет помещён этот виртуальный сервер. В качестве альтернативы, для получения информации об уже имеющейся ресурсной группе можно использовать _data source_ функцию с таким же названием. + +Затем с помощью _resource_ функции `dynamix_disk` создаётся диск, который будет подключён к виртуальному серверу в качестве дополнительного. Помимо этого дополнительного диска у сервера будет также и загрузочный диск, на который в процессе создания сервера клонируется выбранный образ операционной системы. + +Виртуальный сервер - в данном примере на базе системы виртуализации KVM x86 - создаётся посредством _resource_ функции `dynamix_kvmvm`. + +Только авторизованные в контроллере облачной платформы пользователи могут управлять облачными ресурсами. Подробнее о способах авторизации см. [Обзор облачной платформы DYNAMIX](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/03.-Обзор-облачной-платформы-DYNAMIX.md). + +```terraform +# 1. Initialize DYNAMIX plugin and connection to DYNAMIX cloud controller +# NOTE: in this example credentials are expected to come from +# DYNAMIX_APP_ID and DYNAMIX_APP_SECRET environmental variables - set them +# in the shell before calling terraform. +# Alternatively you may define plugin parameters app_id and app_secret in +# the TF file, however, this may not be secure if you plan to share this TF +# file with others. + +provider "dynamix" { + authenticator = "decs3o" + controller_url = "<>" # specify correct DYNAMIX controller URL, e.g. "https://ds1.digitalenergy.online" + oauth2_url = "<>" # specify corresponding DYNAMIX OAUTH2 URL, e.g. "https://sso.digitalenergy.online" + app_id = "<>" # application secret to access DYNAMIX cloud API in 'decs3o' and 'bvs' authentication mode, e.g. "ewqfrvea7s890avw804389qwguf234h0otfi3w4eiu" + app_secret = "<>" # application ID to access DYNAMIX cloud API in 'decs3o' and 'bvs' authentication mode, e.g. "ewqfrvea7s890avw804389qwguf234h0otfi3w4eiu" + # allow_unverified_ssl = true +} + +# 2. Load account to use - new VM will belong to this account +data "dynamix_account" "my_account" { + account_id = # Specify account ID +} + +# 3. Load OS image to use for VM deployment +data "dynamix_image" "os_image" { + image_id = # Specify OS image id, e.g. 1234. You can get accessible image id from data source "dynamix_image_list" +} + +# 4. Create new Resource Group in the selected account, new VM will be created in this RG +resource "dynamix_resgroup" "my_rg" { + name = "NewRgByTF" + account_id = data.dynamix_account.my_account.account_id + gid = # Grid (platform) ID + # if you want to set resource quota on this Resource Group, uncomment + # the following code fragment + # quota { + # cpu = 8 # CPU limit + # ram = 8912 # RAM limit in MB + # disk = 96 # disk volume limit in GB + #} +} + +# 5. Create extra disk, which will be attached to the new VM. +# This step is optional - if you do not want extra disks on your VM, skip it +# and comment out extra_disks parameter when creating VM below. +resource "dynamix_disk" "extra_disk" { + disk_name = "extra-disk-for-vm" + account_id = data.dynamix_account.my_account.account_id + gid = # Grid (platform) ID + size_max = 5 # disk size in GB + type = "D" # disk type, always use "D" for extra disks + sep_id = data.dynamix_image.os_image.sep_id # use the same SEP ID as the OS image + pool = "<>" # consult your DYNAMIX platform admin for configured storage pool names +} + +# 6. Create virtual machine (a compute of type KVM VM x86 in this example) +# Now that we have all necessary components at hand, we may create a virtual machine. +# This VM will be based on the previsouly obtained OS image, located in the specified +# Resource Group, directly connected to an external network, have a boot disk of +# specified size and one extra disk attached. +resource "dynamix_kvmvm" "my_new_vm" { + name = "tf-managed-vm" + driver = "KVM_X86" # Compute virtualization driver + rg_id = dynamix_resgroup.my_rg.id + cpu = 1 # CPU count + ram = 1024 # RAM size in MB, must be even number, ideally a power of 2 + boot_disk_size = 10 # Boot disk size in GB + image_id = data.dynamix_image.os_image.image_id + description = "Test KVM VM Compute managed by Terraform" + extra_disks = [ dynamix_disk.extra_disk.id ] + + network { + net_type = "EXTNET" + net_id = <> # specify external network ID to use, consult your DYNAMIX platform admin for correct IDs + # ip_address = "<>" # you may optionally request a specific IP address + } +} +``` diff --git a/wiki/1.2.0/03.-Обзор-облачной-платформы-DYNAMIX.md b/wiki/1.2.0/03.-Обзор-облачной-платформы-DYNAMIX.md new file mode 100644 index 0000000..1574893 --- /dev/null +++ b/wiki/1.2.0/03.-Обзор-облачной-платформы-DYNAMIX.md @@ -0,0 +1,32 @@ +## Основные понятия +Ниже перечислены основные понятия с указанием соответствующих им аргументов в Terraform провайдере DYNAMIX. +1. **Контроллер облачной платформы DYNAMIX** – управляющее приложение, которое обеспечивает авторизацию пользователей и оркестрацию облачных ресурсов. + - Адрес контроллера задается в обязательном аргументе `controller_url` на стадии инициализации Terraform провайдера DYNAMIX. Например, `controller_url= "https://ds1.digitalenergy.online"` +2. **Авторизационный провайдер** – приложение, работающее по протоколу Oauth2, предназначенное для выпуска и валидации токенов доступа к контроллеру облачной платформы в соответствующих режимах авторизации. Все действия в платформе должны выполняться авторизованными пользователями, и авторизационное приложение позволяет получить токен доступа, действующий некоторое ограниченное время, наличие которого подтверждает успешную авторизацию. + - Адрес авторизационного провайдера задается в аргументе`oauth2_url` на стадии инициализации Terraform провайдера DYNAMIX. Например `oauth2_url= "https://sso.digitalenergy.online"` +3. **Подписчик** (_account_) – сущность, которая используется для группирования облачных ресурсов по принадлежности к определенному клиенту для целей учета потребления и биллинга. + - Имя подписчика задается аргументом `account_name` при вызове _resource_ или _data_ функций провайдера. Альтернативной является задание численного идентификатора подписчика в аргументе `account_id`. +4. **Пользователь** (_user_) – пользователь облачной инфраструктуры, представленный учетной записью. Чтобы получить возможность управлять облачными ресурсами (например, создавать виртуальные серверы или дискт) пользователь должен быть ассоциирован с одним или несколькими подписчиками и иметь соответствующие права, определяемые ролевой моделью, принятой в облачной платформе DYNAMIX. Для доступа к платформе пользователь должен авторизоваться одним из способов, описанных ниже в разделе «Способы авторизации». +5. **Ресурсная группа** (_resource group_) – способ группирования вычислительных ресурсов (например, виртуальных серверов по функциональному признаку или принадлежности к одному и тому же проекту). Ресурсную группу можно рассматривать как небольшой персональный дата-центр, в котором размещаются один или несколько серверов и виртуальных сетевых сегментов. Ресурсная группа идентифицируется по комбинации параметров `account` и `name`. Обратите внимание, что имя имя ресурсной группы уникально только в рамках одного и того же `account`. +6. **Вычислительный ресурс** (_compute_) - универсальная абстракция пользовательского сервера в платформе DYNAMIX. Благодаря использованию такой абстракции можно, например, создать одну виртуальную машину на базе KVM Intel x86, а другую - на базе KVM IBM Power, а потом управлять ими - изменять количество CPU/RAM, подключать/отключать диски и т.п. - одинаковым образом, не задумываясь об их архитектурных различиях. В то же время, так как типизация ресурсов в Terraform не поддерживает наследование, различные типы вычислительных ресурсов, доступных на платформе DYNAMIX и абстрагируемых через понятие унифицированный _compute_, в Terraform представлены разными типами (напр., свой тип для виртуальных серверов на базе KVM и свой тип для перспективных x86-совместимых bare metal серверов). +7. **Ресурс хранения** (_disk_) - универсальная абстракция дискового ресурса в платформе DYNAMIX. Платформа поддерживает различные типы систем хранения данных, но при этом управление созданными на разных системах хранения дисками осуществляется посредством унифицированного набора действий, например, "подключить диск к _compute_", "увеличить размер диска", "сделать мгновенный снимок диска", "настроить параметры быстродействия диска". +8. **Виртуальный сервер** – экземпляр _compute_, в основе технической реализации которого лежит виртуальная машина, работающая в облаке и доступна по сети. Виртуальный сервер характеризуется количеством выделенных ему CPU (аргумент`cpu`), объемом ОЗУ (`ram`), размером загрузочного диска (`boot_disk size`). При создании виртуального сервера на загрузочный диск устанавливается образ операционной системы, заданный в аргументе `image_id`. Помимо загрузочного диска к виртуальному серверу можно подключить несколько дисков для хранения прикладных данных, список которых задается аргументами `extra_disks`. Виртуальный сервер идентифицируется по комбинации аргументов `name` (имя сервера) и `rgid` (идентификатор ресурсной группы). Обратите внимание, что имя виртуального сервера `name` уникально только в рамках одной и той же ресурсной группы. +9. **Виртуальный сетевой сегмент** (_Virtual Network Segment_ или _ViNS_) - сетевой сегмент и обеспечивающая его функционирование виртуальная инфраструктура, которые пользователь может создавать для своих нужд на уровне ресурсной группы или подписчика (_account_). ViNS можно создать полностью изолированным от внешних сетей (см. ниже _External Network_) или с подключением во внешнюю сеть. Внутри ViNS работает DHCP-сервис, обеспечивающий управление IP адресами экземпляров _compute_, подключённых в этот ViNS. +10. **Внешняя сеть** (_External Network_) - сетевой сегмент, через который платформа DYNAMIX взаимодействует с внешними по отношению к ней сетевыми ресурсами. Например, в случае с публичным облаком на базе DYNAMIX в качестве внешней сети выступает сеть Интернет. В отличие от ViNS платформа не управляет внешней сетью, а лишь пользуется её ресурсами. В платформе может быть настроено несколько внешних сетей с различными диапазонами IP адресов, и существует механизм управления доступом пользователей к внешним сетям. +11. Сетевой доступ к экземпляру _compute_ (виртуальному серверу) реализуется через его подключение к ViNS и/или прямое подключение во внешнюю сеть (External Network). Один и тот же экземпляр _compute_ может одновременно иметь несколько подключений в разные ViNS и/или различные внешние сети. + +## Способы авторизации +Облачная платформа DYNAMIX поддерживает три базовых типа авторизации: +1. С использованием авторизационного провайдера, работающего по протоколу _Oauth2_. Данный способ является предпочтительным, так как обеспечивает бОльшую гибкость и безопасность. Для авторизации в этом режиме при инициализации Terrafrom провайдера DYNAMIX необходимо указать параметры `oauth2_url` и `controller_url`, а также предоставить одно из нижеперечисленного: + - Комбинация Application ID & Application secret, соответствующих пользователю, от имени которого будет осуществляться управление облачными ресурсами в текущей сессии. В процессе проверки предоставленных Application ID & Application secret модуль получает от авторизационного провайдера токен (JSON Web Token, JWT), который затем используется для доступа к указанному контроллеру DYNAMIX. Для авторизации по данному варианту, при инициализации Terraform провайдера DYNAMIX следует установить аргумент `authenticator=decs3o` и задать аргументы `app_id` и `app_secret` (или определить соответствующие переменные окружения `DYNAMIX_APP_ID` и `DYNAMIX_APP_SECRET`). + - JSON Web Token – заранее полученный от авторизационного провайдера токен доступа, ассоциированный с определенным пользователем, от имени которого будет осуществляться управление облачными ресурсами в текущей сессии. Для авторизации по данному варианту, при инициализации Terraform провайдера DYNAMIX следует установить аргумент `authenticator=jwt` и задать аргумент `jwt` (или определить переменную окружения `DYNAMIX_JWT`). +2. С использованием комбинации _имя пользователя : пароль_. Данный режим не использует внешних авторизационных провайдеров и подразумевает, что пользователь с такой комбинацией зарегистрирован непосредственно на указанном в параметре `controller_url` контроллере облачной платформы DYNAMIX. + - Чтобы провайдер авторизовался по данному варианту, при его инициализации следует установить аргумент `authenticator=legacy` и задать аргументы `user` и `password` (или определить соответствующие переменные окружения `DYNAMIX_USER` и `DYNAMIX_PASSWORD`). +3. С использованием авторизационного провайдера, работающего по протоколу _Oauth2_oidc_. Для авторизации в этом режиме при инициализации Terrafrom провайдера DYNAMIX необходимо указать параметры `oauth2_url` и `controller_url`, а также Application ID & Application secret, _имя пользователя и пароль_, соответствующих пользователю, от имени которого будет осуществляться управление облачными ресурсами в текущей сессии, и _имя домена_. В процессе проверки предоставленных Application ID & Application secret и пары _имя пользователя-пароль_ модуль получает от авторизационного провайдера токен (JSON Web Token, JWT), который затем используется для доступа к указанному контроллеру DYNAMIX. Для авторизации по данному варианту, при инициализации Terraform провайдера DYNAMIX следует установить аргумент `authenticator=bvs`, задать аргументы `app_id` и `app_secret` (или определить соответствующие переменные окружения `DYNAMIX_APP_ID` и `DYNAMIX_APP_SECRET`), `bvs_user` и `bvs_password` (или определить соответствующие переменные окружения `DYNAMIX_BVS_USER` и `DYNAMIX_BVS_PASSWORD`), а также указать `domain` (или определить соответствующие переменные окружения `DYNAMIX_DOMAIN`). + +После успешной авторизации пользователь (или приложение-клиент) получает доступ к ресурсам, находящимся под управлением соответствующего DYNAMIX контроллера. Доступ предоставляется в рамках подписчиков (_account_), с которыми ассоциирован данный пользователь (_user_), и в соответствии с присвоенными ему ролями. + +## Пользовательская и административная группы API +Пользовательская группа API - группа API платформы DYNAMIX, которая позволяет выполнять операции с платформой с правами обычного пользователя. Покрывает большую часть задач. +Административная группа API - группа API платформы DYNAMIX, которая позволяет выполнять операции с платформой с расширенными правами. Данные права подразумевают расширенный перечень операций над ресурсами, расширенный перечень ресурсов, расширенную информацию. Требуются права администратора для взаимодействия с этой группой API. +В Terraform провайдере DYNAMIX версии 1.2.0 реализованы функции только пользовательской группа API. diff --git a/wiki/1.2.0/04.-Начало-работы-с-terraform-провайдером-DYNAMIX.md b/wiki/1.2.0/04.-Начало-работы-с-terraform-провайдером-DYNAMIX.md new file mode 100644 index 0000000..edaa664 --- /dev/null +++ b/wiki/1.2.0/04.-Начало-работы-с-terraform-провайдером-DYNAMIX.md @@ -0,0 +1,6 @@ +Данный раздел описывает: +- Системные требования +- Установку провайдера +- Инициализацию провайдера +- Переключение режима работы между разными группами API +- Получение gid/grid_id площадки diff --git a/wiki/1.2.0/04.01-Установка-Terraform-провайдера-DYNAMIX.md b/wiki/1.2.0/04.01-Установка-Terraform-провайдера-DYNAMIX.md new file mode 100644 index 0000000..970efff --- /dev/null +++ b/wiki/1.2.0/04.01-Установка-Terraform-провайдера-DYNAMIX.md @@ -0,0 +1,147 @@ +## Системные требования + +Для запуска провайдера вам потребуется машина, на которой установлен Terraform. + +Кроме того, в связи с тем, что начиная с версии 0.12 Terraform изменил алгоритм поиска и инициализации локальных провайдеров, настройка данного провайдера для работы с Terraform 0.12 или более новыми версиями потребует выполнения ряда дополнительных действий. Подробнее см. [8.3 Настройка локального провайдера для работы с новыми версиями Terraform](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/08.-Полезные-советы.md#8-3-настройка-локального-провайдера-для-работы-с-новыми-версиями-terraform). + +## Установка +В релизном архиве находятся скрипты-инсталляторы. +Чтобы выполнить установку, необходимо: +1. Перейти по адресу: https://repository.basistech.ru/BASIS/terraform-provider-dynamix/releases +2. Выбрать необходимую версию провайдера подходящую под операционную систему. +3. Скачать архив. +4. Распаковать архив. +5. Выполнить скрипт установщика, `install.sh` или `install.bat` для Windows.
+*Для запуска `install.sh` не забудьте изменить права доступа к файлу* +```bash +chmod u+x install.sh +``` +6. Дождаться сообщения об успешной установке. Установщик выведет актуальный блок конфигурации провайдера, скопируйте его +```bash +terraform { + required_providers { + dynamix = { + version = "1.2.0" + source = "basistech.ru/tf/dynamix" + } + } +} +``` +7. После этого, создайте файл `main.tf` в рабочей директории, которая может находится в любом удобном для пользователя месте. +В данном примере, рабочая директория с файлом main.tf находится по пути: +```bash +~/work/tfdir/main.tf +``` +8. Вставьте в `main.tf` блок конфигурации провайдера, который был выведен на экран установщиком: +```terraform +terraform { + required_providers { + dynamix = { + version = "1.2.0" + source = "basistech.ru/tf/dynamix" + } + } +} +``` +9. Добавьте в файл блок с инициализацией провайдера. +```terraform +provider "dynamix" { + authenticator = "decs3o" + controller_url = "https://mr4.digitalenergy.online" + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true +} +``` + +10. В консоли выполните команду +```bash +terraform init +``` + +11. В случае успешной установки, Terraform инициализирует провайдер и будет готов к дальнейшей работе. + +## Установка из релизов +Terraform провайдер DYNAMIX имеет скомпилированные релизные версии, которые расположены по адресу: [Релизы](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/releases). +Чтобы выполнить установку из релиза, необходимо: +1. Перейти по адресу: https://repository.basistech.ru/BASIS/terraform-provider-dynamix/releases +2. Выбрать необходимую версию провайдера подходящую под операционную систему. +3. Скачать архив. +4. Распаковать архив. +5. Полученный файл (в директории `bin/`) необходимо поместить: +Linux: +```bash +~/.terraform.d/plugins/${host_name}/${namespace}/${type}/${version}/${target} +``` +Windows: +```powershell +%APPDATA%\terraform.d\plugins\${host_name}\${namespace}\${type}\${version}\${target} +``` +Где: +- host_name - имя хоста, держателя провайдера, например, basis +- namespace - пространство имен хоста, например decort +- type - тип провайдера, может совпадать с пространством имен, например, decort +- version - версия провайдера, например 4.3.0 +- target - архитектура операционной системы, например windows_amd64 + +В примере ниже используется путь до провайдера на машине с ОС Linux: + +```bash +~/.terraform.d/plugins/basis/basistech.ru/tf/dynamix/1.2.0/linux_amd64/tf-provider + ^ ^ ^ ^ ^ ^ + host_name | | | | | | + | | | | | + namespace | | | | | + | | | | + type | | | | + | | | + version | | | + | | + target | | + | + исполняемый файл | +``` + +6. После этого, создайте файл `main.tf` в рабочей директории, которая может находится в любом удобном для пользователя месте. +В данном примере, рабочая директория с файлом main.tf находится по пути: +```bash +~/work/tfdir/main.tf +``` +7. Добавьте в `main.tf` следующий блок +```terraform +terraform { + required_providers { + dynamix = { + source = "basistech.ru/tf/dynamix" + version = "1.2.0" + } + } +} +``` +В поле `version` указывается версия провайдера. +
+**ВНИМАНИЕ: Версии в блоке и в пути к исполняемому файлу провайдера должны совпадать!** + +В поле `source` помещается путь до репозитория с версией вида: + +```bash +${host_name}/${namespace}/${type} +``` + +**ВНИМАНИЕ: Версии в блоке и в пути к исполняемому файлу провайдера должны совпадать!** + +8. Добавьте в файл блок с инициализацией провайдера. +```terraform +provider "dynamix" { + authenticator = "decs3o" + controller_url = "https://mr4.digitalenergy.online" + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true +} +``` + +9. В консоли выполните команду +```bash +terraform init +``` + +10. В случае успешной установки, Terraform инициализирует провайдер и будет готов к дальнейшей работе. diff --git a/wiki/1.2.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md b/wiki/1.2.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md new file mode 100644 index 0000000..b8d97b2 --- /dev/null +++ b/wiki/1.2.0/04.02-Инициализация-Terraform-провайдера-DYNAMIX.md @@ -0,0 +1,64 @@ +## Список аргументов для инициализации +Перед началом использования любой Terraform провайдер должен быть инициализирован. + +В процессе инициализации Terraform провайдера DYNAMIX проверяется корректность переданных аргументов и выполняется авторизация в указанном контроллере облачной инфраструктуры. Подробнее о способах авторизации в платформе DYNAMIX смотри соответствующий [раздел](https://repository.basistech.ru/BASIS/terraform-provider-dynamix/src/branch/main/wiki/1.2.0/03.-Обзор-облачной-платформы-DYNAMIX.md#способы-авторизации). + +При инициализации Terraform провайдера DYNAMIX используются следующие аргументы: + +| Аргумент | Переменная окружения | Описание | +| --- | --- | --- | +| allow_unverified_ssl | - | Если данный аргумент явно установлен в `true`, то провайдер **не будет** проверять SSL сертификаты при взаимодействии с авторизационным сервисом OAuth2 и контроллером облачной платформы.
Отключение проверок может быть полезным при работе в доверенной среде, использующей самоподписанные SSL сертификаты. Однако, так как отключение проверок несёт потенциальные риски безопасности, данную настройку следует использовать с осторожностью.
Разрешённые значения: `false` (значение по умолчанию) и `true`. | +| app_id | DYNAMIX_APP_ID | Идентификатор приложения (клиента) для авторизации в контроллере облачной платформы в режиме `decs3o` или `bvs`.
Аргументы `app_id` и `app_secret` являются обязательными для режимов авторизации `authenticator=decs3o` и `authenticator=bvs`.
Если `app_id` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_APP_ID`. | +| app_secret | DYNAMIX_APP_SECRET | Секретный код приложения (клиента) для авторизации в контроллере облачной платформы в режиме `decs3o` или `bvs`.
Аргументы `app_id` и `app_secret` являются обязательными для режимов авторизации `authenticator=decs3o` и `authenticator=bvs`.
Если `app_secret` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_APP_SECRET`. | +| authenticator | - | Режим авторизации при подключении к контроллеру облачной платформы.
Доступные режимы: `decs3o`, `legacy`, `jwt` или `bvs`.
Данный аргумент является обязательным. | +| bvs_user | DYNAMIX_BVS_USER | Имя пользователя для авторизации в контроллере облачной платформы в режиме `bvs`.
Аргументы `bvs_password` и `bvs_user` являются обязательными для режима авторизации `authenticator=bvs`.
Если `bvs_user` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_BVS_USER`. | +| bvs_password | DYNAMIX_BVS_PASSWORD | Пароль пользователя для авторизации в контроллере облачной платформы в режиме `bvs`.
Аргументы `bvs_user` и `bvs_password` являются обязательными для режима авторизации `authenticator=bvs`.
Если `bvs_password` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_BVS_PASSWORD`. | +| domain | DYNAMIX_DOMAIN | Имя домена в контроллере облачной платформы в режиме `bvs`.
Данный аргумент является обязательным.
Если `domain` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_DOMAIN`. | +| controller_url | DYNAMIX_CONTROLLER_URL | URL контроллера облачной платформы, через который будет осуществляться управление облачными ресурсами.
Данный аргумент является обязательным. | +| jwt | DYNAMIX_JWT | JSON Web Token (JWT), который используется для авторизации в контроллере облачной платформы в режиме `jwt`.
Данный аргумент является обязательным для режима авторизации `authenticator=jwt`.
Если `jwt` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_JWT` | +| oauth2_url | DYNAMIX_OAUTH2_URL | URL авторизационного сервиса OAuth2, который используется для управления доступом пользователей (или программных клиентов) к контроллеру облачной платформы.
Данный аргумент является обязательным для режимов авторизации `authenticator=decs3o`, `authenticator=bvs` и `authenticator=jwt`.
Если `oauth2_url` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_OAUTH2_URL` | +| password | DYNAMIX_PASSWORD | Пароль для авторизации в контроллере облачной платформы в режиме `legacy`.
Аргументы `password` и `user` являются обязательными для режима авторизации `authenticator=legacy`.
Если `password` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_PASSWORD`. | +| user | DYNAMIX_USER | Имя пользователя для авторизации в контроллере облачной платформы в режиме `legacy`.
Аргументы `user` и `password` являются обязательными для режима авторизации `authenticator=legacy`.
Если `user` не задан в tf-файле, то провайдер будет использовать значение из переменной окружения `DYNAMIX_USER`. | + +## Пример инициализации в режиме авторизации `decs3o` +Пример инициализации Terraform провайдера DYNAMIX: +```terraform +provider "dynamix" { + authenticator = "decs3o" + controller_url = "https://ctrl.decort.online" + oauth2_url = "https://oauth2.decort.online:7777" +} +``` + +В данном примере используется режим авторизации `decs3o`. + +Как отмечено выше, в данном режиме требуется указать аргументы `app_id` и `app_secret`, идентифицирующие пользователя (или приложение-клиент), от лица которого будут выполняться дальнейшие действия. Однако, так как данная информация является конфиденциальной (по сути, она эквивалентна паре _имя пользователя : пароль_), то в общем случае заносить такого рода данные в tf-файл не следует. Рекомендуется определять в среде запуска Terraform переменные окружения `DYNAMIX_APP_ID` и `DYNAMIX_APP_SECRET`, из которых провайдер извлечёт нужные данные. Приведенный пример подразумевает, что нужная информация будет получена из этих переменных окружения. + +Пользователь, от лица которого Terrafrom будет выполнять действия в облачной платформе, должен заранее создать пару _Application ID_ и _Application Secret_ в авторизационном приложении OAuth2. Именно эти значения, а также URL авторизационного приложения Oauth2, должны присваиваться аргументам `app_id`, `app_secret` и `oauth2_url` соответственно для успешной инициализации провайдера. + +Также обратите внимание на формат задания аргументов `controller_url` и `oauth2_url`. В общем случае они должны содержать идентификатор протокола (_https://_) и сетевой порт, если он отличается от порта по умолчанию (в примере для авторизационного сервиса OAuth2 указан порт _7777_). Эту информацию вы можете узнать у администратора вашей облачной инфраструктуры. + +## Пример инициализации в режиме авторизации `bvs` +Пример инициализации Terraform провайдера DYNAMIX: +```terraform +provider "dynamix" { + authenticator = "bvs" + controller_url = "https://delta.qa.loc" + oauth2_url = "https://bvs-delta.qa.loc:8443" + app_id = "delta" + app_secret = "" + bvs_password = "" + bvs_user = "" + domain = "dynamix" +} +``` + +В данном примере используется режим авторизации `bvs`. + +Как отмечено выше, в данном режиме требуется указать аргументы `app_id` - идентификатор площадки - delta, alpha, poc, etc. Можно найти на странице администратора по следующему пути: вкладка безопасность - клиентские сервисы - наименование площадки. `app_secret` - пароль площадки. Можно найти на странице администратора по следующему пути: вкладка безопасность - клиентские сервисы - наименование площадки (символ i) - поле "Пароль". Однако, так как данная информация является конфиденциальной, то в общем случае заносить такого рода данные в tf-файл не следует. Рекомендуется определять в среде запуска Terraform переменные окружения `DYNAMIX_APP_ID` и `DYNAMIX_APP_SECRET`, из которых провайдер извлечёт нужные данные. Приведенный пример подразумевает, что нужная информация будет получена из этих переменных окружения. +Также обязательными аргументами являются: `bvs_user` - имя пользователя, `bvs_password` - пароль пользователя. Рекомендуется не заносить их в tf-файл, а определять в среде запуска Terraform переменные окружения `DYNAMIX_BVS_USER` и `DYNAMIX_BVS_PASSWORD`, из которых провайдер извлечёт нужные данные. Приведенный пример подразумевает, что нужная информация будет получена из этих переменных окружения. +Домен для подключения `domain` - указывается наименование площадки. Данный аргумент является обязательным. Рекомендуется не заносить его в tf-файл, а определять в среде запуска Terraform переменную окружения `DYNAMIX_DOMAIN`, из которой провайдер извлечёт нужные данные. Приведенный пример подразумевает, что нужная информация будет получена из этих переменных окружения. + +Пользователь, от лица которого Terrafrom будет выполнять действия в облачной платформе, должен заранее получить от администратора _Application ID_ и _Application Secret_, _bvs user_ и _bvs password_, а также _domain_. А также осуществить первичный вход на платформу посредством браузера. + +Также обратите внимание на формат задания аргументов `controller_url` и `oauth2_url`. В общем случае они должны содержать идентификатор протокола (_https://_) и сетевой порт, если он отличается от порта по умолчанию (в примере для авторизационного сервиса OAuth2 указан порт _8443_). Эту информацию вы можете узнать у администратора вашей облачной инфраструктуры. diff --git a/wiki/1.2.0/04.03-Переключение-между-группами-API.md b/wiki/1.2.0/04.03-Переключение-между-группами-API.md new file mode 100644 index 0000000..79557f2 --- /dev/null +++ b/wiki/1.2.0/04.03-Переключение-между-группами-API.md @@ -0,0 +1,38 @@ +Так как платформа DYNAMIX предоставляет для работы две группы API, то terraform провайдер позволяет свободно переключать режимы работы между этими группами. +По умолчанию стоит пользовательская группа API. Ее можно сменить на административную группу. +Если прав у пользователя будет достаточно, то запрос будет выполнен, если нет, то будет ошибка: +```bash +Permission denied +``` +Которая говорит о том, что прав недостаточно. Тогда для выполнения операции обратитесь к администратору платформы. +Установка режима взаимодействия с группами API осуществляется через установку переменной окружения _DECORT_ADMIN_MODE_. +Для более подробного описания возможностей каждой группы API см. соответствующий раздел. + +## Переключение режима работы в Windows +Используйте сл. команду: +```Powershell +$Env:DECORT_ADMIN_MODE=1 +``` +Для отключения: +```Powershell +$Env:DECORT_ADMIN_MODE=0 +``` +## Переключение режима работы в Linux +Используйте сл. команду: +```bash +DECORT_ADMIN_MODE=1 +``` +или +```bash +export DECORT_ADMIN_MODE=1 +``` +Для отключения: +```bash +DECORT_ADMIN_MODE=0 +``` +или +```bash +export DECORT_ADMIN_MODE=0 +``` +**ОБРАТИТЕ ВНИМАНИЕ** +Переменные окружения создаются для терминальной сессии. В сл. раз их придется задавать еще раз, если требуется режим, отличный от пользовательского. diff --git a/wiki/1.2.0/04.04-Получение-gid-или-grid_id.md b/wiki/1.2.0/04.04-Получение-gid-или-grid_id.md new file mode 100644 index 0000000..1161149 --- /dev/null +++ b/wiki/1.2.0/04.04-Получение-gid-или-grid_id.md @@ -0,0 +1,17 @@ +Платформа может располагаться на нескольких площадках(grid). +Такие площадки имеют свой id. +Для создания некоторых ресурсов требуется ввести grid_id или gid площадки. +Получение gid различается для пользовательского и административного API. + +## Получение gid для пользовательского API +Для получения gid с помощью пользовательского API, необходимо получить информацию из _data_source_ функции _dynamix_locations_list_, как указано ниже: +```terraform +data "dynamix_locations_list" "ll" { + +} + +output "test" { + value = data.dynamix_locations_list.ll +} +``` +В файл состояния будет сохранен результат, где можно посмотреть доступные для работы площадки. diff --git a/wiki/1.2.0/04.05-Сборка-terraform-провайдера-в-образ.md b/wiki/1.2.0/04.05-Сборка-terraform-провайдера-в-образ.md new file mode 100644 index 0000000..c0a96bf --- /dev/null +++ b/wiki/1.2.0/04.05-Сборка-terraform-провайдера-в-образ.md @@ -0,0 +1,43 @@ +Образ приложения - современный способ запуска приложений. Образ приложения представляет собой контейнер, в который входит ОС и необходимые для работы приложения пакеты. +Способов создать образ приложения довольно много, для этого существуют программы контейнеризации: +- Docker +- Podman +- и другие +Образ представляет собой "зафиксированную" версию приложения, что означает, что никакие изменения в приложения внесены быть не могут. Так же означает то, что приложение не может создавать побочные файлы при работе. +Контейнер - это запущенный экземпляр образа. То есть, один образ может порождать множество контейнеров, каждый из которых будет включать в себя отдельный экземпляр приложения. +Одно из преимуществ работы приложения в контейнере - кроссплатформенность. Это преимущество обуславливается тем, что образ приложения уже включает в себя все необходимое для успешной работы приложения, в том числе операционную систему. Поэтому, пользователю достаточно установить на вычислительной машине программу, которая обеспечивает работу с образами приложений. + +## Docker +Docker является одной из самых популярных программ для работы с образами. +Docker позволяет: +- Создавать образы +- Запускать контейнеры +- Управлять контейнерами +- Управлять образами +Скачать и установить Docker можно по ссылке https://docs.docker.com/get-docker/ + +## Сборка terraform провайдера +### Требования: +- Docker +- git +- Компилятор языка GO += make +### Установка необходимых программ +1. Компилятор языка GO можно скачать и установить по ссылке: https://go.dev/dl/ +2. Docker можно скачать и установить по ссылке выше. +3. Git можно скачать и установить по ссылке: https://git-scm.com/ +4. Программа make входит в пакет установленных программ для ОС Linux. Для Windows можно воспользоваться инструкцией со stack overflow: https://stackoverflow.com/questions/32127524/how-to-install-and-use-make-in-windows +### Порядок действий +1. Склонировать репозиторий с провайдером: +```bash +git clone https://repository.basistech.ru/BASIS/terraform-provider-dynamix +``` +2. Перейти в директорию со скачанным кодом: +```bash +cd terraform-provider-dynamix +``` +3. Выполнить команду: +```bash +make image +``` +В результате выполнения данной последовательности, будет создан docker образ, который содержит в себе приложение terraform, terraform провайдер. diff --git a/wiki/1.2.0/05.-Работа-с-terraform.md b/wiki/1.2.0/05.-Работа-с-terraform.md new file mode 100644 index 0000000..675f2ea --- /dev/null +++ b/wiki/1.2.0/05.-Работа-с-terraform.md @@ -0,0 +1,4 @@ +Раздел описывает некоторые практики работы с terraform, которые могут быть полезны пользователю. +Раздел включает в себя следующие статьи: +- Импортирование ресурсов +- Работа с таймаутами diff --git a/wiki/1.2.0/05.01-Импортирование-ресурсов.md b/wiki/1.2.0/05.01-Импортирование-ресурсов.md new file mode 100644 index 0000000..6983e22 --- /dev/null +++ b/wiki/1.2.0/05.01-Импортирование-ресурсов.md @@ -0,0 +1,75 @@ +Импортирование ресурсов в terraform позволяет привести в соответствие состояние terraform (.tfstate) к состоянию ресурса в платформе. +Необходимость такого приведения возникает в нескольких случаях: +- Ресурс был создан через портал платформы, работа продолжается через terraform провайдер, +- Ресурс был создан через terraform провайдер, однако был изменен через портал платформы, +- Ресурс был создан через terraform провайдер, однако был изменен другим пользователем через terraform провайдер, +- И так далее + +Такие расхождения в состоянии ресурсов нередки, путей их решения несколько: +- Использовать импортирование ресурсов, +- Использовать общие файлы состояний ресурсов, к которым будут иметь доступ все участники, занятые в работе с платформой. +В текущем разделе рассматривается первый вариант. + +## Импортирование ресурсов +Импортирование ресурсов позволяет совершить запрос к платформе, чтобы сформировать файл состояния. +Чтобы совершить импортирование ресурсов необходимо ввести сл. команду: +```bash +terraform import . +``` +## Пример +Предположим, что у нас ресурс, описывающий диск: +```terraform +resource "dynamix_disk" "disk" { + account_id = 121212 + gid = 3333 + disk_name = "mySuperDisk" + size_max = 100500 +} +``` +Если запустить команду: +```bash +terraform apply +``` +То у нас будет создан новый диск. +Но, такой диск уже есть на площадке и мы хотели бы сформировать .tfstate для этого ресурса. +Поэтому, для начала, необходимо получить список дисков: +```terraform +data "dynamix_disk_list" "dl"{ + +} +output "test" { + value = data.dynamix_disk_list.dl +} +``` +В полученных данных необходимо найти требуемый диск, получить его id - параметр disk_id. Пусть это будет - 777777 +Теперь можно выполнить импортирование: +```bash +terraform import dynamix_disk.disk 777777 +``` +Команда должна успешно завершиться, появиться файл состояний, который позволит манипулировать ресурсом. + +## Ошибки при импортировании +При импортировании ресурса может возникнуть сл. ошибка: +```bash +Error: : required field is not set +``` +Где - наименование поля. +Ошибка возникает в том случае, если в описании ресурса отсутствует обязательное поле. +Например: +```terraform +resource "dynamix_disk" "disk" { + account_id = 121212 + gid = 3333 + size_max = 100500 +} +``` +В приведенном выше описании отсутствует поле disk_name, поэтому, при попытке импортирования возникнет ошибка. +Для ее устранения, необходимо выполнить запрос на получение списка дисков, найти недостающее поле, после чего добавить его в описание ресурса. +После этого повторить попытку импортирования. + +## Общий алгоритм устранения ошибок +1. Выполнить запрос импортирования +2. В случае ошибки - внести недостающие поля. +3. Повторить п.1. + + diff --git a/wiki/1.2.0/05.02-Работа-с-таймаутами.md b/wiki/1.2.0/05.02-Работа-с-таймаутами.md new file mode 100644 index 0000000..ecffe69 --- /dev/null +++ b/wiki/1.2.0/05.02-Работа-с-таймаутами.md @@ -0,0 +1,100 @@ +Terraform провайдер DYNAMIX поддерживает тонкую настройку таймаутов выполнения запросов к платформе. Таймауты необходимы для определения максимального времени выполнения запроса. При превышении этого времени соединение рвется и запрос считается невыполненным. +Таймауты применяются при работе с _resource_ функциями провайдера. _Data source_ функции по-умолчанию имеют таймаут в 20 минут и изменяться не может. + +## Стандартные таймауты terraform +| Операция | Время | Описание | +| --- | --- | --- | +| create | 20 минут | Создание ресурса | +| read | 20 минут | Чтение ресурса | +| update | 20 минут | Обновление ресурса | +| delete | 20 минут | Удаление ресурса | +| default | 20 минут | Значение по умолчанию. Устанавливает значение для всех операций | + +## Стандартные таймауты провайдера DYNAMIX +В провайдере DYNAMIX таймауты переопределены для того, чтобы уменьшить нагрузку на платформу. +| Операция | Время | Описание | +| --- | --- | --- | +| create | 10 минут | Создание ресурса | +| read | 5 минут | Чтение ресурса | +| update | 5 минут | Обновление ресурса | +| delete | 5 минут | Удаление ресурса | +| default | 5 минут | Значение по умолчанию. Устанавливает значение для всех операций | + +## Установка таймаутов +Все таймауты можно установить самостоятельно для каждого ресурса. +Для этого используется блок _timeouts_, который имеется в каждом ресурсе провайдера. +Пример: +```terraform +resource "dynamix_res" "res_name" { + timeouts { + create = "10m" + update = "1m" + delete = "2m" + read = "7m" + #default = "15m" + } +} +``` +Где: +- create - операция создания ресурса +- read - операция чтения ресурса +- update - операция обновления ресурса +- delete - операция удаления ресурса +- default - установит заданное время для всех операций +## Формат установления времени +Как видно из примера выше, провайдер принимает на вход строку вида: +``` +"" +``` +Где: +- time-num - число +- time-val - сокращенная запись значения временного отрезка. + +Таблица с временными отрезками: + +| Отрезок | Значение | +| --- | --- | +| n | наносекунда | +| ms | миллисекунда | +| s | секунда | +| m | минута | +| h | час | + +Примеры: +``` +"10m" +"1s" +"1h10m" +``` +И так далее + +## Работа с таймером через .tf-файл +В .tf-файле, в блоке ресурса можно задавать таймауты для операций над ресурсом, однако, при работе с таймаутом, следует помнить о правиле: +__В случае изменения таймаутов в .tf-файле, операции с новыми таймаутами будут производиться только после apply/plan/destroy__ +То есть, если изменить таймауты и выполнить операцию, то она выполнится со старыми таймаутами, а сл. операция уже будет выполнена с новыми таймаутами. +Это объясняется тем, что значения таймаутов считываются из файла состояний .tfstate при выполнении операции, и новые значения таймаутов попадут туда только при успешно выполненной операции. + +## Ошибки при работе с таймаутом +### context deadline exceeded +Если время таймаута слишком короткое, то можно получить сл. ошибку: +``` +context deadline exceeded +``` +Которая говорит, что было выполнено прерывание работы программы из-за истечения времени на операцию. +Для исправления можно увеличить размер окна таймаута и выполнить успешный запрос (например, с помощью терминала), чтобы новое значения таймаутов было добавлено в .tfstate. В противном случае, файл состояния придется править в ручную, либо удалить его и импортировать ресурс для формирования .tfstate. + +### 504 ошибка +Данная ошибка говорит о том, что сервер принудительно разорвал соединения из-за истечения времени на ответ. +В случае получения данной ошибки, обратитесь в службу технической поддержки. + +## Работа с таймаутами через терминал +Сл. команда выполнит операцию terraform с заданным таймаутом: +```bash +timeout