fix the tests

[github/fretlink/terraform-provider-mailgun.git] / mailgun / resource_mailgun_domain.go

diff --git a/mailgun/resource_mailgun_domain.go b/mailgun/resource_mailgun_domain.go
index 86531c62aec01cefcdbb59a767f3a93beaada9e9..e2bfe732e7fe68142addfe6e7e517f3868a52f33 100644 (file)
--- a/mailgun/resource_mailgun_domain.go
+++ b/mailgun/resource_mailgun_domain.go
@@ -366,7 +366,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 +425,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 +491,15 @@ func ImportStatePassthroughDomain(d *schema.ResourceData, meta interface{}) ([]*
        }
        return []*schema.ResourceData{d}, nil
 }
+
+func getIps(ctx context.Context,mg *mailgun.MailgunImpl) ([]mailgun.IPAddress, error){
+       start := time.Now()
+       t := time.Now()
+       ipAddress, err := mg.ListDomainIPS(ctx)
+       for (err != nil && t.Sub(start)< 120 * time.Second) {
+               ipAddress, err = mg.ListDomainIPS(ctx)
+               time.Sleep(5 * time.Second)
+               t = time.Now()
+       }
+       return ipAddress, err
+}