read/update interface for baremetal fixed

Author: 0ndi

docs/resources/gcore_baremetal.md

@@ -27,13 +27,17 @@ resource "gcore_baremetal" "bm" {
   flavor_id = "bm1-infrastructure-small"
   image_id = "1ee7ccee-5003-48c9-8ae0-d96063af75b2" // your image id
 
-  //additional interface, 'subnet' only, 'external' interface create automatically
+  //additional interface, available type is 'subnet' or 'external'
   //  interface {
   //	type = "subnet"
   //	network_id = "9c7867fb-f404-4a2d-8bb5-24acf2fccaf1" //your network_id
   //	subnet_id = "b68ea6e2-c2b6-4a8d-95eb-7194d12a2156" // your subnet_id
   //  }
 
+  //  interface {
+  //	type = "external"
+  //  }
+
   keypair_name = "test" // your keypair name
 }
 ```
@@ -44,6 +48,7 @@ resource "gcore_baremetal" "bm" {
 ### Required
 
 - **flavor_id** (String)
+- **interface** (Block Set, Min: 1) (see [below for nested schema](#nestedblock--interface))
 - **name** (String)
 
 ### Optional
@@ -52,7 +57,6 @@ resource "gcore_baremetal" "bm" {
 - **apptemplate_id** (String)
 - **id** (String) The ID of this resource.
 - **image_id** (String)
-- **interface** (Block Set) (see [below for nested schema](#nestedblock--interface))
 - **keypair_name** (String)
 - **last_updated** (String)
 - **metadata** (Block List) (see [below for nested schema](#nestedblock--metadata))
@@ -90,6 +94,7 @@ Optional:
 Read-Only:
 
 - **ip_address** (String)
+- **is_trunk** (Boolean) Calculated after creation. Can't detach interface if is_trunk true
 - **port_id** (String)
 
 

docs/resources/gcore_lblistener.md

@@ -67,6 +67,8 @@ resource "gcore_lblistener" "listener" {
 - **project_name** (String)
 - **region_id** (Number)
 - **region_name** (String)
+- **secret_id** (String)
+- **sni_secret_id** (List of String)
 - **timeouts** (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
 ### Read-Only

docs/resources/gcore_loadbalancer.md

@@ -38,7 +38,7 @@ resource "gcore_loadbalancer" "lb" {
 
 ### Required
 
-- **listener** (Block List, Min: 1) (see [below for nested schema](#nestedblock--listener))
+- **listener** (Block List, Min: 1, Max: 1) (see [below for nested schema](#nestedblock--listener))
 - **name** (String)
 
 ### Optional
@@ -71,7 +71,10 @@ Optional:
 
 - **certificate** (String)
 - **certificate_chain** (String)
+- **insert_x_forwarded** (Boolean)
 - **private_key** (String)
+- **secret_id** (String)
+- **sni_secret_id** (List of String)
 
 Read-Only:
 

docs/resources/gcore_securitygroup.md

@@ -74,7 +74,7 @@ Required:
 
 - **direction** (String) Available value is 'ingress', 'egress'
 - **ethertype** (String) Available value is 'IPv4', 'IPv6'
-- **protocol** (String) Available value is udp,tcp,any,icmp,ah,dccp,egp,esp,gre,igmp,ospf,pgm,rsvp,sctp,udplite,vrrp,51,50,112
+- **protocol** (String) Available value is udp,tcp,any,icmp,ah,dccp,egp,esp,gre,igmp,ospf,pgm,rsvp,sctp,udplite,vrrp,51,50,112,0
 
 Optional:
 

examples/resources/gcore_baremetal/resource.tf

@@ -12,12 +12,16 @@ resource "gcore_baremetal" "bm" {
   flavor_id = "bm1-infrastructure-small"
   image_id = "1ee7ccee-5003-48c9-8ae0-d96063af75b2" // your image id
 
-  //additional interface, 'subnet' only, 'external' interface create automatically
+  //additional interface, available type is 'subnet' or 'external'
   //  interface {
   //	type = "subnet"
   //	network_id = "9c7867fb-f404-4a2d-8bb5-24acf2fccaf1" //your network_id
   //	subnet_id = "b68ea6e2-c2b6-4a8d-95eb-7194d12a2156" // your subnet_id
   //  }
 
+  //  interface {
+  //	type = "external"
+  //  }
+
   keypair_name = "test" // your keypair name
 }

gcore/resource_gcore_baremetal.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"sort"
 	"strconv"
 	"time"
 
@@ -12,7 +13,6 @@ 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/task/v1/tasks"
-	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -114,20 +114,18 @@ func resourceBmInstance() *schema.Resource {
 			"interface": &schema.Schema{
 				Type:     schema.TypeSet,
 				Set:      interfaceUniqueID,
-				Optional: true,
+				Required: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"type": {
 							Type:        schema.TypeString,
 							Required:    true,
 							Description: fmt.Sprintf("Avalilable value is '%s', '%s'", types.SubnetInterfaceType, types.ExternalInterfaceType),
-							ValidateDiagFunc: func(val interface{}, path cty.Path) diag.Diagnostics {
-								v := types.InterfaceType(val.(string))
-								if v != types.SubnetInterfaceType {
-									return diag.Errorf("subnet type only")
-								}
-								return nil
-							},
+						},
+						"is_trunk": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Calculated after creation. Can't detach interface if is_trunk true",
 						},
 						"network_id": {
 							Type:        schema.TypeString,
@@ -273,10 +271,6 @@ func resourceBmInstanceCreate(ctx context.Context, d *schema.ResourceData, m int
 		}
 		newInterface[i] = newIface
 	}
-	//for api interface is required, but we cant attach external, and not receive it in interfaceList method
-	if len(ints) == 0 {
-		newInterface = []bminstances.InterfaceOpts{{Type: types.ExternalInterfaceType}}
-	}
 
 	opts := bminstances.CreateOpts{
 		Flavor:        d.Get("flavor_id").(string),
@@ -372,33 +366,80 @@ func resourceBmInstanceRead(ctx context.Context, d *schema.ResourceData, m inter
 	}
 
 	var cleanInterfaces []interface{}
-	for _, iface := range ifs[0].SubPorts {
-		if len(iface.IPAssignments) == 0 {
-			continue
-		}
-
+	for _, iface := range ifs {
 		for _, assignment := range iface.IPAssignments {
 			subnetID := assignment.SubnetID
 
-			_, ok := interfaces[subnetID]
+			//bad idea, but what to do
+			var iOpts instances.InterfaceOpts
+			var orderedIOpts OrderedInterfaceOpts
+			var ok bool
+			// we need to match our interfaces with api's interfaces
+			// but with don't have any unique value, that's why we use exactly that list of keys
+			for _, k := range []string{subnetID, iface.PortID, iface.NetworkID, types.ExternalInterfaceType.String()} {
+				if orderedIOpts, ok = interfaces[k]; ok {
+					iOpts = orderedIOpts.InterfaceOpts
+					break
+				}
+			}
+
 			if !ok {
 				continue
 			}
 
 			i := make(map[string]interface{})
 
-			i["type"] = interfaces[subnetID].Type.String()
+			i["type"] = iOpts.Type.String()
 			i["network_id"] = iface.NetworkID
 			i["subnet_id"] = subnetID
 			i["port_id"] = iface.PortID
-			if interfaces[subnetID].FloatingIP != nil {
-				i["fip_source"] = interfaces[subnetID].FloatingIP.Source.String()
-				i["existing_fip_id"] = interfaces[subnetID].FloatingIP.ExistingFloatingID
+			i["is_trunk"] = true
+			if iOpts.FloatingIP != nil {
+				i["fip_source"] = iOpts.FloatingIP.Source.String()
+				i["existing_fip_id"] = iOpts.FloatingIP.ExistingFloatingID
 			}
-			i["ip_address"] = iface.IPAssignments[0].IPAddress.String()
+			i["ip_address"] = assignment.IPAddress.String()
 
 			cleanInterfaces = append(cleanInterfaces, i)
 		}
+
+		for _, iface1 := range iface.SubPorts {
+			for _, assignment := range iface1.IPAssignments {
+				subnetID := assignment.SubnetID
+
+				//bad idea, but what to do
+				var iOpts instances.InterfaceOpts
+				var orderedIOpts OrderedInterfaceOpts
+				var ok bool
+				// we need to match our interfaces with api's interfaces
+				// but with don't have any unique value, that's why we use exactly that list of keys
+				for _, k := range []string{subnetID, iface1.PortID, iface1.NetworkID, types.ExternalInterfaceType.String()} {
+					if orderedIOpts, ok = interfaces[k]; ok {
+						iOpts = orderedIOpts.InterfaceOpts
+						break
+					}
+				}
+
+				if !ok {
+					continue
+				}
+
+				i := make(map[string]interface{})
+
+				i["type"] = iOpts.Type.String()
+				i["network_id"] = iface1.NetworkID
+				i["subnet_id"] = subnetID
+				i["port_id"] = iface1.PortID
+				i["is_trunk"] = false
+				if iOpts.FloatingIP != nil {
+					i["fip_source"] = iOpts.FloatingIP.Source.String()
+					i["existing_fip_id"] = iOpts.FloatingIP.ExistingFloatingID
+				}
+				i["ip_address"] = assignment.IPAddress.String()
+
+				cleanInterfaces = append(cleanInterfaces, i)
+			}
+		}
 	}
 	if err := d.Set("interface", schema.NewSet(interfaceUniqueID, cleanInterfaces)); err != nil {
 		return diag.FromErr(err)
@@ -500,33 +541,62 @@ func resourceBmInstanceUpdate(ctx context.Context, d *schema.ResourceData, m int
 			}
 
 			iface := i.(map[string]interface{})
+			if iface["is_trunk"].(bool) {
+				return diag.Errorf("could not detach trunk interface")
+			}
+
 			var opts instances.InterfaceOpts
 			opts.PortID = iface["port_id"].(string)
 			opts.IpAddress = iface["ip_address"].(string)
 
-			if err := instances.DetachInterface(client, instanceID, opts).Err; err != nil {
+			log.Printf("[DEBUG] detach interface: %+v", opts)
+			results, err := instances.DetachInterface(client, instanceID, opts).Extract()
+			if err != nil {
 				return diag.FromErr(err)
 			}
+			taskID := results.Tasks[0]
+			_, err = tasks.WaitTaskAndReturnResult(client, taskID, true, InstanceCreatingTimeout, func(task tasks.TaskID) (interface{}, error) {
+				taskInfo, err := tasks.Get(client, string(task)).Extract()
+				if err != nil {
+					return nil, fmt.Errorf("cannot get task with ID: %s. Error: %w, task: %+v", task, err, taskInfo)
+				}
+				return nil, nil
+			},
+			)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+
+		currentIfs, err := instances.ListInterfacesAll(client, d.Id())
+		if err != nil {
+			return diag.FromErr(err)
 		}
 
-		for _, i := range ifsNew.List() {
+		sortedNewIfs := ifsNew.List()
+		sort.Sort(instanceInterfaces(sortedNewIfs))
+		for _, i := range sortedNewIfs {
 			if ifsOld.Contains(i) {
 				log.Println("[DEBUG] Skipped, dont need attach")
 				continue
 			}
-
 			iface := i.(map[string]interface{})
+			if isInterfaceAttached(currentIfs, iface) {
+				continue
+			}
 
 			iType := types.InterfaceType(iface["type"].(string))
 			opts := instances.InterfaceOpts{Type: iType}
 			switch iType {
 			case types.SubnetInterfaceType:
 				opts.SubnetID = iface["subnet_id"].(string)
-				//opts.NetworkID = iface["network_id"].(string)
-			case types.ExternalInterfaceType:
-				continue
+			case types.AnySubnetInterfaceType:
+				opts.NetworkID = iface["network_id"].(string)
+			case types.ReservedFixedIpType:
+				opts.PortID = iface["port_id"].(string)
 			}
 
+			log.Printf("[DEBUG] attach interface: %+v", opts)
 			results, err := instances.AttachInterface(client, instanceID, opts).Extract()
 			if err != nil {
 				return diag.Errorf("cannot attach interface: %s. Error: %s", iType, err)

gcore/utils.go

@@ -84,7 +84,9 @@ func (s instanceInterfaces) Len() int {
 func (s instanceInterfaces) Less(i, j int) bool {
 	ifLeft := s[i].(map[string]interface{})
 	ifRight := s[j].(map[string]interface{})
-	return ifLeft["order"].(int) < ifRight["order"].(int)
+	lOrder, _ := ifLeft["order"].(int)
+	rOrder, _ := ifRight["order"].(int)
+	return lOrder < rOrder
 }
 
 func (s instanceInterfaces) Swap(i, j int) {
@@ -669,3 +671,29 @@ func parseCIDRFromString(cidr string) (gcorecloud.CIDR, error) {
 	gccidr.Mask = netIPNet.Mask
 	return gccidr, nil
 }
+
+func isInterfaceAttached(ifs []instances.Interface, ifs2 map[string]interface{}) bool {
+	subnetID, _ := ifs2["subnet_id"].(string)
+	iType := types.InterfaceType(ifs2["type"].(string))
+	for _, i := range ifs {
+		if iType == types.ExternalInterfaceType && i.NetworkDetails.External {
+			return true
+		}
+		for _, assignement := range i.IPAssignments {
+			if assignement.SubnetID == subnetID {
+				return true
+			}
+		}
+		for _, subPort := range i.SubPorts {
+			if iType == types.ExternalInterfaceType && subPort.NetworkDetails.External {
+				return true
+			}
+			for _, assignement := range subPort.IPAssignments {
+				if assignement.SubnetID == subnetID {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}

go.mod

@@ -10,8 +10,9 @@ require (
 	github.com/G-Core/gcorelabscdn-go v0.1.2
 	github.com/G-Core/gcorelabscloud-go v0.4.34
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
+	github.com/hashicorp/terraform-plugin-docs v0.5.1 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0
-	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-colorable v0.1.11 // indirect
 	github.com/mitchellh/mapstructure v1.4.1
-	github.com/zclconf/go-cty v1.9.1 // indirect
+	github.com/zclconf/go-cty v1.10.0 // indirect
 )