4.5.3

CHANGELOG.md

@@ -1,25 +1,31 @@
-## Version 4.4.1
+## Version 4.5.3
 
 ### Bugfix
-- Add in cloudapi in account/data_source_account_templates_list fields for filters - image_id, name, type, page, size. 
-- Add in cloudapi in disks/data_source_disk_list_types_detailed, disks/data_source_disk_list_types fields for filters - page, size.
-- Add in cloudapi in disks/data_source_disk_list, disks/data_source_disk_list_unattached fields for filters - account_id, type, sep_id, pool_name, page, size.
-- Add in cloudapi in extnet/data_source_extnet_computes_list fields for filters - rg_id, compute_id, page, size.
-- Add in cloudapi in k8s/data_source_k8s_list_deleted fields for filters page, size, delete field for filters status. In k8s/data_source_k8s_list add fields for filters page, size, includedeleted.
-- Add in cloudapi in rg/data_source_rg_affinity_groups_list fields for filters - page, size.
-- Fixed tag Required in rg/data_source_rg_list_vins fields - vins_id, page, size.
-- Fixed panic in pfw
-- Fixed panic in image_virtual
-- Fixed error reading data_source_vins_static_route
-- Fixed static_route deletion
-- Fixed start bservice and bservice_group
+- Change field Value in schema resource kvmvm in blocks affinity_rules and anti_affinity_rules from required to optional in cloudapi and cloudbroker
+- Change the format ID in resource k8s_wg from wg_id to k8s_id#wg_id
+- Fix scripts intall.bat and intall.sh
+- Increased timeouts for resources account, disk, cdrom_image, image, virtual_image, k8s_wg, vins, rg in cloudbroker so that they match the same from cloudapi
+- Increased timeouts for resources pcidevice, sep, sep_config in cloudbroker
+- Fix bug in affinity_rules in cloudbroker/kvmvm
+- Add field NeedReboot in cloudapi/kvmvm in data_source, data_source_list and resource schemas
+- Fix bug with field ExtNetID in CreateInRGRequest in cloudapi/vins and cloudbroker/vins
+- Add boolean field Safe in Restart func in resource cloudapi/lb
+- Add field force_resize in Resize func in resource cloudapi/kvmvm and cloudbroker/kvmvm
+- Fix bug in cloudBroker/kvmvm with disk and extra_disks
+- Change logic from disk delete and disk add to disk rename when disk.disk_name field is changed in resource cloudapi/kvmvm and cloudbroker/kvmvm
+- Fix allowed network plugin value from "weawenet" to "weavenet" for k8ci, k8s resources in cloudbroker and for k8s resource in cloudapi
+- Fix bug with deleting decort_bservice resource when setting enable=false in cloudapi/bservice
+- Fix panic in data source decort_bservice_snapshot_list in cloudapi/bservice
+- Fix panic in data source decort_rg_affinity_groups_list in cloudapi/rg
+- Fix change description in resource decort_cb_kvmvm in cloudbroker
+- Computed field bootdisk_size has been renamed to boot_disk_size in data sources decort_kvmvm, decort_kvmvm_list, decort_cb_kvmvm_list in cloudapi and cloudbroker
+- Change request logic for delete resource decort_cb_k8s_cp in cloudbroker
+- Fix schema in datasource decort_cb_kvmvm in cloudbroker, fields boot_disk_id, sep_id, pool, extra_disks, network, net_id, net_type, ip_address, mac have been removes
+- Fix panic with RG in cloudapi
+- Fix permanently field for disks delete in decort_kvmvm in cloudapi/kvmvm and decort_cb_kvmvm in cloudbroker/kvmvm
+- Fix bug with enable request duplication
 
+### Feature
 
-## Feature
-- Add in cloudapi in account "data_source_account_get_resource_consumption" and "data_source_account_resource_consumption_list".
-- Add in cloudapi in kvmvm "data_source_compute_list_deleted", "data_source_compute_pci_device_list", "data_source_compute_vgpu_list".
-- Add in cloudapi in rg "data_source_rg_get_resource_consumption", "data_source_rg_resource_consumption_list".
-- Add in cloudapi in k8s "decort_k8s_wg_cloud_init".
-- Upgraded image_id existence check
-- Added sample of image_virtual config
-- Added cloud_init parameter to decort_k8s_wg resource
+- Add RAM divisibility validation in compute, k8s, k8s_cp and k8s_wg resources in cloudapi and cloudbroker
+- Add "permanently" flag in k8s, k8s_cp in cloudapi

Makefile

@@ -7,7 +7,7 @@ ZIPDIR = ./zip
 BINARY=${NAME}
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/decort/
-VERSION=4.4.1
+VERSION=4.5.3
 OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
 
 FILES = ${BINARY}_${VERSION}_darwin_amd64\

README.md

@@ -6,6 +6,7 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 
 | Версия DECORT API | Версия провайдера Terraform |
 | ------ | ------ |
+| 3.8.9 | 4.5.x |
 | 3.8.8 | 4.4.x |
 | 3.8.7 | 4.3.x |
 | 3.8.6 | 4.0.x, 4.1.x, 4.2.x |
@@ -26,23 +27,42 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 
 ## Возможности провайдера
 
-- Работа с Compute instances,
-- Работа с disks,
-- Работа с k8s,
-- Работа с image,
-- Работа с flipgroups,
-- Работа с stacks,
-- Работа с reource groups,
-- Работа с VINS,
-- Работа с pfw,
+- Режим пользователя:
   - Работа с accounts,
-- Работа с snapshots,
   - Работа с bservice,
+  - Работа с disks,
   - Работа с extnets,
+  - Работа с flipgroups,
+  - Работа с image,
+  - Работа с k8s,
+  - Работа с Compute instances,
+  - Работа с load balancer,
   - Работа с locations,
-- Работа с load balancer.
+  - Работа с pfw,
+  - Работа с resource groups,
+  - Работа с snapshots,
+  - Работа с stacks,
+  - Работа с VINS.
 
-Вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+- Режим администратора:
+  - Работа с accounts,
+  - Работа с audits,
+  - Работа с disks,
+  - Работа с extnets,
+  - Работа с flipgroups,
+  - Работа с grids,
+  - Работа с images,
+  - Работа с k8ci,
+  - Работа с k8s,
+  - Работа с Compute instances,
+  - Работа с load balancer,
+  - Работа с pci device,
+  - Работа с resource groups,
+  - Работа с seps,
+  - Работа с stacks,
+  - Работа с VINS.
+
+Со списком и описанием функционала всех групп можно ознамоиться на Вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 
 ## Установка
 Начиная с версии провайдера `4.3.0` в релизном архиве находятся скрипты-инсталляторы.
