import gcore_loadbalancer fixed

Author: Alexandr Sokolov

docs/resources/gcore_loadbalancer.md

@@ -98,6 +98,6 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-# import using <project_id>:<region_id>:<loadbalancer_id> format
-terraform import gcore_loadbalancer.loadbalancer1 1:6:447d2959-8ae0-4ca0-8d47-9f050a3637d7
+# import using <project_id>:<region_id>:<loadbalancer_id>:<listener_id> format, listener_id - nested listener id
+terraform import gcore_loadbalancer.loadbalancer1 1:6:447d2959-8ae0-4ca0-8d47-9f050a3637d7:a336f28c-fbb0-4256-9545-e905bed9f48f
 ```

examples/resources/gcore_loadbalancer/import.sh

@@ -1,2 +1,2 @@
-# import using <project_id>:<region_id>:<loadbalancer_id> format
-terraform import gcore_loadbalancer.loadbalancer1 1:6:447d2959-8ae0-4ca0-8d47-9f050a3637d7
+# import using <project_id>:<region_id>:<loadbalancer_id>:<listener_id> format, listener_id - nested listener id
+terraform import gcore_loadbalancer.loadbalancer1 1:6:447d2959-8ae0-4ca0-8d47-9f050a3637d7:a336f28c-fbb0-4256-9545-e905bed9f48f

gcore/data_source_gcore_instance.go

@@ -223,6 +223,7 @@ func dataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, m inter
 	}
 
 	ifs, err := instances.ListInterfacesAll(client, instance.ID)
+	log.Printf("instance data source interfaces: %+v", ifs)
 	if err != nil {
 		return diag.FromErr(err)
 	}

gcore/resource_gcore_loadbalancer.go

@@ -33,8 +33,8 @@ func resourceLoadBalancer() *schema.Resource {
 			Delete: schema.DefaultTimeout(5 * time.Minute),
 		},
 		Importer: &schema.ResourceImporter{
-			StateContext: func(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-				projectID, regionID, lbID, err := ImportStringParser(d.Id())
+			StateContext: func(ctx context.Context, d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+				projectID, regionID, lbID, listenerID, err := ImportStringParserExtended(d.Id())
 
 				if err != nil {
 					return nil, err
@@ -43,6 +43,24 @@ func resourceLoadBalancer() *schema.Resource {
 				d.Set("region_id", regionID)
 				d.SetId(lbID)
 
+				config := m.(*Config)
+				provider := config.Provider
+
+				listenersClient, err := CreateClient(provider, d, LBListenersPoint, versionPointV1)
+				if err != nil {
+					return nil, err
+				}
+
+				listener, err := listeners.Get(listenersClient, listenerID).Extract()
+				if err != nil {
+					return nil, err
+				}
+
+				l := extractListenerIntoMap(listener)
+				if err := d.Set("listener", []interface{}{l}); err != nil {
+					return nil, err
+				}
+
 				return []*schema.ResourceData{d}, nil
 			},
 		},
@@ -278,12 +296,13 @@ func resourceLoadBalancerRead(ctx context.Context, d *schema.ResourceData, m int
 	d.Set("project_id", lb.ProjectID)
 	d.Set("region_id", lb.RegionID)
 	d.Set("name", lb.Name)
+	d.Set("flavor", lb.Flavor.FlavorName)
 
 	if lb.VipAddress != nil {
 		d.Set("vip_address", lb.VipAddress.String())
 	}
 
-	fields := []string{"flavor", "vip_network_id", "vip_subnet_id"}
+	fields := []string{"vip_network_id", "vip_subnet_id"}
 	revertState(d, &fields)
 
 	listenersClient, err := CreateClient(provider, d, LBListenersPoint, versionPointV1)
@@ -307,14 +326,9 @@ func resourceLoadBalancerRead(ctx context.Context, d *schema.ResourceData, m int
 		if err != nil {
 			return diag.FromErr(err)
 		}
-
-		if listener.ProtocolPort == currentL["protocol_port"].(int) && listener.Protocol.String() == currentL["protocol"] {
-			currentL["id"] = listener.ID
-			currentL["name"] = listener.Name
-			currentL["protocol"] = listener.Protocol.String()
-			currentL["protocol_port"] = listener.ProtocolPort
-			currentL["secret_id"] = listener.SecretID
-			currentL["sni_secret_id"] = listener.SNISecretID
+		port, _ := currentL["protocol_port"].(int)
+		if (listener.ProtocolPort == port && listener.Protocol.String() == currentL["protocol"]) || len(cls) == 0 {
+			currentL = extractListenerIntoMap(listener)
 			break
 		}
 	}

gcore/utils.go

@@ -21,6 +21,7 @@ import (
 	"github.com/G-Core/gcorelabscloud-go/gcore/instance/v1/instances"
 	"github.com/G-Core/gcorelabscloud-go/gcore/instance/v1/types"
 	"github.com/G-Core/gcorelabscloud-go/gcore/loadbalancer/v1/lbpools"
+	"github.com/G-Core/gcorelabscloud-go/gcore/loadbalancer/v1/listeners"
 	typesLb "github.com/G-Core/gcorelabscloud-go/gcore/loadbalancer/v1/types"
 	"github.com/G-Core/gcorelabscloud-go/gcore/network/v1/availablenetworks"
 	"github.com/G-Core/gcorelabscloud-go/gcore/network/v1/networks"
@@ -733,3 +734,14 @@ func isInterfaceContains(verifiable map[string]interface{}, ifsSet []interface{}
 	}
 	return false
 }
+
+func extractListenerIntoMap(listener *listeners.Listener) map[string]interface{} {
+	l := make(map[string]interface{})
+	l["id"] = listener.ID
+	l["name"] = listener.Name
+	l["protocol"] = listener.Protocol.String()
+	l["protocol_port"] = listener.ProtocolPort
+	l["secret_id"] = listener.SecretID
+	l["sni_secret_id"] = listener.SNISecretID
+	return l
+}