4.4.4

internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go

@@ -82,8 +82,17 @@ func dataSourceRgAffinityGroupsListSchemaMake() map[string]*schema.Schema {
 					"ids": {
 						Type:     schema.TypeList,
 						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"node_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
 						},
 					},
 				},

internal/service/cloudapi/rg/flattens.go

@@ -461,7 +461,7 @@ func flattenRgListLb(listLb *rg.ListLB) []map[string]interface{} {
 }
 
 func flattenRgListPfw(listPfw *rg.ListPortForwards) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0, len (listPfw.Data))
+	res := make([]map[string]interface{}, 0, len(listPfw.Data))
 	for _, pfw := range listPfw.Data {
 		temp := map[string]interface{}{
 			"public_port_end":   pfw.PublicPortEnd,
@@ -538,10 +538,25 @@ func flattenRgAffinityGroupComputes(list rg.ListAffinityGroupsComputes) []map[st
 
 func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(list.Data))
-	for groupKey, groupVal := range list.Data {
+	for _, groupVal := range list.Data {
+		for label, ag := range groupVal {
+			temp := map[string]interface{}{
+				"label": label,
+				"ids":   flattenRgAffinityListGroup(ag),
+			}
+			res = append(res, temp)
+		}
+	}
+
+	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{}{
-			"label": groupKey,
-			"ids":   groupVal,
+			"id":      ag.ID,
+			"node_id": ag.NodeID,
 		}
 		res = append(res, temp)
 	}
@@ -564,10 +579,10 @@ func flattenRGResourceConsumptionList(rg *rg.ListResourceConsumption) []map[stri
 	res := make([]map[string]interface{}, 0, len(rg.Data))
 	for _, rc := range rg.Data {
 		temp := map[string]interface{}{
-			"consumed":       flattenResource(rc.Consumed),
-			"reserved":       flattenResource(rc.Reserved),
+			"consumed":        flattenResource(rc.Consumed),
+			"reserved":        flattenResource(rc.Reserved),
 			"resource_limits": flattenRgResourceLimits(rc.ResourceLimits),
-			"rg_id":          rc.RGID,
+			"rg_id":           rc.RGID,
 		}
 		res = append(res, temp)
 	}