3.6.0

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     tags:
-      - 'v*'
+      - '*'
 
 jobs:
   release:

.gitignore

@@ -2,4 +2,4 @@ decort/vendor/
 examples/
 url_scrapping/
 terraform-provider-decort*
-.vscode/
+.vscode/

CHANGELOG.md

@@ -1,10 +1,23 @@
-### Version 3.2.2
-
-### Bug fixes
-
-- Fix bug with getting kvmvm data_source
+## Version 3.6.0
 
 ### Features
+- Added validation for required fields in the following resources:
+	- disks
+	- lb
+	- image
+	- bservice
+	- vins
+	- k8s
+	- k8s_wg
+	- lb_frontend
+	- lb_frontend_bind
+	- lb_backed
+	- lb_backend_server
+- Added status handlers in create/update functions (where present)
 
-- Add enable/disable functionality for kvmvm resource
-- Add status checker for kvmvm resource
+### Bug Fixes
+- Fixed state inconsistency in the following resources/data sources:
+	- data_source_account
+	- resource_k8s
+	- resource_k8s_wg
+	- resource_account

Dockerfile

@@ -1,10 +0,0 @@
-FROM docker.io/hashicorp/terraform:latest
-
-WORKDIR /opt/decort/tf/
-COPY provider.tf ./
-COPY terraform-provider-decort ./terraform.d/plugins/digitalenergy.online/decort/decort/3.2.2/linux_amd64/
-RUN terraform init
-
-WORKDIR /tf
-COPY entrypoint.sh /
-ENTRYPOINT ["/entrypoint.sh", "/bin/terraform"]

Jenkinsfile-sast

@@ -1,52 +0,0 @@
-pipeline {
-    agent {
-        kubernetes {
-            yaml '''
-apiVersion: v1
-kind: Pod
-spec:
-  containers:
-  - name: alpine
-    image: alpine:3.15
-    command:
-      - sleep
-      - infinity
-'''
-        }
-    }
-    stages {
-        stage('Dependency check') {
-            environment {
-                DEPCHECKDB = credentials('depcheck-postgres')
-            }
-            steps {
-                container('alpine') {
-                    sh 'apk update && apk add openjdk11 java-postgresql-jdbc go'
-                    dependencyCheck additionalArguments: '-f JSON -f HTML -n --enableExperimental \
-                        -l deplog \
-                        --dbDriverName org.postgresql.Driver \
-                        --dbDriverPath /usr/share/java/postgresql-jdbc.jar \
-                        --dbUser $DEPCHECKDB_USR \
-                        --dbPassword $DEPCHECKDB_PSW \
-                        --connectionString jdbc:postgresql://postgres-postgresql.postgres/depcheck', odcInstallation: 'depcheck'
-                    sh 'cat deplog'
-                }
-            }
-        }
-        stage('SonarQube analysis') {
-            environment {
-                SONARSCANNER_HOME = tool 'sonarscanner'
-            }
-            steps {
-                withSonarQubeEnv('sonarqube') {
-                    sh '$SONARSCANNER_HOME/bin/sonar-scanner'
-                }
-            }
-        }
-        stage('SonarQube quality gate') {
-            steps {
-                waitForQualityGate webhookSecretId: 'sonar-webhook', abortPipeline: true
-            }
-        }
-    }
-}

Makefile

@@ -2,15 +2,32 @@ TEST?=$$(go list ./... | grep -v 'vendor')
 HOSTNAME=digitalenergy.online
 NAMESPACE=decort
 NAME=terraform-provider-decort
+BINDIR = ./bin
+ZIPDIR = ./zip
 #BINARY=terraform-provider-${NAME}
 BINARY=${NAME}.exe
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/decort/
-VERSION=1.1
+VERSION=3.6.0
 #OS_ARCH=darwin_amd64
 OS_ARCH=windows_amd64
 #OS_ARCH=linux_amd64
 
+FILES= 	${BINARY}_${VERSION}_darwin_amd64\
+		${BINARY}_${VERSION}_freebsd_386\
+		${BINARY}_${VERSION}_freebsd_amd64\
+		${BINARY}_${VERSION}_freebsd_arm\
+		${BINARY}_${VERSION}_linux_386\
+		${BINARY}_${VERSION}_linux_amd64\
+		${BINARY}_${VERSION}_linux_arm\
+		${BINARY}_${VERSION}_openbsd_386\
+		${BINARY}_${VERSION}_openbsd_amd64\
+		${BINARY}_${VERSION}_solaris_amd64\
+		${BINARY}_${VERSION}_windows_386  \
+		${BINARY}_${VERSION}_windows_amd64\
+
+BINS = $(addprefix bin/, $(FILES))
+
 default: install
 
 image:
@@ -29,19 +46,30 @@ st:
 build:
 	go build -o ${BINARY} ${MAINPATH}
 
-release:
-	GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64
-	GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386
-	GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64
-	GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm
-	GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386
-	GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64
-	GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm
-	GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386
-	GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64
-	GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64
-	GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386
-	GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64
+release: $(FILES)
+
+$(FILES) : $(BINDIR) $(ZIPDIR) $(BINS)
+	zip -r $(ZIPDIR)/$@.zip $(BINDIR)/$@
+
+$(BINDIR):
+	mkdir $@
+
+$(ZIPDIR):
+	mkdir $@
+
+$(BINS):
+	GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64 $(MAINPATH)
+	GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386 $(MAINPATH)
+	GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64 $(MAINPATH)
+	GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm $(MAINPATH)
+	GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386 $(MAINPATH)
+	GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64 $(MAINPATH)
+	GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm $(MAINPATH)
+	GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386 $(MAINPATH)
+	GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64 $(MAINPATH)
+	GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64 $(MAINPATH)
+	GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386 $(MAINPATH)
+	GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64 $(MAINPATH)
 
 install: build
 	mkdir -p ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
@@ -52,4 +80,4 @@ test:
 	echo $(TEST) | xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4                    
 
 testacc: 
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m   
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m

README.md

@@ -2,12 +2,15 @@
 
 Terraform provider для платформы Digital Energy Cloud Orchestration Technology (DECORT)
 
-Внимание: провайдер версии 3.x разработан для DECORT API 3.8.x.  
-Для более старых версий можно использовать:
+## Соответсвие версий платформы версиям провайдера
 