@@ -89,7 +109,7 @@ terraform {
 9. Добавьте в файл блок с инициализацией провайдера.
 ```terraform
 provider "decort" {
-  authenticator        = "oauth2"
+  authenticator        = "decs3o"
   controller_url       = "https://mr4.digitalenergy.online"
   oauth2_url           = "https://sso.digitalenergy.online"
   allow_unverified_ssl = true
@@ -175,7 +195,7 @@ ${host_name}/${namespace}/${type}
 8. Добавьте в файл блок с инициализацией провайдера.
 ```terraform
 provider "decort" {
-  authenticator        = "oauth2"
+  authenticator        = "decs3o"
   controller_url       = "https://mr4.digitalenergy.online"
   oauth2_url           = "https://sso.digitalenergy.online"
   allow_unverified_ssl = true

README_EN.md

@@ -58,7 +58,7 @@ Two ways for starting:
 
 ```terraform
 provider "decort" {
-  authenticator = "oauth2"
+  authenticator = "decs3o"
   #controller_url = <DECORT_CONTROLLER_URL>
   controller_url = "https://ds1.digitalenergy.online"
   #oauth2_url = <DECORT_SSO_URL>

go.mod

@@ -3,52 +3,53 @@ module repository.basistech.ru/BASIS/terraform-provider-decort
 go 1.18
 
 require (
-	github.com/golang-jwt/jwt/v4 v4.4.3
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/terraform-plugin-docs v0.13.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0
 	github.com/sirupsen/logrus v1.9.0
-	golang.org/x/net v0.15.0
-	repository.basistech.ru/BASIS/decort-golang-sdk v1.6.5
+	golang.org/x/net v0.17.0
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.7.7
 )
 
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.15.4 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
-	github.com/hashicorp/go-hclog v1.4.0 // indirect
+	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.8 // indirect
+	github.com/hashicorp/go-plugin v1.5.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/hc-install v0.4.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.15.0 // indirect
+	github.com/hashicorp/hc-install v0.6.1 // indirect
+	github.com/hashicorp/hcl/v2 v2.19.1 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.17.3 // indirect
-	github.com/hashicorp/terraform-json v0.14.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.14.2 // indirect
-	github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.1.0 // indirect
-	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
+	github.com/hashicorp/terraform-exec v0.19.0 // indirect
+	github.com/hashicorp/terraform-json v0.17.1 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.19.0 // indirect
+	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.2 // indirect
+	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
@@ -64,15 +65,16 @@ require (
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
-	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
-	github.com/vmihailenco/tagparser v0.1.2 // indirect
-	github.com/zclconf/go-cty v1.12.1 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/zclconf/go-cty v1.14.1 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
-	google.golang.org/grpc v1.51.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
+	google.golang.org/grpc v1.57.1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,4 +1,4 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
@@ -7,49 +7,38 @@ github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYr
 github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
 github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
 github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
-github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
-github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
-github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
-github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ=
-github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
-github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
+github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
+github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg=
+github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
+github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFUye+ZcSR6opIgz9Co7WcDx6ZcY+RjfFHoA0I=
-github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
-github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
-github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
+github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
+github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
+github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
+github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
-github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
-github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
-github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
-github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
-github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34=
-github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
-github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
-github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
-github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
+github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
+github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
+github.com/go-git/go-git/v5 v5.9.0 h1:cD9SFA7sHVRdJ7AYck1ZaAa/yeuBvGPxwXDL8cxrObY=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
@@ -58,22 +47,17 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91
 github.com/go-playground/validator/v10 v10.15.4 h1:zMXza4EpOdooxPel5xDqXEdXG5r+WggpvnAKMsalBjs=
 github.com/go-playground/validator/v10 v10.15.4/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
-github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU=
-github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -86,47 +70,44 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
 github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI=
 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs=
-github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I=
-github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
+github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM=
-github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
+github.com/hashicorp/go-plugin v1.5.1 h1:oGm7cWBaYIp3lJpx1RUEfLWophprE2EV/KUeqBYo+6k=
+github.com/hashicorp/go-plugin v1.5.1/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go-version v1.5.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
 github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/hc-install v0.4.0 h1:cZkRFr1WVa0Ty6x5fTvL1TuO1flul231rWkGH92oYYk=
-github.com/hashicorp/hc-install v0.4.0/go.mod h1:5d155H8EC5ewegao9A4PUTMNPZaq+TbOzkJJZ4vrXeI=
-github.com/hashicorp/hcl/v2 v2.15.0 h1:CPDXO6+uORPjKflkWCCwoWc9uRp+zSIPcCQ+BrxV7m8=
-github.com/hashicorp/hcl/v2 v2.15.0/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng=
+github.com/hashicorp/hc-install v0.6.1 h1:IGxShH7AVhPaSuSJpKtVi/EFORNjO+OYVJJrAtGG2mY=
+github.com/hashicorp/hc-install v0.6.1/go.mod h1:0fW3jpg+wraYSnFDJ6Rlie3RvLf1bIqVIkzoon4KoVE=
+github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI=
+github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=
 github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/terraform-exec v0.17.3 h1:MX14Kvnka/oWGmIkyuyvL6POx25ZmKrjlaclkx3eErU=
-github.com/hashicorp/terraform-exec v0.17.3/go.mod h1:+NELG0EqQekJzhvikkeQsOAZpsw0cv/03rbeQJqscAI=
-github.com/hashicorp/terraform-json v0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e17dKDpqV7s=
-github.com/hashicorp/terraform-json v0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM=
+github.com/hashicorp/terraform-exec v0.19.0 h1:FpqZ6n50Tk95mItTSS9BjeOVUb4eg81SpgVtZNNtFSM=
+github.com/hashicorp/terraform-exec v0.19.0/go.mod h1:tbxUpe3JKruE9Cuf65mycSIT8KiNPZ0FkuTE3H4urQg=
+github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA=
+github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o=
 github.com/hashicorp/terraform-plugin-docs v0.13.0 h1:6e+VIWsVGb6jYJewfzq2ok2smPzZrt1Wlm9koLeKazY=
 github.com/hashicorp/terraform-plugin-docs v0.13.0/go.mod h1:W0oCmHAjIlTHBbvtppWHe8fLfZ2BznQbuv8+UD8OucQ=
-github.com/hashicorp/terraform-plugin-go v0.14.2 h1:rhsVEOGCnY04msNymSvbUsXfRLKh9znXZmHlf5e8mhE=
-github.com/hashicorp/terraform-plugin-go v0.14.2/go.mod h1:Q12UjumPNGiFsZffxOsA40Tlz1WVXt2Evh865Zj0+UA=
-github.com/hashicorp/terraform-plugin-log v0.7.0 h1:SDxJUyT8TwN4l5b5/VkiTIaQgY6R+Y2BQ0sRZftGKQs=
-github.com/hashicorp/terraform-plugin-log v0.7.0/go.mod h1:p4R1jWBXRTvL4odmEkFfDdhUjHf9zcs/BCoNHAc7IK4=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1 h1:zHcMbxY0+rFO9gY99elV/XC/UnQVg7FhRCbj1i5b7vM=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1/go.mod h1:+tNlb0wkfdsDJ7JEiERLz4HzM19HyiuIoGzTsM7rPpw=
-github.com/hashicorp/terraform-registry-address v0.1.0 h1:W6JkV9wbum+m516rCl5/NjKxCyTVaaUBbzYcMzBDO3U=
-github.com/hashicorp/terraform-registry-address v0.1.0/go.mod h1:EnyO2jYO6j29DTHbJcm00E5nQTFeTtyZH3H5ycydQ5A=
-github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0=
-github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
+github.com/hashicorp/terraform-plugin-go v0.19.0 h1:BuZx/6Cp+lkmiG0cOBk6Zps0Cb2tmqQpDM3iAtnhDQU=
+github.com/hashicorp/terraform-plugin-go v0.19.0/go.mod h1:EhRSkEPNoylLQntYsk5KrDHTZJh9HQoumZXbOGOXmec=
+github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
+github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0 h1:X7vB6vn5tON2b49ILa4W7mFAsndeqJ7bZFOGbVO+0Cc=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0/go.mod h1:ydFcxbdj6klCqYEPkPvdvFKiNGKZLUs+896ODUXCyao=
+github.com/hashicorp/terraform-registry-address v0.2.2 h1:lPQBg403El8PPicg/qONZJDC6YlgCVbWDtNmmZKtBno=
+github.com/hashicorp/terraform-registry-address v0.2.2/go.mod h1:LtwNbCihUoUZ3RYriyS2wF/lGPB6gF9ICLRtuDk7hSo=
+github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
+github.com/hashicorp/terraform-svchost v0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv26+X7JPS+buii2c9/ctc=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
@@ -135,28 +116,19 @@ github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq
 github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
 github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
+github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
-github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
-github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
 github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
@@ -172,8 +144,6 @@ github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2c
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
 github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
@@ -183,11 +153,9 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
@@ -196,24 +164,20 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
 github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
-github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -226,64 +190,46 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U=
-github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
-github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
-github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
-github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
+github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
+github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
-github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8=
-github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
-github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY=
-github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
-github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
-golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA=
+github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -293,51 +239,51 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 h1:jmIfw8+gSvXcZSgaFAGyInDXeWzUhvYH57G/5GKMn70=
-google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
-google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg=
+google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0/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.6.5 h1:37OLNiSgF3SXjj0ZMRikVrBiNlNdS9NY8QxD9YFfHBY=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.6.5/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.7.7 h1:VIF+NXXfYec8DtlTcPae+CjB0fhH8ovBQxKMwEnLgE8=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.7.7/go.mod h1:7fj8sgGZFiiExewQeqckCS4WxwOmU0oP6BO6mi1Lpkw=

internal/constants/constants.go

@@ -37,3 +37,6 @@ const MaxCpusPerCompute = 128
 
 // MinRamPerCompute sets minimum amount of RAM per compute in MB
 const MinRamPerCompute = 128
+
+// RAMDivisibility sets divisibility of RAM value
+const RAMDivisibility = 128

internal/constants/timeouts.go

@@ -28,5 +28,6 @@ var Timeout60s = time.Second * 60
 var Timeout180s = time.Second * 180
 var Timeout300s = time.Second * 300
 var Timeout600s = time.Second * 600
+var Timeout900s = time.Second * 900
 var Timeout20m = time.Minute * 20
 var Timeout30m = time.Minute * 30

internal/controller/controller.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
 Authors:
 Petr Krutov, <petr.krutov@digitalenergy.online>
 Stanislav Solovev, <spsolovev@digitalenergy.online>
@@ -21,17 +21,15 @@ limitations under the License.
 package controller
 
 import (
-	"bytes"
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
+
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 
-	// "time"
-
 	log "github.com/sirupsen/logrus"
 	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
@@ -39,31 +37,37 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 
-	jwt "github.com/golang-jwt/jwt/v4"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 // enumerated constants that define authentication modes
 const (
 	MODE_UNDEF = iota // this is the invalid mode - it should never be seen
-	MODE_LEGACY = iota
-	MODE_OAUTH2 = iota
-	MODE_JWT    = iota
+	MODE_LEGACY
+	MODE_DECS3O
+	MODE_JWT
+	MODE_BVS
 )
 
 type ControllerCfg struct {
 	controller_url  string       // always required
 	auth_mode_code  int          // always required
 	auth_mode_txt   string       // always required, it is a text representation of auth mode
+	bvs_user        string       // required for bvs mode
+	bvs_password    string       // required for bvs mode
+	domain          string       // required for bvs mode
+	token           config.Token // obtained from BVS provider on successful login in bvs mode
+	path_cfg        string       // the path of the configuration file entry
+	path_token      string       // the path of the token file entry
+	time_to_refresh int64        // the number of minutes before the expiration of the token, a refresh will be made
 	legacy_user     string       // required for legacy mode
 	legacy_password string       // required for legacy mode
 	legacy_sid      string       // obtained from DECORT controller on successful login in legacy mode
-	jwt             string       // obtained from Outh2 provider on successful login in oauth2 mode, required in jwt mode
-	app_id          string       // required for oauth2 mode
-	app_secret      string       // required for oauth2 mode
-	oauth2_url      string       // always required
-	decort_username string       // assigned to either legacy_user (legacy mode) or Oauth2 user (oauth2 mode) upon successful verification
+	jwt             string       // obtained from Outh2 provider on successful login in decs3o mode, required in jwt mode
+	app_id          string       // required for decs3o and bvs mode
+	app_secret      string       // required for decs3o and bvs mode
+	oauth2_url      string       // required for decs3o and bvs mode
+	decort_username string       // assigned to either legacy_user (legacy mode) or Oauth2 user (decs3o mode) upon successful verification
 	cc_client       *http.Client // assigned when all initial checks successfully passed
 	caller          interfaces.Caller
 }
@@ -86,17 +90,24 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		legacy_user:     d.Get("user").(string),
 		legacy_password: d.Get("password").(string),
 		legacy_sid:      "",
+		bvs_user:        d.Get("bvs_user").(string),
+		bvs_password:    d.Get("bvs_password").(string),
+		domain:          d.Get("domain").(string),
 		jwt:             d.Get("jwt").(string),
 		app_id:          d.Get("app_id").(string),
 		app_secret:      d.Get("app_secret").(string),
 		oauth2_url:      d.Get("oauth2_url").(string),
 		decort_username: "",
+		token:           config.Token{},
+		path_cfg:        d.Get("path_cfg").(string),
+		path_token:      d.Get("path_token").(string),
+		time_to_refresh: int64(d.Get("time_to_refresh").(int)),
 	}
 
 	allow_unverified_ssl := d.Get("allow_unverified_ssl").(bool)
 
 	if ret_config.controller_url == "" {
-		return nil, fmt.Errorf("Empty DECORT cloud controller URL provided.")
+		return nil, fmt.Errorf("empty DECORT cloud controller URL provided")
 	}
 
 	// this should have already been done by StateFunc defined in Schema, but we want to be sure
@@ -105,33 +116,53 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 	switch ret_config.auth_mode_txt {
 	case "jwt":
 		if ret_config.jwt == "" {
-			return nil, fmt.Errorf("Authenticator mode 'jwt' specified but no JWT provided.")
+			return nil, fmt.Errorf("authenticator mode 'jwt' specified but no JWT provided")
 		}
 		ret_config.auth_mode_code = MODE_JWT
-	case "oauth2":
+	case "decs3o":
 		if ret_config.oauth2_url == "" {
-			return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no OAuth2 URL provided.")
+			return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no OAuth2 URL provided")
 		}
 		if ret_config.app_id == "" {
-			return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no Application ID provided.")
+			return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no Application ID provided")
 		}
 		if ret_config.app_secret == "" {
-			return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no Secret ID provided.")
+			return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no Secret ID provided")
 		}
-		ret_config.auth_mode_code = MODE_OAUTH2
+		ret_config.auth_mode_code = MODE_DECS3O
 	case "legacy":
 		//
 		ret_config.legacy_user = d.Get("user").(string)
 		if ret_config.legacy_user == "" {
-			return nil, fmt.Errorf("Authenticator mode 'legacy' specified but no user provided.")
+			return nil, fmt.Errorf("authenticator mode 'legacy' specified but no user provided")
 		}
 		ret_config.legacy_password = d.Get("password").(string)
 		if ret_config.legacy_password == "" {
-			return nil, fmt.Errorf("Authenticator mode 'legacy' specified but no password provided.")
+			return nil, fmt.Errorf("authenticator mode 'legacy' specified but no password provided")
 		}
 		ret_config.auth_mode_code = MODE_LEGACY
+	case "bvs":
+		if ret_config.bvs_user == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no user provided")
+		}
+		if ret_config.bvs_password == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no password provided")
+		}
+		if ret_config.oauth2_url == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no bvs URL provided")
+		}
+		if ret_config.app_id == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Application ID provided")
+		}
+		if ret_config.app_secret == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Secret ID provided")
+		}
+		if ret_config.domain == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Domain provided")
+		}
+		ret_config.auth_mode_code = MODE_BVS
 	default:
-		return nil, fmt.Errorf("Unknown authenticator mode %q provided.", ret_config.auth_mode_txt)
+		return nil, fmt.Errorf("unknown authenticator mode %q provided", ret_config.auth_mode_txt)
 	}
 
 	if allow_unverified_ssl {
@@ -167,30 +198,30 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		if !ok {
 			return nil, err
 		}
-	case MODE_OAUTH2:
-		// on success getOAuth2JWT will set config.jwt to the obtained JWT, so there is no
+	case MODE_DECS3O:
+		// on success getDECS3OJWT will set config.jwt to the obtained JWT, so there is no
 		// need to set it once again here
-		_, err := ret_config.getOAuth2JWT()
-		if err != nil {
-			return nil, err
-		}
+		// _, err := ret_config.getDECS3OJWT()
+		// if err != nil {
+		// 	return nil, err
+		// }
 		// we are not verifying the JWT when parsing because actual verification is done on the
 		// OVC controller side. Here we do parsing solely to extract Oauth2 user name (claim "user")
 		// and JWT issuer name (claim "iss")
-		parser := jwt.Parser{}
-		token, _, err := parser.ParseUnverified(ret_config.jwt, jwt.MapClaims{})
-		if err != nil {
-			return nil, err
-		}
-		if claims, ok := token.Claims.(jwt.MapClaims); ok {
-			var tbuf bytes.Buffer
-			tbuf.WriteString(claims["username"].(string))
-			tbuf.WriteString("@")
-			tbuf.WriteString(claims["iss"].(string))
-			ret_config.decort_username = tbuf.String()
-		} else {
-			return nil, fmt.Errorf("Failed to extract user and iss fields from JWT token in oauth2 mode.")
-		}
+		// parser := jwt.Parser{}
+		// token, _, err := parser.ParseUnverified(ret_config.jwt, jwt.MapClaims{})
+		// if err != nil {
+		// 	return nil, err
+		// }
+		// if claims, ok := token.Claims.(jwt.MapClaims); ok {
+		// 	var tbuf bytes.Buffer
+		// 	tbuf.WriteString(claims["username"].(string))
+		// 	tbuf.WriteString("@")
+		// 	tbuf.WriteString(claims["iss"].(string))
+		// 	ret_config.decort_username = tbuf.String()
+		// } else {
+		// 	return nil, fmt.Errorf("failed to extract user and iss fields from JWT token in oauth2 mode")
+		// }
 
 		sdkConf := config.Config{
 			AppID:         ret_config.app_id,
@@ -201,10 +232,27 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		}
 
 		ret_config.caller = decort.New(sdkConf)
+	case MODE_BVS:
 
+		sdkConf := config.BVSConfig{
+			AppID:         ret_config.app_id,
+			AppSecret:     ret_config.app_secret,
+			SSOURL:        ret_config.oauth2_url,
+			DecortURL:     ret_config.controller_url,
+			SSLSkipVerify: allow_unverified_ssl,
+			Username:      ret_config.bvs_user,
+			Password:      ret_config.bvs_password,
+			Domain:        ret_config.domain,
+			Token:         ret_config.token,
+			PathCfg:       ret_config.path_cfg,
+			PathToken:     ret_config.path_token,
+			TimeToRefresh: ret_config.time_to_refresh,
+		}
+
+		ret_config.caller = decort.NewBVS(sdkConf)
 	default:
 		// FYI, this should never happen due to all above checks, but we want to be fool proof
-		return nil, fmt.Errorf("Unknown authenticator mode code %d provided.", ret_config.auth_mode_code)
+		return nil, fmt.Errorf("unknown authenticator mode code %d provided", ret_config.auth_mode_code)
 	}
 
 	// All checks passed successfully, credentials corresponding to the selected authenticator mode
@@ -212,57 +260,57 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 	return ret_config, nil
 }
 
-func (config *ControllerCfg) GetDecortUsername() string {
-	return config.decort_username
-}
+// func (config *ControllerCfg) GetDecortUsername() string {
+// 	return config.decort_username
+// }
 
-func (config *ControllerCfg) getOAuth2JWT() (string, error) {
-	// 	Obtain JWT from the Oauth2 provider using application ID and application secret provided in config.
-	if config.auth_mode_code == MODE_UNDEF {
-		return "", fmt.Errorf("getOAuth2JWT method called for undefined authorization mode.")
-	}
-	if config.auth_mode_code != MODE_OAUTH2 {
-		return "", fmt.Errorf("getOAuth2JWT method called for incompatible authorization mode %q.", config.auth_mode_txt)
-	}
+// func (config *ControllerCfg) getDECS3OJWT() (string, error) {
+// 	// 	Obtain JWT from the Oauth2 provider using application ID and application secret provided in config.
+// 	if config.auth_mode_code == MODE_UNDEF {
+// 		return "", fmt.Errorf("getOAuth2JWT method called for undefined authorization mode")
+// 	}
+// 	if config.auth_mode_code != MODE_DECS3O {
+// 		return "", fmt.Errorf("getOAuth2JWT method called for incompatible authorization mode %q", config.auth_mode_txt)
+// 	}
 
-	params := url.Values{}
-	params.Add("grant_type", "client_credentials")
-	params.Add("client_id", config.app_id)
-	params.Add("client_secret", config.app_secret)
-	params.Add("response_type", "id_token")
-	params.Add("validity", "3600")
-	params_str := params.Encode()
+// 	params := url.Values{}
+// 	params.Add("grant_type", "client_credentials")
+// 	params.Add("client_id", config.app_id)
+// 	params.Add("client_secret", config.app_secret)
+// 	params.Add("response_type", "id_token")
+// 	params.Add("validity", "3600")
+// 	params_str := params.Encode()
 
-	req, err := http.NewRequest("POST", config.oauth2_url+"/v1/oauth/access_token", strings.NewReader(params_str))
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Content-Length", strconv.Itoa(len(params_str)))
+// 	req, err := http.NewRequest("POST", config.oauth2_url+"/v1/oauth/access_token", strings.NewReader(params_str))
+// 	if err != nil {
+// 		return "", err
+// 	}
+// 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+// 	req.Header.Set("Content-Length", strconv.Itoa(len(params_str)))
 
-	resp, err := config.cc_client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	if resp.StatusCode != http.StatusOK {
-		// fmt.Println("response Status:", resp.Status)
-		// fmt.Println("response Headers:", resp.Header)
-		// fmt.Println("response Headers:", req.URL)
-		return "", fmt.Errorf("getOauth2JWT: unexpected status code %d when obtaining JWT from %q for APP_ID %q, request Body %q",
-			resp.StatusCode, req.URL, config.app_id, params_str)
-	}
-	defer resp.Body.Close()
+// 	resp, err := config.cc_client.Do(req)
+// 	if err != nil {
+// 		return "", err
+// 	}
+// 	if resp.StatusCode != http.StatusOK {
+// 		// fmt.Println("response Status:", resp.Status)
+// 		// fmt.Println("response Headers:", resp.Header)
+// 		// fmt.Println("response Headers:", req.URL)
+// 		return "", fmt.Errorf("getOauth2JWT: unexpected status code %d when obtaining JWT from %q for APP_ID %q, request Body %q",
+// 			resp.StatusCode, req.URL, config.app_id, params_str)
+// 	}
+// 	defer resp.Body.Close()
 
-	responseData, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
+// 	responseData, err := io.ReadAll(resp.Body)
+// 	if err != nil {
+// 		return "", err
+// 	}
 
-	// validation successful - store JWT in the corresponding field of the ControllerCfg structure
-	config.jwt = strings.TrimSpace(string(responseData))
+// 	// validation successful - store JWT in the corresponding field of the ControllerCfg structure
+// 	config.jwt = strings.TrimSpace(string(responseData))
 
-	return config.jwt, nil
-}
+// 	return config.jwt, nil
+// }
 
 func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 	/*
@@ -273,13 +321,13 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 	*/
 	if jwt == "" {
 		if config.jwt == "" {
-			return false, fmt.Errorf("validateJWT method called, but no meaningful JWT provided.")
+			return false, fmt.Errorf("validateJWT method called, but no meaningful JWT provided")
 		}
 		jwt = config.jwt
 	}
 
 	if config.oauth2_url == "" {
-		return false, fmt.Errorf("validateJWT method called, but no OAuth2 URL provided.")
+		return false, fmt.Errorf("validateJWT method called, but no OAuth2 URL provided")
 	}
 
 	req, err := http.NewRequest("POST", config.controller_url+"/restmachine/cloudapi/account/list", nil)
@@ -296,7 +344,7 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 		return false, err
 	}
 	if resp.StatusCode != http.StatusOK {
-		return false, fmt.Errorf("validateJWT: unexpected status code %d when validating JWT against %q.",
+		return false, fmt.Errorf("validateJWT: unexpected status code %d when validating JWT against %q",
 			resp.StatusCode, req.URL)
 	}
 	defer resp.Body.Close()
@@ -312,10 +360,10 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 		    reason, the method will return false and error.
 	*/
 	if config.auth_mode_code == MODE_UNDEF {
-		return false, fmt.Errorf("validateLegacyUser method called for undefined authorization mode.")
+		return false, fmt.Errorf("validateLegacyUser method called for undefined authorization mode")
 	}
 	if config.auth_mode_code != MODE_LEGACY {
-		return false, fmt.Errorf("validateLegacyUser method called for incompatible authorization mode %q.", config.auth_mode_txt)
+		return false, fmt.Errorf("validateLegacyUser method called for incompatible authorization mode %q", config.auth_mode_txt)
 	}
 
 	params := url.Values{}
@@ -336,12 +384,12 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 		return false, err
 	}
 	if resp.StatusCode != http.StatusOK {
-		return false, fmt.Errorf("validateLegacyUser: unexpected status code %d when validating legacy user %q against %q.",
+		return false, fmt.Errorf("validateLegacyUser: unexpected status code %d when validating legacy user %q against %q",
 			resp.StatusCode, config.legacy_user, config.controller_url)
 	}
 	defer resp.Body.Close()
 
-	responseData, err := ioutil.ReadAll(resp.Body)
+	responseData, err := io.ReadAll(req.Body)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -353,21 +401,32 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 }
 
 func (config *ControllerCfg) CloudAPI() *cloudapi.CloudAPI {
-	if config.auth_mode_code == MODE_LEGACY {
+	switch config.auth_mode_code {
+	case MODE_LEGACY:
 		client, _ := config.caller.(*decort.LegacyDecortClient)
 		return client.CloudAPI()
-	}
-
+	case MODE_DECS3O:
 		client, _ := config.caller.(*decort.DecortClient)
 		return client.CloudAPI()
+	case MODE_BVS:
+		client, _ := config.caller.(*decort.BVSDecortClient)
+		return client.CloudAPI()
+	default:
+		return &cloudapi.CloudAPI{}
+	}
 }
-
 func (config *ControllerCfg) CloudBroker() *cloudbroker.CloudBroker {
-	if config.auth_mode_code == MODE_LEGACY {
+	switch config.auth_mode_code {
+	case MODE_LEGACY:
 		client, _ := config.caller.(*decort.LegacyDecortClient)
 		return client.CloudBroker()
-	}
-
+	case MODE_DECS3O:
 		client, _ := config.caller.(*decort.DecortClient)
 		return client.CloudBroker()
+	case MODE_BVS:
+		client, _ := config.caller.(*decort.BVSDecortClient)
+		return client.CloudBroker()
+	default:
+		return &cloudbroker.CloudBroker{}
+	}
 }

internal/dc/utils.go

@@ -1,8 +1,12 @@
 /*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+
 Authors:
 Petr Krutov, <petr.krutov@digitalenergy.online>
 Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Nikita Sorokin, <nesorokin@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,9 +33,33 @@ builds seamlessly.
 Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
-package snapshot
+package dc
 
-const snapshotCreateAPI = "/restmachine/cloudbroker/compute/snapshotCreate"
-const snapshotDeleteAPI = "/restmachine/cloudbroker/compute/snapshotDelete"
-const snapshotRollbackAPI = "/restmachine/cloudbroker/compute/snapshotRollback"
-const snapshotListAPI = "/restmachine/cloudbroker/compute/snapshotList"
+import "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+
+func ErrorsToDiagnostics(errs []error) diag.Diagnostics {
+	if len(errs) == 0 {
+		return nil
+	}
+
+	diags := diag.Diagnostics{}
+
+	for _, err := range errs {
+		diags = append(diags, diag.Diagnostic{
+			Severity: diag.Error,
+			Summary:  err.Error(),
+		})
+	}
+
+	return diags
+}
+
+func ErrorsToWarnings(errs []error) Warnings {
+	w := Warnings{}
+
+	for _, err := range errs {
+		w.Add(err)
+	}
+
+	return w
+}

internal/provider/data_sources_map.go

@@ -38,25 +38,31 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vins"
 
 	cb_account "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
+	cb_audit "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/audit"
 	cb_disks "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
 	cb_extnet "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/extnet"
+	cb_flipgroup "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/flipgroup"
 	cb_grid "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/grid"
 	cb_image "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
+	cb_kvmvm "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/kvmvm"
+	cb_lb "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/lb"
 	cb_pcidevice "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
 	cb_rg "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/rg"
 	cb_sep "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/sep"
-	cb_vgpu "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vgpu"
+	cb_stack "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/stack"
+	cb_vins "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
+
+	// cb_vgpu "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vgpu"
+	cb_k8ci "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8ci"
+	cb_k8s "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8s"
 )
 
 func newDataSourcesMap() map[string]*schema.Resource {
 	return map[string]*schema.Resource{
 		"decort_account":                           account.DataSourceAccount(),
-		"decort_account_resource_consumption_list": account.DataSourceAccountResourceConsumptionList(),
-		"decort_account_resource_consumption_get":  account.DataSourceAccountResourceConsumptionGet(),
 		"decort_resgroup":                          rg.DataSourceResgroup(),
 		"decort_kvmvm":                             kvmvm.DataSourceCompute(),
 		"decort_kvmvm_list":                        kvmvm.DataSourceComputeList(),
-		"decort_kvmvm_list_deleted":                kvmvm.DataSourceComputeListDeleted(),
 		"decort_kvmvm_audits":                      kvmvm.DataSourceComputeAudits(),
 		"decort_kvmvm_get_audits":                  kvmvm.DataSourceComputeGetAudits(),
 		"decort_kvmvm_get_console_url":             kvmvm.DataSourceComputeGetConsoleUrl(),
@@ -64,15 +70,12 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_kvmvm_pfw_list":                    kvmvm.DataSourceComputePfwList(),
 		"decort_kvmvm_user_list":                   kvmvm.DataSourceComputeUserList(),
 		"decort_kvmvm_snapshot_usage":              kvmvm.DataSourceComputeSnapshotUsage(),
-		"decort_kvmvm_vgpu_list":                   kvmvm.DataSourceComputeVGPUList(),
-		"decort_kvmvm_pci_device_list":             kvmvm.DataSourceComputePCIDeviceList(),
 		"decort_k8s":                               k8s.DataSourceK8s(),
 		"decort_k8s_list":                          k8s.DataSourceK8sList(),
 		"decort_k8s_list_deleted":                  k8s.DataSourceK8sListDeleted(),
 		"decort_k8s_wg":                            k8s.DataSourceK8sWg(),
 		"decort_k8s_wg_list":                       k8s.DataSourceK8sWgList(),
 		"decort_k8s_computes":                      k8s.DataSourceK8sComputes(),
-		"decort_k8s_wg_cloud_init":                 k8s.DataSourceK8sWgCloudInit(),
 		"decort_k8ci_list":                         k8s.DataSourceK8CIList(),
 		"decort_vins":                              vins.DataSourceVins(),
 		"decort_vins_list":                         vins.DataSourceVinsList(),
@@ -96,8 +99,6 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_rg_list_lb":                        rg.DataSourceRgListLb(),
 		"decort_rg_list_pfw":                       rg.DataSourceRgListPfw(),
 		"decort_rg_list_vins":                      rg.DataSourceRgListVins(),
-		"decort_rg_resource_consumption_list":      rg.DataSourceRGResourceConsumptionList(),
-		"decort_rg_resource_consumption_get":       rg.DataSourceRGResourceConsumptionGet(),
 		"decort_rg_usage":                          rg.DataSourceRgUsage(),
 		"decort_disk_list_types_detailed":          disks.DataSourceDiskListTypesDetailed(),
 		"decort_disk_list_types":                   disks.DataSourceDiskListTypes(),
@@ -137,36 +138,117 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_flipgroup_list":                    flipgroup.DataSourceFlipGroupList(),
 		"decort_stack":                             stack.DataSourceStack(),
 		"decort_stack_list":                        stack.DataSourceStackList(),
+		"decort_account_resource_consumption_list": account.DataSourceAccountResourceConsumptionList(),
+		"decort_account_resource_consumption_get":  account.DataSourceAccountResourceConsumptionGet(),
+		"decort_kvmvm_list_deleted":                kvmvm.DataSourceComputeListDeleted(),
+		"decort_kvmvm_vgpu_list":                   kvmvm.DataSourceComputeVGPUList(),
+		"decort_kvmvm_pci_device_list":             kvmvm.DataSourceComputePCIDeviceList(),
+		"decort_k8s_wg_cloud_init":                 k8s.DataSourceK8sWgCloudInit(),
+		"decort_rg_resource_consumption_list":      rg.DataSourceRGResourceConsumptionList(),
+		"decort_rg_resource_consumption_get":       rg.DataSourceRGResourceConsumptionGet(),
 
 		"decort_cb_account":                           cb_account.DataSourceAccount(),
 		"decort_cb_account_list":                      cb_account.DataSourceAccountList(),
 		"decort_cb_account_computes_list":             cb_account.DataSourceAccountComputesList(),
-		"decort_cb_account_deleted_list":    cb_account.DataSourceAccountDeletedList(),
+		"decort_cb_account_list_deleted":              cb_account.DataSourceAccountDeletedList(),
 		"decort_cb_account_disks_list":                cb_account.DataSourceAccountDisksList(),
 		"decort_cb_account_flipgroups_list":           cb_account.DataSourceAccountFlipGroupsList(),
 		"decort_cb_account_rg_list":                   cb_account.DataSourceAccountRGList(),
 		"decort_cb_account_vins_list":                 cb_account.DataSourceAccountVinsList(),
+		"decort_cb_account_resource_consumption_get":  cb_account.DataSourceAccountResourceConsumptionGet(),
+		"decort_cb_account_resource_consumption_list": cb_account.DataSourceAccountResourceConsumptionList(),
 		"decort_cb_account_audits_list":               cb_account.DataSourceAccountAuditsList(),
+		"decort_cb_audit":                             cb_audit.DataSourceAudit(),
+		"decort_cb_audit_list":                        cb_audit.DataSourceAuditList(),
+		"decort_cb_audit_linked_jobs":                 cb_audit.DataSourceAuditLinkedJobs(),
 		"decort_cb_extnet":                            cb_extnet.DataSourceExtnetCB(),
 		"decort_cb_extnet_list":                       cb_extnet.DataSourceExtnetListCB(),
 		"decort_cb_extnet_default":                    cb_extnet.DataSourceExtnetDefaultCB(),
-		"decort_cb_disk":                    cb_disks.DataSourceDisk(),
-		"decort_cb_disk_list":               cb_disks.DataSourceDiskList(),
+		"decort_cb_extnet_static_route_list":          cb_extnet.DataSourceStaticRouteList(),
+		"decort_cb_extnet_static_route":               cb_extnet.DataSourceStaticRoute(),
 		"decort_cb_image":                             cb_image.DataSourceImage(),
 		"decort_cb_grid":                              cb_grid.DataSourceGrid(),
+		"decort_cb_grid_get_status":                   cb_grid.DataSourceGridGetStatus(),
+		"decort_cb_grid_post_status":                  cb_grid.DataSourceGridPostStatus(),
+		"decort_cb_grid_get_diagnosis":                cb_grid.DataSourceGridGetDiagnosis(),
+		"decort_cb_grid_post_diagnosis":               cb_grid.DataSourceGridPostDiagnosis(),
 		"decort_cb_grid_list":                         cb_grid.DataSourceGridList(),
+		"decort_cb_grid_list_emails":                  cb_grid.DataSourceGridListEmails(),
+		"decort_cb_grid_list_consumption":             cb_grid.DataSourceGridListConsumption(),
+		"decort_cb_grid_get_consumption":              cb_grid.DataSourceGridGetConsumption(),
 		"decort_cb_image_list":                        cb_image.DataSourceImageList(),
 		"decort_cb_image_list_stacks":                 cb_image.DataSourceImageListStacks(),
+		"decort_cb_kvmvm":                             cb_kvmvm.DataSourceCompute(),
+		"decort_cb_kvmvm_affinity_relations":          cb_kvmvm.DataSourceComputeAffinityRelations(),
+		"decort_cb_kvmvm_audits":                      cb_kvmvm.DataSourceComputeAudits(),
+		"decort_cb_kvmvm_boot_order_get":              cb_kvmvm.DataSourceComputeBootOrderGet(),
+		"decort_cb_kvmvm_get_audits":                  cb_kvmvm.DataSourceComputeGetAudits(),
+		"decort_cb_kvmvm_get_console_url":             cb_kvmvm.DataSourceComputeGetConsoleUrl(),
+		"decort_cb_kvmvm_get_log":                     cb_kvmvm.DataSourceComputeGetLog(),
+		"decort_cb_kvmvm_list":                        cb_kvmvm.DataSourceComputeList(),
+		"decort_cb_kvmvm_list_deleted":                cb_kvmvm.DataSourceComputeListDeleted(),
+		"decort_cb_kvmvm_migrate_storage_info":        cb_kvmvm.DataSourceComputeMigrateStorageInfo(),
+		"decort_cb_kvmvm_pci_device_list":             cb_kvmvm.DataSourceComputePCIDeviceList(),
+		"decort_cb_kvmvm_pfw_list":                    cb_kvmvm.DataSourceComputePfwList(),
+		"decort_cb_kvmvm_snapshot_list":               cb_kvmvm.DataSourceComputeSnapshotList(),
+		"decort_cb_kvmvm_snapshot_usage":              cb_kvmvm.DataSourceComputeSnapshotUsage(),
+		"decort_cb_kvmvm_user_list":                   cb_kvmvm.DataSourceComputeUserList(),
+		"decort_cb_kvmvm_vgpu_list":                   cb_kvmvm.DataSourceComputeVGPUList(),
+		"decort_cb_disk":                              cb_disks.DataSourceDisk(),
+		"decort_cb_disk_list":                         cb_disks.DataSourceDiskList(),
+		"decort_cb_disk_list_deleted":                 cb_disks.DataSourceDiskListDeleted(),
+		"decort_cb_disk_list_types":                   cb_disks.DataSourceDiskListTypes(),
+		"decort_cb_disk_list_types_detailed":          cb_disks.DataSourceDiskListTypesDetailed(),
+		"decort_cb_disk_list_unattached":              cb_disks.DataSourceDiskListUnattached(),
+		"decort_cb_disk_snapshot":                     cb_disks.DataSourceDiskSnapshot(),
+		"decort_cb_disk_snapshot_list":                cb_disks.DataSourceDiskSnapshotList(),
 		"decort_cb_pcidevice":                         cb_pcidevice.DataSourcePcidevice(),
 		"decort_cb_pcidevice_list":                    cb_pcidevice.DataSourcePcideviceList(),
+		"decort_cb_rg":                                cb_rg.DataSourceResgroup(),
+		"decort_cb_rg_affinity_group_computes":        cb_rg.DataSourceRgAffinityGroupComputes(),
+		"decort_cb_rg_affinity_groups_get":            cb_rg.DataSourceRgAffinityGroupsGet(),
+		"decort_cb_rg_affinity_groups_list":           cb_rg.DataSourceRgAffinityGroupsList(),
+		"decort_cb_rg_resource_consumption_get":       cb_rg.DataSourceRGResourceConsumptionGet(),
+		"decort_cb_rg_resource_consumption_list":      cb_rg.DataSourceRGResourceConsumptionList(),
+		"decort_cb_rg_audits":                         cb_rg.DataSourceRgAudits(),
+		"decort_cb_rg_list":                           cb_rg.DataSourceRgList(),
+		"decort_cb_rg_list_deleted":                   cb_rg.DataSourceRgListDeleted(),
+		"decort_cb_rg_list_computes":                  cb_rg.DataSourceRgListComputes(),
+		"decort_cb_rg_list_lb":                        cb_rg.DataSourceRgListLb(),
+		"decort_cb_rg_list_pfw":                       cb_rg.DataSourceRgListPfw(),
+		"decort_cb_rg_list_vins":                      cb_rg.DataSourceRgListVins(),
+		"decort_cb_rg_usage":                          cb_rg.DataSourceRgUsage(),
 		"decort_cb_sep_list":                          cb_sep.DataSourceSepList(),
 		"decort_cb_sep":                               cb_sep.DataSourceSep(),
 		"decort_cb_sep_consumption":                   cb_sep.DataSourceSepConsumption(),
 		"decort_cb_sep_disk_list":                     cb_sep.DataSourceSepDiskList(),
 		"decort_cb_sep_config":                        cb_sep.DataSourceSepConfig(),
 		"decort_cb_sep_pool":                          cb_sep.DataSourceSepPool(),
-		"decort_cb_vgpu":                    cb_vgpu.DataSourceVGPU(),
-		"decort_cb_rg_list":                 cb_rg.DataSourceRgList(),
+		"decort_cb_lb":                                cb_lb.DataSourceLB(),
+		"decort_cb_lb_list":                           cb_lb.DataSourceLBList(),
+		"decort_cb_lb_list_deleted":                   cb_lb.DataSourceLBListDeleted(),
+		"decort_cb_flipgroup_list":                    cb_flipgroup.DataSourceFlipgroupList(),
+		"decort_cb_flipgroup":                         cb_flipgroup.DataSourceFlipgroup(),
+		"decort_cb_stack_list":                        cb_stack.DataSourceStacksList(),
+		"decort_cb_stack":                             cb_stack.DataSourceStack(),
+		"decort_cb_vins":                              cb_vins.DataSourceVins(),
+		"decort_cb_vins_list":                         cb_vins.DataSourceVinsList(),
+		"decort_cb_vins_audits":                       cb_vins.DataSourceVinsAudits(),
+		"decort_cb_vins_ip_list":                      cb_vins.DataSourceVinsIpList(),
+		"decort_cb_vins_list_deleted":                 cb_vins.DataSourceVinsListDeleted(),
+		"decort_cb_vins_ext_net_list":                 cb_vins.DataSourceVinsExtNetList(),
+		"decort_cb_vins_nat_rule_list":                cb_vins.DataSourceVinsNatRuleList(),
+		"decort_cb_vins_static_route":                 cb_vins.DataSourceStaticRoute(),
+		"decort_cb_vins_static_route_list":            cb_vins.DataSourceStaticRouteList(),
+		"decort_cb_k8ci":                              cb_k8ci.DataSourceK8CI(),
+		"decort_cb_k8ci_list":                         cb_k8ci.DataSourceK8CIList(),
+		"decort_cb_k8ci_list_deleted":                 cb_k8ci.DataSourceK8CIListDeleted(),
+		"decort_cb_k8s":                               cb_k8s.DataSourceK8s(),
+		"decort_cb_k8s_list":                          cb_k8s.DataSourceK8sList(),
+		"decort_cb_k8s_list_deleted":                  cb_k8s.DataSourceK8sListDeleted(),
+		"decort_cb_k8s_wg":                            cb_k8s.DataSourceK8sWg(),
+		"decort_cb_k8s_wg_cloud_init":                 cb_k8s.DataSourceK8sWgCloudInit(),
+		"decort_cb_k8s_wg_list":                       cb_k8s.DataSourceK8sWgList(),
+		"decort_cb_k8s_computes":                      cb_k8s.DataSourceK8sComputes(),
 	}
-
 }

internal/provider/provider.go

@@ -40,8 +40,8 @@ func Provider() *schema.Provider {
 				Type:         schema.TypeString,
 				Required:     true,
 				StateFunc:    statefuncs.StateFuncToLower,
-				ValidateFunc: validation.StringInSlice([]string{"oauth2", "legacy", "jwt"}, true), // ignore case while validating
-				Description:  "Authentication mode to use when connecting to DECORT cloud API. Should be one of 'oauth2', 'legacy' or 'jwt'.",
+				ValidateFunc: validation.StringInSlice([]string{"decs3o", "legacy", "jwt", "bvs"}, true), // ignore case while validating
+				Description:  "Authentication mode to use when connecting to DECORT cloud API. Should be one of 'decs3o', 'legacy', 'jwt' or 'bvs'.",
 			},
 
 			"oauth2_url": {
@@ -49,7 +49,7 @@ func Provider() *schema.Provider {
 				Optional:    true,
 				StateFunc:   statefuncs.StateFuncToLower,
 				DefaultFunc: schema.EnvDefaultFunc("DECORT_OAUTH2_URL", nil),
-				Description: "OAuth2 application URL in 'oauth2' authentication mode.",
+				Description: "OAuth2 application URL in 'decs3o' and 'bvs' authentication mode.",
 			},
 
 			"controller_url": {
@@ -74,18 +74,39 @@ func Provider() *schema.Provider {
 				Description: "User password for DECORT cloud API operations in 'legacy' authentication mode.",
 			},
 
+			"bvs_user": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_BVS_USER", nil),
+				Description: "User name for DECORT cloud API operations in 'bvs' authentication mode.",
+			},
+
+			"bvs_password": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_BVS_PASSWORD", nil),
+				Description: "User password for DECORT cloud API operations in 'bvs' authentication mode.",
+			},
+
+			"domain": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_DOMAIN", nil),
+				Description: "User password for DECORT cloud API operations in 'bvs' authentication mode.",
+			},
+
 			"app_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_ID", nil),
-				Description: "Application ID to access DECORT cloud API in 'oauth2' authentication mode.",
+				Description: "Application ID to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode.",
 			},
 
 			"app_secret": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_SECRET", nil),
-				Description: "Application secret to access DECORT cloud API in 'oauth2' authentication mode.",
+				Description: "Application secret to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode.",
 			},
 
 			"jwt": {
@@ -101,6 +122,25 @@ func Provider() *schema.Provider {
 				Default:     false,
 				Description: "If true, DECORT API will not verify SSL certificates. Use this with caution and in trusted environments only!",
 			},
+
+			"path_cfg": {
+				Type: schema.TypeString,
+				Optional:    true,
+				Description: "The path of the configuration file entry",
+			},
+
+			"path_token": {
+				Type: schema.TypeString,
+				Optional:    true,
+				Description: "The path of the token file entry",
+			},
+
+			"time_to_refresh": {
+				Type: schema.TypeInt,
+				Optional:    true,
+				Description: "The number of minutes before the expiration of the token, a refresh will be made",
+			},
+
 		},
 
 		ResourcesMap: newResourcesMap(),

internal/provider/resource_map.go

@@ -38,14 +38,15 @@ import (
 	cb_account "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
 	cb_disks "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
 	cb_extnet "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/extnet"
+	cb_flipgroup "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/flipgroup"
 	cb_image "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
 	cb_k8s "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8s"
 	cb_kvmvm "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/kvmvm"
+	cb_lb "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/lb"
 	cb_pcidevice "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
-	cb_pfw "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pfw"
 	cb_rg "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/rg"
 	cb_sep "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/sep"
-	cb_snapshot "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/snapshot"
+	cb_k8ci "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8ci"
 	cb_vins "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
 )
 
@@ -76,20 +77,27 @@ func newResourcesMap() map[string]*schema.Resource {
 
 		"decort_cb_account":             cb_account.ResourceAccount(),
 		"decort_cb_extnet":              cb_extnet.ResourceExtnetCB(),
+		"decort_cb_extnet_static_route": cb_extnet.ResourceStaticRoute(),
 		"decort_cb_disk":                cb_disks.ResourceDisk(),
+		"decort_cb_disk_snapshot":       cb_disks.ResourceDiskSnapshot(),
 		"decort_cb_image":               cb_image.ResourceImage(),
 		"decort_cb_virtual_image":       cb_image.ResourceVirtualImage(),
 		"decort_cb_cdrom_image":         cb_image.ResourceCDROMImage(),
-		"decort_cb_delete_images": cb_image.ResourceDeleteImages(),
 		"decort_cb_pcidevice":           cb_pcidevice.ResourcePcidevice(),
 		"decort_cb_sep":                 cb_sep.ResourceSep(),
 		"decort_cb_sep_config":          cb_sep.ResourceSepConfig(),
-		"decort_cb_resgroup":      cb_rg.ResourceResgroup(),
 		"decort_cb_kvmvm":               cb_kvmvm.ResourceCompute(),
 		"decort_cb_vins":                cb_vins.ResourceVins(),
-		"decort_cb_pfw":           cb_pfw.ResourcePfw(),
-		"decort_cb_k8s":           cb_k8s.ResourceK8s(),
+		"decort_cb_k8ci":                cb_k8ci.ResourceK8CI(),
+		"decort_cb_k8s_cp":              cb_k8s.ResourceK8sCP(),
 		"decort_cb_k8s_wg":              cb_k8s.ResourceK8sWg(),
-		"decort_cb_snapshot":      cb_snapshot.ResourceSnapshot(),
+		"decort_cb_vins_static_route":   cb_vins.ResourceStaticRoute(),
+		"decort_cb_flipgroup":           cb_flipgroup.ResourceFlipgroup(),
+		"decort_cb_lb":                  cb_lb.ResourceLB(),
+		"decort_cb_lb_backend":          cb_lb.ResourceLBBackend(),
+		"decort_cb_lb_backend_server":   cb_lb.ResourceLBBackendServer(),
+		"decort_cb_lb_frontend":         cb_lb.ResourceLBFrontend(),
+		"decort_cb_lb_frontend_bind":    cb_lb.ResourceLBFrontendBind(),
+		"decort_cb_rg":                  cb_rg.ResourceResgroup(),
 	}
 }

internal/service/cloudapi/account/data_source_account.go

@@ -45,6 +45,7 @@ import (
 func dataSourceAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	acc, err := utilityAccountCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -99,6 +100,10 @@ func resourceLimitsSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeFloat,
 			Computed: true,
 		},
+		"cu_dm": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
 		"cu_i": {
 			Type:     schema.TypeFloat,
 			Computed: true,

internal/service/cloudapi/account/data_source_account_audits_list.go

@@ -61,6 +61,7 @@ func flattenAccountAuditsList(aal account.ListAudits) []map[string]interface{} {
 func dataSourceAccountAuditsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountAuditsList, err := utilityAccountAuditsListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_computes_list.go

@@ -76,6 +76,7 @@ func flattenAccountComputesList(acl *account.ListComputes) []map[string]interfac
 func dataSourceAccountComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountComputesList, err := utilityAccountComputesListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_consumed_units.go

@@ -44,6 +44,7 @@ import (
 func dataSourceAccountConsumedUnitsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountConsumedUnits, err := utilityAccountConsumedUnitsCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -51,6 +52,7 @@ func dataSourceAccountConsumedUnitsRead(ctx context.Context, d *schema.ResourceD
 	d.SetId(id.String())
 	d.Set("cu_c", accountConsumedUnits.CUC)
 	d.Set("cu_d", accountConsumedUnits.CUD)
+	d.Set("cu_dm", accountConsumedUnits.CUDM)
 	d.Set("cu_i", accountConsumedUnits.CUI)
 	d.Set("cu_m", accountConsumedUnits.CUM)
 	d.Set("cu_np", accountConsumedUnits.CUNP)
@@ -74,6 +76,10 @@ func dataSourceAccountConsumedUnitsSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeFloat,
 			Computed: true,
 		},
+		"cu_dm": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
 		"cu_i": {
 			Type:     schema.TypeFloat,
 			Computed: true,

internal/service/cloudapi/account/data_source_account_consumed_units_by_type.go

@@ -44,6 +44,7 @@ import (
 func dataSourceAccountConsumedUnitsByTypeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	result, err := utilityAccountConsumedUnitsByTypeCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_deleted_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceAccountDeletedListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountDeletedList, err := utilityAccountDeletedListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_disks_list.go

@@ -62,6 +62,7 @@ func flattenAccountDisksList(adl *account.ListDisks) []map[string]interface{} {
 func dataSourceAccountDisksListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountDisksList, err := utilityAccountDisksListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_flipgroups_list.go

@@ -77,6 +77,7 @@ func flattenAccountFlipGroupsList(afgl *account.ListFLIPGroups) []map[string]int
 func dataSourceAccountFlipGroupsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountFlipGroupsList, err := utilityAccountFlipGroupsListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_get_resource_consumption.go

@@ -44,6 +44,7 @@ import (
 func dataSourceAccountResourceConsumptionGetRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountResourceConsumptionRec, err := utilityAccountResourceConsumptionGetCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_list.go

@@ -78,6 +78,7 @@ func flattenRgAcl(rgAcls []account.RecordACL) []map[string]interface{} {
 func dataSourceAccountListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountList, err := utilityAccountListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_reserved_units.go

@@ -44,6 +44,7 @@ import (
 func dataSourceAccountReservedUnitsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountReservedUnits, err := utilityAccountReservedUnitsCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -51,6 +52,7 @@ func dataSourceAccountReservedUnitsRead(ctx context.Context, d *schema.ResourceD
 	d.SetId(id.String())
 	d.Set("cu_c", accountReservedUnits.CUC)
 	d.Set("cu_d", accountReservedUnits.CUD)
+	d.Set("cu_dm", accountReservedUnits.CUDM)
 	d.Set("cu_i", accountReservedUnits.CUI)
 	d.Set("cu_m", accountReservedUnits.CUM)
 	d.Set("cu_np", accountReservedUnits.CUNP)
@@ -74,6 +76,10 @@ func dataSourceAccountReservedUnitsSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeFloat,
 			Computed: true,
 		},
+		"cu_dm": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
 		"cu_i": {
 			Type:     schema.TypeFloat,
 			Computed: true,

internal/service/cloudapi/account/data_source_account_resource_consumption_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceAccountResourceConsumptionListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountResourceConsumptionList, err := utilityAccountResourceConsumptionListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_rg_list.go

@@ -119,6 +119,7 @@ func flattenAccRGResources(argr account.RGResources) []map[string]interface{} {
 func dataSourceAccountRGListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountRGList, err := utilityAccountRGListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_templates_list.go

@@ -66,6 +66,7 @@ func flattenAccountTemplatesList(atl *account.ListTemplates) []map[string]interf
 func dataSourceAccountTemplatesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountTemplatesList, err := utilityAccountTemplatesListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/data_source_account_vins_list.go

@@ -73,6 +73,7 @@ func flattenAccountVinsList(avl *account.ListVINS) []map[string]interface{} {
 func dataSourceAccountVinsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountVinsList, err := utilityAccountVinsListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/account/resource_account.go

@@ -148,7 +148,7 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	case status.Destroying:
 		return diag.Errorf("The account is in progress with status: %s", acc.Status)
 	case status.Deleted:
-
+		if d.Get("restore").(bool) {
 			req := account.RestoreRequest{
 				AccountID: accountId,
 			}
@@ -159,6 +159,7 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 
 			hasChanged = true
+		}
 	case status.Disabled:
 		log.Debugf("The account is in status: %s, troubles may occur with update. Please, enable account first.", acc.Status)
 	case status.Confirmed:
@@ -184,6 +185,7 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 			if err != nil {
 				return diag.FromErr(err)
 
+			}
 		} else {
 
 			_, err := c.CloudAPI().Account().Disable(ctx, reqSwitch)
@@ -193,7 +195,6 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 
 		}
 	}
-	}
 
 	req := account.UpdateRequest{
 		AccountID: accountId,
@@ -280,8 +281,7 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 
 	if d.HasChange("restore") {
 		restore := d.Get("restore").(bool)
-		if restore {
-			if acc.Status == "DELETED" {
+		if restore && acc.Status == "DELETED" {
 			req := account.RestoreRequest{
 				AccountID: accountId,
 			}
@@ -291,7 +291,6 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 	}
-	}
 
 	if d.HasChange("users") {
 		deletedUsers := make([]interface{}, 0)

internal/service/cloudapi/bservice/data_source_bservice.go

@@ -44,6 +44,7 @@ import (
 func dataSourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	bs, err := utilityBasicServiceCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/bservice/data_source_bservice_deleted_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceBasicServiceDeletedListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	basicServiceDeletedList, err := utilityBasicServiceDeletedListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/bservice/data_source_bservice_group.go

@@ -45,6 +45,7 @@ import (
 func dataSourceBasicServiceGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	bsg, err := utilityBasicServiceGroupCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/bservice/data_source_bservice_list.go

@@ -77,6 +77,7 @@ func flattenBasicServiceList(bsl *bservice.ListBasicServices) []map[string]inter
 func dataSourceBasicServiceListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	basicServiceList, err := utilityBasicServiceListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go

@@ -44,13 +44,14 @@ import (
 func dataSourceBasicServiceSnapshotListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	basicServiceSnapshotList, err := utilityBasicServiceSnapshotListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
 	id := uuid.New()
 	d.SetId(id.String())
-	d.Set("items", flattenBasicServiceSnapshots(basicServiceSnapshotList))
-
+	d.Set("items", flattenBasicServiceSnapshotsList(basicServiceSnapshotList))
+	d.Set("entry_count", basicServiceSnapshotList.EntryCount)
 	return nil
 }
 
@@ -85,6 +86,10 @@ func dataSourceBasicServiceSnapshotListSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return res
 }

internal/service/cloudapi/bservice/flattens.go

@@ -111,7 +111,7 @@ func flattenBasicServiceComputes(bscs bservice.ListComputes) []map[string]interf
 }
 
 func flattenBasicServiceSnapshots(bsrvss bservice.ListSnapshots) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(bsrvss))
 	for _, bsrvs := range bsrvss {
 		temp := map[string]interface{}{
 			"guid":      bsrvs.GUID,
@@ -123,3 +123,17 @@ func flattenBasicServiceSnapshots(bsrvss bservice.ListSnapshots) []map[string]in
 	}
 	return res
 }
+
+func flattenBasicServiceSnapshotsList(bsrvss *bservice.ListInfoSnapshots) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(bsrvss.Data))
+	for _, bsrvs := range bsrvss.Data {
+		temp := map[string]interface{}{
+			"guid":      bsrvs.GUID,
+			"label":     bsrvs.Label,
+			"timestamp": bsrvs.Timestamp,
+			"valid":     bsrvs.Valid,
+		}
+		res = append(res, temp)
+	}
+	return res
+}

internal/service/cloudapi/bservice/resource_bservice.go

@@ -34,6 +34,7 @@ package bservice
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -42,6 +43,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
 )
 
@@ -83,6 +85,13 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 		return diag.FromErr(err)
 	}
 
+	warn := dc.Warnings{}
+
+	if !d.Get("enable").(bool) && d.Get("start").(bool) {
+
+		warn.Add(fmt.Errorf("the basic service is in tech_status %s, troubles can occur with the usage. Please, enable bservice first", service.TechStatus))
+	}
+
 	if d.Get("enable").(bool) && (service.Status == status.Disabled || service.Status == status.Created) {
 		log.Debugf("trying to enable bservice %v", serviceId)
 		_, err := c.CloudAPI().BService().Enable(ctx, bservice.EnableRequest{
@@ -92,10 +101,12 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 		if err != nil {
 			return diag.FromErr(err)
 		}
+
 	}
 	if d.Get("start").(bool) && d.Get("enable").(bool) {
+
 		log.Debugf("trying to start bservice %v", serviceId)
-		_, err := c.CloudAPI().BService().Enable(ctx, bservice.EnableRequest{
+		_, err = c.CloudAPI().BService().Start(ctx, bservice.StartRequest{
 			ServiceID: serviceId,
 		})
 
@@ -104,7 +115,7 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 		}
 	}
 
-	return resourceBasicServiceRead(ctx, d, m)
+	return append(warn.Get(), resourceBasicServiceRead(ctx, d, m)...)
 }
 
 func resourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -231,24 +242,45 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 		log.Debugf("The basic service is in status: %s, troubles can occur with the update.", bs.Status)
 	case status.Deleted:
 		id, _ := strconv.ParseUint(d.Id(), 10, 64)
+
+		if restore, ok := d.GetOk("restore"); ok {
+			if restore.(bool) {
 				restoreReq := bservice.RestoreRequest{
 					ServiceID: id,
 				}
-		enableReq := bservice.EnableRequest{
-			ServiceID: id,
-		}
-
 				_, err := c.CloudAPI().BService().Restore(ctx, restoreReq)
 				if err != nil {
 					return diag.FromErr(err)
 				}
+			}
+			hasChanged = true
+		}
 
+		if enable, ok := d.GetOk("enable"); ok {
+			if enable.(bool) {
+				enableReq := bservice.EnableRequest{
+					ServiceID: id,
+				}
 				_, err = c.CloudAPI().BService().Enable(ctx, enableReq)
 				if err != nil {
 					return diag.FromErr(err)
 				}
-
 				hasChanged = true
+			}
+		}
+
+		if start, ok := d.GetOk("start"); ok {
+			if start.(bool) {
+				startReq := bservice.StartRequest{
+					ServiceID: id,
+				}
+				_, err = c.CloudAPI().BService().Start(ctx, startReq)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+				hasChanged = true
+			}
+		}
 	case status.Deleting:
 	case status.Destroyed:
 		d.SetId("")
@@ -291,19 +323,6 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 		}
 	}
 
-	if d.HasChange("restore") {
-		restore := d.Get("restore").(bool)
-		if restore {
-			req := bservice.RestoreRequest{
-				ServiceID: uint64(d.Get("service_id").(int)),
-			}
-			_, err := c.CloudAPI().BService().Restore(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
 	if d.HasChange("start") {
 		start := d.Get("start").(bool)
 		if start {
@@ -394,10 +413,9 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 				}
 			}
 		}
-
 	}
 
-	return nil
+	return resourceBasicServiceRead(ctx, d, m)
 }
 
 func isContainsSnapshot(els []interface{}, el interface{}) bool {

internal/service/cloudapi/bservice/resource_bservice_group.go

@@ -143,6 +143,7 @@ func resourceBasicServiceGroupDelete(ctx context.Context, d *schema.ResourceData
 
 	bsg, err := utilityBasicServiceGroupCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -334,7 +335,7 @@ func resourceBasicServiceGroupUpdate(ctx context.Context, d *schema.ResourceData
 		}
 	}
 
-	return nil
+	return resourceBasicServiceGroupRead(ctx, d, m)
 }
 
 func isContainsParent(els []interface{}, el interface{}) bool {

internal/service/cloudapi/bservice/utility_bservice_snapshot_list.go

@@ -42,7 +42,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityBasicServiceSnapshotListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (bservice.ListSnapshots, error) {
+func utilityBasicServiceSnapshotListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListInfoSnapshots, error) {
 	c := m.(*controller.ControllerCfg)
 	var id uint64
 

internal/service/cloudapi/disks/data_source_disk.go

@@ -47,6 +47,7 @@ import (
 func dataSourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_disk_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceDiskListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	diskList, err := utilityDiskListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_disk_list_types.go

@@ -44,6 +44,7 @@ import (
 func dataSourceDiskListTypesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	listTypes, err := utilityDiskListTypesCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go

@@ -74,6 +74,7 @@ func flattenListTypesDetailedPools(pools []interface{}) []interface{} {
 func dataSourceDiskListTypesDetailedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	listTypesDetailed, err := utilityDiskListTypesDetailedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_disk_list_unattached.go

@@ -44,6 +44,7 @@ import (
 func dataSourceDiskListUnattachedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	diskListUnattached, err := utilityDiskListUnattachedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -375,6 +376,11 @@ func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "Storage endpoint provider ID to create disk",
 					},
+					"shareable": {
+						Type:        schema.TypeBool,
+						Computed:    true,
+						Description: "shareable",
+					},
 					"size_max": {
 						Type:        schema.TypeInt,
 						Computed:    true,

internal/service/cloudapi/disks/data_source_disk_snapshot.go

@@ -45,6 +45,7 @@ import (
 func dataSourceDiskSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_disk_snapshot_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceDiskSnapshotListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_list_deleted.go

@@ -45,6 +45,7 @@ import (
 func dataSourceDiskListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	diskList, err := utilityDiskListDeletedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/flattens.go

@@ -56,6 +56,7 @@ func flattenDiskListUnattached(ul *disks.ListDisksUnattached) []map[string]inter
 			"res_name":              unattachedDisk.ResName,
 			"role":                  unattachedDisk.Role,
 			"sep_id":                unattachedDisk.SEPID,
+			"shareable":             unattachedDisk.Shareable,
 			"size_max":              unattachedDisk.SizeMax,
 			"size_used":             unattachedDisk.SizeUsed,
 			"snapshots":             flattenDiskSnapshotList(unattachedDisk.Snapshots),

internal/service/cloudapi/disks/resource_disk.go

@@ -95,6 +95,7 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 
 	diskId, err := c.CloudAPI().Disks().Create(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -219,6 +220,7 @@ func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface
 
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -379,7 +381,7 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 		"account_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "The unique ID of the subscriber-owner of the disk",
 		},
 		"disk_name": {
@@ -395,7 +397,7 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 		"gid": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "ID of the grid (platform)",
 		},
 		"pool": {

internal/service/cloudapi/disks/resource_disk_snapshot.go

@@ -83,6 +83,7 @@ func resourceDiskSnapshotCreate(ctx context.Context, d *schema.ResourceData, m i
 func resourceDiskSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -171,13 +172,13 @@ func resourceDiskSnapshotSchemaMake() map[string]*schema.Schema {
 		"disk_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "The unique ID of the subscriber-owner of the disk",
 		},
 		"label": {
 			Type:     schema.TypeString,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "Name of the snapshot",
 		},
 		"rollback": {

internal/service/cloudapi/extnet/data_source_extnet.go

@@ -45,6 +45,7 @@ import (
 func dataSourceExtnetRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	e, err := utilityExtnetCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/extnet/data_source_extnet_computes_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceExtnetComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	extnetComputesList, err := utilityExtnetComputesListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/extnet/data_source_extnet_default.go

@@ -45,6 +45,7 @@ import (
 func dataSourceExtnetDefaultRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	extnetId, err := utilityExtnetDefaultCheckPresence(ctx, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/extnet/data_source_extnet_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceExtnetListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	extnetList, err := utilityExtnetListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -118,6 +119,10 @@ func dataSourceExtnetListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 				},
 			},
 		},

internal/service/cloudapi/extnet/flattens.go

@@ -129,6 +129,7 @@ func flattenExtnetList(el *extnet.ListExtNets) []map[string]interface{} {
 			"net_id": e.ID,
 			"ipcidr": e.IPCIDR,
 			"name":   e.Name,
+			"status": e.Status,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudapi/flipgroup/data_source_flipgroup.go

@@ -66,6 +66,10 @@ func dataSourceFlipgroupSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"client_ids": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -85,10 +89,26 @@ func dataSourceFlipgroupSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"created_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"default_gw": {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"deleted_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"desc": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -121,16 +141,28 @@ func dataSourceFlipgroupSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"network": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"rg_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"rg_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"status": {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"net_mask": {
-			Type:     schema.TypeInt,
+		"updated_by": {
+			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"ckey": {
-			Type:     schema.TypeString,
+		"updated_time": {
+			Type:     schema.TypeInt,
 			Computed: true,
 		},
 	}

internal/service/cloudapi/flipgroup/data_source_flipgroup_list.go

@@ -185,6 +185,13 @@ func dataSourceFlipgroupListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"meta": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
 				},
 			},
 		},

internal/service/cloudapi/flipgroup/flattens.go

@@ -36,15 +36,21 @@ package flipgroup
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/flipgroup"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
 )
 
 func flattenFlipgroup(d *schema.ResourceData, fg *flipgroup.RecordFLIPGroup) {
 	d.Set("account_id", fg.AccountID)
+	d.Set("account_name", fg.AccountName)
 	d.Set("client_ids", fg.ClientIDs)
 	d.Set("client_type", fg.ClientType)
 	d.Set("conn_id", fg.ConnID)
 	d.Set("conn_type", fg.ConnType)
+	d.Set("created_by", fg.CreatedBy)
+	d.Set("created_time", fg.CreatedTime)
 	d.Set("default_gw", fg.DefaultGW)
+	d.Set("deleted_by", fg.DeletedBy)
+	d.Set("deleted_time", fg.DeletedTime)
 	d.Set("desc", fg.Description)
 	d.Set("gid", fg.GID)
 	d.Set("guid", fg.GUID)
@@ -54,13 +60,20 @@ func flattenFlipgroup(d *schema.ResourceData, fg *flipgroup.RecordFLIPGroup) {
 	d.Set("name", fg.Name)
 	d.Set("net_id", fg.NetID)
 	d.Set("net_type", fg.NetType)
+	d.Set("network", fg.Network)
+	d.Set("rg_id", fg.RGID)
+	d.Set("rg_name", fg.RGName)
 	d.Set("status", fg.Status)
+	d.Set("updated_by", fg.UpdatedBy)
+	d.Set("updated_time", fg.UpdatedTime)
 }
 
 func flattenFlipgroupList(fg_list *flipgroup.ListFLIPGroups) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, fg := range fg_list.Data {
 		temp := map[string]interface{}{
+			"ckey":         fg.CKey,
+			"meta":         flattens.FlattenMeta(fg.Meta),
 			"account_id":   fg.AccountID,
 			"client_ids":   fg.ClientIDs,
 			"client_type":  fg.ClientType,
@@ -76,6 +89,7 @@ func flattenFlipgroupList(fg_list *flipgroup.ListFLIPGroups) []map[string]interf
 			"name":         fg.Name,
 			"net_id":       fg.NetID,
 			"net_type":     fg.NetType,
+			"net_mask":     fg.NetMask,
 			"status":       fg.Status,
 		}
 		res = append(res, temp)

internal/service/cloudapi/flipgroup/resource_flipgroup.go

@@ -64,6 +64,7 @@ func resourceFlipgroupCreate(ctx context.Context, d *schema.ResourceData, m inte
 
 	resp, err := c.CloudAPI().FLIPGroup().Create(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -136,6 +137,7 @@ func resourceFlipgroupDelete(ctx context.Context, d *schema.ResourceData, m inte
 
 	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -148,6 +150,8 @@ func resourceFlipgroupDelete(ctx context.Context, d *schema.ResourceData, m inte
 		return diag.FromErr(err)
 	}
 
+	d.SetId("")
+
 	return nil
 }
 
@@ -205,6 +209,10 @@ func resourceFlipgroupSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"conn_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -213,10 +221,26 @@ func resourceFlipgroupSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"created_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"default_gw": {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"deleted_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"gid": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -233,14 +257,26 @@ func resourceFlipgroupSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"net_mask": {
+		"network": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"rg_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
-		"ckey": {
+		"rg_name": {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"updated_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 }
 

internal/service/cloudapi/image/data_source_image.go

@@ -34,8 +34,8 @@ package image
 
 import (
 	"context"
+	"strconv"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
@@ -44,12 +44,11 @@ import (
 func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	image, err := utilityImageCheckPresence(ctx, d, m)
 	if err != nil {
-
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
-	id := uuid.New()
-	d.SetId(id.String())
+	d.SetId(strconv.Itoa(int(image.ID)))
 
 	flattenImage(d, image)
 

internal/service/cloudapi/image/data_source_image_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceImageListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	imageList, err := utilityImageListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/image/flattens.go

@@ -3,6 +3,7 @@ package image
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
+	"strconv"
 )
 
 func flattenHistory(history []image.History) []map[string]interface{} {
@@ -23,7 +24,7 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("unc_path", img.UNCPath)
 	d.Set("ckey", img.CKey)
 	d.Set("account_id", img.AccountID)
-	d.Set("acl", img.ACL)
+	d.Set("acl", FlattenACL(img.ACL))
 	d.Set("architecture", img.Architecture)
 	d.Set("boot_type", img.BootType)
 	d.Set("bootable", img.Bootable)
@@ -85,3 +86,18 @@ func flattenImageList(il *image.ListImages) []map[string]interface{} {
 	}
 	return res
 }
+
+func FlattenACL(acl interface{}) string {
+	switch d := acl.(type) {
+	case string:
+		return d
+	case int:
+		return strconv.Itoa(d)
+	case int64:
+		return strconv.FormatInt(d, 10)
+	case float64:
+		return strconv.FormatInt(int64(d), 10)
+	default:
+		return ""
+	}
+}

internal/service/cloudapi/image/resource_image.go

@@ -114,6 +114,7 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
 
 	imageId, err := c.CloudAPI().Image().Create(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -158,6 +159,7 @@ func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interfac
 
 	_, err := utilityImageCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/k8s/data_source_k8s.go

@@ -50,6 +50,7 @@ import (
 func dataSourceK8sRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	cluster, err := utilityDataK8sCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	d.SetId(strconv.FormatUint(cluster.ID, 10))
@@ -399,6 +400,10 @@ func dataSourceK8sSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"network_plugin": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"rg_id": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudapi/k8s/data_source_k8s_list.go

@@ -271,6 +271,10 @@ func createK8sListSchema() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"network_plugin": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"rg_id": {
 						Type:     schema.TypeInt,
 						Computed: true,

internal/service/cloudapi/k8s/data_source_k8s_wg.go

@@ -47,6 +47,7 @@ func dataSourceK8sWgRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 	wg, workersComputeList, err := utilityDataK8sWgCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/k8s/data_source_k8s_wg_cloud_init.go

@@ -47,6 +47,7 @@ func dataSourceK8sWgCloudInitRead(ctx context.Context, d *schema.ResourceData, m
 
 	metaData, err := utilityK8sWgCloudInitCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/k8s/data_source_k8s_wg_list.go

@@ -45,6 +45,7 @@ import (
 func dataSourceK8sWgListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	wgList, err := utilityK8sWgListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/k8s/flattens.go

@@ -247,6 +247,7 @@ func flattenK8sData(d *schema.ResourceData, cluster k8s.RecordK8S, masters []com
 	d.Set("workers", flattenK8sGroup(cluster.K8SGroups.Workers, workers))
 	d.Set("lb_id", cluster.LBID)
 	d.Set("name", cluster.Name)
+	d.Set("network_plugin", cluster.NetworkPlugin)
 	d.Set("rg_id", cluster.RGID)
 	d.Set("rg_name", cluster.RGName)
 	d.Set("status", cluster.Status)
@@ -292,7 +293,7 @@ func flattenK8sItems(k8sItems *k8s.ListK8SClusters) []map[string]interface{} {
 	for _, item := range k8sItems.Data {
 		temp := map[string]interface{}{
 			"account_id":      item.AccountID,
-			"account_name":    item.Name,
+			"account_name":    item.AccountName,
 			"acl":             item.ACL,
 			"bservice_id":     item.BServiceID,
 			"ci_id":           item.CIID,
@@ -308,6 +309,7 @@ func flattenK8sItems(k8sItems *k8s.ListK8SClusters) []map[string]interface{} {
 			"lb_id":           item.LBID,
 			"milestones":      item.Milestones,
 			"k8s_name":        item.Name,
+			"network_plugin":  item.NetworkPlugin,
 			"rg_id":           item.RGID,
 			"rg_name":         item.RGName,
 			"service_account": flattenServiceAccount(item.ServiceAccount),

internal/service/cloudapi/k8s/node_subresource.go

@@ -35,6 +35,8 @@ package k8s
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
 )
 
 func nodeMasterDefault() K8sNodeRecord {
@@ -87,19 +89,23 @@ func mastersSchemaMake() map[string]*schema.Schema {
 	masters["cpu"] = &schema.Schema{
 		Type:     schema.TypeInt,
 		Required: true,
-		ForceNew:    true,
+		//ForceNew:    true,
 		Description: "Node CPU count.",
 	}
 	masters["ram"] = &schema.Schema{
 		Type:     schema.TypeInt,
 		Required: true,
-		ForceNew:    true,
+		//ForceNew:    true,
+		ValidateFunc: validation.All(
+			validation.IntAtLeast(constants.MinRamPerCompute),
+			validators.DivisibleBy(constants.RAMDivisibility),
+		),
 		Description: "Node RAM in MB.",
 	}
 	masters["disk"] = &schema.Schema{
 		Type:     schema.TypeInt,
 		Required: true,
-		ForceNew:    true,
+		//ForceNew:    true,
 		Description: "Node boot disk size in GB.",
 	}
 
@@ -118,6 +124,10 @@ func workersSchemaMake() map[string]*schema.Schema {
 		},
 		"ram": {
 			Type: schema.TypeInt,
+			ValidateFunc: validation.All(
+				validation.IntAtLeast(constants.MinRamPerCompute),
+				validators.DivisibleBy(constants.RAMDivisibility),
+			),
 			Required: true,
 		},
 		"cpu": {

internal/service/cloudapi/k8s/old_schemas.go

@@ -0,0 +1,396 @@
+package k8s
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func resourceK8sCPSchemaV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Name of the cluster.",
+			},
+			"rg_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew:    true,
+				Description: "Resource group ID that this instance belongs to.",
+			},
+			"k8sci_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew:    true,
+				Description: "ID of the k8s catalog item to base this instance on.",
+			},
+			"network_plugin": {
+				Type:         schema.TypeString,
+				Required:     true,
+				Description:  "Network plugin to be used",
+				ValidateFunc: validation.StringInSlice([]string{"flannel", "weavenet", "calico"}, true),
+			},
+			"num": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validation.IntInSlice([]int{1, 3}),
+				Description:  "Number of VMs to create. Can be either 1 or 3",
+			},
+			"cpu": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Node CPU count.",
+			},
+			"ram": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Node RAM in MB.",
+			},
+			"disk": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Node boot disk size in GB.",
+			},
+			"sep_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Storage Endpoint ID",
+			},
+			"sep_pool": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Storage Endpoint Pool",
+			},
+			"with_lb": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Create k8s with load balancer if true.",
+			},
+			"extnet_only": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Use only selected ExtNet for infrastructure connections",
+			},
+			// /4.4.0
+			"cloud_init": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Meta data for working group computes, format YAML 'user_data': 1111",
+			},
+			"join_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to configure the behavior and settings for joining a node to a cluster. It includes parameters such as the cluster's control plane endpoint, token, and certificate key. insert a valid JSON string with all levels of nesting.",
+			},
+			"kube_proxy_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to configure the behavior and settings of the Kube-proxy, which is responsible for network proxying and load balancing within the cluster. It includes parameters such as proxy mode, cluster IP ranges, and other Kube-proxy specific configurations. insert a valid JSON string with all levels of nesting.",
+			},
+			"kubelet_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to configure the behavior and settings of the Kubelet, which is the primary node agent that runs on each node in the cluster. It includes parameters such as node IP address, resource allocation, pod eviction policies, and other Kubelet-specific configurations. insert a valid JSON string with all levels of nesting.",
+			},
+			"cluster_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to define global settings and configurations for the entire cluster. It includes parameters such as cluster name, DNS settings, authentication methods, and other cluster-wide configurations. insert a valid JSON string with all levels of nesting.",
+			},
+			"init_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to define settings and actions that should be performed before any other component in the cluster starts. It allows you to configure things like node registration, network setup, and other initialization tasks. insert a valid JSON string with all levels of nesting.",
+			},
+			"additional_sans": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"ha_mode": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Description: "Use Highly Available schema for LB deploy",
+			},
+			"lb_sysctl_params": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Custom sysctl values for Load Balancer instance. Applied on boot.",
+			},
+			"oidc_cert": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "insert ssl certificate in x509 pem format",
+			},
+			////
+			"extnet_id": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+				//ForceNew:    true,
+				Description: "ID of the external network to connect workers to. If omitted network will be chosen by the platfom.",
+			},
+			"desc": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Text description of this instance.",
+			},
+			"start": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Start k8s cluster.",
+			},
+			"detailed_info": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"compute_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"status": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"tech_status": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"interfaces": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"def_gw": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"ip_address": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"natable_vins_ip": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"natable_vins_network": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"master_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Master group ID.",
+			},
+			"master_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Master group name.",
+			},
+			"acl": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"account_acl": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"explicit": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
+									"guid": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"right": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"status": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"type": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"user_group_id": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"k8s_acl": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"explicit": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
+									"guid": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"right": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"status": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"type": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"user_group_id": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"rg_acl": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"explicit": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
+									"guid": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"right": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"status": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"type": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"user_group_id": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			"account_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"account_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"bservice_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"created_by": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"created_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"deleted_by": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"deleted_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"k8s_ci_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"lb_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"k8s_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"lb_ip": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "IP address of default load balancer.",
+			},
+			"rg_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tech_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"updated_by": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"updated_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"kubeconfig": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Kubeconfig for cluster access.",
+			},
+			"vins_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "ID of default vins for this instace.",
+			},
+		},
+	}
+}

internal/service/cloudapi/k8s/resource_k8s.go

@@ -189,7 +189,6 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 	if oidcCertificate, ok := d.GetOk("oidc_cert"); ok {
 		createReq.OidcCertificate = oidcCertificate.(string)
 	}
-	///
 
 	createReq.ExtNetOnly = d.Get("extnet_only").(bool)
 
@@ -199,12 +198,19 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 		createReq.ExtNetID = 0
 	}
 
+	if vins, ok := d.GetOk("vins_id"); ok {
+		createReq.VinsId = uint64(vins.(int))
+	} else {
+		createReq.VinsId = 0
+	}
+
 	if desc, ok := d.GetOk("desc"); ok {
 		createReq.Description = desc.(string)
 	}
 
 	resp, err := c.CloudAPI().K8S().Create(ctx, createReq)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -310,7 +316,7 @@ func resourceK8sRead(ctx context.Context, d *schema.ResourceData, m interface{})
 		}
 	}
 
-	k8sList, err := utilityK8sListCheckPresence(ctx, d, m)
+	k8sList, err := utilityK8sListForResourceCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
@@ -509,10 +515,11 @@ func resourceK8sUpdate(ctx context.Context, d *schema.ResourceData, m interface{
 		}
 	}
 
-	return nil
+	return resourceK8sRead(ctx, d, m)
 }
 
 func resourceK8sDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
 	log.Debugf("resourceK8sDelete: called with id %s, rg %d", d.Id(), d.Get("rg_id").(int))
 
 	cluster, err := utilityK8sCheckPresence(ctx, d, m)
@@ -520,12 +527,14 @@ func resourceK8sDelete(ctx context.Context, d *schema.ResourceData, m interface{
 		return diag.FromErr(err)
 	}
 
-	c := m.(*controller.ControllerCfg)
-	req := k8s.DeleteRequest{
-		K8SID:       cluster.ID,
-		Permanently: true,
+	req := k8s.DeleteRequest{K8SID: cluster.ID}
+
+	if val, ok := d.GetOk("permanently"); ok {
+		req.Permanently = val.(bool)
 	}
 
+	c := m.(*controller.ControllerCfg)
+
 	_, err = c.CloudAPI().K8S().Delete(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
@@ -544,13 +553,13 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 		"rg_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "Resource group ID that this instance belongs to.",
 		},
 		"k8sci_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "ID of the k8s catalog item to base this instance on.",
 		},
 		"wg_name": {
@@ -589,7 +598,7 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Optional: true,
 			Computed: true,
-			ForceNew: true,
+			//ForceNew: true,
 			MaxItems: 1,
 			Elem: &schema.Resource{
 				Schema: mastersSchemaMake(),
@@ -621,9 +630,15 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Optional: true,
 			Computed: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "ID of the external network to connect workers to. If omitted network will be chosen by the platfom.",
 		},
+		"permanently": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Determines if cluster should be destroyed",
+		},
 
 		///4.4.0
 		"cloud_init": {
@@ -679,8 +694,6 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "insert ssl certificate in x509 pem format",
 		},
-		////
-
 		"desc": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -692,7 +705,6 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			Default:     true,
 			Description: "Start k8s cluster",
 		},
-
 		"acl": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/k8s/resource_k8s_cp.go

@@ -52,6 +52,7 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
 )
 
 func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -158,9 +159,9 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		createReq.JoinConfiguration = joinConfig.(string)
 	}
 
-	if cloudInit, ok := d.GetOk("cloud_init"); ok {
-		createReq.UserData = cloudInit.(string)
-	}
+	// if cloudInit, ok := d.GetOk("cloud_init"); ok {
+	// 	createReq.UserData = cloudInit.(string)
+	// }
 
 	if initConfig, ok := d.GetOk("init_config"); ok {
 		createReq.InitConfiguration = initConfig.(string)
@@ -175,8 +176,6 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		log.Debug(createReq.OidcCertificate)
 	}
 
-	///
-
 	createReq.ExtNetOnly = d.Get("extnet_only").(bool)
 
 	if extNet, ok := d.GetOk("extnet_id"); ok {
@@ -185,12 +184,19 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		createReq.ExtNetID = 0
 	}
 
+	if vins, ok := d.GetOk("vins_id"); ok {
+		createReq.VinsId = uint64(vins.(int))
+	} else {
+		createReq.VinsId = 0
+	}
+
 	if desc, ok := d.GetOk("desc"); ok {
 		createReq.Description = desc.(string)
 	}
 
 	resp, err := c.CloudAPI().K8S().Create(ctx, createReq)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -311,7 +317,7 @@ func resourceK8sCPRead(ctx context.Context, d *schema.ResourceData, m interface{
 		}
 	}
 
-	k8sList, err := utilityK8sListCheckPresence(ctx, d, m)
+	k8sList, err := utilityK8sListForResourceCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
@@ -526,28 +532,34 @@ func resourceK8sCPUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
-	return nil
+	return resourceK8sCPRead(ctx, d, m)
 }
 
 func resourceK8sCPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
 	log.Debugf("resourceK8sControlPlaneDelete: called with id %s, rg %d", d.Id(), d.Get("rg_id").(int))
 
 	cluster, err := utilityK8sCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
-	c := m.(*controller.ControllerCfg)
-	req := k8s.DeleteRequest{
-		K8SID:       cluster.ID,
-		Permanently: true,
+	req := k8s.DeleteRequest{K8SID: cluster.ID}
+
+	if val, ok := d.GetOk("permanently"); ok {
+		req.Permanently = val.(bool)
 	}
 
+	c := m.(*controller.ControllerCfg)
+
 	_, err = c.CloudAPI().K8S().Delete(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
+	d.SetId("")
+
 	return nil
 }
 
@@ -561,13 +573,13 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 		"rg_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "Resource group ID that this instance belongs to.",
 		},
 		"k8sci_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "ID of the k8s catalog item to base this instance on.",
 		},
 		"network_plugin": {
@@ -593,6 +605,10 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Optional: true,
 			Computed: true,
+			ValidateFunc: validation.All(
+				validation.IntAtLeast(constants.MinRamPerCompute),
+				validators.DivisibleBy(constants.RAMDivisibility),
+			),
 			Description: "Node RAM in MB.",
 		},
 		"disk": {
@@ -625,12 +641,6 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Use only selected ExtNet for infrastructure connections",
 		},
-		///4.4.0
-		"cloud_init": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Meta data for working group computes, format YAML 'user_data': 1111",
-		},
 		"join_config": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -679,12 +689,11 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "insert ssl certificate in x509 pem format",
 		},
-		////
 		"extnet_id": {
 			Type:     schema.TypeInt,
 			Optional: true,
 			Computed: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "ID of the external network to connect workers to. If omitted network will be chosen by the platfom.",
 		},
 		"desc": {
@@ -767,6 +776,12 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "IP address of default load balancer.",
 		},
+		"permanently": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Determines if cluster should be destroyed",
+		},
 		"rg_name": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -794,6 +809,7 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 		},
 		"vins_id": {
 			Type:        schema.TypeInt,
+			Optional:    true,
 			Computed:    true,
 			Description: "ID of default vins for this instace.",
 		},
@@ -802,7 +818,7 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 
 func ResourceK8sCP() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceK8sCPCreate,
 		ReadContext:   resourceK8sCPRead,
@@ -822,5 +838,12 @@ func ResourceK8sCP() *schema.Resource {
 		},
 
 		Schema: resourceK8sCPSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceK8sCPSchemaV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceK8sCPStateUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudapi/k8s/resource_k8s_wg.go

@@ -34,16 +34,19 @@ package k8s
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	log "github.com/sirupsen/logrus"
 	"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-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
 )
 
 func resourceK8sWgCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -101,7 +104,7 @@ func resourceK8sWgCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(err)
 	}
 
-	d.SetId(strconv.FormatUint(resp, 10))
+	d.SetId(fmt.Sprintf("%d#%d", d.Get("k8s_id").(int), resp))
 
 	return resourceK8sWgRead(ctx, d, m)
 }
@@ -125,7 +128,7 @@ func resourceK8sWgRead(ctx context.Context, d *schema.ResourceData, m interface{
 
 	d.Set("wg_id", wg.ID)
 	if strings.Contains(d.Id(), "#") {
-		k8sId, err := strconv.Atoi(strings.Split(d.Id(), "#")[1])
+		k8sId, err := strconv.Atoi(strings.Split(d.Id(), "#")[0])
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -134,8 +137,7 @@ func resourceK8sWgRead(ctx context.Context, d *schema.ResourceData, m interface{
 	} else {
 		d.Set("k8s_id", d.Get("k8s_id"))
 	}
-
-	d.SetId(strings.Split(d.Id(), "#")[0])
+	d.SetId(fmt.Sprintf("%d#%d", d.Get("k8s_id").(int), wg.ID))
 
 	flattenWg(d, *wg, workersComputeList)
 
@@ -161,11 +163,10 @@ func resourceK8sWgUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(err)
 	}
 
-	wgId, _ := strconv.ParseUint(d.Id(), 10, 64)
 	if newNum := d.Get("num").(int); uint64(newNum) > wg.Num {
 		req := k8s.WorkerAddRequest{
 			K8SID:          uint64(d.Get("k8s_id").(int)),
-			WorkersGroupID: wgId,
+			WorkersGroupID: wg.ID,
 			Num:            uint64(newNum) - wg.Num,
 		}
 
@@ -177,7 +178,7 @@ func resourceK8sWgUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		for i := int(wg.Num) - 1; i >= newNum; i-- {
 			req := k8s.DeleteWorkerFromGroupRequest{
 				K8SID:          uint64(d.Get("k8s_id").(int)),
-				WorkersGroupID: wgId,
+				WorkersGroupID: wg.ID,
 				WorkerID:       wg.DetailedInfo[i].ID,
 			}
 
@@ -191,7 +192,7 @@ func resourceK8sWgUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 	if d.HasChange("cloud_init") {
 		req := k8s.UpdateWorkerNodesMetaDataRequest{
 			K8SID:          uint64(d.Get("k8s_id").(int)),
-			WorkersGroupID: wgId,
+			WorkersGroupID: wg.ID,
 			UserData:       d.Get("cloud_init").(string),
 		}
 
@@ -201,7 +202,7 @@ func resourceK8sWgUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
-	return nil
+	return resourceK8sWgRead(ctx, d, m)
 }
 
 func resourceK8sWgDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -209,6 +210,7 @@ func resourceK8sWgDelete(ctx context.Context, d *schema.ResourceData, m interfac
 
 	wg, err := utilityK8sWgCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -223,6 +225,8 @@ func resourceK8sWgDelete(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(err)
 	}
 
+	d.SetId("")
+
 	return nil
 }
 
@@ -231,14 +235,14 @@ func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 		"k8s_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "ID of k8s instance.",
 		},
 
 		"name": {
 			Type:     schema.TypeString,
 			Required: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Description: "Name of the worker group.",
 		},
 
@@ -252,7 +256,7 @@ func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 		"cpu": {
 			Type:     schema.TypeInt,
 			Optional: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Default:     1,
 			Description: "Worker node CPU count.",
 		},
@@ -260,8 +264,12 @@ func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 		"ram": {
 			Type:     schema.TypeInt,
 			Optional: true,
-			ForceNew:    true,
+			//ForceNew:    true,
 			Default: 1024,
+			ValidateFunc: validation.All(
+				validation.IntAtLeast(constants.MinRamPerCompute),
+				validators.DivisibleBy(constants.RAMDivisibility),
+			),
 			Description: "Worker node RAM in MB.",
 		},
 

internal/service/cloudapi/k8s/state_upgraders.go

@@ -0,0 +1,15 @@
+package k8s
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourceK8sCPStateUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourceK8sCPStateUpgradeV1: upgrading state")
+
+	delete(rawState, "cloud_init")
+
+	return rawState, nil
+}

internal/service/cloudapi/k8s/utility_k8s.go

@@ -273,7 +273,22 @@ func utilityK8sListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 		req.Size = uint64(size.(int))
 	}
 
+	k8sList, err := c.CloudAPI().K8S().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
 
+	return k8sList, nil
+}
+
+func utilityK8sListForResourceCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*k8s.ListK8SClusters, error) {
+	c := m.(*controller.ControllerCfg)
+	req := k8s.ListRequest{
+		IncludeDeleted: false,
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
 	k8sList, err := c.CloudAPI().K8S().List(ctx, req)
 	if err != nil {
 		return nil, err

internal/service/cloudapi/k8s/utility_k8s_wg.go

@@ -91,11 +91,11 @@ func utilityK8sWgCheckPresence(ctx context.Context, d *schema.ResourceData, m in
 	var err error
 
 	if strings.Contains(d.Id(), "#") {
-		wgId, err = strconv.Atoi(strings.Split(d.Id(), "#")[0])
+		wgId, err = strconv.Atoi(strings.Split(d.Id(), "#")[1])
 		if err != nil {
 			return nil, err
 		}
-		k8sId, err = strconv.Atoi(strings.Split(d.Id(), "#")[1])
+		k8sId, err = strconv.Atoi(strings.Split(d.Id(), "#")[0])
 		if err != nil {
 			return nil, err
 		}

internal/service/cloudapi/kvmvm/data_source_compute.go

@@ -54,6 +54,7 @@ func findInExtraDisks(DiskId uint, ExtraDisks []interface{}) bool {
 func dataSourceComputeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	compute, err := utilityDataComputeCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	d.SetId(strconv.Itoa(int(compute.ID)))
@@ -290,6 +291,10 @@ func computeListDisksSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"image_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"images": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -444,6 +449,10 @@ func computeInterfacesSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"enabled": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"flip_group_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -606,7 +615,7 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeString,
 			},
 		},
-		"bootdisk_size": {
+		"boot_disk_size": {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
@@ -711,6 +720,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"need_reboot" : {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"natable_vins_id": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudapi/kvmvm/data_source_compute_audits.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputeAuditsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeAudits, err := utilityComputeAuditsCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/kvmvm/data_source_compute_get_audits.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputeGetAuditsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeAudits, err := utilityComputeGetAuditsCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/kvmvm/data_source_compute_get_console_url.go

@@ -45,12 +45,13 @@ import (
 func dataSourceComputeGetConsoleUrlRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeConsoleUrl, err := utilityComputeGetConsoleUrlCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()
 	d.SetId(id.String())
-	result := strings.ReplaceAll(string(computeConsoleUrl), "\"", "")
-	result = strings.ReplaceAll(string(result), "\\", "")
+	result := strings.ReplaceAll(computeConsoleUrl, "\"", "")
+	result = strings.ReplaceAll(result, "\\", "")
 	d.Set("console_url", result)
 	return nil
 }

internal/service/cloudapi/kvmvm/data_source_compute_get_log.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputeGetLogRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeGetLog, err := utilityComputeGetLogCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/kvmvm/data_source_compute_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputeListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeList, err := utilityDataComputeListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -123,7 +124,7 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeString,
 			},
 		},
-		"bootdisk_size": {
+		"boot_disk_size": {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
@@ -232,6 +233,10 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"need_reboot": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"pinned": {
 			Type:     schema.TypeBool,
 			Computed: true,

internal/service/cloudapi/kvmvm/data_source_compute_list_deleted.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputeListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeList, err := utilityDataComputeListDeletedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/kvmvm/data_source_compute_pci_device_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputePCIDeviceListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computePCIDeviceList, err := utilityComputePCIDeviceListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/kvmvm/data_source_compute_pfw_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputePfwListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computePfwList, err := utilityComputePfwListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/kvmvm/data_source_compute_snapshot_usage.go

@@ -12,6 +12,7 @@ import (
 func dataSourceComputeSnapshotUsageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeSnapshotUsage, err := utilityComputeSnapshotUsageCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/kvmvm/data_source_compute_user_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputeUserListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeUserList, err := utilityComputeUserListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/kvmvm/data_source_compute_vgpu_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceComputeVGPUListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	computeVGPUList, err := utilityComputeVGPUListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()
@@ -94,7 +95,6 @@ func dataSourceComputeVGPUListSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 			Elem: &schema.Schema{
 				Type: schema.TypeString,
-
 			},
 		},
 		"entry_count": {

internal/service/cloudapi/kvmvm/flattens.go

@@ -33,6 +33,7 @@ Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/w
 package kvmvm
 
 import (
+	"context"
 	"encoding/json"
 	"sort"
 	"strconv"
@@ -72,6 +73,7 @@ func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface
 			"conn_id":       interfaceItem.ConnID,
 			"conn_type":     interfaceItem.ConnType,
 			"def_gw":        interfaceItem.DefGW,
+			"enabled":       interfaceItem.Enabled,
 			"flip_group_id": interfaceItem.FLIPGroupID,
 			"guid":          interfaceItem.GUID,
 			"ip_address":    interfaceItem.IPAddress,
@@ -162,7 +164,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"anti_affinity_rules": flattenListRules(compute.AntiAffinityRules),
 			"arch":                compute.Architecture,
 			"boot_order":          compute.BootOrder,
-			"bootdisk_size":       compute.BootDiskSize,
+			"boot_disk_size":      compute.BootDiskSize,
 			"clone_reference":     compute.CloneReference,
 			"clones":              compute.Clones,
 			"computeci_id":        compute.ComputeCIID,
@@ -187,6 +189,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"migrationjob":        compute.MigrationJob,
 			"milestones":          compute.Milestones,
 			"name":                compute.Name,
+			"need_reboot":         compute.NeedReboot,
 			"pinned":              compute.Pinned,
 			"ram":                 compute.RAM,
 			"reference_id":        compute.ReferenceID,
@@ -236,12 +239,18 @@ func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{}
 	return res
 }
 
-func flattenComputeDisksDemo(disksList compute.ListComputeDisks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} {
+func flattenComputeDisksDemo(ctx context.Context, d *schema.ResourceData, disksList compute.ListComputeDisks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(disksList))
 	for _, disk := range disksList {
 		if disk.ID == bootDiskId || findInExtraDisks(uint(disk.ID), extraDisks) { //skip main bootdisk and extraDisks
 			continue
 		}
+
+		permanently, ok := ctx.Value(DiskKey(strconv.Itoa(int(disk.ID)))).(bool) // get permamently from Create or Update context
+		if !ok {
+			permanently = getPermanentlyByDiskID(d, disk.ID) // get permanently from state when Read is not after Create/Update
+		}
+
 		temp := map[string]interface{}{
 			"disk_name":   disk.Name,
 			"disk_id":     disk.ID,
@@ -254,6 +263,7 @@ func flattenComputeDisksDemo(disksList compute.ListComputeDisks, extraDisks []in
 			"desc":        disk.Description,
 			"image_id":    disk.ImageID,
 			"size":        disk.SizeMax,
+			"permanently": permanently,
 		}
 		res = append(res, temp)
 	}
@@ -264,6 +274,21 @@ func flattenComputeDisksDemo(disksList compute.ListComputeDisks, extraDisks []in
 	return res
 }
 
+// getPermanentlyByDiskID gets permanently value of specific disk (by diskId) from disks current state
+func getPermanentlyByDiskID(d *schema.ResourceData, diskId uint64) bool {
+	disks := d.Get("disks").([]interface{})
+
+	for _, diskItem := range disks {
+		disk := diskItem.(map[string]interface{})
+		if uint64(disk["disk_id"].(int)) == diskId {
+			return disk["permanently"].(bool)
+		}
+	}
+
+	log.Infof("getPermanentlyByDiskID: disk with id %d not found in state", diskId)
+	return false
+}
+
 func flattenNetwork(interfaces compute.ListInterfaces) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(interfaces))
 
@@ -288,7 +313,7 @@ func findBootDisk(disks compute.ListComputeDisks) *compute.ItemComputeDisk {
 	return nil
 }
 
-func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute) error {
+func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec compute.RecordCompute) error {
 	// This function expects that compFacts string contains response from API compute/get,
 	// i.e. detailed information about compute instance.
 	//
@@ -307,6 +332,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute) er
 	d.Set("affinity_weight", computeRec.AffinityWeight)
 	d.Set("arch", computeRec.Architecture)
 	d.Set("boot_order", computeRec.BootOrder)
+	// we intentionally use the SizeMax field, do not change it until the BootDiskSize field is fixed on the platform
 	d.Set("boot_disk_size", bootDisk.SizeMax)
 	d.Set("boot_disk", flattenBootDisk(bootDisk))
 	d.Set("boot_disk_id", bootDisk.ID)
@@ -322,7 +348,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute) er
 	d.Set("deleted_time", computeRec.DeletedTime)
 	d.Set("description", computeRec.Description)
 	d.Set("devices", string(devices))
-	err := d.Set("disks", flattenComputeDisksDemo(computeRec.Disks, d.Get("extra_disks").(*schema.Set).List(), bootDisk.ID))
+	err := d.Set("disks", flattenComputeDisksDemo(ctx, d, computeRec.Disks, d.Get("extra_disks").(*schema.Set).List(), bootDisk.ID))
 	if err != nil {
 		return err
 	}
@@ -343,6 +369,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute) er
 	d.Set("migrationjob", computeRec.MigrationJob)
 	d.Set("milestones", computeRec.Milestones)
 	d.Set("name", computeRec.Name)
+	d.Set("need_reboot", computeRec.NeedReboot)
 	d.Set("natable_vins_id", computeRec.NatableVINSID)
 	d.Set("natable_vins_ip", computeRec.NatableVINSIP)
 	d.Set("natable_vins_name", computeRec.NatableVINSName)
@@ -362,7 +389,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute) er
 	d.Set("stateless_sep_id", computeRec.StatelessSepID)
 	d.Set("stateless_sep_type", computeRec.StatelessSepType)
 	d.Set("status", computeRec.Status)
-	d.Set("tags", flattenTags(computeRec.Tags))
+	// d.Set("tags", flattenTags(computeRec.Tags))
 	d.Set("tech_status", computeRec.TechStatus)
 	d.Set("updated_by", computeRec.UpdatedBy)
 	d.Set("updated_time", computeRec.UpdatedTime)
@@ -536,7 +563,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("anti_affinity_rules", flattenListRules(computeRec.AntiAffinityRules))
 	d.Set("arch", computeRec.Architecture)
 	d.Set("boot_order", computeRec.BootOrder)
-	d.Set("bootdisk_size", computeRec.BootDiskSize)
+	d.Set("boot_disk_size", computeRec.BootDiskSize)
 	d.Set("clone_reference", computeRec.CloneReference)
 	d.Set("clones", computeRec.Clones)
 	d.Set("computeci_id", computeRec.ComputeCIID)
@@ -554,6 +581,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("guid", computeRec.GUID)
 	d.Set("compute_id", computeRec.ID)
 	d.Set("image_id", computeRec.ImageID)
+	d.Set("image_name", computeRec.ImageName)
 	d.Set("interfaces", flattenInterfaces(computeRec.Interfaces))
 	d.Set("lock_status", computeRec.LockStatus)
 	d.Set("manager_id", computeRec.ManagerID)
@@ -561,6 +589,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("migrationjob", computeRec.MigrationJob)
 	d.Set("milestones", computeRec.Milestones)
 	d.Set("name", computeRec.Name)
+	d.Set("need_reboot", computeRec.NeedReboot)
 	d.Set("natable_vins_id", computeRec.NatableVINSID)
 	d.Set("natable_vins_ip", computeRec.NatableVINSIP)
 	d.Set("natable_vins_name", computeRec.NatableVINSName)
@@ -653,19 +682,19 @@ func flattenSnapshotUsage(computeSnapshotUsages compute.ListUsageSnapshots) []ma
 	return res
 }
 
-func flattenSnapshotList(computeSnapshotUsages *compute.ListSnapShots) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0, len(computeSnapshotUsages.Data))
-	for _, computeUsage := range computeSnapshotUsages.Data {
-		temp := map[string]interface{}{
-			"disks":     computeUsage.Disks,
-			"guid":    computeUsage.GUID,
-			"label":     computeUsage.Label,
-			"timestamp": computeUsage.Timestamp,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
+// func flattenSnapshotList(computeSnapshotUsages *compute.ListSnapShots) []map[string]interface{} {
+// 	res := make([]map[string]interface{}, 0, len(computeSnapshotUsages.Data))
+// 	for _, computeUsage := range computeSnapshotUsages.Data {
+// 		temp := map[string]interface{}{
+// 			"disks":     computeUsage.Disks,
+// 			"guid":      computeUsage.GUID,
+// 			"label":     computeUsage.Label,
+// 			"timestamp": computeUsage.Timestamp,
+// 		}
+// 		res = append(res, temp)
+// 	}
+// 	return res
+// }
 
 func flattenVGPU(m []interface{}) []string {
 	output := []string{}

internal/service/cloudapi/kvmvm/old_schemas.go

@@ -548,3 +548,882 @@ func resourceComputeResourceV1() *schema.Resource {
 		},
 	}
 }
+
+func resourceComputeResourceV2() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Name of this compute. Compute names are case sensitive and must be unique in the resource group.",
+			},
+			"rg_id": {
+				Type:         schema.TypeInt,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.IntAtLeast(1),
+				Description:  "ID of the resource group where this compute should be deployed.",
+			},
+			"driver": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				StateFunc:    statefuncs.StateFuncToUpper,
+				ValidateFunc: validation.StringInSlice([]string{"SVA_KVM_X86", "KVM_X86", "KVM_PPC"}, false), // observe case while validating
+				Description:  "Hardware architecture of this compute instance.",
+			},
+			"cpu": {
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntBetween(1, constants.MaxCpusPerCompute),
+				Description:  "Number of CPUs to allocate to this compute instance.",
+			},
+			"ram": {
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntAtLeast(constants.MinRamPerCompute),
+				Description:  "Amount of RAM in MB to allocate to this compute instance.",
+			},
+			"image_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew:    true, //REDEPLOY
+				Description: "ID of the OS image to base this compute instance on.",
+			},
+			"boot_disk_size": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "This compute instance boot disk size in GB. Make sure it is large enough to accomodate selected OS image.",
+			},
+			"affinity_label": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Set affinity label for compute",
+			},
+			"affinity_rules": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"topology": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"node", "compute"}, false),
+							Description:  "compute or node, for whom rule applies",
+						},
+						"policy": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"RECOMMENDED", "REQUIRED"}, false),
+							Description:  "RECOMMENDED or REQUIRED, the degree of 'strictness' of this rule",
+						},
+						"mode": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"EQ", "NE", "ANY"}, false),
+							Description:  "EQ or NE or ANY - the comparison mode is 'value', recorded by the specified 'key'",
+						},
+						"key": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "key that are taken into account when analyzing this rule will be identified",
+						},
+						"value": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "value that must match the key to be taken into account when analyzing this rule",
+						},
+					},
+				},
+			},
+			"anti_affinity_rules": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"topology": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"node", "compute"}, false),
+							Description:  "compute or node, for whom rule applies",
+						},
+						"policy": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"RECOMMENDED", "REQUIRED"}, false),
+							Description:  "RECOMMENDED or REQUIRED, the degree of 'strictness' of this rule",
+						},
+						"mode": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"EQ", "NE", "ANY"}, false),
+							Description:  "EQ or NE or ANY - the comparison mode is 'value', recorded by the specified 'key'",
+						},
+						"key": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "key that are taken into account when analyzing this rule will be identified",
+						},
+						"value": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "value that must match the key to be taken into account when analyzing this rule",
+						},
+					},
+				},
+			},
+			"disks": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disk_name": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Name for disk",
+						},
+						"size": {
+							Type:        schema.TypeInt,
+							Required:    true,
+							Description: "Disk size in GiB",
+						},
+						"sep_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Storage endpoint provider ID; by default the same with boot disk",
+						},
+						"disk_type": {
+							Type:         schema.TypeString,
+							Computed:     true,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice([]string{"B", "D"}, false),
+							Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data'",
+						},
+						"pool": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Pool name; by default will be chosen automatically",
+						},
+						"desc": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Optional description",
+						},
+						"image_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Specify image id for create disk from template",
+						},
+						"permanently": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Optional:    true,
+							Description: "Disk deletion status",
+						},
+						"disk_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Disk ID",
+						},
+						"shareable": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+						"size_max": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"size_used": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"custom_fields": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"stateless": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Compute will be stateless (SVA_KVM_X86) if set to True",
+			},
+			"with_default_vins": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Create compute with default resgroup ViNS (true) or without any interfaces (false). This parameter is ignored if network block is specified",
+			},
+			"boot_disk": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disk_name": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Name for disk",
+						},
+						"size": {
+							Type:        schema.TypeInt,
+							Required:    true,
+							Description: "Disk size in GiB",
+						},
+						"sep_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Storage endpoint provider ID; by default the same with boot disk",
+						},
+						"disk_type": {
+							Type:         schema.TypeString,
+							Computed:     true,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice([]string{"B", "D"}, false),
+							Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data'",
+						},
+						"pool": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Pool name; by default will be chosen automatically",
+						},
+						"desc": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Optional description",
+						},
+						"image_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Specify image id for create disk from template",
+						},
+						"permanently": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Optional:    true,
+							Description: "Disk deletion status",
+						},
+						"disk_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Disk ID",
+						},
+						"shareable": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+						"size_max": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"size_used": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"sep_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				ForceNew:    true,
+				Description: "ID of SEP to create bootDisk on. Uses image's sepId if not set.",
+			},
+			"pool": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				ForceNew:    true,
+				Description: "Pool to use if sepId is set, can be also empty if needed to be chosen by system.",
+			},
+
+			"extra_disks": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				MaxItems: constants.MaxExtraDisksPerCompute,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+				Description: "Optional list of IDs of extra disks to attach to this compute. You may specify several extra disks.",
+			},
+
+			"network": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				MinItems: 1,
+				MaxItems: constants.MaxNetworksPerCompute,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"net_type": {
+							Type:         schema.TypeString,
+							Required:     true,
+							StateFunc:    statefuncs.StateFuncToUpper,
+							ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS"}, false), // observe case while validating
+							Description:  "Type of the network for this connection, either EXTNET or VINS.",
+						},
+
+						"net_id": {
+							Type:        schema.TypeInt,
+							Required:    true,
+							Description: "ID of the network for this connection.",
+						},
+
+						"ip_address": {
+							Type:             schema.TypeString,
+							Optional:         true,
+							Computed:         true,
+							DiffSuppressFunc: networkSubresIPAddreDiffSupperss,
+							Description:      "Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.",
+						},
+
+						"mac": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "MAC address associated with this connection. MAC address is assigned automatically.",
+						},
+					},
+				},
+				Description: "Optional network connection(s) for this compute. You may specify several network blocks, one for each connection.",
+			},
+
+			"tags": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"key": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+						"value": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"port_forwarding": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"public_port_start": {
+							Type:     schema.TypeInt,
+							Required: true,
+						},
+						"public_port_end": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Default:  -1,
+						},
+						"local_port": {
+							Type:     schema.TypeInt,
+							Required: true,
+						},
+						"proto": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"tcp", "udp"}, false),
+						},
+					},
+				},
+			},
+
+			"user_access": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"username": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+						"access_type": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"snapshot": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"label": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"rollback": {
+				Type:     schema.TypeSet,
+				MaxItems: 1,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"label": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"cd": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"cdrom_id": {
+							Type:     schema.TypeInt,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"pin_to_stack": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+
+			"description": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Optional text description of this compute instance.",
+			},
+
+			"cloud_init": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Optional cloud_init parameters. Applied when creating new compute instance only, ignored in all other cases.",
+			},
+
+			"enabled": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Computed:    true,
+				Description: "If true - enable compute, else - disable",
+			},
+
+			"pause": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+
+			"reset": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+
+			"auto_start": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Flag for redeploy compute",
+			},
+			"force_stop": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Flag for redeploy compute",
+			},
+			"data_disks": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice([]string{"KEEP", "DETACH", "DESTROY"}, false),
+				Default:      "DETACH",
+				Description:  "Flag for redeploy compute",
+			},
+			"started": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Is compute started.",
+			},
+			"detach_disks": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
+			"permanently": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
+			"is": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "system name",
+			},
+			"ipa_type": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "compute purpose",
+			},
+			// The rest are Compute properties, which are "computed" once it is created
+			"account_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "ID of the account this compute instance belongs to.",
+			},
+			"account_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Name of the account this compute instance belongs to.",
+			},
+			"affinity_weight": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"arch": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"boot_order": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"boot_disk_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "This compute instance boot disk ID.",
+			},
+			"clone_reference": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"clones": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"computeci_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"created_by": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"created_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"deleted_by": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"deleted_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"devices": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"gid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"guid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"compute_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"interfaces": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"conn_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"conn_type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"def_gw": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"flip_group_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"ip_address": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"listen_ssh": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+						"mac": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"net_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"netmask": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"net_type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"pci_slot": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"qos": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"e_rate": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"guid": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"in_brust": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"in_rate": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"target": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"vnfs": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeInt,
+							},
+						},
+					},
+				},
+			},
+			"lock_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"manager_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"manager_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"migrationjob": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"milestones": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"natable_vins_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"natable_vins_ip": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"natable_vins_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"natable_vins_network": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"natable_vins_network_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"os_users": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"guid": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "GUID of this guest OS user.",
+						},
+
+						"login": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Login name of this guest OS user.",
+						},
+
+						"password": {
+							Type:     schema.TypeString,
+							Computed: true,
+							//Sensitive:   true,
+							Description: "Password of this guest OS user.",
+						},
+
+						"public_key": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "SSH public key of this guest OS user.",
+						},
+					},
+				},
+				Description: "Guest OS users provisioned on this compute instance.",
+			},
+			"pinned": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"reference_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"registered": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"res_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"rg_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Name of the resource group where this compute instance is located.",
+			},
+			"snap_sets": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disks": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeInt,
+							},
+						},
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"label": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"timestamp": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"stateless_sep_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"stateless_sep_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tech_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"updated_by": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"updated_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"user_managed": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"vgpus": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"virtual_image_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"virtual_image_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}

internal/service/cloudapi/kvmvm/resource_compute.go

@@ -40,6 +40,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmppc"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmx86"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
@@ -47,12 +48,16 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
+// DiskKey is custom string type to set up context Key for Disk ID
+type DiskKey string
+
 func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceComputeCreate: called for Compute name %q, RG ID %d", d.Get("name").(string), d.Get("rg_id").(int))
 	c := m.(*controller.ControllerCfg)
@@ -155,6 +160,32 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
+	createReqPPC.Interfaces = make([]kvmppc.Interface, 0)
+
+	if networks, ok := d.GetOk("network"); ok {
+		if networks.(*schema.Set).Len() > 0 {
+			ns := networks.(*schema.Set).List()
+
+			interfaces := make([]kvmppc.Interface, 0)
+			for _, elem := range ns {
+				netInterfaceVal := elem.(map[string]interface{})
+				reqInterface := kvmppc.Interface{
+					NetType: netInterfaceVal["net_type"].(string),
+					NetID:   uint64(netInterfaceVal["net_id"].(int)),
+				}
+
+				ipaddr, ipSet := netInterfaceVal["ip_address"]
+				if ipSet {
+					reqInterface.IPAddr = ipaddr.(string)
+				}
+
+				interfaces = append(interfaces, reqInterface)
+			}
+
+			createReqPPC.Interfaces = interfaces
+		}
+	}
+
 	argVal, ok = d.GetOk("cloud_init")
 	if ok {
 		userdata := argVal.(string)
@@ -242,16 +273,46 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	// Note bene: we created compute in a STOPPED state (this is required to properly attach 1st network interface),
-	// now we need to start it before we report the sequence complete
-	if d.Get("started").(bool) {
-		req := compute.StartRequest{ComputeID: computeId}
-		log.Debugf("resourceComputeCreate: starting Compute ID %d after completing its resource configuration", computeId)
-		if _, err := c.CloudAPI().Compute().Start(ctx, req); err != nil {
-			warnings.Add(err)
+	if disks, ok := d.GetOk("disks"); ok {
+		log.Debugf("resourceComputeCreate: Create disks on ComputeID: %d", computeId)
+		addedDisks := disks.([]interface{})
+		if len(addedDisks) > 0 {
+			for _, disk := range addedDisks {
+				diskConv := disk.(map[string]interface{})
+				req := compute.DiskAddRequest{
+					ComputeID: computeId,
+					DiskName:  diskConv["disk_name"].(string),
+					Size:      uint64(diskConv["size"].(int)),
+				}
+
+				if diskConv["sep_id"].(int) != 0 {
+					req.SepID = uint64(diskConv["sep_id"].(int))
+				}
+				if diskConv["disk_type"].(string) != "" {
+					req.DiskType = diskConv["disk_type"].(string)
+				}
+				if diskConv["pool"].(string) != "" {
+					req.Pool = diskConv["pool"].(string)
+				}
+				if diskConv["desc"].(string) != "" {
+					req.Description = diskConv["desc"].(string)
+				}
+				if diskConv["image_id"].(int) != 0 {
+					req.ImageID = uint64(diskConv["image_id"].(int))
+				}
+
+				diskId, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
+				if err != nil {
+					cleanup = true
+					return diag.FromErr(err)
+				}
+
+				ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(int(diskId))), diskConv["permanently"].(bool))
+			}
 		}
 	}
 
+	if !cleanup {
 		if enabled, ok := d.GetOk("enabled"); ok {
 			if enabled.(bool) {
 				req := compute.EnableRequest{ComputeID: computeId}
@@ -268,7 +329,25 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
-	if !cleanup {
+		// Note bene: we created compute in a STOPPED state (this is required to properly attach 1st network interface),
+		// now we need to start it before we report the sequence complete
+		if start, ok := d.GetOk("started"); ok {
+			if start.(bool) {
+				req := compute.StartRequest{ComputeID: computeId}
+				log.Debugf("resourceComputeCreate: starting Compute ID %d after completing its resource configuration", computeId)
+				if _, err := c.CloudAPI().Compute().Start(ctx, req); err != nil {
+					warnings.Add(err)
+				}
+			}
+			if !start.(bool) {
+				req := compute.StopRequest{ComputeID: computeId}
+				log.Debugf("resourceComputeCreate: stoping Compute ID %d after completing its resource configuration", computeId)
+				if _, err := c.CloudAPI().Compute().Stop(ctx, req); err != nil {
+					warnings.Add(err)
+				}
+			}
+		}
+
 		if affinityLabel, ok := d.GetOk("affinity_label"); ok {
 			req := compute.AffinityLabelSetRequest{
 				ComputeID:     computeId,
@@ -281,41 +360,6 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
-		if disks, ok := d.GetOk("disks"); ok {
-			log.Debugf("resourceComputeCreate: Create disks on ComputeID: %d", computeId)
-			addedDisks := disks.([]interface{})
-			if len(addedDisks) > 0 {
-				for _, disk := range addedDisks {
-					diskConv := disk.(map[string]interface{})
-					req := compute.DiskAddRequest{
-						ComputeID: computeId,
-						DiskName:  diskConv["disk_name"].(string),
-						Size:      uint64(diskConv["size"].(int)),
-						SepID:     uint64(diskConv["sep_id"].(int)),
-					}
-
-					if diskConv["disk_type"].(string) != "" {
-						req.DiskType = diskConv["disk_type"].(string)
-					}
-					if diskConv["pool"].(string) != "" {
-						req.Pool = diskConv["pool"].(string)
-					}
-					if diskConv["desc"].(string) != "" {
-						req.Description = diskConv["desc"].(string)
-					}
-					if diskConv["image_id"].(int) != 0 {
-						req.ImageID = uint64(diskConv["image_id"].(int))
-					}
-
-					_, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
-					if err != nil {
-						cleanup = true
-						return diag.FromErr(err)
-					}
-				}
-			}
-		}
-
 		if ars, ok := d.GetOk("affinity_rules"); ok {
 			log.Debugf("resourceComputeCreate: Create affinity rules on ComputeID: %d", computeId)
 			addedAR := ars.([]interface{})
@@ -361,7 +405,6 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 				}
 			}
 		}
-	}
 
 		if tags, ok := d.GetOk("tags"); ok {
 			log.Debugf("resourceComputeCreate: Create tags on ComputeID: %d", computeId)
@@ -392,10 +435,12 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 					req := compute.PFWAddRequest{
 						ComputeID:       computeId,
 						PublicPortStart: uint64(pfwItem["public_port_start"].(int)),
-					PublicPortEnd:   int64(pfwItem["public_port_end"].(int)),
 						LocalBasePort:   uint64(pfwItem["local_port"].(int)),
 						Proto:           pfwItem["proto"].(string),
 					}
+					if pfwItem["public_port_end"].(int) != 0 {
+						req.PublicPortEnd = int64(pfwItem["public_port_end"].(int))
+					}
 
 					_, err := c.CloudAPI().Compute().PFWAdd(ctx, req)
 					if err != nil {
@@ -404,6 +449,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 				}
 			}
 		}
+
 		if userAcess, ok := d.GetOk("user_access"); ok {
 			log.Debugf("resourceComputeCreate: Create user access on ComputeID: %d", computeId)
 			usersAcess := userAcess.(*schema.Set).List()
@@ -460,7 +506,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
-	if d.Get("pin_to_stack").(bool) == true {
+		if d.Get("pin_to_stack").(bool) {
 			req := compute.PinToStackRequest{
 				ComputeID: computeId,
 			}
@@ -470,7 +516,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
-	if d.Get("pause").(bool) == true {
+		if d.Get("pause").(bool) {
 			req := compute.PauseRequest{
 				ComputeID: computeId,
 			}
@@ -479,15 +525,14 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 				warnings.Add(err)
 			}
 		}
-
+	}
 	log.Debugf("resourceComputeCreate: new Compute ID %d, name %s creation sequence complete", computeId, d.Get("name").(string))
 
 	// We may reuse dataSourceComputeRead here as we maintain similarity
 	// between Compute resource and Compute data source schemas
 	// Compute read function will also update resource ID on success, so that Terraform
 	// will know the resource exists
-	defer resourceComputeRead(ctx, d, m)
-	return warnings.Get()
+	return append(warnings.Get(), resourceComputeRead(ctx, d, m)...)
 }
 
 func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -498,6 +543,7 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 	computeRec, err := utilityComputeCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -541,7 +587,7 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
-	if err = flattenCompute(d, computeRec); err != nil {
+	if err = flattenCompute(ctx, d, computeRec); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -601,6 +647,76 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(err)
 	}
 
+	hasChanged := false
+
+	// check compute statuses
+	switch computeRec.Status {
+	case status.Deleted:
+		if restore, ok := d.GetOk("restore"); ok && restore.(bool) {
+			restoreReq := compute.RestoreRequest{ComputeID: computeRec.ID}
+			_, err := c.CloudAPI().Compute().Restore(ctx, restoreReq)
+			if err != nil {
+				d.SetId("")
+				return diag.FromErr(err)
+			}
+		}
+
+		if enabled, ok := d.GetOk("enabled"); ok {
+			if enabled.(bool) {
+				enableReq := compute.EnableRequest{ComputeID: computeRec.ID}
+				_, err = c.CloudAPI().Compute().Enable(ctx, enableReq)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+			}
+			if !enabled.(bool) {
+				enableReq := compute.DisableRequest{ComputeID: computeRec.ID}
+				_, err = c.CloudAPI().Compute().Disable(ctx, enableReq)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+			}
+		}
+
+		if start, ok := d.GetOk("started"); ok {
+			if start.(bool) {
+				req := compute.StartRequest{ComputeID: computeRec.ID}
+
+				if _, err := c.CloudAPI().Compute().Start(ctx, req); err != nil {
+					return diag.FromErr(err)
+				}
+			}
+			if !start.(bool) {
+				req := compute.StopRequest{ComputeID: computeRec.ID}
+
+				if _, err := c.CloudAPI().Compute().Stop(ctx, req); err != nil {
+					return diag.FromErr(err)
+				}
+			}
+		}
+
+		hasChanged = true
+	case status.Destroyed:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceComputeCreate(ctx, d, m)
+	case status.Disabled:
+		log.Debugf("The compute is in status: %s, may troubles can be occured with update. Please, enable compute first.", computeRec.Status)
+	case status.Redeploying:
+	case status.Deleting:
+	case status.Destroying:
+		return diag.Errorf("The compute is in progress with status: %s", computeRec.Status)
+	case status.Modeled:
+		return diag.Errorf("The compute is in status: %s, please, contant the support for more information", computeRec.Status)
+	}
+
+	if hasChanged {
+		computeRec, err = utilityComputeCheckPresence(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("enabled") {
 		enabled := d.Get("enabled").(bool)
 		if enabled {
@@ -623,45 +739,39 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		log.Debugf("resourceComputeUpdate: enable=%s Compute ID %v after completing its resource configuration", d.Id(), enabled)
 	}
 
-	// check compute statuses
-	switch computeRec.Status {
-	case status.Deleted:
-		restoreReq := compute.RestoreRequest{ComputeID: computeRec.ID}
-		enableReq := compute.EnableRequest{ComputeID: computeRec.ID}
+	if d.HasChange("started") {
+		start := d.Get("started").(bool)
+		if start {
+			req := compute.StartRequest{ComputeID: computeRec.ID}
 
-		_, err := c.CloudAPI().Compute().Restore(ctx, restoreReq)
-		if err != nil {
+			if _, err := c.CloudAPI().Compute().Start(ctx, req); err != nil {
 				return diag.FromErr(err)
 			}
+		}
+		if !start {
+			req := compute.StopRequest{ComputeID: computeRec.ID}
 
-		_, err = c.CloudAPI().Compute().Enable(ctx, enableReq)
-		if err != nil {
+			if _, err := c.CloudAPI().Compute().Stop(ctx, req); err != nil {
 				return diag.FromErr(err)
 			}
-
-	case status.Destroyed:
-		d.SetId("")
-		return diag.Errorf("The resource cannot be updated because it has been destroyed")
-		// return resourceComputeCreate(ctx, d, m)
-	case status.Disabled:
-		log.Debugf("The compute is in status: %s, may troubles can be occured with update. Please, enable compute first.", computeRec.Status)
-	case status.Redeploying:
-	case status.Deleting:
-	case status.Destroying:
-		return diag.Errorf("The compute is in progress with status: %s", computeRec.Status)
-	case status.Modeled:
-		return diag.Errorf("The compute is in status: %s, please, contant the support for more information", computeRec.Status)
+		}
 	}
 
 	doUpdate := false
 	resizeReq := compute.ResizeRequest{
 		ComputeID: computeRec.ID,
-		Force:     true,
+	}
+	forceResize, ok := d.GetOk("force_resize")
+	if ok {
+		resizeReq.Force = forceResize.(bool)
 	}
 
 	warnings := dc.Warnings{}
 
 	oldCpu, newCpu := d.GetChange("cpu")
+	if oldCpu.(int) > newCpu.(int) && !forceResize.(bool) {
+		return diag.Errorf("Cannot resize compute ID %d: enable 'force_resize' to reduce compute vCPUs", computeRec.ID)
+	}
 	if oldCpu.(int) != newCpu.(int) {
 		resizeReq.CPU = uint64(newCpu.(int))
 		doUpdate = true
@@ -729,14 +839,16 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChange("description") || d.HasChange("name") {
+	if d.HasChanges("description", "name") {
 		req := compute.UpdateRequest{
 			ComputeID: computeRec.ID,
-			Name:      d.Get("name").(string),
 		}
 
-		if desc, ok := d.GetOk("desc"); ok {
-			req.Description = desc.(string)
+		if d.HasChange("name") {
+			req.Name = d.Get("name").(string)
+		}
+		if d.HasChange("description") {
+			req.Description = d.Get("description").(string)
 		}
 
 		if _, err := c.CloudAPI().Compute().Update(ctx, req); err != nil {
@@ -747,14 +859,23 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	if d.HasChange("disks") {
 		deletedDisks := make([]interface{}, 0)
 		addedDisks := make([]interface{}, 0)
-		updatedDisks := make([]interface{}, 0)
+		resizedDisks := make([]interface{}, 0)
+		renamedDisks := make([]interface{}, 0)
+
+		// save permanently in disks based on disk_id to context
+		for _, diskItemInterface := range d.Get("disks").([]interface{}) {
+			diskItem := diskItemInterface.(map[string]interface{})
+			diskId := diskItem["disk_id"].(int)
+			permanently := diskItem["permanently"].(bool)
+			ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(diskId)), permanently)
+		}
 
 		oldDisks, newDisks := d.GetChange("disks")
 		oldConv := oldDisks.([]interface{})
 		newConv := newDisks.([]interface{})
 
 		for _, el := range oldConv {
-			if !isContainsDisk(newConv, el) {
+			if !isContainsDisk(newConv, el) && !isRenameDisk(newConv, el) && !isResizeDisk(newConv, el) {
 				flag := false
 				extraDisks := d.Get("extra_disks").(*schema.Set).List()
 				delDisk := el.(map[string]interface{})
@@ -778,10 +899,12 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		for _, el := range newConv {
 			if !isContainsDisk(oldConv, el) {
 				addedDisks = append(addedDisks, el)
-			} else {
-				if isChangeDisk(oldConv, el) {
-					updatedDisks = append(updatedDisks, el)
 			}
+			if isResizeDisk(oldConv, el) {
+				resizedDisks = append(resizedDisks, el)
+			}
+			if isRenameDisk(oldConv, el) {
+				renamedDisks = append(renamedDisks, el)
 			}
 		}
 
@@ -835,9 +958,11 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 					ComputeID: computeRec.ID,
 					DiskName:  diskConv["disk_name"].(string),
 					Size:      uint64(diskConv["size"].(int)),
-					SepID:     uint64(diskConv["sep_id"].(int)),
 				}
 
+				if diskConv["sep_id"].(int) != 0 {
+					req.SepID = uint64(diskConv["sep_id"].(int))
+				}
 				if diskConv["disk_type"].(string) != "" {
 					req.DiskType = diskConv["disk_type"].(string)
 				}
@@ -850,15 +975,17 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 				if diskConv["image_id"].(int) != 0 {
 					req.ImageID = uint64(diskConv["image_id"].(int))
 				}
-				_, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
+				diskId, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
 				if err != nil {
 					return diag.FromErr(err)
 				}
+
+				ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(int(diskId))), diskConv["permanently"].(bool))
 			}
 		}
 
-		if len(updatedDisks) > 0 {
-			for _, disk := range updatedDisks {
+		if len(resizedDisks) > 0 {
+			for _, disk := range resizedDisks {
 				diskConv := disk.(map[string]interface{})
 				if diskConv["disk_type"].(string) == "B" {
 					continue
@@ -875,6 +1002,22 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 				}
 			}
 		}
+
+		if len(renamedDisks) > 0 {
+			for _, disk := range renamedDisks {
+				diskConv := disk.(map[string]interface{})
+
+				req := disks.RenameRequest{
+					DiskID: uint64(diskConv["disk_id"].(int)),
+					Name:   diskConv["disk_name"].(string),
+				}
+
+				_, err := c.CloudAPI().Disks().Rename(ctx, req)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+			}
+		}
 	}
 
 	if d.HasChange("started") {
@@ -1267,7 +1410,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 
 	if d.HasChange("pin_to_stack") {
 		oldPin, newPin := d.GetChange("pin_to_stack")
-		if oldPin.(bool) == true && newPin.(bool) == false {
+		if !newPin.(bool) {
 			req := compute.UnpinFromStackRequest{
 				ComputeID: computeRec.ID,
 			}
@@ -1277,7 +1420,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 				return diag.FromErr(err)
 			}
 		}
-		if oldPin.(bool) == false && newPin.(bool) == true {
+		if !oldPin.(bool) {
 			req := compute.PinToStackRequest{
 				ComputeID: computeRec.ID,
 			}
@@ -1291,7 +1434,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 
 	if d.HasChange("pause") {
 		oldPause, newPause := d.GetChange("pause")
-		if oldPause.(bool) == true && newPause.(bool) == false {
+		if !newPause.(bool) {
 			req := compute.ResumeRequest{
 				ComputeID: computeRec.ID,
 			}
@@ -1300,7 +1443,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 				return diag.FromErr(err)
 			}
 		}
-		if oldPause.(bool) == false && newPause.(bool) == true {
+		if !oldPause.(bool) {
 			req := compute.PauseRequest{
 				ComputeID: computeRec.ID,
 			}
@@ -1313,8 +1456,8 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	if d.HasChange("reset") {
-		oldReset, newReset := d.GetChange("reset")
-		if oldReset.(bool) == false && newReset.(bool) == true {
+		_, newReset := d.GetChange("reset")
+		if newReset.(bool) {
 			req := compute.ResetRequest{
 				ComputeID: computeRec.ID,
 			}
@@ -1394,11 +1537,11 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 
 	// we may reuse dataSourceComputeRead here as we maintain similarity
 	// between Compute resource and Compute data source schemas
-	defer resourceComputeRead(ctx, d, m)
-	return warnings.Get()
+
+	return append(warnings.Get(), resourceComputeRead(ctx, d, m)...)
 }
 
-func isChangeDisk(els []interface{}, el interface{}) bool {
+func isResizeDisk(els []interface{}, el interface{}) bool {
 	for _, elOld := range els {
 		elOldConv := elOld.(map[string]interface{})
 		elConv := el.(map[string]interface{})
@@ -1410,11 +1553,23 @@ func isChangeDisk(els []interface{}, el interface{}) bool {
 	return false
 }
 
+func isRenameDisk(els []interface{}, el interface{}) bool {
+	for _, elOld := range els {
+		elOldConv := elOld.(map[string]interface{})
+		elConv := el.(map[string]interface{})
+		if elOldConv["disk_id"].(int) == elConv["disk_id"].(int) &&
+			elOldConv["disk_name"].(string) != elConv["disk_name"].(string) {
+			return true
+		}
+	}
+	return false
+}
+
 func isContainsDisk(els []interface{}, el interface{}) bool {
 	for _, elOld := range els {
 		elOldConv := elOld.(map[string]interface{})
 		elConv := el.(map[string]interface{})
-		if elOldConv["disk_name"].(string) == elConv["disk_name"].(string) {
+		if elOldConv["disk_id"].(int) == elConv["disk_id"].(int) {
 			return true
 		}
 	}
@@ -1456,6 +1611,8 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(err)
 	}
 
+	d.SetId("")
+
 	return nil
 }
 
@@ -1504,7 +1661,6 @@ func disksSubresourceSchemaMake() map[string]*schema.Schema {
 		},
 		"permanently": {
 			Type:        schema.TypeBool,
-			Computed:    true,
 			Optional:    true,
 			Description: "Disk deletion status",
 		},
@@ -1615,14 +1771,14 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 		"rg_id": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ForceNew:     true,
+			// ForceNew:     true,
 			ValidateFunc: validation.IntAtLeast(1),
 			Description:  "ID of the resource group where this compute should be deployed.",
 		},
 		"driver": {
 			Type:     schema.TypeString,
 			Required: true,
-			ForceNew:     true,
+			// ForceNew:     true,
 			StateFunc:    statefuncs.StateFuncToUpper,
 			ValidateFunc: validation.StringInSlice([]string{"SVA_KVM_X86", "KVM_X86", "KVM_PPC"}, false), // observe case while validating
 			Description:  "Hardware architecture of this compute instance.",
@@ -1636,7 +1792,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 		"ram": {
 			Type:     schema.TypeInt,
 			Required: true,
-			ValidateFunc: validation.IntAtLeast(constants.MinRamPerCompute),
+			ValidateFunc: validation.All(
+				validation.IntAtLeast(constants.MinRamPerCompute),
+				validators.DivisibleBy(constants.RAMDivisibility),
+			),
 			Description: "Amount of RAM in MB to allocate to this compute instance.",
 		},
 		"image_id": {
@@ -1686,7 +1845,7 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 					},
 					"value": {
 						Type:        schema.TypeString,
-						Required:    true,
+						Optional:    true,
 						Description: "value that must match the key to be taken into account when analyzing this rule",
 					},
 				},
@@ -1722,7 +1881,7 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 					},
 					"value": {
 						Type:        schema.TypeString,
-						Required:    true,
+						Optional:    true,
 						Description: "value that must match the key to be taken into account when analyzing this rule",
 					},
 				},
@@ -1757,14 +1916,14 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Optional: true,
 			Computed: true,
-			ForceNew:    true,
+			// ForceNew:    true,
 			Description: "ID of SEP to create bootDisk on. Uses image's sepId if not set.",
 		},
 		"pool": {
 			Type:     schema.TypeString,
 			Optional: true,
 			Computed: true,
-			ForceNew:    true,
+			// ForceNew:    true,
 			Description: "Pool to use if sepId is set, can be also empty if needed to be chosen by system.",
 		},
 
@@ -1877,6 +2036,12 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Default:  false,
 		},
 
+		"restore": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Default:  false,
+		},
+
 		"auto_start": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -1889,6 +2054,12 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Flag for redeploy compute",
 		},
+		"force_resize": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Flag for resize compute",
+		},
 		"data_disks": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -2027,6 +2198,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"need_reboot": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"natable_vins_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -2132,7 +2307,7 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 
 func ResourceCompute() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 2,
+		SchemaVersion: 3,
 
 		CreateContext: resourceComputeCreate,
 		ReadContext:   resourceComputeRead,
@@ -2158,6 +2333,11 @@ func ResourceCompute() *schema.Resource {
 				Upgrade: resourceCompueteStateUpgradeV1,
 				Version: 1,
 			},
+			{
+				Type:    resourceComputeResourceV2().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceComputeStateUpgradeV2,
+				Version: 2,
+			},
 		},
 	}
 }

internal/service/cloudapi/kvmvm/state_upgraders.go

@@ -31,3 +31,11 @@ func resourceCompueteStateUpgradeV1(ctx context.Context, rawState map[string]int
 
 	return rawState, nil
 }
+
+func resourceComputeStateUpgradeV2(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourceComputeStateUpgradeV2: upgrading state")
+	
+	delete(rawState, "with_default_vins")
+
+	return rawState, nil
+}

internal/service/cloudapi/kvmvm/utility_compute.go

@@ -34,18 +34,17 @@ package kvmvm
 
 import (
 	"context"
-	"regexp"
-	"strconv"
-
 	log "github.com/sirupsen/logrus"
+	"regexp"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func matchComputes(computeList *compute.ListComputes) *compute.ListComputes {
-	matched, _ := regexp.Compile("[a-zA-Z]+\\d+-[a-zA-Z]+\\d+-[a-zA-Z]+\\d+")
+	matched, _ := regexp.Compile(`[a-zA-Z]+\\d+-[a-zA-Z]+\\d+-[a-zA-Z]+\\d+`)
 	result := computeList.FilterFunc(func(ic compute.ItemCompute) bool {
 		res := matched.Match([]byte(ic.Name))
 		return !res
@@ -176,17 +175,6 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 
 	old_set, new_set := d.GetChange("network")
 
-	req := compute.StopRequest{
-		ComputeID: computeID,
-		Force:     true,
-	}
-
-	log.Debugf("utilityComputeNetworksConfigure: stopping compute %d", computeID)
-	_, err := c.CloudAPI().Compute().Stop(ctx, req)
-	if err != nil {
-		return err
-	}
-
 	apiErrCount := 0
 	var lastSavedError error
 
@@ -246,6 +234,17 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 		}
 	}
 
+	needStart:= false 
+
+	if d.Get("network").(*schema.Set).Len() == 1 || old_set.(*schema.Set).Len() < 1 {
+		computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		if err := utilityComputeStop(ctx, computeId, m); err != nil {
+			apiErrCount++
+			lastSavedError = err
+		}
+		needStart = true
+	}
+
 	attach_set := new_set.(*schema.Set).Difference(old_set.(*schema.Set))
 	log.Debugf("utilityComputeNetworksConfigure: attach set has %d items for Compute ID %s", attach_set.Len(), d.Id())
 	for _, runner := range attach_set.List() {
@@ -270,14 +269,13 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 		}
 	}
 
-	startReq := compute.StartRequest{ComputeID: computeID}
-
-	log.Debugf("utilityComputeNetworksConfigure: starting compute %d", computeID)
-	_, err = c.CloudAPI().Compute().Start(ctx, startReq)
-	if err != nil {
-		apiErrCount++
+	if needStart {
+		computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		if numErr, err := utilityComputeStart(ctx, computeId, m); err != nil {
+			apiErrCount+= numErr
 			lastSavedError = err
 		}
+	}
 
 	if apiErrCount > 0 {
 		log.Errorf("utilityComputeNetworksConfigure: there were %d error(s) when managing networks of Compute ID %s. Last error was: %s",
@@ -302,3 +300,30 @@ func utilityComputeCheckPresence(ctx context.Context, d *schema.ResourceData, m
 
 	return *computeRecord, nil
 }
+
+func utilityComputeStop(ctx context.Context, computeID uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+	req := compute.StopRequest{
+		ComputeID: computeID,
+		Force:     true,
+	}
+
+	log.Debugf("utilityComputeNetworksConfigure: stopping compute %d", computeID)
+	_, err := c.CloudAPI().Compute().Stop(ctx, req)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func utilityComputeStart(ctx context.Context, computeID uint64, m interface{}) (int, error) {
+	c := m.(*controller.ControllerCfg)
+	startReq := compute.StartRequest{ComputeID: computeID}
+
+	log.Debugf("utilityComputeNetworksConfigure: starting compute %d", computeID)
+	_, err := c.CloudAPI().Compute().Start(ctx, startReq)
+	if err != nil {
+		return 1, err
+	}
+	return 0, nil
+}

internal/service/cloudapi/lb/data_source_lb.go

@@ -44,6 +44,7 @@ import (
 func dataSourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	lb, err := utilityLBCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/lb/data_source_lb_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceLBListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	lbList, err := utilityLBListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/lb/data_source_lb_list_deleted.go

@@ -44,6 +44,7 @@ import (
 func dataSourceLBListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	lbList, err := utilityLBListDeletedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	id := uuid.New()

internal/service/cloudapi/lb/lb_resource_subresource.go

@@ -79,6 +79,12 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 		Optional: true,
 	}
 	
+	sch["safe"] = &schema.Schema{
+		Type:     schema.TypeBool,
+		Default:  true,
+		Optional: true,
+	}
+
 	sch["config_reset"] = &schema.Schema{
 		Type:     schema.TypeBool,
 		Optional: true,
@@ -93,7 +99,6 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 		Optional: true,
 	}
 
-	
 	///
 	sch["permanently"] = &schema.Schema{
 		Type:     schema.TypeBool,

internal/service/cloudapi/lb/resource_lb.go

@@ -42,6 +42,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
 )
 
@@ -94,21 +95,16 @@ func resourceLBCreate(ctx context.Context, d *schema.ResourceData, m interface{}
 
 	lbId, err := c.CloudAPI().LB().Create(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
-	lbIdParsed := strconv.Itoa(int(lbId))
-
-	d.SetId(lbIdParsed)
+	d.SetId(strconv.FormatUint(lbId, 10))
 	d.Set("lb_id", lbId)
 
-	_, err = utilityLBCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
+	w := dc.Warnings{}
 
 	if enable, ok := d.GetOk("enable"); ok {
-		lbId := uint64(d.Get("lb_id").(int))
 		req := lb.DisableEnableRequest{
 			LBID: lbId,
 		}
@@ -116,17 +112,33 @@ func resourceLBCreate(ctx context.Context, d *schema.ResourceData, m interface{}
 		if enable.(bool) {
 			_, err := c.CloudAPI().LB().Enable(ctx, req)
 			if err != nil {
-				return diag.FromErr(err)
+				w.Add(err)
 			}
 		} else {
 			_, err := c.CloudAPI().LB().Disable(ctx, req)
 			if err != nil {
-				return diag.FromErr(err)
+				w.Add(err)
+			}
+		}
+
+		if start, ok := d.GetOk("start"); ok && enable.(bool) {
+			if start.(bool) {
+				req := lb.StartRequest{LBID: lbId}
+				_, err := c.CloudAPI().LB().Start(ctx, req)
+				if err != nil {
+					w.Add(err)
+				}
+			} else {
+				req := lb.StopRequest{LBID: lbId}
+				_, err := c.CloudAPI().LB().Stop(ctx, req)
+				if err != nil {
+					w.Add(err)
+				}
 			}
 		}
 	}
 
-	return resourceLBRead(ctx, d, m)
+	return append(w.Get(), resourceLBRead(ctx, d, m)...)
 }
 
 func resourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -193,21 +205,17 @@ func resourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{})
 func resourceLBDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceLBDelete")
 
-	_, err := utilityLBCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
 	c := m.(*controller.ControllerCfg)
+	lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
 	req := lb.DeleteRequest{
-		LBID: uint64(d.Get("lb_id").(int)),
+		LBID: lbId,
 	}
 
 	if permanently, ok := d.GetOk("permanently"); ok {
 		req.Permanently = permanently.(bool)
 	}
 
-	_, err = c.CloudAPI().LB().Delete(ctx, req)
+	_, err := c.CloudAPI().LB().Delete(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -263,19 +271,47 @@ func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}
 	case status.Created:
 	case status.Deleting:
 	case status.Deleted:
-		lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
-		restoreReq := lb.RestoreRequest{LBID: lbId}
-		enableReq := lb.DisableEnableRequest{LBID: lbId}
+		if restore, ok := d.GetOk("restore"); ok && restore.(bool) {
+			restoreReq := lb.RestoreRequest{LBID: lbRec.ID}
 
 			_, err := c.CloudAPI().LB().Restore(ctx, restoreReq)
 			if err != nil {
 				return diag.FromErr(err)
 			}
-		_, err = c.CloudAPI().LB().Enable(ctx, enableReq)
+		}
+		if enable, ok := d.GetOk("enable"); ok {
+			req := lb.DisableEnableRequest{
+				LBID: lbRec.ID,
+			}
+
+			if enable.(bool) {
+				_, err := c.CloudAPI().LB().Enable(ctx, req)
 				if err != nil {
 					return diag.FromErr(err)
 				}
+			} else {
+				_, err := c.CloudAPI().LB().Disable(ctx, req)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+			}
 
+			if start, ok := d.GetOk("start"); ok && enable.(bool) {
+				if start.(bool) {
+					req := lb.StartRequest{LBID: lbRec.ID}
+					_, err := c.CloudAPI().LB().Start(ctx, req)
+					if err != nil {
+						return diag.FromErr(err)
+					}
+				} else {
+					req := lb.StopRequest{LBID: lbRec.ID}
+					_, err := c.CloudAPI().LB().Stop(ctx, req)
+					if err != nil {
+						return diag.FromErr(err)
+					}
+				}
+			}
+		}
 		hasChanged = true
 	case status.Destroying:
 		return diag.Errorf("The LB is in progress with status: %s", lbRec.Status)
@@ -327,7 +363,6 @@ func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}
 			if err != nil {
 				return diag.FromErr(err)
 			}
-
 		}
 	}
 
@@ -367,6 +402,9 @@ func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}
 			req := lb.RestartRequest{
 				LBID: uint64(d.Get("lb_id").(int)),
 			}
+			if safe, ok:= d.GetOk("safe"); ok { 
+				req.Safe = safe.(bool)
+            }
 
 			_, err := c.CloudAPI().LB().Restart(ctx, req)
 			if err != nil {

internal/service/cloudapi/lb/resource_lb_backend.go

@@ -94,6 +94,7 @@ func resourceLBBackendCreate(ctx context.Context, d *schema.ResourceData, m inte
 
 	_, err = c.CloudAPI().LB().BackendCreate(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -101,6 +102,7 @@ func resourceLBBackendCreate(ctx context.Context, d *schema.ResourceData, m inte
 
 	_, err = utilityLBBackendCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -128,6 +130,7 @@ func resourceLBBackendDelete(ctx context.Context, d *schema.ResourceData, m inte
 
 	_, err := utilityLBBackendCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -139,6 +142,7 @@ func resourceLBBackendDelete(ctx context.Context, d *schema.ResourceData, m inte
 
 	_, err = c.CloudAPI().LB().BackendDelete(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -195,6 +199,7 @@ func resourceLBBackendUpdate(ctx context.Context, d *schema.ResourceData, m inte
 
 	_, err = c.CloudAPI().LB().BackendUpdate(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/lb/resource_lb_backend_server.go

@@ -98,6 +98,7 @@ func resourceLBBackendServerCreate(ctx context.Context, d *schema.ResourceData,
 
 	_, err = c.CloudAPI().LB().BackendServerAdd(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -105,6 +106,7 @@ func resourceLBBackendServerCreate(ctx context.Context, d *schema.ResourceData,
 
 	_, err = utilityLBBackendServerCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -133,6 +135,7 @@ func resourceLBBackendServerDelete(ctx context.Context, d *schema.ResourceData,
 
 	_, err := utilityLBBackendServerCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -145,6 +148,7 @@ func resourceLBBackendServerDelete(ctx context.Context, d *schema.ResourceData,
 
 	_, err = c.CloudAPI().LB().BackendServerDelete(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	d.SetId("")
@@ -158,6 +162,7 @@ func resourceLBBackendServerUpdate(ctx context.Context, d *schema.ResourceData,
 
 	haveLBID, err := existLBID(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -203,6 +208,7 @@ func resourceLBBackendServerUpdate(ctx context.Context, d *schema.ResourceData,
 
 	_, err = c.CloudAPI().LB().BackendServerUpdate(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}