Merge branch 'master' into feat/add_support_for_blockedlist

Author: jremy42

internal/services/tem/domain_validation.go

@@ -89,6 +89,16 @@ func ResourceDomainValidationCreate(ctx context.Context, d *schema.ResourceData,
 		return nil
 	})
 
+	domainCheck, _ := api.CheckDomain(&tem.CheckDomainRequest{
+		Region:   region,
+		DomainID: domain.ID,
+	})
+	if domainCheck == nil || domainCheck.Status == "pending" || domainCheck.Status == "unchecked" || domainCheck.Status == "autoconfiguring" {
+		d.SetId("")
+
+		return diag.Errorf("domain validation did not complete in %d seconds", duration)
+	}
+
 	return ResourceDomainValidationRead(ctx, d, meta)
 }
 

internal/services/tem/domain_validation_test.go

@@ -2,6 +2,7 @@ package tem_test
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -10,11 +11,11 @@ import (
 
 const domainNameValidation = "scaleway-terraform.com"
 
-func TestAccDomainValidation_NoValidation(t *testing.T) {
+func TestAccDomainValidation_Validation(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	subDomainName := "validation-no-validation"
+	subDomainName := "validation-validation"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
@@ -32,27 +33,28 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
 					resource scaleway_tem_domain cr01 {
 						name       = scaleway_domain_zone.test.id
 						accept_tos = true
+						autoconfig = true
 					}
 
 					resource scaleway_tem_domain_validation valid {
   						domain_id = scaleway_tem_domain.cr01.id
   						region = scaleway_tem_domain.cr01.region
-						timeout = 1
+						timeout = 3600
 					}
 				`, domainNameValidation, subDomainName),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "false"),
+					resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
 				),
 			},
 		},
 	})
 }
 
-func TestAccDomainValidation_Validation(t *testing.T) {
+func TestAccDomainValidation_TimeoutError(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	subDomainName := "validation-validation"
+	subDomainName := "validation-timeout"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
@@ -62,26 +64,23 @@ func TestAccDomainValidation_Validation(t *testing.T) {
 			{
 				Config: fmt.Sprintf(`
 
-					resource "scaleway_domain_zone" "test" {
-  						domain    = "%s"
-  						subdomain = "%s"
-					}
+                    resource "scaleway_domain_zone" "test" {
+                        domain    = "%s"
+                        subdomain = "%s"
+                    }
 
-					resource scaleway_tem_domain cr01 {
-						name       = scaleway_domain_zone.test.id
-						accept_tos = true
-						autoconfig = true
-					}
+                    resource scaleway_tem_domain cr01 {
+                        name       = scaleway_domain_zone.test.id
+                        accept_tos = true
+                    }
 
-					resource scaleway_tem_domain_validation valid {
-  						domain_id = scaleway_tem_domain.cr01.id
-  						region = scaleway_tem_domain.cr01.region
-						timeout = 3600
-					}
-				`, domainNameValidation, subDomainName),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
-				),
+                    resource scaleway_tem_domain_validation valid {
+                        domain_id = scaleway_tem_domain.cr01.id
+                        region    = scaleway_tem_domain.cr01.region
+                        timeout   = 1
+                    }
+                `, domainNameValidation, subDomainName),
+				ExpectError: regexp.MustCompile("(?i)domain validation did not complete"),
 			},
 		},
 	})