4.5.1

internal/service/cloudbroker/rg/data_source_rg.go

@@ -35,84 +35,12 @@ import (
 	"context"
 	"fmt"
 
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
 	"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"
 )
 
-func flattenResgroup(d *schema.ResourceData, rgData *rg.RecordRG) {
-	log.Debugf("flattenResgroup: decoded RG name %q / ID %d, account ID %d",
-		rgData.Name, rgData.ID, rgData.AccountID)
-
-	d.Set("account_id", rgData.AccountID)
-	d.Set("account_name", rgData.AccountName)
-	d.Set("acl", flattenRgAcl(rgData.ACL))
-	d.Set("cpu_allocation_parameter", rgData.CPUAllocationParameter)
-	d.Set("cpu_allocation_ratio", rgData.CPUAllocationRatio)
-	d.Set("created_by", rgData.CreatedBy)
-	d.Set("created_time", rgData.CreatedTime)
-	d.Set("def_net_id", rgData.DefNetID)
-	d.Set("def_net_type", rgData.DefNetType)
-	d.Set("deleted_by", rgData.DeletedBy)
-	d.Set("deleted_time", rgData.DeletedTime)
-	d.Set("desc", rgData.Description)
-	d.Set("dirty", rgData.Dirty)
-	d.Set("gid", rgData.GID)
-	d.Set("guid", rgData.GUID)
-	d.Set("rg_id", rgData.ID)
-	d.Set("lock_status", rgData.LockStatus)
-	d.Set("milestones", rgData.Milestones)
-	d.Set("name", rgData.Name)
-	d.Set("register_computes", rgData.RegisterComputes)
-	d.Set("resource_limits", flattenRgResourceLimits(rgData.ResourceLimits))
-	d.Set("resource_types", rgData.ResTypes)
-	d.Set("secret", rgData.Secret)
-	d.Set("status", rgData.Status)
-	d.Set("uniq_pools", rgData.UniqPools)
-	d.Set("updated_by", rgData.UpdatedBy)
-	d.Set("updated_time", rgData.UpdatedTime)
-	d.Set("vins", rgData.VINS)
-	d.Set("computes", rgData.VMs)
-}
-
-func flattenRgAcl(rgACLs rg.ListACL) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acl := range rgACLs {
-		temp := map[string]interface{}{
-			"explicit":      acl.Explicit,
-			"guid":          acl.GUID,
-			"right":         acl.Right,
-			"status":        acl.Status,
-			"type":          acl.Type,
-			"user_group_id": acl.UserGroupID,
-		}
-
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func flattenRgResourceLimits(rl rg.ResourceLimits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"cu_c":      rl.CUC,
-		"cu_d":      rl.CuD,
-		"cu_dm":     rl.CUDM,
-		"cu_i":      rl.CUI,
-		"cu_m":      rl.CUM,
-		"cu_np":     rl.CUNP,
-		"gpu_units": rl.GPUUnits,
-	}
-	res = append(res, temp)
-
-	return res
-
-}
-
 func dataSourceResgroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	rg, err := utilityResgroupCheckPresence(ctx, d, m)
 	if err != nil {
@@ -141,200 +69,3 @@ func DataSourceResgroup() *schema.Resource {
 		Schema: dataSourceRgSchemaMake(),
 	}
 }
-
-func dataSourceRgSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"reason": {
-			Type:     schema.TypeString,
-			Optional: true,
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"acl": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"explicit": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"right": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"user_group_id": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"cpu_allocation_parameter": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"cpu_allocation_ratio": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"def_net_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"def_net_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"dirty": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"lock_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"register_computes": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"resource_limits": {
-			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_dm": {
-						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,
-					},
-				},
-			},
-		},
-		"resource_types": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"secret": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"uniq_pools": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"vins": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-	}
-}

internal/service/cloudbroker/rg/data_source_rg_affinity_group_computes.go

@@ -6,10 +6,21 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
+func dataSourceRgAffinityGroupComputesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	rgComputes, err := utilityRgAffinityGroupComputesCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
+	d.Set("items", flattenRgAffinityGroupComputes(rgComputes))
+	return nil
+}
+
 func DataSourceRgAffinityGroupComputes() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
@@ -24,105 +35,3 @@ func DataSourceRgAffinityGroupComputes() *schema.Resource {
 		Schema: dataSourceRgAffinityGroupComputesSchemaMake(),
 	}
 }
-
-func dataSourceRgAffinityGroupComputesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	rgComputes, err := utilityRgAffinityGroupComputesCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
-	d.Set("items", flattenRgAffinityGroupComputes(rgComputes))
-	return nil
-}
-
-func flattenRgAffinityGroupComputes(list rg.ListAffinityGroupCompute) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-
-	for _, item := range list {
-		temp := map[string]interface{}{
-			"compute_id":               item.ComputeID,
-			"other_node":               item.OtherNode,
-			"other_node_indirect":      item.OtherNodeIndirect,
-			"other_node_indirect_soft": item.OtherNodeIndirectSoft,
-			"other_node_soft":          item.OtherNodeSoft,
-			"same_node":                item.SameNode,
-			"same_node_soft":           item.SameNodeSoft,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func dataSourceRgAffinityGroupComputesSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the RG",
-		},
-		"affinity_group": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "Affinity group label",
-		},
-
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"compute_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"other_node": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"other_node_indirect": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"other_node_indirect_soft": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"other_node_soft": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"same_node": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"same_node_soft": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-				},
-			},
-		},
-	}
-
-	return res
-}

internal/service/cloudbroker/rg/data_source_rg_affinity_groups_get.go

@@ -9,6 +9,17 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
+func dataSourceRgAffinityGroupsGetRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	computes, err := utilityRgAffinityGroupsGetCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
+	d.Set("ids", computes)
+	return nil
+}
+
 func DataSourceRgAffinityGroupsGet() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
@@ -23,38 +34,3 @@ func DataSourceRgAffinityGroupsGet() *schema.Resource {
 		Schema: dataSourceRgAffinityGroupsGetSchemaMake(),
 	}
 }
-
-func dataSourceRgAffinityGroupsGetRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	computes, err := utilityRgAffinityGroupsGetCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
-	d.Set("ids", computes)
-	return nil
-}
-
-func dataSourceRgAffinityGroupsGetSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the RG",
-		},
-		"affinity_group": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "Affinity group label",
-		},
-
-		"ids": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-	}
-
-	return res
-}

internal/service/cloudbroker/rg/data_source_rg_affinity_groups_list.go

@@ -2,12 +2,26 @@ package rg
 
 import (
 	"context"
+	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
+func dataSourceRgAffinityGroupsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	list, err := utilityRgAffinityGroupsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
+	d.Set("affinity_groups", flattenRgListGroups(list))
+	d.Set("entry_count", list.EntryCount)
+	return nil
+}
+
 func DataSourceRgAffinityGroupsList() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
@@ -22,13 +36,3 @@ func DataSourceRgAffinityGroupsList() *schema.Resource {
 		Schema: dataSourceRgAffinityGroupsListSchemaMake(),
 	}
 }
-
-func dataSourceRgAffinityGroupsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	return nil
-}
-
-func dataSourceRgAffinityGroupsListSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		
-	}
-}

internal/service/cloudbroker/rg/data_source_rg_audits.go

@@ -6,10 +6,21 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
+func dataSourceRgAuditsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	rgAudits, err := utilityRgAuditsCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		diag.FromErr(err)
+	}
+
+	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
+	d.Set("items", flattenRgAudits(rgAudits))
+	return nil
+}
+
 func DataSourceRgAudits() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
@@ -24,68 +35,3 @@ func DataSourceRgAudits() *schema.Resource {
 		Schema: dataSourceRgAuditsSchemaMake(),
 	}
 }
-
-func dataSourceRgAuditsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	rgAudits, err := utilityRgAuditsCheckPresence(ctx, d, m)
-	if err != nil {
-		diag.FromErr(err)
-	}
-
-	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
-	d.Set("items", flattenRgAudits(rgAudits))
-	return nil
-}
-
-func flattenRgAudits(rgAudits rg.ListAudits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, rgAudit := range rgAudits {
-		temp := map[string]interface{}{
-			"call":         rgAudit.Call,
-			"responsetime": rgAudit.ResponseTime,
-			"statuscode":   rgAudit.StatusCode,
-			"timestamp":    rgAudit.Timestamp,
-			"user":         rgAudit.User,
-		}
-
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func dataSourceRgAuditsSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"call": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"responsetime": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"statuscode": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"timestamp": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"user": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-}

internal/service/cloudbroker/rg/data_source_rg_list.go

@@ -1,293 +1,71 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package rg
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenRgList(rgl *rg.ListRG) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, rg := range rgl.Data {
-		temp := map[string]interface{}{
-			"account_id":        rg.AccountID,
-			"account_name":      rg.AccountName,
-			"acl":               flattenRgAcl(rg.ACL),
-			"created_by":        rg.CreatedBy,
-			"created_time":      rg.CreatedTime,
-			"def_net_id":        rg.DefNetID,
-			"def_net_type":      rg.DefNetType,
-			"deleted_by":        rg.DeletedBy,
-			"deleted_time":      rg.DeletedTime,
-			"desc":              rg.Description,
-			"gid":               rg.GID,
-			"guid":              rg.GUID,
-			"rg_id":             rg.ID,
-			"lock_status":       rg.LockStatus,
-			"milestones":        rg.Milestones,
-			"name":              rg.Name,
-			"register_computes": rg.RegisterComputes,
-			"resource_limits":   flattenRgResourceLimits(rg.ResourceLimits),
-			"secret":            rg.Secret,
-			"status":            rg.Status,
-			"updated_by":        rg.UpdatedBy,
-			"updated_time":      rg.UpdatedTime,
-			"vins":              rg.VINS,
-			"vms":               rg.VMs,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceRgListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	rgList, err := utilityRgListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenRgList(rgList))
-
-	return nil
-}
-
-func dataSourceRgListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"includedeleted": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "included deleted resource groups",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"acl": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"explicit": {
-									Type:     schema.TypeBool,
-									Computed: true,
-								},
-								"guid": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"right": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"status": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"type": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"user_group_id": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"def_net_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"def_net_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"lock_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"register_computes": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"resource_limits": {
-						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,
-								},
-							},
-						},
-					},
-					"secret": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vins": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"vms": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceRgList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceRgListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceRgListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package rg
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceRgListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	rgList, err := utilityRgListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenRgList(rgList))
+	d.Set("entry_count", rgList.EntryCount)
+
+	return nil
+}
+
+func DataSourceRgList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceRgListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceRgListSchemaMake(),
+	}
+}

internal/service/cloudbroker/rg/resource_check_input_values.go

@@ -2,60 +2,31 @@ package rg
 
 import (
 	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/ic"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid"
 	"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)
-	accountId := uint64(d.Get("account_id").(int))
+func checkParamsExistence(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg, accountId, gid uint64) diag.Diagnostics {
+	var errs []error
 
-	req := account.ListRequest{}
-
-	accountList, err := c.CloudBroker().Account().List(ctx, req)
-	if err != nil {
-		return false, err
+	if err := ic.ExistAccount(ctx, accountId, c); err != nil {
+		errs = append(errs, err)
 	}
 
-	return len(accountList.FilterByID(accountId).Data) != 0, nil
-}
-
-func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	c := m.(*controller.ControllerCfg)
-
-	gid := uint64(d.Get("gid").(int))
-
-	gidList, err := c.CloudBroker().Grid().List(ctx, grid.ListRequest{})
-	if err != nil {
-		return false, err
+	if err := ic.ExistGID(ctx, gid, c); err != nil {
+		errs = append(errs, err)
 	}
 
-	for _, elem := range gidList.Data {
-		if elem.GID == gid {
-			return true, nil
+	extNetId, ok := d.GetOk("ext_net_id")
+	if ok {
+		if err := ic.ExistExtNetInRG(ctx, uint64(extNetId.(int)), accountId, c); err != nil {
+			errs = append(errs, err)
 		}
 	}
-
-	return false, nil
-}
-
-func existExtNet(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	c := m.(*controller.ControllerCfg)
-	extNetId := uint64(d.Get("ext_net_id").(int))
-
-	req := extnet.ListRequest{
-		AccountID: uint64(d.Get("account_id").(int)),
-	}
-
-	listExtNet, err := c.CloudBroker().ExtNet().List(ctx, req)
-	if err != nil {
-		return false, err
-	}
-
-	return len(listExtNet.FilterByID(extNetId).Data) != 0, nil
+	return dc.ErrorsToDiagnostics(errs)
 }

internal/service/cloudbroker/rg/utility_rg_affinity_groups_list.go

@@ -1 +1,55 @@
-package rg
+/*
+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
+*/
+
+package rg
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityRgAffinityGroupsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*rg.ListAffinityGroup, error) {
+	c := m.(*controller.ControllerCfg)
+	req := rg.AffinityGroupsListRequest{
+		RGID: uint64(d.Get("rg_id").(int)),
+	}
+
+	groups, err := c.CloudBroker().RG().AffinityGroupsList(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return groups, nil
+}

internal/service/cloudbroker/rg/utility_rg_list.go

@@ -1,65 +1,90 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package rg
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityRgListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*rg.ListRG, error) {
-	c := m.(*controller.ControllerCfg)
-	req := rg.ListRequest{}
-
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if includedeleted, ok := d.GetOk("includedeleted"); ok {
-		req.IncludeDeleted = includedeleted.(bool)
-	}
-
-	log.Debugf("utilityRgListCheckPresence: load rg list")
-	rgList, err := c.CloudBroker().RG().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return rgList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package rg
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityRgListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*rg.ListRG, error) {
+	c := m.(*controller.ControllerCfg)
+	req := rg.ListRequest{}
+
+	if byId, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byId.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if accountName, ok := d.GetOk("account_name"); ok {
+		req.AccountName = accountName.(string)
+	}
+
+	if createdAfter, ok := d.GetOk("created_after"); ok {
+		req.CreatedAfter = uint64(createdAfter.(int))
+	}
+	if createdBefore, ok := d.GetOk("created_before"); ok {
+		req.CreatedBefore = uint64(createdBefore.(int))
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if includedeleted, ok := d.GetOk("includedeleted"); ok {
+		req.IncludeDeleted = includedeleted.(bool)
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	log.Debugf("utilityRgListCheckPresence: load rg list")
+	rgList, err := c.CloudBroker().RG().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return rgList, nil
+}