fix(tem) refacto test for handle conflict

scaleway · Sep 20, 2024 · 4b410a9 · 4b410a9
1 parent 122aa28
commit 4b410a9
Show file tree

Hide file tree

Showing 13 changed files with 12,609 additions and 2,639 deletions.
diff --git a/internal/services/tem/domain_test.go b/internal/services/tem/domain_test.go
@@ -73,6 +73,7 @@ func TestAccDomain_Tos(t *testing.T) {
 func TestAccDomain_Autoconfig(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
+	subDomainName := "test-autoconfig"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
@@ -81,8 +82,14 @@ func TestAccDomain_Autoconfig(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
+
+					resource "scaleway_domain_zone" "test" {
+  						domain    = "%s"
+  						subdomain = "%s"
+					}
+
 					resource scaleway_tem_domain cr01 {
-						name       = "%s"
+						name       = scaleway_domain_zone.test.id
 						accept_tos = true
 						autoconfig = true
 					}
@@ -93,13 +100,13 @@ func TestAccDomain_Autoconfig(t *testing.T) {
 						timeout = 3600
 					}
 
-				`, domainNameValidation),
+				`, domainNameValidation, subDomainName),
 				Check: resource.ComposeTestCheckFunc(
 					isDomainPresent(tt, "scaleway_tem_domain.cr01"),
-					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", domainNameValidation),
+					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
 					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),
 					resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
-					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"),
+					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"+"."+subDomainName),
 					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
 					acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
 					resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
@@ -112,6 +119,7 @@ func TestAccDomain_Autoconfig(t *testing.T) {
 func TestAccDomain_AutoconfigUpdate(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
+	subDomainName := "test-autoconfig-update"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
@@ -120,32 +128,42 @@ func TestAccDomain_AutoconfigUpdate(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
+					resource "scaleway_domain_zone" "test" {
+  						domain    = "%s"
+  						subdomain = "%s"
+					}
+
 					resource scaleway_tem_domain cr01 {
-						name       = "%s"
+						name       = scaleway_domain_zone.test.id
 						accept_tos = true
 						autoconfig = false
 					}
 
-				`, domainNameValidation),
+				`, domainNameValidation, subDomainName),
 				Check: resource.ComposeTestCheckFunc(
 					isDomainPresent(tt, "scaleway_tem_domain.cr01"),
-					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", domainNameValidation),
+					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
 					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "false"),
 					resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
-					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"),
+					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"+"."+subDomainName),
 					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
 					acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
 				),
 			},
 			{
 				Config: fmt.Sprintf(`
+					resource "scaleway_domain_zone" "test" {
+  						domain    = "%s"
+  						subdomain = "%s"
+					}
+
 					resource scaleway_tem_domain cr01 {
-						name       = "%s"
+						name       = scaleway_domain_zone.test.id
 						accept_tos = true
 						autoconfig = true
 					}
 
-				`, domainNameValidation),
+				`, domainNameValidation, subDomainName),
 				Check: resource.ComposeTestCheckFunc(
 					isDomainPresent(tt, "scaleway_tem_domain.cr01"),
 					resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),

diff --git a/internal/services/tem/domain_validation_test.go b/internal/services/tem/domain_validation_test.go
@@ -13,6 +13,7 @@ const domainNameValidation = "scaleway-terraform.com"
 func TestAccDomainValidation_NoValidation(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
+	subDomainName := "validation-no-validation"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
@@ -21,8 +22,14 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
+
+					resource "scaleway_domain_zone" "test" {
+  						domain    = "%s"
+  						subdomain = "%s"
+					}
+
 					resource scaleway_tem_domain cr01 {
-						name       = "%s"
+						name       = scaleway_domain_zone.test.id
 						accept_tos = true
 					}
 
@@ -31,7 +38,7 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
   						region = scaleway_tem_domain.cr01.region
 						timeout = 1
 					}
-				`, domainNameValidation),
+				`, domainNameValidation, subDomainName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "false"),
 				),
@@ -43,6 +50,7 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
 func TestAccDomainValidation_Validation(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
+	subDomainName := "validation-validation"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
@@ -51,8 +59,14 @@ func TestAccDomainValidation_Validation(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
+
+					resource "scaleway_domain_zone" "test" {
+  						domain    = "%s"
+  						subdomain = "%s"
+					}
+
 					resource scaleway_tem_domain cr01 {
-						name       = "%s"
+						name       = scaleway_domain_zone.test.id
 						accept_tos = true
 						autoconfig = true
 					}
@@ -62,7 +76,7 @@ func TestAccDomainValidation_Validation(t *testing.T) {
   						region = scaleway_tem_domain.cr01.region
 						timeout = 3600
 					}
-				`, domainNameValidation),
+				`, domainNameValidation, subDomainName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
 				),