instance's interface read fixed

gcore_lblistener example updated

Author: [Partner] Alexander Sokolov

docs/resources/gcore_lblistener.md

@@ -17,17 +17,11 @@ provider gcore {
   permanent_api_token = "251$d3361.............1b35f26d8"
 }
 
-resource "gcore_loadbalancer" "lb" {
+resource "gcore_loadbalancerv2" "lb" {
   project_id = 1
   region_id  = 1
   name       = "test"
   flavor     = "lb1-1-2"
-
-  listener {
-    name          = "test3"
-    protocol      = "HTTP"
-    protocol_port = 8080
-  }
 }
 
 resource "gcore_lblistener" "listener" {
@@ -36,7 +30,7 @@ resource "gcore_lblistener" "listener" {
   name            = "test"
   protocol        = "TCP"
   protocol_port   = 36621
-  loadbalancer_id = gcore_loadbalancer.lb.id
+  loadbalancer_id = gcore_loadbalancerv2.lb.id
 }
 ```
 

examples/resources/gcore_lblistener/resource.tf

@@ -2,17 +2,11 @@ provider gcore {
   permanent_api_token = "251$d3361.............1b35f26d8"
 }
 
-resource "gcore_loadbalancer" "lb" {
+resource "gcore_loadbalancerv2" "lb" {
   project_id = 1
   region_id  = 1
   name       = "test"
   flavor     = "lb1-1-2"
-
-  listener {
-    name          = "test3"
-    protocol      = "HTTP"
-    protocol_port = 8080
-  }
 }
 
 resource "gcore_lblistener" "listener" {
@@ -21,5 +15,5 @@ resource "gcore_lblistener" "listener" {
   name            = "test"
   protocol        = "TCP"
   protocol_port   = 36621
-  loadbalancer_id = gcore_loadbalancer.lb.id
+  loadbalancer_id = gcore_loadbalancerv2.lb.id
 }

gcore/resource_gcore_instance.go

@@ -539,7 +539,7 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
 	}
 
 	var cleanInterfaces []interface{}
-	for _, iface := range ifs {
+	for ifOrder, iface := range ifs {
 		if len(iface.IPAssignments) == 0 {
 			continue
 		}
@@ -560,20 +560,20 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
 				}
 			}
 
+			i := make(map[string]interface{})
 			if !ok {
-				continue
+				orderedIOpts = OrderedInterfaceOpts{Order: ifOrder}
+			} else {
+				i["type"] = iOpts.Type.String()
 			}
 
-			i := make(map[string]interface{})
-
-			i["type"] = iOpts.Type.String()
 			i["network_id"] = iface.NetworkID
 			i["subnet_id"] = subnetID
 			i["port_id"] = iface.PortID
 			i["order"] = orderedIOpts.Order
-			if iOpts.FloatingIP != nil {
-				i["fip_source"] = iOpts.FloatingIP.Source.String()
-				i["existing_fip_id"] = iOpts.FloatingIP.ExistingFloatingID
+			if len(iface.FloatingIPDetails) > 0 {
+				i["fip_source"] = types.ExistingFloatingIP
+				i["existing_fip_id"] = iface.FloatingIPDetails[0].ID
 			}
 			i["ip_address"] = assignment.IPAddress.String()