instance and reservedfixedip deletion fixed

Author: Alexandr Sokolov

gcore/provider_test.go

@@ -381,7 +381,7 @@ func createTestConfig() (*Config, error) {
 		DNSClient:     dnsClient,
 	}
 
-	return &config, err
+	return &config, nil
 }
 
 func testAccCheckResourceExists(resourceName string) resource.TestCheckFunc {

gcore/resource_gcore_instance.go

@@ -922,8 +922,6 @@ func resourceInstanceDelete(ctx context.Context, d *schema.ResourceData, m inter
 	}
 
 	var delOpts instances.DeleteOpts
-	delOpts.DeleteFloatings = true
-
 	results, err := instances.Delete(client, instanceID, delOpts).Extract()
 	if err != nil {
 		return diag.FromErr(err)

gcore/resource_gcore_reservedfixedip.go

@@ -322,7 +322,14 @@ func resourceReservedFixedIPDelete(ctx context.Context, d *schema.ResourceData,
 	id := d.Id()
 	results, err := reservedfixedips.Delete(client, id).Extract()
 	if err != nil {
-		return diag.FromErr(err)
+		switch err.(type) {
+		case gcorecloud.ErrDefault404:
+			d.SetId("")
+			log.Printf("[DEBUG] Finish of ReservedFixedIP deleting")
+			return diags
+		default:
+			return diag.FromErr(err)
+		}
 	}
 
 	taskID := results.Tasks[0]