2 files changed, 36 insertions, 11 deletions

diff --git a/mailgun/resource_mailgun_domain.go b/mailgun/resource_mailgun_domain.go
index 86531c6..c195cf0 100644
--- a/mailgun/resource_mailgun_domain.go
+++ b/mailgun/resource_mailgun_domain.go
@@ -4,6 +4,7 @@ import (
         "context"
         "fmt"
         "github.com/hashicorp/terraform/helper/schema"
+        "github.com/hashicorp/terraform/helper/resource"
         "github.com/mailgun/mailgun-go/v3"
         "log"
         "time"
@@ -366,7 +367,7 @@ func DeleteDomain(d *schema.ResourceData, meta interface{}) error {
 
 func ReadDomain(d *schema.ResourceData, meta interface{}) error {
         mg := meta.(*mailgun.MailgunImpl)
-        ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+        ctx, cancel := context.WithTimeout(context.Background(), time.Second*120)
         defer cancel()
         domainName := d.Id()
         mg = mailgun.NewMailgun(domainName, mg.APIKey())
@@ -425,9 +426,7 @@ func ReadDomain(d *schema.ResourceData, meta interface{}) error {
         d.Set("unsubscribe_tracking_settings_html_footer", domainTracking.Unsubscribe.HTMLFooter)
         d.Set("unsubscribe_tracking_settings_text_footer", domainTracking.Unsubscribe.TextFooter)
 
-        time.Sleep(25 * time.Second)
-
-        ipAddress, err := mg.ListDomainIPS(ctx)
+        ipAddress, err := getIps(ctx, mg)
 
         if err != nil {
                 return fmt.Errorf("Error Getting mailgun domain ips1 for %s: Error: %s", d.Id(), err)
@@ -493,3 +492,20 @@ func ImportStatePassthroughDomain(d *schema.ResourceData, meta interface{}) ([]*
         }
         return []*schema.ResourceData{d}, nil
 }
+
+func getIps(ctx context.Context,mg *mailgun.MailgunImpl) ([]mailgun.IPAddress, error){
+        var ipAddress []mailgun.IPAddress
+        log.Printf("[DEBUG] begin to fetch ips for %s",mg.Domain())
+        err := resource.Retry(2*time.Minute, func() *resource.RetryError {
+                var err error
+                ipAddress, err = mg.ListDomainIPS(ctx)
+                if err != nil {
+                        log.Printf("[DEBUG] failed to fetch ips for %s",mg.Domain())
+                        return resource.RetryableError(err)
+                }
+                log.Printf("[DEBUG] managed to fetch ips for %s",mg.Domain())
+
+                return nil
+        })
+        return ipAddress, err
+}
diff --git a/mailgun/resource_mailgun_domain_test.go b/mailgun/resource_mailgun_domain_test.go
index 952e013..57aa630 100644
--- a/mailgun/resource_mailgun_domain_test.go
+++ b/mailgun/resource_mailgun_domain_test.go
@@ -10,6 +10,7 @@ import (
         "strconv"
         "testing"
         "time"
+        "log"
 )
 
 type fullDomain struct {
@@ -21,7 +22,7 @@ type fullDomain struct {
 }
 
 func getFullDomain(mg *mailgun.MailgunImpl, domainName string) (*fullDomain, error) {
-        ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+        ctx, cancel := context.WithTimeout(context.Background(), time.Second*120)
         defer cancel()
         mg = mailgun.NewMailgun(domainName, mg.APIKey())
 
@@ -42,7 +43,8 @@ func getFullDomain(mg *mailgun.MailgunImpl, domainName string) (*fullDomain, err
                 return nil, fmt.Errorf("Error Getting mailgun domain tracking Details for %s: Error: %s", domainName, err)
         }
 
-        ipAddress, err := mg.ListDomainIPS(ctx)
+        ipAddress, err := getIps(ctx, mg)
+
         if err != nil {
                 return nil, fmt.Errorf("Error Getting mailgun domain ips2 for %s: Error: %s", domainName, err)
         }
@@ -210,12 +212,19 @@ func testAccDomainCheckDestroy(domain *fullDomain) resource.TestCheckFunc {
                 ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
                 defer cancel()
 
-                _, err := mg.GetDomain(ctx, domain.domainResponse.Domain.Name)
-                if err == nil {
-                        return fmt.Errorf("domain still exists")
-                }
+                log.Printf("[DEBUG] try to fetch destroyed domain %s",mg.Domain())
 
-                return nil
+                return resource.Retry(1*time.Minute, func() *resource.RetryError {
+                        _, err := mg.GetDomain(ctx, domain.domainResponse.Domain.Name)
+                        if err == nil {
+                                log.Printf("[DEBUG] managed to fetch destroyed domain %s",mg.Domain())
+                                return resource.RetryableError(err)
+                        }
+
+                        log.Printf("[DEBUG] failed to fetch destroyed domain %s",mg.Domain())
+
+                        return nil
+                })
         }
 }