vultr/resource*: cleanup and standardize 404s

squat · Nov 17, 2018 · 74c2fad · 74c2fad
1 parent 59cbee0
commit 74c2fad
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/vultr/resource_bare_metal.go b/vultr/resource_bare_metal.go
@@ -190,7 +190,7 @@ func resourceBareMetalRead(d *schema.ResourceData, meta interface{}) error {
 
 	instance, err := client.GetBareMetalServer(d.Id())
 	if err != nil {
-		if err.Error() == "Invalid server." {
+		if strings.HasPrefix(err.Error(), "Invalid server") {
 			log.Printf("[WARN] Removing bare metal instance (%s) because it is gone", d.Id())
 			d.Set("status", "none")
 			d.SetId("")

diff --git a/vultr/resource_block_storage.go b/vultr/resource_block_storage.go
@@ -3,6 +3,7 @@ package vultr
 import (
 	"fmt"
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )
@@ -86,7 +87,7 @@ func resourceBlockStorageRead(d *schema.ResourceData, meta interface{}) error {
 
 	storage, err := client.GetBlockStorage(d.Id())
 	if err != nil {
-		if err.Error() == "Invalid block storage." {
+		if strings.HasPrefix(err.Error(), "Invalid block storage") {
 			log.Printf("[WARN] Removing block storage (%s) because it is gone", d.Id())
 			d.SetId("")
 			return nil
@@ -161,7 +162,7 @@ func resourceBlockStorageDelete(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 	if err := client.DeleteBlockStorage(d.Id()); err != nil {
-		return fmt.Errorf("Error block storage (%s): %v", d.Id(), err)
+		return fmt.Errorf("Error destroying block storage (%s): %v", d.Id(), err)
 	}
 
 	return nil

diff --git a/vultr/resource_dns_domain.go b/vultr/resource_dns_domain.go
@@ -77,7 +77,7 @@ func resourceDNSDomainRead(d *schema.ResourceData, meta interface{}) error {
 	// Find the default record for the domain.
 	records, err := client.GetDNSRecords(dnsDomain.Domain)
 	if err != nil {
-		if strings.HasPrefix(err.Error(), "Invalid domain.") {
+		if strings.HasPrefix(err.Error(), "Invalid domain") {
 			log.Printf("[WARN] Removing DNS domain (%s) because it has no default record", d.Id())
 			d.SetId("")
 			return nil

diff --git a/vultr/resource_dns_record.go b/vultr/resource_dns_record.go
@@ -108,7 +108,7 @@ func resourceDNSRecordRead(d *schema.ResourceData, meta interface{}) error {
 
 	records, err := client.GetDNSRecords(domain)
 	if err != nil {
-		if strings.HasPrefix(err.Error(), "Invalid domain.") {
+		if strings.HasPrefix(err.Error(), "Invalid domain") {
 			log.Printf("[WARN] Removing DNS record (%s) because the domain is gone", d.Id())
 			d.SetId("")
 			return nil

diff --git a/vultr/resource_firewall_group.go b/vultr/resource_firewall_group.go
@@ -3,6 +3,7 @@ package vultr
 import (
 	"fmt"
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )
@@ -60,7 +61,7 @@ func resourceFirewallGroupRead(d *schema.ResourceData, meta interface{}) error {
 
 	firewallGroup, err := client.GetFirewallGroup(d.Id())
 	if err != nil {
-		if err.Error() == fmt.Sprintf("Firewall group with ID %v not found", d.Id()) {
+		if strings.HasPrefix(err.Error(), fmt.Sprintf("Firewall group with ID %v not found", d.Id())) {
 			log.Printf("[WARN] Removing firewall group (%s) because it is gone", d.Id())
 			d.SetId("")
 			return nil

diff --git a/vultr/resource_instance.go b/vultr/resource_instance.go
@@ -266,7 +266,7 @@ func resourceInstanceRead(d *schema.ResourceData, meta interface{}) error {
 
 	instance, err := client.GetServer(d.Id())
 	if err != nil {
-		if err.Error() == "Invalid server." {
+		if strings.HasPrefix(err.Error(), "Invalid server") {
 			log.Printf("[WARN] Removing instance (%s) because it is gone", d.Id())
 			d.SetId("")
 			return nil
@@ -438,7 +438,7 @@ func resourceInstanceDelete(d *schema.ResourceData, meta interface{}) error {
 			}
 
 			// Server does not exist so it has been deleted.
-			if strings.HasPrefix(err.Error(), "Invalid server.") {
+			if strings.HasPrefix(err.Error(), "Invalid server") {
 				break
 			}
 			// There was a legitimate error.

diff --git a/vultr/resource_ipv4.go b/vultr/resource_ipv4.go
@@ -111,7 +111,7 @@ func resourceIPV4Read(d *schema.ResourceData, meta interface{}) error {
 
 	ips, err := client.ListIPv4(instance)
 	if err != nil {
-		if strings.HasPrefix(err.Error(), "Invalid server.") {
+		if strings.HasPrefix(err.Error(), "Invalid server") {
 			log.Printf("[WARN] Removing IPv4 address (%s) because the attached instance (%s) is gone", d.Id(), instance)
 			d.SetId("")
 			return nil

diff --git a/vultr/resource_reserved_ip.go b/vultr/resource_reserved_ip.go
@@ -3,6 +3,7 @@ package vultr
 import (
 	"fmt"
 	"log"
+	"strings"
 
 	"github.com/JamesClonk/vultr/lib"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -87,15 +88,14 @@ func resourceReservedIPRead(d *schema.ResourceData, meta interface{}) error {
 
 	rip, err := client.GetReservedIP(d.Id())
 	if err != nil {
+		if strings.HasPrefix(err.Error(), fmt.Sprintf("IP with ID %v not found", d.Id())) {
+			log.Printf("[WARN] Removing reserved ip (%s) because it is gone", d.Id())
+			d.SetId("")
+			return nil
+		}
 		return fmt.Errorf("Error getting reserved ip (%s): %v", d.Id(), err)
 	}
 
-	if rip == (lib.IP{}) {
-		log.Printf("[WARN] Removing reserved ip (%s) because it is gone", d.Id())
-		d.SetId("")
-		return nil
-	}
-
 	d.Set("attached_id", rip.AttachedTo)
 	d.Set("cidr", reservedIPToCIDR(rip))
 	d.Set("name", rip.Label)