Skip to content

Commit a94b97f

Browse files
authored
Merge pull request #820 from cloudflare/vaishak/email-security-block-sender
fix: email security block sender
2 parents f234125 + 31e1766 commit a94b97f

File tree

3 files changed

+71
-10
lines changed

3 files changed

+71
-10
lines changed

internal/app/cf-terraforming/cmd/generate_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,12 @@ func TestResourceGenerationV5(t *testing.T) {
280280
"cloudflare custom hostname": {identiferType: "zone", resourceType: "cloudflare_custom_hostname", testdataFilename: "cloudflare_custom_hostname"},
281281
// "cloudflare custom pages (account)": {identiferType: "account", resourceType: "cloudflare_custom_pages", testdataFilename: "cloudflare_custom_pages_account"},
282282
// "cloudflare custom pages (zone)": {identiferType: "zone", resourceType: "cloudflare_custom_pages", testdataFilename: "cloudflare_custom_pages_zone"},
283-
"cloudflare email routing address": {identiferType: "account", resourceType: "cloudflare_email_routing_address", testdataFilename: "cloudflare_email_routing_address"},
284-
"cloudflare email routing catch all": {identiferType: "zone", resourceType: "cloudflare_email_routing_catch_all", testdataFilename: "cloudflare_email_routing_catch_all"},
285-
"cloudflare email routing dns": {identiferType: "zone", resourceType: "cloudflare_email_routing_dns", testdataFilename: "cloudflare_email_routing_dns"},
286-
"cloudflare email routing rule": {identiferType: "zone", resourceType: "cloudflare_email_routing_rule", testdataFilename: "cloudflare_email_routing_rule"},
287-
"cloudflare email routing settings": {identiferType: "zone", resourceType: "cloudflare_email_routing_settings", testdataFilename: "cloudflare_email_routing_settings"},
288-
// "cloudflare email security block sender": {identiferType: "account", resourceType: "cloudflare_email_security_block_sender", testdataFilename: "cloudflare_email_security_block_sender"},
283+
"cloudflare email routing address": {identiferType: "account", resourceType: "cloudflare_email_routing_address", testdataFilename: "cloudflare_email_routing_address"},
284+
"cloudflare email routing catch all": {identiferType: "zone", resourceType: "cloudflare_email_routing_catch_all", testdataFilename: "cloudflare_email_routing_catch_all"},
285+
"cloudflare email routing dns": {identiferType: "zone", resourceType: "cloudflare_email_routing_dns", testdataFilename: "cloudflare_email_routing_dns"},
286+
"cloudflare email routing rule": {identiferType: "zone", resourceType: "cloudflare_email_routing_rule", testdataFilename: "cloudflare_email_routing_rule"},
287+
"cloudflare email routing settings": {identiferType: "zone", resourceType: "cloudflare_email_routing_settings", testdataFilename: "cloudflare_email_routing_settings"},
288+
"cloudflare email security block sender": {identiferType: "account", resourceType: "cloudflare_email_security_block_sender", testdataFilename: "cloudflare_email_security_block_sender"},
289289
// "cloudflare email security impersonation registry": {identiferType: "account", resourceType: "cloudflare_email_security_impersonation_registry", testdataFilename: "cloudflare_email_security_impersonation_registry"},
290290
// "cloudflare email security trusted domains": {identiferType: "account", resourceType: "cloudflare_email_security_trusted_domains", testdataFilename: "cloudflare_email_security_trusted_domains"},
291291
// "cloudflare filter": {identiferType: "zone", resourceType: "cloudflare_filter", testdataFilename: "cloudflare_filter"},
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
version: 1
3+
interactions:
4+
- request:
5+
body: ""
6+
form: {}
7+
headers:
8+
Accept:
9+
- application/json
10+
X-Stainless-Arch:
11+
- arm64
12+
X-Stainless-Lang:
13+
- go
14+
X-Stainless-Os:
15+
- MacOS
16+
X-Stainless-Package-Version:
17+
- 4.0.0
18+
X-Stainless-Retry-Count:
19+
- "0"
20+
X-Stainless-Runtime:
21+
- go
22+
X-Stainless-Runtime-Version:
23+
- go1.23.5
24+
url: https://api.cloudflare.com/client/v4/accounts/f037e56e89293a057740de681ac9abbe/email-security/settings/block_senders
25+
method: GET
26+
response:
27+
body: |
28+
{
29+
"errors": [],
30+
"messages": [],
31+
"result": [
32+
{
33+
"id": 2402,
34+
"is_regex": true,
35+
"last_modified": "2019-12-27T18:11:19.117Z",
36+
"pattern": "x",
37+
"pattern_type": "EMAIL",
38+
"comments": "comments"
39+
}
40+
],
41+
"result_info": {
42+
"count": 1,
43+
"page": 1,
44+
"per_page": 20,
45+
"total_count": 200
46+
},
47+
"success": true
48+
}
49+
headers:
50+
Cf-Auditlog-Id:
51+
- 01952a6f-884b-7afd-ab84-7073fb90fa93
52+
Connection:
53+
- keep-alive
54+
Content-Type:
55+
- application/json; charset=UTF-8
56+
Vary:
57+
- Accept-Encoding
58+
status: 200 OK
59+
code: 200
60+
duration: ""
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
resource "cloudflare_email_security_block_sender" "terraform_managed_resource" {
2-
account_id = "023e105f4ecef8ad9ca31a8372d0c353"
3-
is_regex = false
4-
pattern = "[email protected]"
2+
account_id = "f037e56e89293a057740de681ac9abbe"
3+
comments = "comments"
4+
is_regex = true
5+
pattern = "x"
56
pattern_type = "EMAIL"
6-
comments = "block sender with email [email protected]"
77
}
8+

0 commit comments

Comments
 (0)