4.10.1

internal/service/cloudbroker/account/flattens.go

@@ -3,16 +3,13 @@ package account
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
 )
 
 func flattenResourceAccount(d *schema.ResourceData, acc *account.RecordAccount) {
 	d.Set("dc_location", acc.DCLocation)
-	d.Set("ckey", acc.CKey)
 	d.Set("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
 	d.Set("companyurl", acc.CompanyURL)
-	d.Set("compute_features", acc.ComputeFeatures)
 	d.Set("cpu_allocation_parameter", acc.CPUAllocationParameter)
 	d.Set("cpu_allocation_ratio", acc.CPUAllocationRatio)
 	d.Set("created_by", acc.CreatedBy)
@@ -27,6 +24,7 @@ func flattenResourceAccount(d *schema.ResourceData, acc *account.RecordAccount)
 	d.Set("account_id", acc.ID)
 	d.Set("account_name", acc.Name)
 	d.Set("resource_limits", flattenRgResourceLimits(acc.ResourceLimits))
+	d.Set("storage_policy", flattenSTPolicy(acc.ResourceLimits.StoragePolicies))
 	d.Set("resource_types", acc.ResTypes)
 	d.Set("send_access_emails", acc.SendAccessEmails)
 	d.Set("status", acc.Status)
@@ -34,12 +32,11 @@ func flattenResourceAccount(d *schema.ResourceData, acc *account.RecordAccount)
 	d.Set("updated_time", acc.UpdatedTime)
 	d.Set("version", acc.Version)
 	d.Set("vins", acc.VINS)
-	d.Set("zone_ids", acc.ZoneIDs)
+	d.Set("zone_ids", flattenZonesInResource(acc.ZoneIDs))
 }
 
 func flattenDataAccount(d *schema.ResourceData, acc *account.RecordAccount) {
 	d.Set("dc_location", acc.DCLocation)
-	d.Set("ckey", acc.CKey)
 	d.Set("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
 	d.Set("companyurl", acc.CompanyURL)
@@ -142,11 +139,26 @@ func flattenAccResource(r account.Resource) []map[string]interface{} {
 		"gpu":         r.GPU,
 		"ram":         r.RAM,
 		"seps":        flattenAccountSeps(r.SEPs),
+		"policies":    flattenAccountPolicies(r.Policies),
 	}
 	res = append(res, temp)
 	return res
 }
 
+func flattenAccountPolicies(policies map[string]account.Policy) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for k, dataVal := range policies {
+		temp := map[string]interface{}{
+			"id":            k,
+			"disk_size":     dataVal.DiskSize,
+			"disk_size_max": dataVal.DiskSizeMax,
+			"seps":          flattenAccountSeps(dataVal.SEPs),
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
 func flattenAccAcl(acls []account.ACLWithEmails) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(acls))
 	for _, acls := range acls {
@@ -172,19 +184,32 @@ func flattenAccAcl(acls []account.ACLWithEmails) []map[string]interface{} {
 func flattenRgResourceLimits(rl account.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,
+		"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,
+		"storage_policy": flattenSTPolicy(rl.StoragePolicies),
 	}
 	res = append(res, temp)
 
 	return res
 }
 
+func flattenSTPolicy(ast []account.StoragePolicy) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(ast))
+	for _, item := range ast {
+		temp := map[string]interface{}{
+			"id":    item.ID,
+			"limit": item.Limit,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
 func flattenRgAcl(rgAcls []account.ACL) []map[string]interface{} {
 	res := make([]map[string]interface{}, len(rgAcls))
 	for _, rgAcl := range rgAcls {
@@ -206,8 +231,6 @@ func flattenListDeleted(al *account.ListAccounts) []map[string]interface{} {
 	for _, acc := range al.Data {
 		temp := map[string]interface{}{
 			"dc_location":              acc.DCLocation,
-			"ckey":                     acc.CKey,
-			"meta":                     flattens.FlattenMeta(acc.Meta),
 			"acl":                      flattenRgAcl(acc.ACL),
 			"company":                  acc.Company,
 			"companyurl":               acc.CompanyURL,
@@ -228,6 +251,7 @@ func flattenListDeleted(al *account.ListAccounts) []map[string]interface{} {
 			"resource_types":           acc.ResTypes,
 			"send_access_emails":       acc.SendAccessEmails,
 			"status":                   acc.Status,
+			"storage_policy_ids":       acc.StoragePolicyIDs,
 			"uniq_pools":               acc.UniqPools,
 			"default_zone_id":          acc.DefaultZoneID,
 			"zone_ids":                 acc.ZoneIDs,
@@ -245,8 +269,6 @@ func flattenAccountList(al *account.ListAccounts) []map[string]interface{} {
 	for _, acc := range al.Data {
 		temp := map[string]interface{}{
 			"dc_location":              acc.DCLocation,
-			"ckey":                     acc.CKey,
-			"meta":                     flattens.FlattenMeta(acc.Meta),
 			"acl":                      flattenRgAcl(acc.ACL),
 			"company":                  acc.Company,
 			"companyurl":               acc.CompanyURL,
@@ -267,6 +289,7 @@ func flattenAccountList(al *account.ListAccounts) []map[string]interface{} {
 			"resource_types":           acc.ResTypes,
 			"send_access_emails":       acc.SendAccessEmails,
 			"status":                   acc.Status,
+			"storage_policy_ids":       acc.StoragePolicyIDs,
 			"uniq_pools":               acc.UniqPools,
 			"default_zone_id":          acc.DefaultZoneID,
 			"zone_ids":                 acc.ZoneIDs,
@@ -452,3 +475,11 @@ func flattenZones(zones []account.ZoneID) []map[string]interface{} {
 	}
 	return res
 }
+
+func flattenZonesInResource(zones []account.ZoneID) []int64 {
+	res := make([]int64, 0)
+	for _, zone := range zones {
+		res = append(res, zone.ID)
+	}
+	return res
+}