data-source gcore_network fixed

Author: 0ndi

gcore/data_source_gcore_network.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log"
 
+	"github.com/G-Core/gcorelabscloud-go/gcore/network/v1/availablenetworks"
 	"github.com/G-Core/gcorelabscloud-go/gcore/network/v1/networks"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -81,35 +82,50 @@ func dataSourceNetworkRead(ctx context.Context, d *schema.ResourceData, m interf
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	clientShared, err := CreateClient(provider, d, sharedNetworksPoint, versionPointV1)
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
 	name := d.Get("name").(string)
 	nets, err := networks.ListAll(client)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	var found bool
-	var network networks.Network
-	for _, n := range nets {
-		if n.Name == name {
-			network = n
-			found = true
-			break
+	//todo refactor, also refactor inner func
+	var rawNetwork map[string]interface{}
+	network, found := findNetworkByName(name, nets)
+	if !found {
+		//trying to find among shared networks
+		nets, err := availablenetworks.ListAll(clientShared)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		network, found := findSharedNetworkByName(name, nets)
+		if !found {
+			return diag.Errorf("network with name %s not found", name)
 		}
-	}
 
-	if !found {
-		return diag.Errorf("network with name %s not found", name)
+		rawNetwork, err = StructToMap(network)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	} else {
+		rawNetwork, err = StructToMap(network)
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
-	d.SetId(network.ID)
-	d.Set("name", network.Name)
-	d.Set("mtu", network.MTU)
-	d.Set("type", network.Type)
-	d.Set("region_id", network.RegionID)
-	d.Set("project_id", network.ProjectID)
-	d.Set("external", network.External)
-	d.Set("shared", network.Shared)
+	d.SetId(rawNetwork["id"].(string))
+	d.Set("name", rawNetwork["name"])
+	d.Set("mtu", rawNetwork["mtu"])
+	d.Set("type", rawNetwork["type"])
+	d.Set("region_id", rawNetwork["region_id"])
+	d.Set("project_id", rawNetwork["project_id"])
+	d.Set("external", rawNetwork["external"])
+	d.Set("shared", rawNetwork["shared"])
 
 	log.Println("[DEBUG] Finish Network reading")
 	return diags

gcore/resource_gcore_network.go

@@ -16,6 +16,7 @@ import (
 const networkDeleting int = 1200
 const networkCreatingTimeout int = 1200
 const networksPoint = "networks"
+const sharedNetworksPoint = "availablenetworks"
 
 func resourceNetwork() *schema.Resource {
 	return &schema.Resource{

gcore/utils.go

@@ -3,6 +3,7 @@ package gcore
 import (
 	"crypto/md5"
 	"encoding/binary"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -17,6 +18,8 @@ import (
 	"github.com/G-Core/gcorelabscloud-go/gcore/instance/v1/types"
 	"github.com/G-Core/gcorelabscloud-go/gcore/loadbalancer/v1/lbpools"
 	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"
 	"github.com/G-Core/gcorelabscloud-go/gcore/project/v1/projects"
 	"github.com/G-Core/gcorelabscloud-go/gcore/region/v1/regions"
 	"github.com/G-Core/gcorelabscloud-go/gcore/router/v1/routers"
@@ -530,3 +533,40 @@ func extractSecurityGroupRuleMap(r interface{}, gid string) securitygroups.Creat
 	}
 	return opts
 }
+
+//technical debt
+func findNetworkByName(name string, nets []networks.Network) (networks.Network, bool) {
+	var found bool
+	var network networks.Network
+	for _, n := range nets {
+		if n.Name == name {
+			network = n
+			found = true
+			break
+		}
+	}
+	return network, found
+}
+
+//technical debt
+func findSharedNetworkByName(name string, nets []availablenetworks.Network) (availablenetworks.Network, bool) {
+	var found bool
+	var network availablenetworks.Network
+	for _, n := range nets {
+		if n.Name == name {
+			network = n
+			found = true
+			break
+		}
+	}
+	return network, found
+}
+
+func StructToMap(obj interface{}) (newMap map[string]interface{}, err error) {
+	data, err := json.Marshal(obj)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(data, &newMap)
+	return
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-gcorelabs
 go 1.14
 
 require (
-	github.com/G-Core/gcorelabscloud-go v0.3.39
+	github.com/G-Core/gcorelabscloud-go v0.3.40
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.3.0
 	github.com/mitchellh/mapstructure v1.4.0

go.sum

@@ -41,10 +41,8 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/G-Core/gcorelabscloud-go v0.3.37 h1:xomxPdZInL2o0RTCycGakPN0dS6GNKnQhL5uCW64hDk=
-github.com/G-Core/gcorelabscloud-go v0.3.37/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
-github.com/G-Core/gcorelabscloud-go v0.3.39 h1:v83n+dA3ktX5wlL5eoxsNjBd3I8lnxK+FuJaF5fLI+I=
-github.com/G-Core/gcorelabscloud-go v0.3.39/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
+github.com/G-Core/gcorelabscloud-go v0.3.40 h1:l5jBZkrWO4IyaRovthFmZp8XFUIl9IbY7s4zc/ogk4E=
+github.com/G-Core/gcorelabscloud-go v0.3.40/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=