Skip to content

Commit 69c8334

Browse files
jremy42jremy42
authored
fix(tem) add specific domain for webhook test (#2747)
* fix(tem) add specific domain for webhook test * fix(tem) refacto test for handle conflict
1 parent 9898038 commit 69c8334

13 files changed

+8057
-8472
lines changed

‎internal/services/tem/domain_test.go

+28-16
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ func TestAccDomain_Tos(t *testing.T) {
7373
func TestAccDomain_Autoconfig(t *testing.T) {
7474
tt := acctest.NewTestTools(t)
7575
defer tt.Cleanup()
76+
subDomainName := "test-autoconfig"
7677

7778
resource.ParallelTest(t, resource.TestCase{
7879
PreCheck: func() { acctest.PreCheck(t) },
@@ -81,8 +82,14 @@ func TestAccDomain_Autoconfig(t *testing.T) {
8182
Steps: []resource.TestStep{
8283
{
8384
Config: fmt.Sprintf(`
85+
86+
resource "scaleway_domain_zone" "test" {
87+
domain = "%s"
88+
subdomain = "%s"
89+
}
90+
8491
resource scaleway_tem_domain cr01 {
85-
name = "%s"
92+
name = scaleway_domain_zone.test.id
8693
accept_tos = true
8794
autoconfig = true
8895
}
@@ -93,13 +100,13 @@ func TestAccDomain_Autoconfig(t *testing.T) {
93100
timeout = 3600
94101
}
95102
96-
`, domainNameValidation),
103+
`, domainNameValidation, subDomainName),
97104
Check: resource.ComposeTestCheckFunc(
98105
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
99-
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", domainNameValidation),
106+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
100107
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),
101108
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
102-
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"),
109+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"+"."+subDomainName),
103110
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
104111
acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
105112
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
@@ -112,6 +119,7 @@ func TestAccDomain_Autoconfig(t *testing.T) {
112119
func TestAccDomain_AutoconfigUpdate(t *testing.T) {
113120
tt := acctest.NewTestTools(t)
114121
defer tt.Cleanup()
122+
subDomainName := "test-autoconfig-update"
115123

116124
resource.ParallelTest(t, resource.TestCase{
117125
PreCheck: func() { acctest.PreCheck(t) },
@@ -120,41 +128,45 @@ func TestAccDomain_AutoconfigUpdate(t *testing.T) {
120128
Steps: []resource.TestStep{
121129
{
122130
Config: fmt.Sprintf(`
131+
resource "scaleway_domain_zone" "test" {
132+
domain = "%s"
133+
subdomain = "%s"
134+
}
135+
123136
resource scaleway_tem_domain cr01 {
124-
name = "%s"
137+
name = scaleway_domain_zone.test.id
125138
accept_tos = true
126139
autoconfig = false
127140
}
128141
129-
`, domainNameValidation),
142+
`, domainNameValidation, subDomainName),
130143
Check: resource.ComposeTestCheckFunc(
131144
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
132-
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", domainNameValidation),
145+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
133146
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "false"),
134147
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
135-
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"),
148+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", "_dmarc"+"."+subDomainName),
136149
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
137150
acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
138151
),
139152
},
140153
{
141154
Config: fmt.Sprintf(`
155+
resource "scaleway_domain_zone" "test" {
156+
domain = "%s"
157+
subdomain = "%s"
158+
}
159+
142160
resource scaleway_tem_domain cr01 {
143-
name = "%s"
161+
name = scaleway_domain_zone.test.id
144162
accept_tos = true
145163
autoconfig = true
146164
}
147165
148-
resource scaleway_tem_domain_validation valid {
149-
domain_id = scaleway_tem_domain.cr01.id
150-
region = scaleway_tem_domain.cr01.region
151-
timeout = 3600
152-
}
153-
`, domainNameValidation),
166+
`, domainNameValidation, subDomainName),
154167
Check: resource.ComposeTestCheckFunc(
155168
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
156169
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),
157-
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
158170
),
159171
},
160172
},

‎internal/services/tem/domain_validation_test.go

+18-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const domainNameValidation = "scaleway-terraform.com"
1313
func TestAccDomainValidation_NoValidation(t *testing.T) {
1414
tt := acctest.NewTestTools(t)
1515
defer tt.Cleanup()
16+
subDomainName := "validation-no-validation"
1617

1718
resource.ParallelTest(t, resource.TestCase{
1819
PreCheck: func() { acctest.PreCheck(t) },
@@ -21,8 +22,14 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
2122
Steps: []resource.TestStep{
2223
{
2324
Config: fmt.Sprintf(`
25+
26+
resource "scaleway_domain_zone" "test" {
27+
domain = "%s"
28+
subdomain = "%s"
29+
}
30+
2431
resource scaleway_tem_domain cr01 {
25-
name = "%s"
32+
name = scaleway_domain_zone.test.id
2633
accept_tos = true
2734
}
2835
@@ -31,7 +38,7 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
3138
region = scaleway_tem_domain.cr01.region
3239
timeout = 1
3340
}
34-
`, domainNameValidation),
41+
`, domainNameValidation, subDomainName),
3542
Check: resource.ComposeTestCheckFunc(
3643
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "false"),
3744
),
@@ -43,6 +50,7 @@ func TestAccDomainValidation_NoValidation(t *testing.T) {
4350
func TestAccDomainValidation_Validation(t *testing.T) {
4451
tt := acctest.NewTestTools(t)
4552
defer tt.Cleanup()
53+
subDomainName := "validation-validation"
4654

4755
resource.ParallelTest(t, resource.TestCase{
4856
PreCheck: func() { acctest.PreCheck(t) },
@@ -51,8 +59,14 @@ func TestAccDomainValidation_Validation(t *testing.T) {
5159
Steps: []resource.TestStep{
5260
{
5361
Config: fmt.Sprintf(`
62+
63+
resource "scaleway_domain_zone" "test" {
64+
domain = "%s"
65+
subdomain = "%s"
66+
}
67+
5468
resource scaleway_tem_domain cr01 {
55-
name = "%s"
69+
name = scaleway_domain_zone.test.id
5670
accept_tos = true
5771
autoconfig = true
5872
}
@@ -62,7 +76,7 @@ func TestAccDomainValidation_Validation(t *testing.T) {
6276
region = scaleway_tem_domain.cr01.region
6377
timeout = 3600
6478
}
65-
`, domainNameValidation),
79+
`, domainNameValidation, subDomainName),
6680
Check: resource.ComposeTestCheckFunc(
6781
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
6882
),

0 commit comments

Comments
 (0)