Added the option to recreate resource if not found

in the cloud
civo · Jun 7, 2020 · 256b2e3 · 256b2e3
1 parent a239402
commit 256b2e3
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 13 deletions.
diff --git a/civo/resource_dns_domain_name.go b/civo/resource_dns_domain_name.go
@@ -58,7 +58,7 @@ func resourceDNSDomainNameRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retriving the domain %s", d.Get("name").(string))
 	resp, err := apiClient.GetDNSDomain(d.Get("name").(string))
 	if err != nil {
-		if resp != nil {
+		if resp == nil {
 			d.SetId("")
 			return nil
 		}

diff --git a/civo/resource_dns_domain_record.go b/civo/resource_dns_domain_record.go
@@ -145,10 +145,11 @@ func resourceDNSDomainRecordRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retriving the domain record %s", d.Get("name").(string))
 	resp, err := apiClient.GetDNSRecord(d.Get("domain_id").(string), d.Id())
 	if err != nil {
-		if resp != nil {
+		if resp == nil {
 			d.SetId("")
 			return nil
 		}
+
 		return fmt.Errorf("[WARN] domain record (%s) not found", d.Id())
 	}
 

diff --git a/civo/resource_firewall.go b/civo/resource_firewall.go
@@ -55,10 +55,11 @@ func resourceFirewallRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retriving the firewall %s", d.Id())
 	resp, err := apiClient.FindFirewall(d.Id())
 	if err != nil {
-		if resp != nil {
+		if resp == nil {
 			d.SetId("")
 			return nil
 		}
+
 		return fmt.Errorf("[ERR] error retrieving firewall %s, %s", d.Id(), err)
 	}
 

diff --git a/civo/resource_firewall_rule.go b/civo/resource_firewall_rule.go
@@ -126,7 +126,7 @@ func resourceFirewallRuleRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retriving the firewall rule %s", d.Id())
 	resp, err := apiClient.FindFirewallRule(d.Get("firewall_id").(string), d.Id())
 	if err != nil {
-		if resp != nil {
+		if resp == nil {
 			d.SetId("")
 			return nil
 		}

diff --git a/civo/resource_instance.go b/civo/resource_instance.go
@@ -225,7 +225,7 @@ func resourceInstanceRead(d *schema.ResourceData, m interface{}) error {
 
 	log.Printf("[INFO] retriving the instance %s", d.Id())
 	resp, err := apiClient.GetInstance(d.Id())
-	if err != nil {
+	if err == nil {
 		d.SetId("")
 		// check if the instance no longer exists.
 		return fmt.Errorf("[ERR] instance (%s) not found", d.Id())

diff --git a/civo/resource_loadbalancer.go b/civo/resource_loadbalancer.go
@@ -178,7 +178,7 @@ func resourceLoadBalancerRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retrieving the load balancer %s", d.Id())
 	resp, err := apiClient.FindLoadBalancer(d.Id())
 	if err != nil {
-		if resp != nil {
+		if resp == nil {
 			d.SetId("")
 			return nil
 		}

diff --git a/civo/resource_network.go b/civo/resource_network.go
@@ -2,9 +2,10 @@ package civo
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/civo/civogo"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"log"
 )
 
 // The resource network represent a network inside the cloud
@@ -71,6 +72,11 @@ func resourceNetworkRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retriving the network %s", d.Id())
 	resp, err := apiClient.ListNetworks()
 	if err != nil {
+		if resp == nil {
+			d.SetId("")
+			return nil
+		}
+
 		return fmt.Errorf("[ERR] failed to list all network %s", err)
 	}
 

diff --git a/civo/resource_snapshot.go b/civo/resource_snapshot.go
@@ -153,6 +153,11 @@ func resourceSnapshotRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retrieving the snapshot %s", d.Get("name").(string))
 	resp, err := apiClient.FindSnapshot(d.Id())
 	if err != nil {
+		if resp == nil {
+			d.SetId("")
+			return nil
+		}
+
 		return fmt.Errorf("[ERR] failed retrieving the snapshot: %s", err)
 	}
 

diff --git a/civo/resource_ssh.go b/civo/resource_ssh.go
@@ -2,9 +2,10 @@ package civo
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/civo/civogo"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"log"
 )
 
 // Ssh resource, with this we can create and manage all Snapshot
@@ -63,7 +64,7 @@ func resourceSSHKeyRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retrieving the new ssh key %s", d.Get("name").(string))
 	sshKey, err := apiClient.FindSSHKey(d.Id())
 	if err != nil {
-		if sshKey != nil {
+		if sshKey == nil {
 			d.SetId("")
 			return nil
 		}

diff --git a/civo/resource_template.go b/civo/resource_template.go
@@ -2,10 +2,11 @@ package civo
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/civo/civogo"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"log"
 )
 
 // Template resource, with this we can create and manage all template
@@ -144,6 +145,10 @@ func resourceTemplateRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retrieving the template %s", d.Get("code").(string))
 	resp, err := apiClient.GetTemplateByCode(d.Get("code").(string))
 	if err != nil {
+		if resp == nil {
+			d.SetId("")
+			return nil
+		}
 		return fmt.Errorf("[ERR] failed to retrieving the template: %s", err)
 	}
 

diff --git a/civo/resource_volume.go b/civo/resource_volume.go
@@ -2,10 +2,11 @@ package civo
 
 import (
 	"fmt"
-	"github.com/civo/civogo"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"time"
+
+	"github.com/civo/civogo"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 // Volume resource, with this we can create and manage all volume
@@ -74,6 +75,10 @@ func resourceVolumeRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retrieving the volume %s", d.Id())
 	resp, err := apiClient.FindVolume(d.Id())
 	if err != nil {
+		if resp == nil {
+			d.SetId("")
+			return nil
+		}
 		return fmt.Errorf("[ERR] failed retrieving the volume: %s", err)
 	}
 

diff --git a/civo/resource_volume_attachment.go b/civo/resource_volume_attachment.go
@@ -72,7 +72,7 @@ func resourceVolumeAttachmentRead(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[INFO] retrieving the volume %s", volumeID)
 	resp, err := apiClient.FindVolume(volumeID)
 	if err != nil {
-		if resp != nil {
+		if resp == nil {
 			d.SetId("")
 			return nil
 		}