resource_{domain,email_forward}: Return 404s to the user

- Previously the for loop just carried on when it got a 404 error back
  that the resource didn't exist. This actually returns that error to
  the user.

Author: issyl0

improvmx/resource_domain.go

@@ -1,6 +1,7 @@
 package improvmx
 
 import (
+	"fmt"
 	"log"
 	"time"
 
@@ -47,6 +48,11 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
 			time.Sleep(10 * time.Second)
 		}
 
+		if resp.Code == 404 {
+			log.Printf("[DEBUG] Couldn't find the resource in ImprovMX. Aborting")
+			return fmt.Errorf("HTTP response code %d, error text: %s", resp.Code, resp.Errors.Domain)
+		}
+
 		if resp.Success {
 			return resourceDomainRead(d, meta)
 		}
@@ -68,6 +74,11 @@ func resourceDomainRead(d *schema.ResourceData, meta interface{}) error {
 			time.Sleep(10 * time.Second)
 		}
 
+		if resp.Code == 404 {
+			log.Printf("[DEBUG] Couldn't find the resource in ImprovMX. Aborting")
+			return fmt.Errorf("HTTP response code %d, error text: %s", resp.Code, resp.Errors.Domain)
+		}
+
 		if resp.Success {
 			d.SetId(resp.Domain.Domain)
 			d.Set("domain", resp.Domain.Domain)
@@ -92,6 +103,11 @@ func resourceDomainUpdate(d *schema.ResourceData, meta interface{}) error {
 			time.Sleep(10 * time.Second)
 		}
 
+		if resp.Code == 404 {
+			log.Printf("[DEBUG] Couldn't find the resource in ImprovMX. Aborting")
+			return fmt.Errorf("HTTP response code %d, error text: %s", resp.Code, resp.Errors.Domain)
+		}
+
 		if resp.Success {
 			return resourceDomainRead(d, meta)
 		}

improvmx/resource_email_forward.go

@@ -61,6 +61,11 @@ func resourceEmailForwardRead(d *schema.ResourceData, meta interface{}) error {
 			time.Sleep(10 * time.Second)
 		}
 
+		if resp.Code == 404 {
+			log.Printf("[DEBUG] Couldn't find the resource in ImprovMX. Aborting")
+			return fmt.Errorf("HTTP response code %d, error text: %s", resp.Code, resp.Errors.Domain)
+		}
+
 		if resp.Success {
 			d.SetId(strconv.FormatInt(resp.Alias.Id, 10))
 			d.Set("alias_name", resp.Alias.Alias)
@@ -84,6 +89,11 @@ func resourceEmailForwardUpdate(d *schema.ResourceData, meta interface{}) error
 			time.Sleep(10 * time.Second)
 		}
 
+		if resp.Code == 404 {
+			log.Printf("[DEBUG] Couldn't find the resource in ImprovMX. Aborting")
+			return fmt.Errorf("HTTP response code %d, error text: %s", resp.Code, resp.Errors.Domain)
+		}
+
 		if resp.Success {
 			return resourceEmailForwardRead(d, meta)
 		}