4.0.0

internal/service/cloudapi/account/flattens.go

@@ -2,20 +2,19 @@ package account
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
 )
 
-func flattenAccount(d *schema.ResourceData, acc AccountWithResources) error {
+func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) 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("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
-	d.Set("companyurl", acc.CompanyUrl)
+	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("deactivation_time", acc.DeactivationTime)
 	d.Set("deleted_by", acc.DeletedBy)
 	d.Set("deleted_time", acc.DeletedTime)
 	d.Set("displayname", acc.DisplayName)
@@ -24,25 +23,26 @@ func flattenAccount(d *schema.ResourceData, acc AccountWithResources) error {
 	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("vins", acc.VINS)
+	d.Set("vinses", acc.VINSes)
 	d.Set("computes", flattenAccComputes(acc.Computes))
 	d.Set("machines", flattenAccMachines(acc.Machines))
+	d.Set("cpu_allocation_parameter", acc.CPUAllocationParameter)
+	d.Set("cpu_allocation_ratio", acc.CPUAllocationRatio)
 
 	if username, ok := d.GetOk("username"); ok {
 		d.Set("username", username)
 	} else {
-		d.Set("username", acc.Acl[0].UgroupID)
+		d.Set("username", acc.ACL[0].UgroupID)
 	}
 
 	return nil
 }
 
-func flattenAccComputes(acs Computes) []map[string]interface{} {
+func flattenAccComputes(acs account.Computes) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"started": acs.Started,
@@ -52,7 +52,7 @@ func flattenAccComputes(acs Computes) []map[string]interface{} {
 	return res
 }
 
-func flattenAccMachines(ams Machines) []map[string]interface{} {
+func flattenAccMachines(ams account.Machines) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"running": ams.Running,
@@ -62,13 +62,13 @@ func flattenAccMachines(ams Machines) []map[string]interface{} {
 	return res
 }
 
-func flattenAccAcl(acls []AccountAclRecord) []map[string]interface{} {
+func flattenAccAcl(acls []account.RecordACL) []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,
+			"guid":           acls.GUID,
 			"right":          acls.Rights,
 			"status":         acls.Status,
 			"type":           acls.Type,
@@ -79,7 +79,7 @@ func flattenAccAcl(acls []AccountAclRecord) []map[string]interface{} {
 	return res
 }
 
-func flattenRgResourceLimits(rl ResourceLimits) []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,
@@ -87,7 +87,7 @@ func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
 		"cu_i":      rl.CUI,
 		"cu_m":      rl.CUM,
 		"cu_np":     rl.CUNP,
-		"gpu_units": rl.GpuUnits,
+		"gpu_units": rl.GPUUnits,
 	}
 	res = append(res, temp)
 
@@ -95,7 +95,7 @@ func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
 
 }
 
-func flattenAccResources(r Resources) []map[string]interface{} {
+func flattenAccResources(r account.Resources) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"current":  flattenAccResource(r.Current),
@@ -105,7 +105,7 @@ func flattenAccResources(r Resources) []map[string]interface{} {
 	return res
 }
 
-func flattenAccountSeps(seps map[string]map[string]ResourceSep) []map[string]interface{} {
+func flattenAccountSeps(seps map[string]map[string]account.DiskUsage) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for sepKey, sepVal := range seps {
 		for dataKey, dataVal := range sepVal {
@@ -121,13 +121,13 @@ func flattenAccountSeps(seps map[string]map[string]ResourceSep) []map[string]int
 	return res
 }
 
-func flattenAccResource(r Resource) []map[string]interface{} {
+func flattenAccResource(r account.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,
+		"disksize":   r.DiskSize,
+		"extips":     r.ExtIPs,
+		"exttraffic": r.ExtTraffic,
 		"gpu":        r.GPU,
 		"ram":        r.RAM,
 		"seps":       flattenAccountSeps(r.SEPs),