-- DECORT API 3.7.x - версия провайдера rc-1.25
-- DECORT API 3.6.x - версия провайдера rc-1.10
-- DECORT API до 3.6.0 - terraform DECS provider (https://github.com/rudecs/terraform-provider-decs)
+| Версия DECORT API | Версия провайдера Terraform |
+| ------ | ------ |
+| 3.8.5 | 3.4.x |
+| 3.8.0 - 3.8.4 | 3.3.1 |
+| 3.7.x |  rc-1.25 |
+| 3.6.x |  rc-1.10 |
+| до 3.6.0 | [terraform-provider-decs](https://github.com/rudecs/terraform-provider-decs) |
 
 ## Режимы работы
 
@@ -16,7 +19,7 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 - Режим пользователя,
 - Режим администратора.
   Для переключения между режимами используйте флаг DECORT_ADMIN_MODE.
-  Вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki
+  Вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 
 ## Возможности провайдера
 
@@ -37,7 +40,7 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 - Работа с locations,
 - Работа с load balancer.
 
-Вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki
+Вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 
 ## Начало
 
@@ -77,7 +80,7 @@ terraform init
 3. Склонируйте репозиторий с провайдером, выполнив команду:
 
 ```bash
-git clone https://github.com/rudecs/terraform-provider-decort.git
+git clone https://repository.basistech.ru/BASIS/terraform-provider-decort
 ```
 
 4. Перейдите в скачанную папку с провайдером и выполните команду
@@ -155,7 +158,7 @@ terraform init
 
 Примеры работы можно найти:
 
-- На вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki
+- На вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 - В папке `samples`
 
 Схемы к terraform'у доступны:

README_EN.md

@@ -2,11 +2,15 @@
 
 Terraform provider for Digital Energy Cloud Orchestration Technology (DECORT) platform
 
-NOTE: provider 3.x is designed for DECORT API 3.8.x. For older API versions please use:
+## Mapping of platform versions with provider versions
 
-- DECORT API 3.7.x versions - provider verion rc-1.25
-- DECORT API 3.6.x versions - provider version rc-1.10
-- DECORT API versions prior to 3.6.0 - Terraform DECS provider (https://github.com/rudecs/terraform-provider-decs)
+|  DECORT API version | Terraform provider version |
+| ------ | ------ |
+| 3.8.5 | 3.4.x |
+| 3.8.0 - 3.8.4 | 3.3.1 |
+| 3.7.x |  rc-1.25 |
+| 3.6.x |  rc-1.10 |
+| до 3.6.0 | [terraform-provider-decs](https://github.com/rudecs/terraform-provider-decs) |
 
 ## Working modes
 
@@ -15,7 +19,7 @@ The provider support two working modes:
 - User mode,
 - Administator mode.
   Use flag DECORT_ADMIN_MODE for swithcing beetwen modes.
-  See user guide at https://github.com/rudecs/terraform-provider-decort/wiki
+  See user guide at https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 
 ## Features
 
@@ -38,7 +42,7 @@ The provider support two working modes:
 
 This provider supports Import operations on pre-existing resources.
 
-See user guide at https://github.com/rudecs/terraform-provider-decort/wiki
+See user guide at https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 
 ## Get Started
 
@@ -154,7 +158,7 @@ More details about the provider's building process: https://learn.hashicorp.com/
 
 ## Examples and Samples
 
-- Examples: https://github.com/rudecs/terraform-provider-decort/wiki
+- Examples: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 - Samples: see in repository `samples`
 
 Terraform schemas in:

cmd/decort/main.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package main
@@ -37,7 +38,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
 
-	"github.com/rudecs/terraform-provider-decort/internal/provider"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/provider"
 )
 
 //go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs

entrypoint.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cp -aL /opt/decort/tf/* /opt/decort/tf/.* ./
-exec "$@"

go.mod

@@ -1,4 +1,4 @@
-module github.com/rudecs/terraform-provider-decort
+module repository.basistech.ru/BASIS/terraform-provider-decort
 
 go 1.18
 

internal/constants/api.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/constants/constants.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/constants/timeouts.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/controller/controller.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -243,7 +244,7 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 			Validate JWT against DECORT controller. JWT can be supplied as argument to this method. If empty string supplied as
 			argument, JWT will be taken from config attribute.
 			DECORT controller URL will always be taken from the config attribute assigned at instantiation.
-		    Validation is accomplished by attempting API call that lists accounts for the invoking user.
+		    Validation is accomplished by attempting API call that lists account for the invoking user.
 	*/
 	if jwt == "" {
 		if config.jwt == "" {
@@ -256,7 +257,7 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 		return false, fmt.Errorf("validateJWT method called, but no OAuth2 URL provided.")
 	}
 
-	req, err := http.NewRequest("POST", config.controller_url+"/restmachine/cloudapi/accounts/list", nil)
+	req, err := http.NewRequest("POST", config.controller_url+"/restmachine/cloudapi/account/list", nil)
 	if err != nil {
 		return false, err
 	}
@@ -297,7 +298,7 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 	params.Add("password", config.legacy_password)
 	params_str := params.Encode()
 
-	req, err := http.NewRequest("POST", config.controller_url+"/restmachine/cloudapi/users/authenticate", strings.NewReader(params_str))
+	req, err := http.NewRequest("POST", config.controller_url+"/restmachine/cloudapi/user/authenticate", strings.NewReader(params_str))
 	if err != nil {
 		return false, err
 	}

internal/dc/warnings.go

@@ -0,0 +1,53 @@
+/*
+Copyright (c) 2019-2022 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>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+//Diagnostics Collector
+package dc
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+
+type Warnings struct {
+	diagnostics diag.Diagnostics
+}
+
+func (w *Warnings) Add(err error) {
+	if w.diagnostics == nil {
+		w.diagnostics = diag.Diagnostics{}
+	}
+	diagFromErr := diag.FromErr(err)
+	diagFromErr[0].Severity = diag.Warning
+	w.diagnostics = append(w.diagnostics, diagFromErr[0])
+}
+
+func (w Warnings) Get() diag.Diagnostics {
+	return w.diagnostics
+}

internal/flattens/meta.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/location/api.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/location/location.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,8 +26,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
 var DefaultGridID int

internal/location/models.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/provider/cloudapi/data_sources_map.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,18 +22,18 @@ package cloudapi
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/account"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/bservice"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/disks"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/extnet"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/image"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/k8s"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/kvmvm"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/lb"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/locations"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/rg"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/snapshot"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/vins"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/k8s"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/kvmvm"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/lb"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/locations"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/snapshot"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vins"
 )
 
 func NewDataSourcesMap() map[string]*schema.Resource {
@@ -40,16 +41,40 @@ func NewDataSourcesMap() map[string]*schema.Resource {
 		"decort_account":                        account.DataSourceAccount(),
 		"decort_resgroup":                       rg.DataSourceResgroup(),
 		"decort_kvmvm":                          kvmvm.DataSourceCompute(),
+		"decort_kvmvm_list":                     kvmvm.DataSourceComputeList(),
+		"decort_kvmvm_audits":                   kvmvm.DataSourceComputeAudits(),
+		"decort_kvmvm_get_audits":               kvmvm.DataSourceComputeGetAudits(),
+		"decort_kvmvm_get_console_url":          kvmvm.DataSourceComputeGetConsoleUrl(),
+		"decort_kvmvm_get_log":                  kvmvm.DataSourceComputeGetLog(),
+		"decort_kvmvm_pfw_list":                 kvmvm.DataSourceComputePfwList(),
+		"decort_kvmvm_user_list":                kvmvm.DataSourceComputeUserList(),
+		"decort_kvmvm_snapshot_usage":           kvmvm.DataSourceComputeSnapshotUsage(),
 		"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_vins":                           vins.DataSourceVins(),
+		"decort_vins_list":                      vins.DataSourceVinsList(),
+		"decort_vins_audits":                    vins.DataSourceVinsAudits(),
+		"decort_vins_ip_list":                   vins.DataSourceVinsIpList(),
+		"decort_vins_list_deleted":              vins.DataSourceVinsListDeleted(),
+		"decort_vins_ext_net_list":              vins.DataSourceVinsExtNetList(),
+		"decort_vins_nat_rule_list":             vins.DataSourceVinsNatRuleList(),
 		"decort_snapshot_list":                  snapshot.DataSourceSnapshotList(),
 		"decort_disk":                           disks.DataSourceDisk(),
 		"decort_disk_list":                      disks.DataSourceDiskList(),
 		"decort_rg_list":                        rg.DataSourceRgList(),
+		"decort_rg_affinity_group_computes":     rg.DataSourceRgAffinityGroupComputes(),
+		"decort_rg_affinity_groups_list":        rg.DataSourceRgAffinityGroupsList(),
+		"decort_rg_affinity_groups_get":         rg.DataSourceRgAffinityGroupsGet(),
+		"decort_rg_audits":                      rg.DataSourceRgAudits(),
+		"decort_rg_list_computes":               rg.DataSourceRgListComputes(),
+		"decort_rg_list_deleted":                rg.DataSourceRgListDeleted(),
+		"decort_rg_list_lb":                     rg.DataSourceRgListLb(),
+		"decort_rg_list_pfw":                    rg.DataSourceRgListPfw(),
+		"decort_rg_list_vins":                   rg.DataSourceRgListVins(),
+		"decort_rg_usage":                       rg.DataSourceRgUsage(),
 		"decort_disk_list_types_detailed":       disks.DataSourceDiskListTypesDetailed(),
 		"decort_disk_list_types":                disks.DataSourceDiskListTypes(),
 		"decort_disk_list_deleted":              disks.DataSourceDiskListDeleted(),
@@ -77,7 +102,6 @@ func NewDataSourcesMap() map[string]*schema.Resource {
 		"decort_extnet_computes_list":           extnet.DataSourceExtnetComputesList(),
 		"decort_extnet":                         extnet.DataSourceExtnet(),
 		"decort_extnet_default":                 extnet.DataSourceExtnetDefault(),
-		"decort_vins_list":                      vins.DataSourceVinsList(),
 		"decort_locations_list":                 locations.DataSourceLocationsList(),
 		"decort_location_url":                   locations.DataSourceLocationUrl(),
 		"decort_image_list":                     image.DataSourceImageList(),

internal/provider/cloudapi/resource_map.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,17 +22,17 @@ package cloudapi
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/account"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/bservice"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/disks"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/image"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/k8s"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/kvmvm"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/lb"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/pfw"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/rg"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/snapshot"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudapi/vins"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/k8s"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/kvmvm"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/lb"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/pfw"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/snapshot"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vins"
 )
 
 func NewRersourcesMap() map[string]*schema.Resource {

internal/provider/cloudbroker/data_sources_map.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,14 +22,14 @@ package cloudbroker
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/account"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/disks"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/grid"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/image"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/rg"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/sep"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/vgpu"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/grid"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/sep"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vgpu"
 )
 
 func NewDataSourcesMap() map[string]*schema.Resource {

internal/provider/cloudbroker/resources_map.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,17 +22,17 @@ package cloudbroker
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/account"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/disks"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/image"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/k8s"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/kvmvm"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/pfw"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/rg"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/sep"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/snapshot"
-	"github.com/rudecs/terraform-provider-decort/internal/service/cloudbroker/vins"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8s"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/kvmvm"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pfw"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/sep"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/snapshot"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
 )
 
 func NewRersourcesMap() map[string]*schema.Resource {

internal/provider/provider.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,9 +28,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"golang.org/x/net/context"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
-	"github.com/rudecs/terraform-provider-decort/internal/location"
-	"github.com/rudecs/terraform-provider-decort/internal/statefuncs"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/location"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
 )
 
 func Provider() *schema.Provider {

internal/provider/select_schema.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,8 +25,8 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ca "github.com/rudecs/terraform-provider-decort/internal/provider/cloudapi"
-	cb "github.com/rudecs/terraform-provider-decort/internal/provider/cloudbroker"
+	ca "repository.basistech.ru/BASIS/terraform-provider-decort/internal/provider/cloudapi"
+	cb "repository.basistech.ru/BASIS/terraform-provider-decort/internal/provider/cloudbroker"
 )
 
 func selectSchema(isDatasource bool) map[string]*schema.Resource {

internal/service/cloudapi/account/api.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account

internal/service/cloudapi/account/data_source_account.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,24 +22,23 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
 
 import (
 	"context"
+	"strconv"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/flattens"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -47,111 +47,213 @@ func dataSourceAccountRead(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(err)
 	}
 
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("dc_location", acc.DCLocation)
-	d.Set("resources", flattenAccResources(acc.Resources))
-	d.Set("ckey", acc.CKey)
-	d.Set("meta", flattens.FlattenMeta(acc.Meta))
-	d.Set("acl", flattenAccAcl(acc.Acl))
-	d.Set("company", acc.Company)
-	d.Set("companyurl", acc.CompanyUrl)
-	d.Set("created_by", acc.CreatedBy)
-	d.Set("created_time", acc.CreatedTime)
-	d.Set("deactivation_time", acc.DeactiovationTime)
-	d.Set("deleted_by", acc.DeletedBy)
-	d.Set("deleted_time", acc.DeletedTime)
-	d.Set("displayname", acc.DisplayName)
-	d.Set("guid", acc.GUID)
-	d.Set("account_id", acc.ID)
-	d.Set("account_name", acc.Name)
-	d.Set("resource_limits", flattenRgResourceLimits(acc.ResourceLimits))
-	d.Set("send_access_emails", acc.SendAccessEmails)
-	d.Set("service_account", acc.ServiceAccount)
-	d.Set("status", acc.Status)
-	d.Set("updated_time", acc.UpdatedTime)
-	d.Set("version", acc.Version)
-	d.Set("vins", acc.Vins)
-	d.Set("vinses", acc.Vinses)
-	d.Set("computes", flattenAccComputes(acc.Computes))
-	d.Set("machines", flattenAccMachines(acc.Machines))
+	flattenAccount(d, *acc)
+	d.SetId(strconv.Itoa(acc.ID))
+
 	return nil
 }
 
-func flattenAccComputes(acs Computes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"started": acs.Started,
-		"stopped": acs.Stopped,
+func aclSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"can_be_deleted": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"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,
+		},
 	}
-	res = append(res, temp)
+
 	return res
 }
 
-func flattenAccMachines(ams Machines) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"running": ams.Running,
-		"halted":  ams.Halted,
+func resourceLimitsSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"cu_c": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"cu_d": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"cu_i": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"cu_m": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"cu_np": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"gpu_units": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
 	}
-	res = append(res, temp)
+
 	return res
 }
 
-func flattenAccAcl(acls []AccountAclRecord) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acls := range acls {
-		temp := map[string]interface{}{
-			"can_be_deleted": acls.CanBeDeleted,
-			"explicit":       acls.IsExplicit,
-			"guid":           acls.Guid,
-			"right":          acls.Rights,
-			"status":         acls.Status,
-			"type":           acls.Type,
-			"user_group_id":  acls.UgroupID,
-		}
-		res = append(res, temp)
+func sepsSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"sep_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"data_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"disk_size": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"disk_size_max": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
+
 	return res
 }
 
-func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"cu_c":      rl.CUC,
-		"cu_d":      rl.CUD,
-		"cu_i":      rl.CUI,
-		"cu_m":      rl.CUM,
-		"cu_np":     rl.CUNP,
-		"gpu_units": rl.GpuUnits,
+func resourcesSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"current": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"cpu": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"disksize": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+					"extips": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"exttraffic": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"gpu": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ram": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"seps": {
+						Type:     schema.TypeSet,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: sepsSchemaMake(),
+						},
+					},
+				},
+			},
+		},
+		"reserved": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"cpu": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"disksize": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+					"extips": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"exttraffic": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"gpu": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ram": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"seps": {
+						Type:     schema.TypeSet,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: sepsSchemaMake(),
+						},
+					},
+				},
+			},
+		},
 	}
-	res = append(res, temp)
 
 	return res
-
-}
-
-func flattenAccResources(r Resources) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"current":  flattenAccResource(r.Current),
-		"reserved": flattenAccResource(r.Reserved),
-	}
-	res = append(res, temp)
-	return res
 }
 
-func flattenAccResource(r Resource) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"cpu":        r.CPU,
-		"disksize":   r.Disksize,
-		"extips":     r.Extips,
-		"exttraffic": r.Exttraffic,
-		"gpu":        r.GPU,
-		"ram":        r.RAM,
+func computesSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"started": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"stopped": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
-	res = append(res, temp)
+
+	return res
+}
+
+func machinesSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"halted": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"running": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+
 	return res
 }
 
@@ -161,6 +263,7 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Required: true,
 		},
+
 		"dc_location": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -169,72 +272,7 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"current": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"reserved": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-				},
+				Schema: resourcesSchemaMake(),
 			},
 		},
 		"ckey": {
@@ -252,36 +290,7 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"can_be_deleted": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"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,
-					},
-				},
+				Schema: aclSchemaMake(),
 			},
 		},
 		"company": {
@@ -328,32 +337,7 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"cu_c": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_d": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_i": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_m": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_np": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"gpu_units": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-				},
+				Schema: resourceLimitsSchemaMake(),
 			},
 		},
 		"send_access_emails": {
@@ -387,32 +371,14 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"started": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"stopped": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
+				Schema: computesSchemaMake(),
 			},
 		},
 		"machines": {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"halted": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"running": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
+				Schema: machinesSchemaMake(),
 			},
 		},
 		"vinses": {

internal/service/cloudapi/account/data_source_account_audits_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountAuditsList(aal AccountAuditsList) []map[string]interface{} {

internal/service/cloudapi/account/data_source_account_computes_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountComputesList(acl AccountComputesList) []map[string]interface{} {

internal/service/cloudapi/account/data_source_account_consumed_units.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceAccountConsumedUnitsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/account/data_source_account_consumed_units_by_type.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceAccountConsumedUnitsByTypeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/account/data_source_account_deleted_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceAccountDeletedListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/account/data_source_account_disks_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 package account
 
@@ -36,7 +37,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountDisksList(adl AccountDisksList) []map[string]interface{} {
@@ -47,6 +48,7 @@ func flattenAccountDisksList(adl AccountDisksList) []map[string]interface{} {
 			"disk_name": ad.Name,
 			"pool":      ad.Pool,
 			"sep_id":    ad.SepId,
+			"shareable": ad.Shareable,
 			"size_max":  ad.SizeMax,
 			"type":      ad.Type,
 		}
@@ -98,6 +100,10 @@ func dataSourceAccountDisksListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"shareable": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"size_max": {
 						Type:     schema.TypeInt,
 						Computed: true,

internal/service/cloudapi/account/data_source_account_flipgroups_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountFlipGroupsList(afgl AccountFlipGroupsList) []map[string]interface{} {

internal/service/cloudapi/account/data_source_account_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountList(al AccountCloudApiList) []map[string]interface{} {

internal/service/cloudapi/account/data_source_account_reserved_units.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceAccountReservedUnitsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/account/data_source_account_rg_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountRGList(argl AccountRGList) []map[string]interface{} {
@@ -74,12 +75,41 @@ func flattenAccRGComputes(argc AccountRGComputes) []map[string]interface{} {
 	return res
 }
 
+func flattenAccResourceHack(r ResourceHack) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cpu":        r.CPU,
+		"disksize":   r.Disksize,
+		"extips":     r.Extips,
+		"exttraffic": r.Exttraffic,
+		"gpu":        r.GPU,
+		"ram":        r.RAM,
+		//"seps":       flattenAccountSeps(r.SEPs),
+	}
+	res = append(res, temp)
+	return res
+}
+
+func flattenAccResourceRg(r Resource) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cpu":        r.CPU,
+		"disksize":   r.Disksize,
+		"extips":     r.Extips,
+		"exttraffic": r.Exttraffic,
+		"gpu":        r.GPU,
+		"ram":        r.RAM,
+	}
+	res = append(res, temp)
+	return res
+}
+
 func flattenAccRGResources(argr AccountRGResources) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
-		"consumed": flattenAccResource(argr.Consumed),
-		"limits":   flattenAccResource(argr.Limits),
-		"reserved": flattenAccResource(argr.Reserved),
+		"consumed": flattenAccResourceRg(argr.Consumed),
+		"limits":   flattenAccResourceHack(argr.Limits),
+		"reserved": flattenAccResourceRg(argr.Reserved),
 	}
 	res = append(res, temp)
 	return res

internal/service/cloudapi/account/data_source_account_templates_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountTemplatesList(atl AccountTemplatesList) []map[string]interface{} {

internal/service/cloudapi/account/data_source_account_vins_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenAccountVinsList(avl AccountVinsList) []map[string]interface{} {

internal/service/cloudapi/account/flattens.go

@@ -0,0 +1,137 @@
+package account
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
+)
+
+func flattenAccount(d *schema.ResourceData, acc AccountWithResources) error {
+	d.Set("dc_location", acc.DCLocation)
+	d.Set("resources", flattenAccResources(acc.Resources))
+	d.Set("ckey", acc.CKey)
+	d.Set("meta", flattens.FlattenMeta(acc.Meta))
+	d.Set("acl", flattenAccAcl(acc.Acl))
+	d.Set("company", acc.Company)
+	d.Set("companyurl", acc.CompanyUrl)
+	d.Set("created_by", acc.CreatedBy)
+	d.Set("created_time", acc.CreatedTime)
+	d.Set("deactivation_time", acc.DeactiovationTime)
+	d.Set("deleted_by", acc.DeletedBy)
+	d.Set("deleted_time", acc.DeletedTime)
+	d.Set("displayname", acc.DisplayName)
+	d.Set("guid", acc.GUID)
+	d.Set("account_id", acc.ID)
+	d.Set("account_name", acc.Name)
+	d.Set("resource_limits", flattenRgResourceLimits(acc.ResourceLimits))
+	d.Set("send_access_emails", acc.SendAccessEmails)
+	d.Set("service_account", acc.ServiceAccount)
+	d.Set("status", acc.Status)
+	d.Set("updated_time", acc.UpdatedTime)
+	d.Set("version", acc.Version)
+	d.Set("vins", acc.Vins)
+	d.Set("vinses", acc.Vinses)
+	d.Set("computes", flattenAccComputes(acc.Computes))
+	d.Set("machines", flattenAccMachines(acc.Machines))
+
+	if username, ok := d.GetOk("username"); ok {
+		d.Set("username", username)
+	} else {
+		d.Set("username", acc.Acl[0].UgroupID)
+	}
+
+	return nil
+}
+
+func flattenAccComputes(acs Computes) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"started": acs.Started,
+		"stopped": acs.Stopped,
+	}
+	res = append(res, temp)
+	return res
+}
+
+func flattenAccMachines(ams Machines) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"running": ams.Running,
+		"halted":  ams.Halted,
+	}
+	res = append(res, temp)
+	return res
+}
+
+func flattenAccAcl(acls []AccountAclRecord) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, acls := range acls {
+		temp := map[string]interface{}{
+			"can_be_deleted": acls.CanBeDeleted,
+			"explicit":       acls.IsExplicit,
+			"guid":           acls.Guid,
+			"right":          acls.Rights,
+			"status":         acls.Status,
+			"type":           acls.Type,
+			"user_group_id":  acls.UgroupID,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cu_c":      rl.CUC,
+		"cu_d":      rl.CUD,
+		"cu_i":      rl.CUI,
+		"cu_m":      rl.CUM,
+		"cu_np":     rl.CUNP,
+		"gpu_units": rl.GpuUnits,
+	}
+	res = append(res, temp)
+
+	return res
+
+}
+
+func flattenAccResources(r Resources) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"current":  flattenAccResource(r.Current),
+		"reserved": flattenAccResource(r.Reserved),
+	}
+	res = append(res, temp)
+	return res
+}
+
+func flattenAccountSeps(seps map[string]map[string]ResourceSep) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for sepKey, sepVal := range seps {
+		for dataKey, dataVal := range sepVal {
+			temp := map[string]interface{}{
+				"sep_id":        sepKey,
+				"data_name":     dataKey,
+				"disk_size":     dataVal.DiskSize,
+				"disk_size_max": dataVal.DiskSizeMax,
+			}
+			res = append(res, temp)
+		}
+	}
+	return res
+}
+
+func flattenAccResource(r Resource) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cpu":        r.CPU,
+		"disksize":   r.Disksize,
+		"extips":     r.Extips,
+		"exttraffic": r.Exttraffic,
+		"gpu":        r.GPU,
+		"ram":        r.RAM,
+		"seps":       flattenAccountSeps(r.SEPs),
+	}
+	res = append(res, temp)
+	return res
+}

internal/service/cloudapi/account/models.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -89,13 +90,19 @@ type AccountCloudApi struct {
 
 type AccountCloudApiList []AccountCloudApi
 
+type ResourceSep struct {
+	DiskSize    float64 `json:"disksize"`
+	DiskSizeMax int     `json:"disksizemax"`
+}
+
 type Resource struct {
-	CPU        int `json:"cpu"`
-	Disksize   int `json:"disksize"`
-	Extips     int `json:"extips"`
-	Exttraffic int `json:"exttraffic"`
-	GPU        int `json:"gpu"`
-	RAM        int `json:"ram"`
+	CPU        int                               `json:"cpu"`
+	Disksize   float64                           `json:"disksize"`
+	Extips     int                               `json:"extips"`
+	Exttraffic int                               `json:"exttraffic"`
+	GPU        int                               `json:"gpu"`
+	RAM        int                               `json:"ram"`
+	SEPs       map[string]map[string]ResourceSep `json:"seps"`
 }
 
 type Resources struct {
@@ -147,12 +154,13 @@ type AccountCompute struct {
 type AccountComputesList []AccountCompute
 
 type AccountDisk struct {
-	ID      int    `json:"id"`
-	Name    string `json:"name"`
-	Pool    string `json:"pool"`
-	SepId   int    `json:"sepId"`
-	SizeMax int    `json:"sizeMax"`
-	Type    string `json:"type"`
+	ID        int    `json:"id"`
+	Name      string `json:"name"`
+	Pool      string `json:"pool"`
+	SepId     int    `json:"sepId"`
+	Shareable bool   `json:"shareable"`
+	SizeMax   int    `json:"sizeMax"`
+	Type      string `json:"type"`
 }
 
 type AccountDisksList []AccountDisk
@@ -194,10 +202,19 @@ type AccountRGComputes struct {
 	Stopped int `json:"Stopped"`
 }
 
+type ResourceHack struct {
+	CPU        int     `json:"cpu"`
+	Disksize   float64 `json:"disksize"`
+	Extips     int     `json:"extips"`
+	Exttraffic int     `json:"exttraffic"`
+	GPU        int     `json:"gpu"`
+	RAM        int     `json:"ram"`
+}
+
 type AccountRGResources struct {
-	Consumed Resource `json:"Consumed"`
-	Limits   Resource `json:"Limits"`
-	Reserved Resource `json:"Reserved"`
+	Consumed Resource     `json:"Consumed"`
+	Limits   ResourceHack `json:"Limits"`
+	Reserved Resource     `json:"Reserved"`
 }
 
 type AccountRG struct {

internal/service/cloudapi/account/resource_account.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -39,10 +40,10 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
-	"github.com/rudecs/terraform-provider-decort/internal/flattens"
 	log "github.com/sirupsen/logrus"
+	"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/status"
 )
 
 func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -121,13 +122,10 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(err)
 	}
 
-	d.SetId(accountId)
-	d.Set("account_id", accountId)
+	accIdParsed, _ := strconv.Atoi(accountId)
 
-	diagnostics := resourceAccountRead(ctx, d, m)
-	if diagnostics != nil {
-		return diagnostics
-	}
+	d.SetId(accountId)
+	d.Set("account_id", accIdParsed)
 
 	urlValues = &url.Values{}
 
@@ -166,44 +164,52 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	return nil
+	return resourceAccountRead(ctx, d, m)
 }
 
 func resourceAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceAccountRead")
+	log.Debugf("resourceAccountRead: called for account with ID: %v", d.Id())
+
+	c := m.(*controller.ControllerCfg)
 
 	acc, err := utilityAccountCheckPresence(ctx, d, m)
-	if acc == nil {
+	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
 	}
 
-	d.Set("dc_location", acc.DCLocation)
-	d.Set("resources", flattenAccResources(acc.Resources))
-	d.Set("ckey", acc.CKey)
-	d.Set("meta", flattens.FlattenMeta(acc.Meta))
-	d.Set("acl", flattenAccAcl(acc.Acl))
-	d.Set("company", acc.Company)
-	d.Set("companyurl", acc.CompanyUrl)
-	d.Set("created_by", acc.CreatedBy)
-	d.Set("created_time", acc.CreatedTime)
-	d.Set("deactivation_time", acc.DeactiovationTime)
-	d.Set("deleted_by", acc.DeletedBy)
-	d.Set("deleted_time", acc.DeletedTime)
-	d.Set("displayname", acc.DisplayName)
-	d.Set("guid", acc.GUID)
-	d.Set("account_id", acc.ID)
-	d.Set("account_name", acc.Name)
-	d.Set("resource_limits", flattenRgResourceLimits(acc.ResourceLimits))
-	d.Set("send_access_emails", acc.SendAccessEmails)
-	d.Set("service_account", acc.ServiceAccount)
-	d.Set("status", acc.Status)
-	d.Set("updated_time", acc.UpdatedTime)
-	d.Set("version", acc.Version)
-	d.Set("vins", acc.Vins)
-	d.Set("vinses", acc.Vinses)
-	d.Set("computes", flattenAccComputes(acc.Computes))
-	d.Set("machines", flattenAccMachines(acc.Machines))
+	hasChanged := false
+
+	switch acc.Status {
+	case status.Destroyed:
+		d.SetId("")
+		return resourceAccountCreate(ctx, d, m)
+	case status.Destroying:
+		return diag.Errorf("The account is in progress with status: %s", acc.Status)
+	case status.Deleted:
+		urlValues := &url.Values{}
+		urlValues.Add("accountId", d.Id())
+
+		_, err := c.DecortAPICall(ctx, "POST", accountRestoreAPI, urlValues)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		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:
+	}
+
+	if hasChanged {
+		acc, err = utilityAccountCheckPresence(ctx, d, m)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	}
+
+	flattenAccount(d, *acc)
 
 	return nil
 }
@@ -233,11 +239,49 @@ func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, m interf
 	return nil
 }
 
-func resourceAccountEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceAccountEdit")
 	c := m.(*controller.ControllerCfg)
 
 	urlValues := &url.Values{}
+
+	acc, err := utilityAccountCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	hasChanged := false
+
+	switch acc.Status {
+	case status.Destroyed:
+		d.SetId("")
+		return resourceAccountCreate(ctx, d, m)
+	case status.Destroying:
+		return diag.Errorf("The account is in progress with status: %s", acc.Status)
+	case status.Deleted:
+		urlVal := &url.Values{}
+		urlVal.Add("accountId", d.Id())
+
+		_, err := c.DecortAPICall(ctx, "POST", accountRestoreAPI, urlVal)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		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:
+	}
+
+	if hasChanged {
+		acc, err = utilityAccountCheckPresence(ctx, d, m)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("enable") {
 		api := accountDisableAPI
 		enable := d.Get("enable").(bool)
@@ -423,7 +467,7 @@ func resourceAccountEdit(ctx context.Context, d *schema.ResourceData, m interfac
 
 	}
 
-	return nil
+	return resourceAccountRead(ctx, d, m)
 }
 
 func isContainsUser(els []interface{}, el interface{}) bool {
@@ -552,7 +596,6 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 		},
 		"account_id": {
 			Type:     schema.TypeInt,
-			Optional: true,
 			Computed: true,
 		},
 		"dc_location": {
@@ -563,72 +606,7 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"current": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"reserved": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-				},
+				Schema: resourcesSchemaMake(),
 			},
 		},
 		"ckey": {
@@ -646,36 +624,7 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"can_be_deleted": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"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,
-					},
-				},
+				Schema: aclSchemaMake(),
 			},
 		},
 		"company": {
@@ -741,32 +690,14 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"started": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"stopped": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
+				Schema: computesSchemaMake(),
 			},
 		},
 		"machines": {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"halted": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"running": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
+				Schema: machinesSchemaMake(),
 			},
 		},
 		"vinses": {
@@ -782,7 +713,7 @@ func ResourceAccount() *schema.Resource {
 
 		CreateContext: resourceAccountCreate,
 		ReadContext:   resourceAccountRead,
-		UpdateContext: resourceAccountEdit,
+		UpdateContext: resourceAccountUpdate,
 		DeleteContext: resourceAccountDelete,
 
 		Importer: &schema.ResourceImporter{

internal/service/cloudapi/account/utility_account.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_audits_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_computes_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_consumed_units.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_consumed_units_by_type.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_deleted_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_disks_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_flip_groups.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_reserved_units.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_rg_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_templates_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/account/utility_account_vins_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package account
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/bservice/api.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice

internal/service/cloudapi/bservice/data_source_bservice.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,23 +22,23 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
 
 import (
 	"context"
+	"strconv"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -46,70 +47,13 @@ func dataSourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m i
 		return diag.FromErr(err)
 	}
 
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("account_id", bs.AccountId)
-	d.Set("account_name", bs.AccountName)
-	d.Set("base_domain", bs.BaseDomain)
-	d.Set("computes", flattenBasicServiceComputes(bs.Computes))
-	d.Set("cpu_total", bs.CPUTotal)
-	d.Set("created_by", bs.CreatedBy)
-	d.Set("created_time", bs.CreatedTime)
-	d.Set("deleted_by", bs.DeletedBy)
-	d.Set("deleted_time", bs.DeletedTime)
-	d.Set("disk_total", bs.DiskTotal)
-	d.Set("gid", bs.GID)
-	d.Set("groups", bs.Groups)
-	d.Set("groups_name", bs.GroupsName)
-	d.Set("guid", bs.GUID)
-	d.Set("milestones", bs.Milestones)
-	d.Set("service_name", bs.Name)
-	d.Set("parent_srv_id", bs.ParentSrvId)
-	d.Set("parent_srv_type", bs.ParentSrvType)
-	d.Set("ram_total", bs.RamTotal)
-	d.Set("rg_id", bs.RGID)
-	d.Set("rg_name", bs.RGName)
-	d.Set("snapshots", flattenBasicServiceSnapshots(bs.Snapshots))
-	d.Set("ssh_key", bs.SSHKey)
-	d.Set("ssh_user", bs.SSHUser)
-	d.Set("status", bs.Status)
-	d.Set("tech_status", bs.TechStatus)
-	d.Set("updated_by", bs.UpdatedBy)
-	d.Set("updated_time", bs.UpdatedTime)
-	d.Set("user_managed", bs.UserManaged)
+	d.SetId(strconv.Itoa(bs.ID))
+
+	flattenService(d, bs)
+
 	return nil
 }
 
-func flattenBasicServiceComputes(bscs BasicServiceComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsc := range bscs {
-		temp := map[string]interface{}{
-			"compgroup_id":   bsc.CompGroupId,
-			"compgroup_name": bsc.CompGroupName,
-			"compgroup_role": bsc.CompGroupRole,
-			"id":             bsc.ID,
-			"name":           bsc.Name,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func flattenBasicServiceSnapshots(bsrvss BasicServiceSnapshots) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsrvs := range bsrvss {
-		temp := map[string]interface{}{
-			"guid":      bsrvs.GUID,
-			"label":     bsrvs.Label,
-			"timestamp": bsrvs.Timestamp,
-			"valid":     bsrvs.Valid,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
 func dataSourceBasicServiceSchemaMake() map[string]*schema.Schema {
 	res := map[string]*schema.Schema{
 		"service_id": {

internal/service/cloudapi/bservice/data_source_bservice_deleted_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceBasicServiceDeletedListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/bservice/data_source_bservice_group.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceBasicServiceGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/bservice/data_source_bservice_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenBasicServiceList(bsl BasicServiceList) []map[string]interface{} {

internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceBasicServiceSnapshotListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/bservice/flattens.go

@@ -0,0 +1,66 @@
+package bservice
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func flattenService(d *schema.ResourceData, bs *BasicServiceExtend) {
+	d.Set("account_id", bs.AccountId)
+	d.Set("account_name", bs.AccountName)
+	d.Set("base_domain", bs.BaseDomain)
+	d.Set("computes", flattenBasicServiceComputes(bs.Computes))
+	d.Set("cpu_total", bs.CPUTotal)
+	d.Set("created_by", bs.CreatedBy)
+	d.Set("created_time", bs.CreatedTime)
+	d.Set("deleted_by", bs.DeletedBy)
+	d.Set("deleted_time", bs.DeletedTime)
+	d.Set("disk_total", bs.DiskTotal)
+	d.Set("gid", bs.GID)
+	d.Set("groups", bs.Groups)
+	d.Set("groups_name", bs.GroupsName)
+	d.Set("guid", bs.GUID)
+	d.Set("milestones", bs.Milestones)
+	d.Set("service_name", bs.Name)
+	d.Set("service_id", bs.ID)
+	d.Set("parent_srv_id", bs.ParentSrvId)
+	d.Set("parent_srv_type", bs.ParentSrvType)
+	d.Set("ram_total", bs.RamTotal)
+	d.Set("rg_id", bs.RGID)
+	d.Set("rg_name", bs.RGName)
+	d.Set("snapshots", flattenBasicServiceSnapshots(bs.Snapshots))
+	d.Set("ssh_key", bs.SSHKey)
+	d.Set("ssh_user", bs.SSHUser)
+	d.Set("status", bs.Status)
+	d.Set("tech_status", bs.TechStatus)
+	d.Set("updated_by", bs.UpdatedBy)
+	d.Set("updated_time", bs.UpdatedTime)
+	d.Set("user_managed", bs.UserManaged)
+}
+
+func flattenBasicServiceComputes(bscs BasicServiceComputes) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, bsc := range bscs {
+		temp := map[string]interface{}{
+			"compgroup_id":   bsc.CompGroupId,
+			"compgroup_name": bsc.CompGroupName,
+			"compgroup_role": bsc.CompGroupRole,
+			"id":             bsc.ID,
+			"name":           bsc.Name,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenBasicServiceSnapshots(bsrvss BasicServiceSnapshots) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, bsrvs := range bsrvss {
+		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/models.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice

internal/service/cloudapi/bservice/resource_bservice.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -38,9 +39,10 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"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/status"
 )
 
 func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -49,6 +51,15 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 	c := m.(*controller.ControllerCfg)
 	urlValues := &url.Values{}
 
+	haveRGID, err := existRGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveRGID {
+		return diag.Errorf("resourceBasicServiceCreate: can't create basic service because RGID %d is not allowed or does not exist", d.Get("rg_id").(int))
+	}
+
 	urlValues.Add("name", d.Get("service_name").(string))
 	urlValues.Add("rgId", strconv.Itoa(d.Get("rg_id").(int)))
 
@@ -64,8 +75,10 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 		return diag.FromErr(err)
 	}
 
+	serviceIdParsed, _ := strconv.Atoi(serviceId)
+
 	d.SetId(serviceId)
-	d.Set("service_id", serviceId)
+	d.Set("service_id", serviceIdParsed)
 
 	diagnostics := resourceBasicServiceRead(ctx, d, m)
 	if diagnostics != nil {
@@ -78,42 +91,55 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 func resourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceBasicServiceRead")
 
+	c := m.(*controller.ControllerCfg)
+
 	bs, err := utilityBasicServiceCheckPresence(ctx, d, m)
-	if bs == nil {
+	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
 	}
 
-	d.Set("account_id", bs.AccountId)
-	d.Set("account_name", bs.AccountName)
-	d.Set("base_domain", bs.BaseDomain)
-	d.Set("computes", flattenBasicServiceComputes(bs.Computes))
-	d.Set("cpu_total", bs.CPUTotal)
-	d.Set("created_by", bs.CreatedBy)
-	d.Set("created_time", bs.CreatedTime)
-	d.Set("deleted_by", bs.DeletedBy)
-	d.Set("deleted_time", bs.DeletedTime)
-	d.Set("disk_total", bs.DiskTotal)
-	d.Set("gid", bs.GID)
-	d.Set("groups", bs.Groups)
-	d.Set("groups_name", bs.GroupsName)
-	d.Set("guid", bs.GUID)
-	d.Set("milestones", bs.Milestones)
-	d.Set("service_name", bs.Name)
-	d.Set("service_id", bs.ID)
-	d.Set("parent_srv_id", bs.ParentSrvId)
-	d.Set("parent_srv_type", bs.ParentSrvType)
-	d.Set("ram_total", bs.RamTotal)
-	d.Set("rg_id", bs.RGID)
-	d.Set("rg_name", bs.RGName)
-	d.Set("snapshots", flattenBasicServiceSnapshots(bs.Snapshots))
-	d.Set("ssh_key", bs.SSHKey)
-	d.Set("ssh_user", bs.SSHUser)
-	d.Set("status", bs.Status)
-	d.Set("tech_status", bs.TechStatus)
-	d.Set("updated_by", bs.UpdatedBy)
-	d.Set("updated_time", bs.UpdatedTime)
-	d.Set("user_managed", bs.UserManaged)
+	hasChanged := false
+
+	switch bs.Status {
+	case status.Modeled:
+		return diag.Errorf("The basic service is in status: %s, please, contact support for more information", bs.Status)
+	case status.Created:
+	case status.Enabled:
+	case status.Enabling:
+	case status.Disabled:
+		log.Debugf("The basic service is in status: %s, troubles can occur with the update. Please, enable bservice first.", bs.Status)
+	case status.Disabling:
+		log.Debugf("The basic service is in status: %s, troubles can occur with the update.", bs.Status)
+	case status.Deleted:
+		urlVal := &url.Values{}
+		urlVal.Add("serviceId", d.Id())
+
+		_, err := c.DecortAPICall(ctx, "POST", bserviceRestoreAPI, urlVal)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		hasChanged = true
+	case status.Deleting:
+	case status.Destroyed:
+		d.SetId("")
+		return resourceBasicServiceCreate(ctx, d, m)
+	case status.Destroying:
+		return diag.Errorf("The basic service is in progress with status: %s", bs.Status)
+	case status.Restoring:
+	case status.Reconfiguring:
+	}
+
+	if hasChanged {
+		bs, err = utilityBasicServiceCheckPresence(ctx, d, m)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	}
+
+	flattenService(d, bs)
 
 	return nil
 }
@@ -143,10 +169,65 @@ func resourceBasicServiceDelete(ctx context.Context, d *schema.ResourceData, m i
 	return nil
 }
 
-func resourceBasicServiceEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceBasicServiceEdit")
 	c := m.(*controller.ControllerCfg)
 
+	haveRGID, err := existRGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveRGID {
+		return diag.Errorf("resourceBasicServiceUpdate: can't create basic service because RGID %d is not allowed or does not exist", d.Get("rg_id").(int))
+	}
+
+	bs, err := utilityBasicServiceCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	hasChanged := false
+
+	switch bs.Status {
+	case status.Modeled:
+		return diag.Errorf("The basic service is in status: %s, please, contact support for more information", bs.Status)
+	case status.Created:
+	case status.Enabled:
+	case status.Enabling:
+	case status.Disabled:
+		log.Debugf("The basic service is in status: %s, troubles can occur with the update. Please, enable bservice first.", bs.Status)
+	case status.Disabling:
+		log.Debugf("The basic service is in status: %s, troubles can occur with the update.", bs.Status)
+	case status.Deleted:
+		urlVal := &url.Values{}
+		urlVal.Add("serviceId", d.Id())
+
+		_, err := c.DecortAPICall(ctx, "POST", bserviceRestoreAPI, urlVal)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		hasChanged = true
+	case status.Deleting:
+	case status.Destroyed:
+		d.SetId("")
+		return resourceBasicServiceCreate(ctx, d, m)
+	case status.Destroying:
+		return diag.Errorf("The basic service is in progress with status: %s", bs.Status)
+	case status.Restoring:
+	case status.Reconfiguring:
+	}
+
+	if hasChanged {
+		bs, err = utilityBasicServiceCheckPresence(ctx, d, m)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	}
+
 	urlValues := &url.Values{}
 	if d.HasChange("enable") {
 		api := bserviceDisableAPI
@@ -507,7 +588,7 @@ func ResourceBasicService() *schema.Resource {
 
 		CreateContext: resourceBasicServiceCreate,
 		ReadContext:   resourceBasicServiceRead,
-		UpdateContext: resourceBasicServiceEdit,
+		UpdateContext: resourceBasicServiceUpdate,
 		DeleteContext: resourceBasicServiceDelete,
 
 		Importer: &schema.ResourceImporter{

internal/service/cloudapi/bservice/resource_bservice_group.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -40,9 +41,9 @@ import (
 	"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"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
 func resourceBasicServiceGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/bservice/resource_check_input_values.go

@@ -0,0 +1,42 @@
+package bservice
+
+import (
+	"context"
+	"encoding/json"
+	"net/url"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func existRGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
+	c := m.(*controller.ControllerCfg)
+	urlValues := &url.Values{}
+
+	rgList := []struct {
+		ID int `json:"id"`
+	}{}
+
+	rgListAPI := "/restmachine/cloudapi/rg/list"
+
+	rgListRaw, err := c.DecortAPICall(ctx, "POST", rgListAPI, urlValues)
+	if err != nil {
+		return false, err
+	}
+
+	err = json.Unmarshal([]byte(rgListRaw), &rgList)
+	if err != nil {
+		return false, err
+	}
+
+	haveRG := false
+	rgId := d.Get("rg_id").(int)
+	for _, rg := range rgList {
+		if rg.ID == rgId {
+			haveRG = true
+			break
+		}
+	}
+
+	return haveRG, nil
+}

internal/service/cloudapi/bservice/utility_bservicce_deleted_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/bservice/utility_bservice.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/bservice/utility_bservice_group.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/bservice/utility_bservice_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/bservice/utility_bservice_snapshot_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package bservice
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/disks/api.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -47,4 +47,6 @@ const (
 
 	disksSnapshotDeleteAPI   = "/restmachine/cloudapi/disks/snapshotDelete"
 	disksSnapshotRollbackAPI = "/restmachine/cloudapi/disks/snapshotRollback"
+	disksShareAPI            = "/restmachine/cloudapi/disks/share"
+	disksUnshareAPI          = "/restmachine/cloudapi/disks/unshare"
 )

internal/service/cloudapi/disks/data_source_disk.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -39,7 +39,7 @@ import (
 	// "net/url"
 
 	"github.com/google/uuid"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -60,8 +60,7 @@ func dataSourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface
 	d.Set("account_name", disk.AccountName)
 	d.Set("acl", string(diskAcl))
 	d.Set("boot_partition", disk.BootPartition)
-	d.Set("compute_id", disk.ComputeID)
-	d.Set("compute_name", disk.ComputeName)
+	d.Set("computes", flattenDiskComputes(disk.Computes))
 	d.Set("created_time", disk.CreatedTime)
 	d.Set("deleted_time", disk.DeletedTime)
 	d.Set("desc", disk.Desc)
@@ -84,6 +83,7 @@ func dataSourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface
 	d.Set("passwd", disk.Passwd)
 	d.Set("pci_slot", disk.PciSlot)
 	d.Set("pool", disk.Pool)
+	d.Set("present_to", disk.PresentTo)
 	d.Set("purge_attempts", disk.PurgeAttempts)
 	d.Set("purge_time", disk.PurgeTime)
 	d.Set("reality_device_number", disk.RealityDeviceNumber)
@@ -93,6 +93,7 @@ func dataSourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface
 	d.Set("role", disk.Role)
 	d.Set("sep_id", disk.SepID)
 	d.Set("sep_type", disk.SepType)
+	d.Set("shareable", disk.Shareable)
 	d.Set("size_max", disk.SizeMax)
 	d.Set("size_used", disk.SizeUsed)
 	d.Set("snapshots", flattenDiskSnapshotList(disk.Snapshots))
@@ -130,15 +131,21 @@ func dataSourceDiskSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Number of disk partitions",
 		},
-		"compute_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Compute ID",
-		},
-		"compute_name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "Compute name",
+		"computes": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"compute_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"compute_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
 		},
 		"created_time": {
 			Type:        schema.TypeInt,
@@ -316,6 +323,13 @@ func dataSourceDiskSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Pool for disk location",
 		},
+		"present_to": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"purge_attempts": {
 			Type:        schema.TypeInt,
 			Computed:    true,
@@ -361,13 +375,17 @@ func dataSourceDiskSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Type SEP. Defines the type of storage system and contains one of the values set in the cloud platform",
 		},
+		"shareable": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"size_max": {
 			Type:        schema.TypeInt,
 			Computed:    true,
 			Description: "Size in GB",
 		},
 		"size_used": {
-			Type:        schema.TypeInt,
+			Type:        schema.TypeFloat,
 			Computed:    true,
 			Description: "Number of used space, in GB",
 		},

internal/service/cloudapi/disks/data_source_disk_list.go

@@ -22,124 +22,25 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
-func flattenIOTune(iot IOTune) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"read_bytes_sec":      iot.ReadBytesSec,
-		"read_bytes_sec_max":  iot.ReadBytesSecMax,
-		"read_iops_sec":       iot.ReadIopsSec,
-		"read_iops_sec_max":   iot.ReadIopsSecMax,
-		"size_iops_sec":       iot.SizeIopsSec,
-		"total_bytes_sec":     iot.TotalBytesSec,
-		"total_bytes_sec_max": iot.TotalBytesSecMax,
-		"total_iops_sec":      iot.TotalIopsSec,
-		"total_iops_sec_max":  iot.TotalIopsSecMax,
-		"write_bytes_sec":     iot.WriteBytesSec,
-		"write_bytes_sec_max": iot.WriteBytesSecMax,
-		"write_iops_sec":      iot.WriteIopsSec,
-		"write_iops_sec_max":  iot.WriteIopsSecMax,
-	}
-
-	res = append(res, temp)
-	return res
-}
-
-func flattenDiskList(dl DisksList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, disk := range dl {
-		diskAcl, _ := json.Marshal(disk.Acl)
-		temp := map[string]interface{}{
-			"account_id":            disk.AccountID,
-			"account_name":          disk.AccountName,
-			"acl":                   string(diskAcl),
-			"boot_partition":        disk.BootPartition,
-			"compute_id":            disk.ComputeID,
-			"compute_name":          disk.ComputeName,
-			"created_time":          disk.CreatedTime,
-			"deleted_time":          disk.DeletedTime,
-			"desc":                  disk.Desc,
-			"destruction_time":      disk.DestructionTime,
-			"devicename":            disk.DeviceName,
-			"disk_path":             disk.DiskPath,
-			"gid":                   disk.GridID,
-			"guid":                  disk.GUID,
-			"disk_id":               disk.ID,
-			"image_id":              disk.ImageID,
-			"images":                disk.Images,
-			"iotune":                flattenIOTune(disk.IOTune),
-			"iqn":                   disk.IQN,
-			"login":                 disk.Login,
-			"machine_id":            disk.MachineId,
-			"machine_name":          disk.MachineName,
-			"milestones":            disk.Milestones,
-			"disk_name":             disk.Name,
-			"order":                 disk.Order,
-			"params":                disk.Params,
-			"parent_id":             disk.ParentId,
-			"passwd":                disk.Passwd,
-			"pci_slot":              disk.PciSlot,
-			"pool":                  disk.Pool,
-			"purge_attempts":        disk.PurgeAttempts,
-			"purge_time":            disk.PurgeTime,
-			"reality_device_number": disk.RealityDeviceNumber,
-			"reference_id":          disk.ReferenceId,
-			"res_id":                disk.ResID,
-			"res_name":              disk.ResName,
-			"role":                  disk.Role,
-			"sep_id":                disk.SepID,
-			"sep_type":              disk.SepType,
-			"size_max":              disk.SizeMax,
-			"size_used":             disk.SizeUsed,
-			"snapshots":             flattenDiskSnapshotList(disk.Snapshots),
-			"status":                disk.Status,
-			"tech_status":           disk.TechStatus,
-			"type":                  disk.Type,
-			"vmid":                  disk.VMID,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func flattenDiskSnapshotList(sl SnapshotList) []interface{} {
-	res := make([]interface{}, 0)
-	for _, snapshot := range sl {
-		temp := map[string]interface{}{
-			"guid":          snapshot.Guid,
-			"label":         snapshot.Label,
-			"res_id":        snapshot.ResId,
-			"snap_set_guid": snapshot.SnapSetGuid,
-			"snap_set_time": snapshot.SnapSetTime,
-			"timestamp":     snapshot.TimeStamp,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-
-}
-
 func dataSourceDiskListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	diskList, err := utilityDiskListCheckPresence(ctx, d, m, disksListAPI)
 	if err != nil {
@@ -199,15 +100,21 @@ func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "Number of disk partitions",
 					},
-					"compute_id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Compute ID",
-					},
-					"compute_name": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Compute name",
+					"computes": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"compute_id": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"compute_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+							},
+						},
 					},
 					"created_time": {
 						Type:        schema.TypeInt,
@@ -400,6 +307,13 @@ func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "Pool for disk location",
 					},
+					"present_to": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
 					"purge_attempts": {
 						Type:        schema.TypeInt,
 						Computed:    true,
@@ -445,13 +359,17 @@ func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "Type SEP. Defines the type of storage system and contains one of the values set in the cloud platform",
 					},
+					"shareable": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"size_max": {
 						Type:        schema.TypeInt,
 						Computed:    true,
 						Description: "Size in GB",
 					},
 					"size_used": {
-						Type:        schema.TypeInt,
+						Type:        schema.TypeFloat,
 						Computed:    true,
 						Description: "Number of used space, in GB",
 					},

internal/service/cloudapi/disks/data_source_disk_list_types.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceDiskListTypesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenDiskListTypesDetailed(tld TypesDetailedList) []map[string]interface{} {

internal/service/cloudapi/disks/data_source_disk_list_unattached.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -41,9 +41,9 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
-	"github.com/rudecs/terraform-provider-decort/internal/flattens"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -415,7 +415,7 @@ func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 						Description: "Size in GB",
 					},
 					"size_used": {
-						Type:        schema.TypeInt,
+						Type:        schema.TypeFloat,
 						Computed:    true,
 						Description: "Number of used space, in GB",
 					},

internal/service/cloudapi/disks/data_source_disk_snapshot.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceDiskSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/disks/data_source_disk_snapshot_list.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceDiskSnapshotListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/disks/data_source_list_deleted.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceDiskListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/disks/flattens.go

@@ -0,0 +1,166 @@
+package disks
+
+import (
+	"encoding/json"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func flattenDisk(d *schema.ResourceData, disk Disk) {
+	diskAcl, _ := json.Marshal(disk.Acl)
+
+	d.Set("account_id", disk.AccountID)
+	d.Set("account_name", disk.AccountName)
+	d.Set("acl", string(diskAcl))
+	d.Set("boot_partition", disk.BootPartition)
+	d.Set("computes", flattenDiskComputes(disk.Computes))
+	d.Set("created_time", disk.CreatedTime)
+	d.Set("deleted_time", disk.DeletedTime)
+	d.Set("desc", disk.Desc)
+	d.Set("destruction_time", disk.DestructionTime)
+	d.Set("devicename", disk.DeviceName)
+	d.Set("disk_path", disk.DiskPath)
+	d.Set("gid", disk.GridID)
+	d.Set("guid", disk.GUID)
+	d.Set("disk_id", disk.ID)
+	d.Set("image_id", disk.ImageID)
+	d.Set("images", disk.Images)
+	d.Set("iotune", flattenIOTune(disk.IOTune))
+	d.Set("iqn", disk.IQN)
+	d.Set("login", disk.Login)
+	d.Set("milestones", disk.Milestones)
+	d.Set("disk_name", disk.Name)
+	d.Set("order", disk.Order)
+	d.Set("params", disk.Params)
+	d.Set("parent_id", disk.ParentId)
+	d.Set("passwd", disk.Passwd)
+	d.Set("pci_slot", disk.PciSlot)
+	d.Set("pool", disk.Pool)
+	d.Set("present_to", disk.PresentTo)
+	d.Set("purge_attempts", disk.PurgeAttempts)
+	d.Set("purge_time", disk.PurgeTime)
+	d.Set("reality_device_number", disk.RealityDeviceNumber)
+	d.Set("reference_id", disk.ReferenceId)
+	d.Set("res_id", disk.ResID)
+	d.Set("res_name", disk.ResName)
+	d.Set("role", disk.Role)
+	d.Set("sep_id", disk.SepID)
+	d.Set("sep_type", disk.SepType)
+	d.Set("size_max", disk.SizeMax)
+	d.Set("size_used", disk.SizeUsed)
+	d.Set("shareable", disk.Shareable)
+	d.Set("snapshots", flattenDiskSnapshotList(disk.Snapshots))
+	d.Set("status", disk.Status)
+	d.Set("tech_status", disk.TechStatus)
+	d.Set("type", disk.Type)
+	d.Set("vmid", disk.VMID)
+}
+
+func flattenDiskSnapshotList(sl SnapshotList) []interface{} {
+	res := make([]interface{}, 0)
+	for _, snapshot := range sl {
+		temp := map[string]interface{}{
+			"guid":          snapshot.Guid,
+			"label":         snapshot.Label,
+			"res_id":        snapshot.ResId,
+			"snap_set_guid": snapshot.SnapSetGuid,
+			"snap_set_time": snapshot.SnapSetTime,
+			"timestamp":     snapshot.TimeStamp,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenDiskList(dl DisksList) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, disk := range dl {
+		diskAcl, _ := json.Marshal(disk.Acl)
+		temp := map[string]interface{}{
+			"account_id":            disk.AccountID,
+			"account_name":          disk.AccountName,
+			"acl":                   string(diskAcl),
+			"computes":              flattenDiskComputes(disk.Computes),
+			"boot_partition":        disk.BootPartition,
+			"created_time":          disk.CreatedTime,
+			"deleted_time":          disk.DeletedTime,
+			"desc":                  disk.Desc,
+			"destruction_time":      disk.DestructionTime,
+			"devicename":            disk.DeviceName,
+			"disk_path":             disk.DiskPath,
+			"gid":                   disk.GridID,
+			"guid":                  disk.GUID,
+			"disk_id":               disk.ID,
+			"image_id":              disk.ImageID,
+			"images":                disk.Images,
+			"iotune":                flattenIOTune(disk.IOTune),
+			"iqn":                   disk.IQN,
+			"login":                 disk.Login,
+			"machine_id":            disk.MachineId,
+			"machine_name":          disk.MachineName,
+			"milestones":            disk.Milestones,
+			"disk_name":             disk.Name,
+			"order":                 disk.Order,
+			"params":                disk.Params,
+			"parent_id":             disk.ParentId,
+			"passwd":                disk.Passwd,
+			"pci_slot":              disk.PciSlot,
+			"pool":                  disk.Pool,
+			"present_to":            disk.PresentTo,
+			"purge_attempts":        disk.PurgeAttempts,
+			"purge_time":            disk.PurgeTime,
+			"reality_device_number": disk.RealityDeviceNumber,
+			"reference_id":          disk.ReferenceId,
+			"res_id":                disk.ResID,
+			"res_name":              disk.ResName,
+			"role":                  disk.Role,
+			"sep_id":                disk.SepID,
+			"sep_type":              disk.SepType,
+			"shareable":             disk.Shareable,
+			"size_max":              disk.SizeMax,
+			"size_used":             disk.SizeUsed,
+			"snapshots":             flattenDiskSnapshotList(disk.Snapshots),
+			"status":                disk.Status,
+			"tech_status":           disk.TechStatus,
+			"type":                  disk.Type,
+			"vmid":                  disk.VMID,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenIOTune(iot IOTune) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"read_bytes_sec":      iot.ReadBytesSec,
+		"read_bytes_sec_max":  iot.ReadBytesSecMax,
+		"read_iops_sec":       iot.ReadIopsSec,
+		"read_iops_sec_max":   iot.ReadIopsSecMax,
+		"size_iops_sec":       iot.SizeIopsSec,
+		"total_bytes_sec":     iot.TotalBytesSec,
+		"total_bytes_sec_max": iot.TotalBytesSecMax,
+		"total_iops_sec":      iot.TotalIopsSec,
+		"total_iops_sec_max":  iot.TotalIopsSecMax,
+		"write_bytes_sec":     iot.WriteBytesSec,
+		"write_bytes_sec_max": iot.WriteBytesSecMax,
+		"write_iops_sec":      iot.WriteIopsSec,
+		"write_iops_sec_max":  iot.WriteIopsSecMax,
+	}
+
+	res = append(res, temp)
+	return res
+}
+
+func flattenDiskComputes(computes map[string]string) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for computeKey, computeVal := range computes {
+		temp := map[string]interface{}{
+			"compute_id":   computeKey,
+			"compute_name": computeVal,
+		}
+		res = append(res, temp)
+	}
+	return res
+}

internal/service/cloudapi/disks/models.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -37,9 +37,8 @@ type Disk struct {
 	AccountID           int                    `json:"accountId"`
 	AccountName         string                 `json:"accountName"`
 	BootPartition       int                    `json:"bootPartition"`
+	Computes            map[string]string      `json:"computes"`
 	CreatedTime         uint64                 `json:"creationTime"`
-	ComputeID           int                    `json:"computeId"`
-	ComputeName         string                 `json:"computeName"`
 	DeletedTime         uint64                 `json:"deletionTime"`
 	DeviceName          string                 `json:"devicename"`
 	Desc                string                 `json:"desc"`
@@ -63,6 +62,7 @@ type Disk struct {
 	ParentId            int                    `json:"parentId"`
 	PciSlot             int                    `json:"pciSlot"`
 	Pool                string                 `json:"pool"`
+	PresentTo           []int                  `json:"presentTo"`
 	PurgeTime           uint64                 `json:"purgeTime"`
 	PurgeAttempts       uint64                 `json:"purgeAttempts"`
 	RealityDeviceNumber int                    `json:"realityDeviceNumber"`
@@ -71,9 +71,10 @@ type Disk struct {
 	ResName             string                 `json:"resName"`
 	Role                string                 `json:"role"`
 	SepType             string                 `json:"sepType"`
+	Shareable           bool                   `json:"shareable"`
 	SepID               int                    `json:"sepId"` // NOTE: absent from compute/get output
 	SizeMax             int                    `json:"sizeMax"`
-	SizeUsed            int                    `json:"sizeUsed"` // sum over all snapshots of this disk to report total consumed space
+	SizeUsed            float64                `json:"sizeUsed"` // sum over all snapshots of this disk to report total consumed space
 	Snapshots           []Snapshot             `json:"snapshots"`
 	Status              string                 `json:"status"`
 	TechStatus          string                 `json:"techStatus"`
@@ -164,7 +165,7 @@ type Unattached struct {
 	Role                string                 `json:"role"`
 	SepID               int                    `json:"sepId"`
 	SizeMax             int                    `json:"sizeMax"`
-	SizeUsed            int                    `json:"sizeUsed"`
+	SizeUsed            float64                `json:"sizeUsed"`
 	Snapshots           []Snapshot             `json:"snapshots"`
 	Status              string                 `json:"status"`
 	TechStatus          string                 `json:"techStatus"`
@@ -173,3 +174,8 @@ type Unattached struct {
 }
 
 type UnattachedList []Unattached
+
+type Pair struct {
+	intPort      int
+	extPortStart int
+}

internal/service/cloudapi/disks/resource_check_input_values.go

@@ -0,0 +1,77 @@
+package disks
+
+import (
+	"context"
+	"encoding/json"
+	"net/url"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func existAccountID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
+	c := m.(*controller.ControllerCfg)
+
+	urlValues := &url.Values{}
+
+	accountList := []struct {
+		ID int `json:"id"`
+	}{}
+
+	accountListAPI := "/restmachine/cloudapi/account/list"
+
+	accountListRaw, err := c.DecortAPICall(ctx, "POST", accountListAPI, urlValues)
+	if err != nil {
+		return false, err
+	}
+
+	err = json.Unmarshal([]byte(accountListRaw), &accountList)
+	if err != nil {
+		return false, err
+	}
+
+	haveAccount := false
+
+	myAccount := d.Get("account_id").(int)
+	for _, account := range accountList {
+		if account.ID == myAccount {
+			haveAccount = true
+			break
+		}
+	}
+	return haveAccount, nil
+}
+
+func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
+	c := m.(*controller.ControllerCfg)
+
+	urlValues := &url.Values{}
+
+	locationList := []struct {
+		GID int `json:"gid"`
+	}{}
+
+	locationsListAPI := "/restmachine/cloudapi/locations/list"
+
+	locationListRaw, err := c.DecortAPICall(ctx, "POST", locationsListAPI, urlValues)
+	if err != nil {
+		return false, err
+	}
+
+	err = json.Unmarshal([]byte(locationListRaw), &locationList)
+	if err != nil {
+		return false, err
+	}
+
+	haveGID := false
+
+	gid := d.Get("gid").(int)
+	for _, location := range locationList {
+		if location.GID == gid {
+			haveGID = true
+			break
+		}
+	}
+
+	return haveGID, nil
+}

internal/service/cloudapi/disks/resource_disk.go

@@ -22,28 +22,28 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/url"
 	"strconv"
 	"strings"
 
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
-	"github.com/rudecs/terraform-provider-decort/internal/status"
 	log "github.com/sirupsen/logrus"
+	"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"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -54,10 +54,26 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 	c := m.(*controller.ControllerCfg)
 	urlValues := &url.Values{}
 
-	urlValues.Add("accountId", fmt.Sprintf("%d", d.Get("account_id").(int)))
-	urlValues.Add("gid", fmt.Sprintf("%d", d.Get("gid").(int)))
+	haveAccount, err := existAccountID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	if !haveAccount {
+		return diag.Errorf("resourceDiskCreate: can't create Disk because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
+	}
+
+	haveGID, err := existGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	if !haveGID {
+		return diag.Errorf("resourceDiskCreate: can't create Disk because GID %d is not allowed or does not exist", d.Get("gid").(int))
+	}
+
+	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
+	urlValues.Add("gid", strconv.Itoa(d.Get("gid").(int)))
 	urlValues.Add("name", d.Get("disk_name").(string))
-	urlValues.Add("size", fmt.Sprintf("%d", d.Get("size_max").(int)))
+	urlValues.Add("size", strconv.Itoa(d.Get("size_max").(int)))
 	if typeRaw, ok := d.GetOk("type"); ok {
 		urlValues.Add("type", strings.ToUpper(typeRaw.(string)))
 	} else {
@@ -84,7 +100,7 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 
 	urlValues = &url.Values{}
 
-	d.SetId(diskId) // update ID of the resource to tell Terraform that the disk resource exists
+	d.SetId(diskId)
 
 	if iotuneRaw, ok := d.GetOk("iotune"); ok {
 		iot := iotuneRaw.([]interface{})[0]
@@ -112,6 +128,15 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 		urlValues = &url.Values{}
 	}
 
+	if shareable := d.Get("shareable"); shareable.(bool) == true {
+		urlValues.Add("diskId", diskId)
+		_, err := c.DecortAPICall(ctx, "POST", disksShareAPI, urlValues)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		urlValues = &url.Values{}
+	}
+
 	dgn := resourceDiskRead(ctx, d, m)
 	if dgn != nil {
 		return dgn
@@ -123,109 +148,107 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 func resourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	urlValues := &url.Values{}
 	c := m.(*controller.ControllerCfg)
+	warnings := dc.Warnings{}
 
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
-	if disk == nil {
+	if err != nil {
 		d.SetId("")
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		return nil
+		return diag.FromErr(err)
 	}
 
-	if disk.Status == status.Destroyed || disk.Status == status.Purged {
+	hasChangeState := false
+
+	switch disk.Status {
+	case status.Destroyed, status.Purged:
 		d.Set("disk_id", 0)
 		return resourceDiskCreate(ctx, d, m)
-	} else if disk.Status == status.Deleted {
+	case status.Deleted:
+		hasChangeState = true
 		urlValues.Add("diskId", d.Id())
 		urlValues.Add("reason", d.Get("reason").(string))
 
 		_, err := c.DecortAPICall(ctx, "POST", disksRestoreAPI, urlValues)
 		if err != nil {
-			return diag.FromErr(err)
+			warnings.Add(err)
 		}
-		urlValues = &url.Values{}
+	case status.Assigned:
+	case status.Modeled:
+		return diag.Errorf("The disk is in status: %s, please, contact support for more information", disk.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Allocated:
+	case status.Unallocated:
+	}
+
+	if hasChangeState {
 		disk, err = utilityDiskCheckPresence(ctx, d, m)
-		if disk == nil {
+		if err != nil {
 			d.SetId("")
-			if err != nil {
-				return diag.FromErr(err)
-			}
-			return nil
+			return diag.FromErr(err)
 		}
 	}
 
-	diskAcl, _ := json.Marshal(disk.Acl)
+	flattenDisk(d, *disk)
 
-	d.Set("account_id", disk.AccountID)
-	d.Set("account_name", disk.AccountName)
-	d.Set("acl", string(diskAcl))
-	d.Set("boot_partition", disk.BootPartition)
-	d.Set("compute_id", disk.ComputeID)
-	d.Set("compute_name", disk.ComputeName)
-	d.Set("created_time", disk.CreatedTime)
-	d.Set("deleted_time", disk.DeletedTime)
-	d.Set("desc", disk.Desc)
-	d.Set("destruction_time", disk.DestructionTime)
-	d.Set("devicename", disk.DeviceName)
-	d.Set("disk_path", disk.DiskPath)
-	d.Set("gid", disk.GridID)
-	d.Set("guid", disk.GUID)
-	d.Set("disk_id", disk.ID)
-	d.Set("image_id", disk.ImageID)
-	d.Set("images", disk.Images)
-	d.Set("iotune", flattenIOTune(disk.IOTune))
-	d.Set("iqn", disk.IQN)
-	d.Set("login", disk.Login)
-	d.Set("milestones", disk.Milestones)
-	d.Set("disk_name", disk.Name)
-	d.Set("order", disk.Order)
-	d.Set("params", disk.Params)
-	d.Set("parent_id", disk.ParentId)
-	d.Set("passwd", disk.Passwd)
-	d.Set("pci_slot", disk.PciSlot)
-	d.Set("pool", disk.Pool)
-	d.Set("purge_attempts", disk.PurgeAttempts)
-	d.Set("purge_time", disk.PurgeTime)
-	d.Set("reality_device_number", disk.RealityDeviceNumber)
-	d.Set("reference_id", disk.ReferenceId)
-	d.Set("res_id", disk.ResID)
-	d.Set("res_name", disk.ResName)
-	d.Set("role", disk.Role)
-	d.Set("sep_id", disk.SepID)
-	d.Set("sep_type", disk.SepType)
-	d.Set("size_max", disk.SizeMax)
-	d.Set("size_used", disk.SizeUsed)
-	d.Set("snapshots", flattenDiskSnapshotList(disk.Snapshots))
-	d.Set("status", disk.Status)
-	d.Set("tech_status", disk.TechStatus)
-	d.Set("type", disk.Type)
-	d.Set("vmid", disk.VMID)
-
-	return nil
+	return warnings.Get()
 }
 
 func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	c := m.(*controller.ControllerCfg)
+	warnings := dc.Warnings{}
 	urlValues := &url.Values{}
-	disk, err := utilityDiskCheckPresence(ctx, d, m)
-	if disk == nil {
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		return nil
+
+	haveAccount, err := existAccountID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
 	}
-	if disk.Status == status.Destroyed || disk.Status == status.Purged {
+	if !haveAccount {
+		return diag.Errorf("resourceDiskUpdate: can't update Disk because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
+	}
+
+	haveGID, err := existGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	if !haveGID {
+		return diag.Errorf("resourceDiskUpdate: can't update Disk because GID %d is not allowed or does not exist", d.Get("gid").(int))
+	}
+
+	disk, err := utilityDiskCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	hasChangeState := false
+
+	switch disk.Status {
+	case status.Destroyed, status.Purged:
+		d.Set("disk_id", 0)
 		return resourceDiskCreate(ctx, d, m)
-	} else if disk.Status == status.Deleted {
+	case status.Deleted:
+		hasChangeState = true
 		urlValues.Add("diskId", d.Id())
 		urlValues.Add("reason", d.Get("reason").(string))
 
 		_, err := c.DecortAPICall(ctx, "POST", disksRestoreAPI, urlValues)
 		if err != nil {
+			warnings.Add(err)
+		}
+	case status.Assigned:
+	case status.Modeled:
+		return diag.Errorf("The disk is in status: %s, please, contact support for more information", disk.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Allocated:
+	case status.Unallocated:
+	}
+
+	if hasChangeState {
+		disk, err = utilityDiskCheckPresence(ctx, d, m)
+		if err != nil {
+			d.SetId("")
 			return diag.FromErr(err)
 		}
-		urlValues = &url.Values{}
 	}
 
 	if d.HasChange("size_max") {
@@ -234,7 +257,7 @@ func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface
 			log.Debugf("resourceDiskUpdate: resizing disk ID %s - %d GB -> %d GB",
 				d.Id(), oldSize.(int), newSize.(int))
 			urlValues.Add("diskId", d.Id())
-			urlValues.Add("size", fmt.Sprintf("%d", newSize.(int)))
+			urlValues.Add("size", strconv.Itoa(newSize.(int)))
 			_, err := c.DecortAPICall(ctx, "POST", disksResizeAPI, urlValues)
 			if err != nil {
 				return diag.FromErr(err)
@@ -283,16 +306,32 @@ func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface
 		urlValues = &url.Values{}
 	}
 
+	if d.HasChange("shareable") {
+		oldShare, newShare := d.GetChange("shareable")
+		urlValues = &url.Values{}
+		urlValues.Add("diskId", d.Id())
+		if oldShare.(bool) == false && newShare.(bool) == true {
+			_, err := c.DecortAPICall(ctx, "POST", disksShareAPI, urlValues)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+		if oldShare.(bool) == true && newShare.(bool) == false {
+			_, err := c.DecortAPICall(ctx, "POST", disksUnshareAPI, urlValues)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
 	return resourceDiskRead(ctx, d, m)
 }
 
 func resourceDiskDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
-	if disk == nil {
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		return nil
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
 	}
 	if disk.Status == status.Destroyed || disk.Status == status.Purged {
 		return nil
@@ -360,7 +399,6 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 			ValidateFunc: validation.StringInSlice([]string{"D", "B", "T"}, false),
 			Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
 		},
-
 		"detach": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -379,79 +417,11 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 			Default:     "",
 			Description: "Reason for deletion",
 		},
-
-		"disk_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Disk ID. Duplicates the value of the ID parameter",
-		},
-		"account_name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "The name of the subscriber '(account') to whom this disk belongs",
-		},
-		"acl": {
-			Type:     schema.TypeString,
+		"shareable": {
+			Type:     schema.TypeBool,
+			Optional: true,
 			Computed: true,
 		},
-		"boot_partition": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Number of disk partitions",
-		},
-		"compute_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Compute ID",
-		},
-		"compute_name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "Compute name",
-		},
-		"created_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Created time",
-		},
-		"deleted_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Deleted time",
-		},
-		"destruction_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Time of final deletion",
-		},
-		"devicename": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "Name of the device",
-		},
-		"disk_path": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "Disk path",
-		},
-		"guid": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Disk ID on the storage side",
-		},
-		"image_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "Image ID",
-		},
-		"images": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-			Description: "IDs of images using the disk",
-		},
 		"iotune": {
 			Type:     schema.TypeList,
 			Optional: true,
@@ -540,6 +510,91 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"present_to": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"disk_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Disk ID. Duplicates the value of the ID parameter",
+		},
+		"account_name": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "The name of the subscriber '(account') to whom this disk belongs",
+		},
+		"acl": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"boot_partition": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Number of disk partitions",
+		},
+		"computes": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"compute_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"compute_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"created_time": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Created time",
+		},
+		"deleted_time": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Deleted time",
+		},
+		"destruction_time": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Time of final deletion",
+		},
+		"devicename": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Name of the device",
+		},
+		"disk_path": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Disk path",
+		},
+		"guid": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Disk ID on the storage side",
+		},
+		"image_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Image ID",
+		},
+		"images": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "IDs of images using the disk",
+		},
 		"iqn": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -622,7 +677,7 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 			Description: "Type SEP. Defines the type of storage system and contains one of the values set in the cloud platform",
 		},
 		"size_used": {
-			Type:        schema.TypeInt,
+			Type:        schema.TypeFloat,
 			Computed:    true,
 			Description: "Number of used space, in GB",
 		},

internal/service/cloudapi/disks/resource_disk_snapshot.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -39,21 +39,20 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
 func resourceDiskSnapshotCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	urlValues := &url.Values{}
 	c := m.(*controller.ControllerCfg)
+
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
-	if disk == nil {
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		return nil
+	if err != nil {
+		return diag.FromErr(err)
 	}
+
 	snapshots := disk.Snapshots
 	snapshot := Snapshot{}
 	label := d.Get("label").(string)
@@ -190,17 +189,17 @@ func resourceDiskSnapshotSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Needed in order to make a snapshot rollback",
 		},
-		"guid": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "ID of the snapshot",
-		},
 		"timestamp": {
 			Type:        schema.TypeInt,
 			Optional:    true,
 			Computed:    true,
 			Description: "Snapshot time",
 		},
+		"guid": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "ID of the snapshot",
+		},
 		"res_id": {
 			Type:        schema.TypeString,
 			Computed:    true,

internal/service/cloudapi/disks/utility_disk.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -50,8 +50,12 @@ func utilityDiskCheckPresence(ctx context.Context, d *schema.ResourceData, m int
 
 	disk := &Disk{}
 
-	if d.Get("disk_id").(int) == 0 {
-		urlValues.Add("diskId", d.Id())
+	if d.Get("disk_id") != nil {
+		if d.Get("disk_id").(int) == 0 {
+			urlValues.Add("diskId", d.Id())
+		} else {
+			urlValues.Add("diskId", strconv.Itoa(d.Get("disk_id").(int)))
+		}
 	} else {
 		urlValues.Add("diskId", strconv.Itoa(d.Get("disk_id").(int)))
 	}

internal/service/cloudapi/disks/utility_disk_list.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -39,7 +39,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

internal/service/cloudapi/disks/utility_disk_types_detailed_list.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,7 +38,7 @@ import (
 	"net/url"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
 )
 

internal/service/cloudapi/disks/utility_disk_types_list.go

@@ -22,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package disks
@@ -38,7 +38,7 @@ import (
 	"net/url"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
 )
 

internal/service/cloudapi/extnet/api.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet

internal/service/cloudapi/extnet/data_source_extnet.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -37,8 +38,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
-	"github.com/rudecs/terraform-provider-decort/internal/flattens"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
 )
 
 func dataSourceExtnetRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/extnet/data_source_extnet_computes_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenExtnetsComputes(ecs ExtnetExtendList) []map[string]interface{} {

internal/service/cloudapi/extnet/data_source_extnet_default.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -38,7 +39,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceExtnetDefaultRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

internal/service/cloudapi/extnet/data_source_extnet_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -37,7 +38,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/rudecs/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func flattenExtnetList(el ExtnetList) []map[string]interface{} {

internal/service/cloudapi/extnet/models.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet

internal/service/cloudapi/extnet/utility_extnet.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/extnet/utility_extnet_computes_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

internal/service/cloudapi/extnet/utility_extnet_default.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -35,8 +36,8 @@ import (
 	"context"
 	"net/url"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
 func utilityExtnetDefaultCheckPresence(ctx context.Context, m interface{}) (string, error) {

internal/service/cloudapi/extnet/utility_extnet_list.go

@@ -3,6 +3,7 @@ Copyright (c) 2019-2022 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>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,12 +22,12 @@ limitations under the License.
 Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
 Orchestration Technology) with Terraform by Hashicorp.
 
-Source code: https://github.com/rudecs/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
 
 Please see README.md to learn where to place source code so that it
 builds seamlessly.
 
-Documentation: https://github.com/rudecs/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
 package extnet
@@ -37,8 +38,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )