4.5.3

2024-03-26 12:17:33 +03:00
parent f49d9f8860
commit 91ba361af9
97 changed files with 6127 additions and 5997 deletions
--- a/internal/service/cloudapi/rg/data_source_rg.go
+++ b/internal/service/cloudapi/rg/data_source_rg.go
@@ -68,6 +68,7 @@ func DataSourceResgroup() *schema.Resource {
 	}
 }

+
 // func sepsSchemaMake() map[string]*schema.Schema {
 // 	res := map[string]*schema.Schema{
 // 		"sep_id": {
@@ -417,3 +418,5 @@ func dataSourceRgSchemaMake() map[string]*schema.Schema {
 	}
 	return res
 }
+
+
--- a/internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go
+++ b/internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go
@@ -83,17 +83,8 @@ func dataSourceRgAffinityGroupsListSchemaMake() map[string]*schema.Schema {
 					"ids": {
 						Type:     schema.TypeList,
 						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"id": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"node_id": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
 						},
 					},
 				},
--- a/internal/service/cloudapi/rg/data_source_rg_list.go
+++ b/internal/service/cloudapi/rg/data_source_rg_list.go
@@ -1,280 +1,280 @@
-/*
-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/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 dataSourceRgListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"by_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find by ID",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by name",
-		},
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find by account ID",
-		},
-		"account_name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by account name",
-		},
-		"created_after": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find RGs created after specific time (unix timestamp)",
-		},
-		"created_before": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find RGs created before specific time (unix timestamp)",
-		},
-		"status": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by status",
-		},
-		"lock_status": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by lock status",
-		},
-		"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_acl": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: aclSchemaMake(),
-						},
-					},
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						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,
-					},
-					"dirty": {
-						Type:     schema.TypeBool,
-						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: resourceLimitsSchemaMake(),
-						},
-					},
-					"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,
-						},
-					},
-					"resource_types": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"cpu_allocation_parameter": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"cpu_allocation_ratio": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"uniq_pools": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-				},
-			},
-		},
-		"entry_count": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-	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>
+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/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 dataSourceRgListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by name",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by account ID",
+		},
+		"account_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by account name",
+		},
+		"created_after": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find RGs created after specific time (unix timestamp)",
+		},
+		"created_before": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find RGs created before specific time (unix timestamp)",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by status",
+		},
+		"lock_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by lock status",
+		},
+		"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_acl": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: aclSchemaMake(),
+						},
+					},
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_name": {
+						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,
+					},
+					"dirty": {
+						Type:     schema.TypeBool,
+						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: resourceLimitsSchemaMake(),
+						},
+					},
+					"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,
+						},
+					},
+					"resource_types": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"cpu_allocation_parameter": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"cpu_allocation_ratio": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+					"uniq_pools": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceRgList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceRgListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceRgListSchemaMake(),
+	}
+}
--- a/internal/service/cloudapi/rg/flattens.go
+++ b/internal/service/cloudapi/rg/flattens.go
@@ -542,7 +542,7 @@ func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
 		for label, ag := range groupVal {
 			temp := map[string]interface{}{
 				"label": label,
-				"ids":   flattenRgAffinityListGroup(ag),
+				"ids":   ag,
 			}
 			res = append(res, temp)
 		}
@@ -551,19 +551,6 @@ func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
 	return res
 }

-func flattenRgAffinityListGroup(list rg.ListAffinityGroup) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0, len(list))
-	for _, ag := range list {
-		temp := map[string]interface{}{
-			"id":      ag.ID,
-			"node_id": ag.NodeID,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-}
-
 func flattenRgUsageResource(d *schema.ResourceData, usage rg.RecordResourceUsage) {
 	d.Set("cpu", usage.CPU)
 	d.Set("disk_size", usage.DiskSize)
--- a/internal/service/cloudapi/rg/models.go
+++ b/internal/service/cloudapi/rg/models.go
--- a/internal/service/cloudapi/rg/resource_rg.go
+++ b/internal/service/cloudapi/rg/resource_rg.go
@@ -557,8 +557,8 @@ func ResourceRgSchemaMake() map[string]*schema.Schema {
 		},

 		"gid": {
-			Type:     schema.TypeInt,
-			Required: true,
+			Type:        schema.TypeInt,
+			Required:    true,
 			// ForceNew:    true,
 			Description: "Unique ID of the grid, where this resource group is deployed.",
 		},
@@ -603,8 +603,8 @@ func ResourceRgSchemaMake() map[string]*schema.Schema {
 		},

 		"owner": {
-			Type:     schema.TypeString,
-			Optional: true,
+			Type:        schema.TypeString,
+			Optional:    true,
 		},

 		"quota": {
@@ -619,35 +619,35 @@ func ResourceRgSchemaMake() map[string]*schema.Schema {
 						Default:     -1,
 						Description: "Limit on the total number of CPUs in this resource group.",
 					},
-
+			
 					"ram": {
 						Type:        schema.TypeInt, // NB: API expects and returns this as float in units of MB! This may be changed in the future.
 						Optional:    true,
 						Default:     -1,
 						Description: "Limit on the total amount of RAM in this resource group, specified in MB.",
 					},
-
+			
 					"disk": {
 						Type:        schema.TypeInt,
 						Optional:    true,
 						Default:     -1,
 						Description: "Limit on the total volume of storage resources in this resource group, specified in GB.",
 					},
-
+			
 					"ext_traffic": {
 						Type:        schema.TypeInt,
 						Optional:    true,
 						Default:     -1,
 						Description: "Limit on the total ingress network traffic for this resource group, specified in GB.",
 					},
-
+			
 					"ext_ips": {
 						Type:        schema.TypeInt,
 						Optional:    true,
 						Default:     -1,
 						Description: "Limit on the total number of external IP addresses this resource group can use.",
 					},
-
+			
 					"gpu_units": {
 						Type:        schema.TypeInt,
 						Optional:    true,
--- a/internal/service/cloudapi/rg/state_upgraders.go
+++ b/internal/service/cloudapi/rg/state_upgraders.go
@@ -8,21 +8,10 @@ import (

 func resourceRGStateUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
 	log.Debug("resourceRGStateUpgradeV1: upgrading state")
-	quota, ok := rawState["quota"]
-	if !ok || quota == nil {
-		rawState["quota"] = QuotaRecord{
-			Cpu:        -1,
-			Ram:        -1,
-			Disk:       -1,
-			ExtTraffic: -1,
-			ExtIPs:     -1,
-			GpuUnits:   -1,
-		}
-		return rawState, nil
+	oldQuotaList := rawState["quota"].([]interface{})
+	if len(oldQuotaList) != 0 {
+		oldQuota := oldQuotaList[0].(map[string]interface{})
+		oldQuota["ram"] = int64(oldQuota["ram"].(float64))
 	}
-
-	oldQuotaList := quota.([]interface{})
-	oldQuota := oldQuotaList[0].(map[string]interface{})
-	oldQuota["ram"] = int64(oldQuota["ram"].(float64))
 	return rawState, nil
 }
--- a/internal/service/cloudapi/rg/utility_rg.go
+++ b/internal/service/cloudapi/rg/utility_rg.go
@@ -79,12 +79,20 @@ func utilityUpdateRG(ctx context.Context, d *schema.ResourceData, m interface{},
 	if d.HasChange("quota") {
 		log.Debugf("resourceResgroupUpdate: quota specified - looking for deltas from the old quota.")
 		quotaList := d.Get("quota").([]interface{})
-		quota := quotaList[0].(map[string]interface{})
-		req.MaxCPUCapacity = int64(quota["cpu"].(int))
-		req.MaxVDiskCapacity = int64(quota["disk"].(int))
-		req.MaxMemoryCapacity = int64(quota["ram"].(int))
-		req.MaxNetworkPeerTransfer = int64(quota["ext_traffic"].(int))
-		req.MaxNumPublicIP = int64(quota["ext_ips"].(int))
+		if len(quotaList) != 0 {
+			quota := quotaList[0].(map[string]interface{})
+			req.MaxCPUCapacity = int64(quota["cpu"].(int))
+			req.MaxVDiskCapacity = int64(quota["disk"].(int))
+			req.MaxMemoryCapacity = int64(quota["ram"].(int))
+			req.MaxNetworkPeerTransfer = int64(quota["ext_traffic"].(int))
+			req.MaxNumPublicIP = int64(quota["ext_ips"].(int))
+		} else {
+			req.MaxCPUCapacity = -1
+			req.MaxVDiskCapacity = -1
+			req.MaxMemoryCapacity = -1
+			req.MaxNetworkPeerTransfer = -1
+			req.MaxNumPublicIP = -1
+		}
 	}

 	if d.HasChange("description") {