update instance interfaces, switch type from set to list

Author: Alexandr Sokolov

gcore/resource_gcore_floatingip.go

@@ -82,6 +82,7 @@ func resourceFloatingIP() *schema.Resource {
 			"fixed_ip_address": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ValidateDiagFunc: func(val interface{}, key cty.Path) diag.Diagnostics {
 					v := val.(string)
 					ip := net.ParseIP(v)
@@ -103,6 +104,7 @@ func resourceFloatingIP() *schema.Resource {
 			"port_id": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 			},
 			"updated_at": &schema.Schema{
 				Type:     schema.TypeString,

gcore/resource_gcore_instance.go

@@ -161,8 +161,7 @@ func resourceInstance() *schema.Resource {
 				},
 			},
 			"interface": &schema.Schema{
-				Type:     schema.TypeSet,
-				Set:      interfaceUniqueID,
+				Type:     schema.TypeList,
 				Required: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -180,6 +179,7 @@ func resourceInstance() *schema.Resource {
 							Type:        schema.TypeString,
 							Description: "required if type is 'subnet' or 'any_subnet'",
 							Optional:    true,
+							Computed:    true,
 						},
 						"subnet_id": {
 							Type:        schema.TypeString,
@@ -396,7 +396,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter
 		createOpts.Volumes = vs
 	}
 
-	ifs := d.Get("interface").(*schema.Set).List()
+	ifs := d.Get("interface").([]interface{})
 	//sort interfaces by 'order' key to attach it in right order
 	sort.Sort(instanceInterfaces(ifs))
 	if len(ifs) > 0 {
@@ -533,7 +533,7 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
 		return diag.FromErr(err)
 	}
 
-	interfaces, err := extractInstanceInterfaceIntoMap(d.Get("interface").(*schema.Set).List())
+	interfaces, err := extractInstanceInterfaceIntoMap(d.Get("interface").([]interface{}))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -580,7 +580,7 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
 			cleanInterfaces = append(cleanInterfaces, i)
 		}
 	}
-	if err := d.Set("interface", schema.NewSet(interfaceUniqueID, cleanInterfaces)); err != nil {
+	if err := d.Set("interface", cleanInterfaces); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -765,10 +765,10 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 	if d.HasChange("interface") {
 		ifsOldRaw, ifsNewRaw := d.GetChange("interface")
 
-		ifsOld := ifsOldRaw.(*schema.Set)
-		ifsNew := ifsNewRaw.(*schema.Set)
+		ifsOld := ifsOldRaw.([]interface{})
+		ifsNew := ifsNewRaw.([]interface{})
 
-		for _, i := range ifsOld.List() {
+		for _, i := range ifsOld {
 			iface := i.(map[string]interface{})
 			var opts instances.InterfaceOpts
 			opts.PortID = iface["port_id"].(string)
@@ -793,9 +793,8 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 			}
 		}
 
-		sortedNewIfs := ifsNew.List()
-		sort.Sort(instanceInterfaces(sortedNewIfs))
-		for _, i := range sortedNewIfs {
+		sort.Sort(instanceInterfaces(ifsNew))
+		for _, i := range ifsNew {
 			iface := i.(map[string]interface{})
 
 			iType := types.InterfaceType(iface["type"].(string))

gcore/resource_gcore_reservedfixedip.go

@@ -247,7 +247,14 @@ func resourceReservedFixedIPRead(ctx context.Context, d *schema.ResourceData, m
 
 	reservedFixedIP, err := reservedfixedips.Get(client, d.Id()).Extract()
 	if err != nil {
-		return diag.FromErr(err)
+		switch err.(type) {
+		case gcorecloud.ErrDefault404:
+			log.Printf("[WARN] Removing reserved fixed ip %s because resource doesn't exist anymore", d.Id())
+			d.SetId("")
+			return nil
+		default:
+			return diag.FromErr(err)
+		}
 	}
 
 	d.Set("project_id", reservedFixedIP.ProjectID)