Skip to content

Commit 61b48b2

Browse files
jremy42jremy42
committed
fix(tem) add specific domain for webhook test
1 parent 9898038 commit 61b48b2

11 files changed

+1680
-12512
lines changed

‎internal/services/tem/domain_test.go

-6
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,10 @@ func TestAccDomain_AutoconfigUpdate(t *testing.T) {
145145
autoconfig = true
146146
}
147147
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-
}
153148
`, domainNameValidation),
154149
Check: resource.ComposeTestCheckFunc(
155150
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
156151
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),
157-
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
158152
),
159153
},
160154
},

‎internal/services/tem/testdata/data-source-domain-basic.cassette.yaml

+1-1,285
Large diffs are not rendered by default.

‎internal/services/tem/testdata/data-source-domain-reputation.cassette.yaml

+1-540
Large diffs are not rendered by default.

‎internal/services/tem/testdata/domain-autoconfig-update.cassette.yaml

+100-808
Large diffs are not rendered by default.

‎internal/services/tem/testdata/domain-autoconfig.cassette.yaml

+1-1,207
Large diffs are not rendered by default.

‎internal/services/tem/testdata/domain-basic.cassette.yaml

+1-448
Large diffs are not rendered by default.

‎internal/services/tem/testdata/domain-validation-no-validation.cassette.yaml

+1-648
Large diffs are not rendered by default.

‎internal/services/tem/testdata/domain-validation-validation.cassette.yaml

+1-1,107
Large diffs are not rendered by default.

‎internal/services/tem/testdata/webhook-basic.cassette.yaml

+531-2,733
Large diffs are not rendered by default.

‎internal/services/tem/testdata/webhook-update.cassette.yaml

+1,023-3,613
Large diffs are not rendered by default.

‎internal/services/tem/webhook_test.go

+20-117
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ import (
1515
)
1616

1717
const (
18-
webhookName = "terraform-webhook-test"
19-
organizationID = "105bdce1-64c0-48ab-899d-868455867ecf"
18+
webhookName = "terraform-webhook-test"
19+
organizationID = "105bdce1-64c0-48ab-899d-868455867ecf"
20+
webhookDomainName = "webhook-test.scaleway-terraform.com"
2021
)
2122

2223
func TestAccWebhook_Basic(t *testing.T) {
@@ -55,50 +56,18 @@ func TestAccWebhook_Basic(t *testing.T) {
5556
secret_key = scaleway_mnq_sns_credentials.sns_credentials.secret_key
5657
}
5758
58-
resource scaleway_tem_domain cr01 {
59-
name = "%s"
60-
accept_tos = true
61-
}
62-
63-
resource "scaleway_domain_record" "spf" {
64-
dns_zone = "%s"
65-
type = "TXT"
66-
data = "v=spf1 ${scaleway_tem_domain.cr01.spf_config} -all"
67-
}
68-
69-
resource "scaleway_domain_record" "dkim" {
70-
dns_zone = "%s"
71-
name = "${scaleway_tem_domain.cr01.project_id}._domainkey"
72-
type = "TXT"
73-
data = scaleway_tem_domain.cr01.dkim_config
74-
}
75-
resource "scaleway_domain_record" "mx" {
76-
dns_zone = "%s"
77-
type = "MX"
78-
data = "."
79-
}
80-
81-
resource "scaleway_domain_record" "dmarc" {
82-
dns_zone = "%s"
83-
name = scaleway_tem_domain.cr01.dmarc_name
84-
type = "TXT"
85-
data = scaleway_tem_domain.cr01.dmarc_config
86-
}
87-
88-
resource scaleway_tem_domain_validation valid {
89-
domain_id = scaleway_tem_domain.cr01.id
90-
region = scaleway_tem_domain.cr01.region
91-
timeout = 3600
59+
data "scaleway_tem_domain" "cr01" {
60+
name = "%s"
9261
}
9362
9463
resource "scaleway_tem_webhook" "webhook" {
9564
name = "%s"
96-
domain_id = scaleway_tem_domain.cr01.id
65+
domain_id = data.scaleway_tem_domain.cr01.id
9766
event_types = ["%s", "%s"]
9867
sns_arn = scaleway_mnq_sns_topic.sns_topic.arn
99-
depends_on = [scaleway_tem_domain_validation.valid, scaleway_mnq_sns_topic.sns_topic]
68+
depends_on = [scaleway_mnq_sns_topic.sns_topic]
10069
}
101-
`, organizationID, domainNameValidation, domainNameValidation, domainNameValidation, domainNameValidation, domainNameValidation, webhookName, eventTypes[0], eventTypes[1]),
70+
`, organizationID, webhookDomainName, webhookName, eventTypes[0], eventTypes[1]),
10271
Check: resource.ComposeTestCheckFunc(
10372
isWebhookPresent(tt, "scaleway_tem_webhook.webhook"),
10473
resource.TestCheckResourceAttr("scaleway_tem_webhook.webhook", "name", webhookName),
@@ -127,7 +96,6 @@ func TestAccWebhook_Update(t *testing.T) {
12796
Steps: []resource.TestStep{
12897
{
12998
Config: fmt.Sprintf(`
130-
13199
data scaleway_account_project "project" {
132100
name = "default"
133101
organization_id = "%s"
@@ -146,55 +114,23 @@ func TestAccWebhook_Update(t *testing.T) {
146114
147115
resource "scaleway_mnq_sns_topic" "sns_topic" {
148116
project_id = data.scaleway_mnq_sns.sns.project_id
149-
name = "test-mnq-sns-topic-update"
117+
name = "test-mnq-sns-topic-basic"
150118
access_key = scaleway_mnq_sns_credentials.sns_credentials.access_key
151119
secret_key = scaleway_mnq_sns_credentials.sns_credentials.secret_key
152120
}
153121
154-
resource scaleway_tem_domain cr01 {
155-
name = "%s"
156-
accept_tos = true
157-
}
158-
159-
resource "scaleway_domain_record" "spf" {
160-
dns_zone = "%s"
161-
type = "TXT"
162-
data = "v=spf1 ${scaleway_tem_domain.cr01.spf_config} -all"
163-
}
164-
165-
resource "scaleway_domain_record" "dkim" {
166-
dns_zone = "%s"
167-
name = "${scaleway_tem_domain.cr01.project_id}._domainkey"
168-
type = "TXT"
169-
data = scaleway_tem_domain.cr01.dkim_config
170-
}
171-
resource "scaleway_domain_record" "mx" {
172-
dns_zone = "%s"
173-
type = "MX"
174-
data = "."
175-
}
176-
177-
resource "scaleway_domain_record" "dmarc" {
178-
dns_zone = "%s"
179-
name = scaleway_tem_domain.cr01.dmarc_name
180-
type = "TXT"
181-
data = scaleway_tem_domain.cr01.dmarc_config
182-
}
183-
184-
resource scaleway_tem_domain_validation valid {
185-
domain_id = scaleway_tem_domain.cr01.id
186-
region = scaleway_tem_domain.cr01.region
187-
timeout = 3600
122+
data "scaleway_tem_domain" "cr01" {
123+
name = "%s"
188124
}
189125
190126
resource "scaleway_tem_webhook" "webhook" {
191127
name = "%s"
192-
domain_id = scaleway_tem_domain.cr01.id
128+
domain_id = data.scaleway_tem_domain.cr01.id
193129
event_types = ["%s"]
194130
sns_arn = scaleway_mnq_sns_topic.sns_topic.arn
195-
depends_on = [scaleway_tem_domain_validation.valid, scaleway_mnq_sns_topic.sns_topic]
131+
depends_on = [scaleway_mnq_sns_topic.sns_topic]
196132
}
197-
`, organizationID, domainNameValidation, domainNameValidation, domainNameValidation, domainNameValidation, domainNameValidation, initialName, eventTypes[0]),
133+
`, organizationID, webhookDomainName, initialName, eventTypes[0]),
198134
Check: resource.ComposeTestCheckFunc(
199135
isWebhookPresent(tt, "scaleway_tem_webhook.webhook"),
200136
resource.TestCheckResourceAttr("scaleway_tem_webhook.webhook", "name", initialName),
@@ -205,7 +141,6 @@ func TestAccWebhook_Update(t *testing.T) {
205141
},
206142
{
207143
Config: fmt.Sprintf(`
208-
209144
data scaleway_account_project "project" {
210145
name = "default"
211146
organization_id = "%s"
@@ -224,55 +159,23 @@ func TestAccWebhook_Update(t *testing.T) {
224159
225160
resource "scaleway_mnq_sns_topic" "sns_topic" {
226161
project_id = data.scaleway_mnq_sns.sns.project_id
227-
name = "test-mnq-sns-topic-update"
162+
name = "test-mnq-sns-topic-basic"
228163
access_key = scaleway_mnq_sns_credentials.sns_credentials.access_key
229164
secret_key = scaleway_mnq_sns_credentials.sns_credentials.secret_key
230165
}
231166
232-
resource scaleway_tem_domain cr01 {
233-
name = "%s"
234-
accept_tos = true
235-
}
236-
237-
resource "scaleway_domain_record" "spf" {
238-
dns_zone = "%s"
239-
type = "TXT"
240-
data = "v=spf1 ${scaleway_tem_domain.cr01.spf_config} -all"
241-
}
242-
243-
resource "scaleway_domain_record" "dkim" {
244-
dns_zone = "%s"
245-
name = "${scaleway_tem_domain.cr01.project_id}._domainkey"
246-
type = "TXT"
247-
data = scaleway_tem_domain.cr01.dkim_config
248-
}
249-
resource "scaleway_domain_record" "mx" {
250-
dns_zone = "%s"
251-
type = "MX"
252-
data = "."
253-
}
254-
255-
resource "scaleway_domain_record" "dmarc" {
256-
dns_zone = "%s"
257-
name = scaleway_tem_domain.cr01.dmarc_name
258-
type = "TXT"
259-
data = scaleway_tem_domain.cr01.dmarc_config
260-
}
261-
262-
resource scaleway_tem_domain_validation valid {
263-
domain_id = scaleway_tem_domain.cr01.id
264-
region = scaleway_tem_domain.cr01.region
265-
timeout = 3600
167+
data "scaleway_tem_domain" "cr01" {
168+
name = "%s"
266169
}
267170
268171
resource "scaleway_tem_webhook" "webhook" {
269172
name = "%s"
270-
domain_id = scaleway_tem_domain.cr01.id
173+
domain_id = data.scaleway_tem_domain.cr01.id
271174
event_types = ["%s"]
272175
sns_arn = scaleway_mnq_sns_topic.sns_topic.arn
273-
depends_on = [scaleway_tem_domain_validation.valid, scaleway_mnq_sns_topic.sns_topic]
176+
depends_on = [scaleway_mnq_sns_topic.sns_topic]
274177
}
275-
`, organizationID, domainNameValidation, domainNameValidation, domainNameValidation, domainNameValidation, domainNameValidation, updatedName, updatedEventTypes[0]),
178+
`, organizationID, webhookDomainName, updatedName, updatedEventTypes[0]),
276179
Check: resource.ComposeTestCheckFunc(
277180
isWebhookPresent(tt, "scaleway_tem_webhook.webhook"),
278181
resource.TestCheckResourceAttr("scaleway_tem_webhook.webhook", "name", updatedName),

0 commit comments

Comments
 (0)