Skip to content

Commit 8a766c8

Browse files
jacobbednarzjacobbednarz
authored
Merge pull request #579 from cloudflare/fix-test-assertions
2 parents 65f84eb + b533c84 commit 8a766c8

File tree

14 files changed

+72
-119
lines changed
  • testdata/terraform
    • cloudflare_custom_hostname
    • cloudflare_page_rule
    • cloudflare_ruleset_http_request_cache_settings
    • cloudflare_ruleset_override_remapping_disabled
    • cloudflare_ruleset_override_remapping_enabled
    • cloudflare_ruleset_zone
    • cloudflare_ruleset_zone_ddos_l7
    • cloudflare_ruleset_zone_http_log_custom_fields
    • cloudflare_ruleset_zone_http_ratelimit
    • cloudflare_ruleset_zone_http_request_firewall_custom
    • cloudflare_ruleset_zone_http_request_firewall_managed
    • cloudflare_ruleset_zone_http_request_late_transform
    • cloudflare_ruleset_zone_http_request_sanitize
    • cloudflare_ruleset_zone_rewrite_to_empty_query_parameter

14 files changed

+72
-119
lines changed

‎testdata/terraform/cloudflare_custom_hostname/test.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ resource "cloudflare_custom_hostname" "terraform_managed_resource" {
66
hostname = "app.example.com"
77
zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
88
ssl {
9+
bundle_method = "ubiquitous"
910
certificate_authority = "digicert"
1011
custom_certificate = "-----BEGIN CERTIFICATE-----\\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\\n-----END CERTIFICATE-----\\n"
1112
custom_key = "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n"

‎testdata/terraform/cloudflare_page_rule/test.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ resource "cloudflare_page_rule" "terraform_managed_resource" {
1818
resolved = true
1919
}
2020
query_string {
21-
exclude = ["*"]
21+
ignore = true
2222
}
2323
user {
2424
device_type = true

‎testdata/terraform/cloudflare_ruleset_http_request_cache_settings/test.tf

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,10 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
5151
disable_stale_while_updating = true
5252
}
5353
}
54-
description = "test cache rule"
55-
enabled = false
56-
expression = "(http.host eq \"example.com\")"
57-
id = "0f24aab3002347a9a4ac01520e6893d0"
58-
last_updated = "2022-09-28T17:21:21.510301Z"
59-
ref = "0f24aab3002347a9a4ac01520e6893d0"
60-
version = "3"
54+
description = "test cache rule"
55+
enabled = false
56+
expression = "(http.host eq \"example.com\")"
57+
ref = "0f24aab3002347a9a4ac01520e6893d0"
6158
}
6259
rules {
6360
action = "set_cache_settings"
@@ -68,12 +65,9 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
6865
mode = "override_origin"
6966
}
7067
}
71-
description = "/status/202"
72-
enabled = true
73-
expression = "(http.host eq \"example.com\")"
74-
id = "e5f1bd1386b4464aa8d726ba1e0d51ad"
75-
last_updated = "2022-09-21T16:36:00.999083Z"
76-
ref = "e5f1bd1386b4464aa8d726ba1e0d51ad"
77-
version = "2"
68+
description = "/status/202"
69+
enabled = true
70+
expression = "(http.host eq \"example.com\")"
71+
ref = "e5f1bd1386b4464aa8d726ba1e0d51ad"
7872
}
7973
}

‎testdata/terraform/cloudflare_ruleset_override_remapping_disabled/test.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
2121
}
2222
version = "latest"
2323
}
24-
description = "zone"
25-
enabled = false
26-
expression = "(http.cookie eq \"jb_testing=true\")"
27-
last_updated = "2021-09-03T06:42:41.341405Z"
24+
description = "zone"
25+
enabled = false
26+
expression = "(http.cookie eq \"jb_testing=true\")"
2827
}
2928
}

‎testdata/terraform/cloudflare_ruleset_override_remapping_enabled/test.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
2121
}
2222
version = "latest"
2323
}
24-
description = "zone"
25-
enabled = false
26-
expression = "(http.cookie eq \"jb_testing=true\")"
27-
last_updated = "2021-09-03T06:42:41.341405Z"
24+
description = "zone"
25+
enabled = false
26+
expression = "(http.cookie eq \"jb_testing=true\")"
2827
}
2928
}

‎testdata/terraform/cloudflare_ruleset_zone/test.tf

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
1515
}
1616
version = "latest"
1717
}
18-
enabled = true
19-
expression = "true"
20-
id = "0789dc4343054d1e981f8c44bedc6fbd"
21-
last_updated = "2021-08-19T23:41:34.985519Z"
22-
ref = "0789dc4343054d1e981f8c44bedc6fbd"
23-
version = "1"
18+
enabled = true
19+
expression = "true"
20+
ref = "0789dc4343054d1e981f8c44bedc6fbd"
2421
}
2522
}

‎testdata/terraform/cloudflare_ruleset_zone_ddos_l7/test.tf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
1212
}
1313
version = "latest"
1414
}
15-
description = "zone"
16-
enabled = true
17-
expression = "true"
18-
id = "c6893ad10fb344e9b8be3c0c3575adc9"
19-
last_updated = "2021-08-30T02:38:50.39057Z"
20-
ref = "c6893ad10fb344e9b8be3c0c3575adc9"
21-
version = "1"
15+
description = "zone"
16+
enabled = true
17+
expression = "true"
18+
ref = "c6893ad10fb344e9b8be3c0c3575adc9"
2219
}
2320
}

‎testdata/terraform/cloudflare_ruleset_zone_http_log_custom_fields/test.tf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
1010
request_fields = ["request", "fields"]
1111
response_fields = ["response", "fields"]
1212
}
13-
description = "zone"
14-
enabled = true
15-
expression = "true"
16-
id = "17a0d1e23a3444ccbd5e58fc7793649a"
17-
last_updated = "2022-07-22T12:34:45.479429Z"
18-
ref = "17a0d1e23a3444ccbd5e58fc7793649a"
19-
version = "1"
13+
description = "zone"
14+
enabled = true
15+
expression = "true"
16+
ref = "17a0d1e23a3444ccbd5e58fc7793649a"
2017
}
2118
}

‎testdata/terraform/cloudflare_ruleset_zone_http_ratelimit/test.tf

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
44
phase = "http_ratelimit"
55
zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
66
rules {
7-
action = "block"
8-
description = "fwewe"
9-
enabled = false
10-
expression = "(http.cookie eq \"namwe=value\")"
11-
id = "549e64153ff14d2cb5a5ef88c1f5bdbc"
12-
last_updated = "2021-08-29T21:59:21.447624Z"
7+
action = "block"
8+
description = "fwewe"
9+
enabled = false
10+
expression = "(http.cookie eq \"namwe=value\")"
1311
ratelimit {
1412
characteristics = ["ip.src", "cf.colo.id"]
1513
mitigation_timeout = 30
1614
period = 60
1715
requests_per_period = 100
1816
}
19-
ref = "549e64153ff14d2cb5a5ef88c1f5bdbc"
20-
version = "1"
17+
ref = "549e64153ff14d2cb5a5ef88c1f5bdbc"
2118
}
2219
}

‎testdata/terraform/cloudflare_ruleset_zone_http_request_firewall_custom/test.tf

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,26 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
1010
products = ["zoneLockdown", "uaBlock", "bic", "hot", "securityLevel", "rateLimit", "waf"]
1111
ruleset = "current"
1212
}
13-
description = "test.example.com"
14-
enabled = true
15-
expression = "(http.host eq \"test.example.com\")"
16-
id = "88dcb30401e348ba9e1352c2598f2a4c"
17-
last_updated = "2022-11-24T14:24:14.756247Z"
13+
description = "test.example.com"
14+
enabled = true
15+
expression = "(http.host eq \"test.example.com\")"
1816
logging {
1917
enabled = true
2018
}
21-
ref = "88dcb30401e348ba9e1352c2598f2a4c"
22-
version = "2"
19+
ref = "88dcb30401e348ba9e1352c2598f2a4c"
2320
}
2421
rules {
25-
action = "challenge"
26-
description = "customRule-test"
27-
enabled = true
28-
expression = "(cf.bot_management.score eq 50 and cf.bot_management.static_resource)"
29-
id = "b3cc5e4cc6604f9d90a6a106df867760"
30-
last_updated = "2022-11-07T19:03:05.198191Z"
31-
ref = "b3cc5e4cc6604f9d90a6a106df867760"
32-
version = "29"
22+
action = "challenge"
23+
description = "customRule-test"
24+
enabled = true
25+
expression = "(cf.bot_management.score eq 50 and cf.bot_management.static_resource)"
26+
ref = "b3cc5e4cc6604f9d90a6a106df867760"
3327
}
3428
rules {
35-
action = "log"
36-
description = "AWAF ML"
37-
enabled = false
38-
expression = "(cf.waf.score le 20)"
39-
id = "1ecf73bdf7bd4227969a734412b13ad1"
40-
last_updated = "2022-12-09T16:53:19.003821Z"
41-
ref = "1ecf73bdf7bd4227969a734412b13ad1"
42-
version = "7"
29+
action = "log"
30+
description = "AWAF ML"
31+
enabled = false
32+
expression = "(cf.waf.score le 20)"
33+
ref = "1ecf73bdf7bd4227969a734412b13ad1"
4334
}
4435
}

‎testdata/terraform/cloudflare_ruleset_zone_http_request_firewall_managed/test.tf

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
7171
}
7272
version = "latest"
7373
}
74-
description = "zone"
75-
enabled = false
76-
expression = "(http.cookie eq \"jb_testing=true\")"
77-
last_updated = "2021-09-03T06:42:41.341405Z"
74+
description = "zone"
75+
enabled = false
76+
expression = "(http.cookie eq \"jb_testing=true\")"
7877
}
7978
rules {
8079
action = "skip"
@@ -83,15 +82,12 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
8382
"4814384a9e5d4991b9815dcfc25d2f1f" = "37da7855d2f94f69865365d894a556a4,6afe6795ee6a48d6a1dfe59255395a78,5a6f5a57cde8428ab0668ce17cdec0c8,5e4903d6afa841c9b88b96203297003f,2380cd409b604c2a9273042f3eb29c4e,f5aebedc99a14c8d9e8cfa2ce5f94216,edf8c37cc81747d382690b3c77e82ce4,1129dfb383bb42e48466488cf3b37cb1"
8483
}
8584
}
86-
description = "Bypass managed OWSAP SQL Injection rules for /api/v1/identity"
87-
enabled = true
88-
expression = "(http.request.method eq \"POST\" and http.request.uri.path eq \"/api/v1/identity\")"
89-
id = "d189267a8dc943769d0000c3dcb400eb"
90-
last_updated = "2023-05-12T08:23:03.177093Z"
85+
description = "Bypass managed OWSAP SQL Injection rules for /api/v1/identity"
86+
enabled = true
87+
expression = "(http.request.method eq \"POST\" and http.request.uri.path eq \"/api/v1/identity\")"
9188
logging {
9289
enabled = true
9390
}
94-
ref = "d189267a8dc943769d0000c3dcb400eb"
95-
version = "1"
91+
ref = "d189267a8dc943769d0000c3dcb400eb"
9692
}
9793
}

‎testdata/terraform/cloudflare_ruleset_zone_http_request_late_transform/test.tf

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
2525
}
2626
}
2727
}
28-
description = "test transform"
29-
enabled = true
30-
expression = "(http.request.uri.path eq \"example.com\")"
31-
id = "e5b61605d6cf4ce08f729c17d42d76ef"
32-
last_updated = "2022-02-07T16:58:54.317608Z"
33-
ref = "e5b61605d6cf4ce08f729c17d42d76ef"
34-
version = "1"
28+
description = "test transform"
29+
enabled = true
30+
expression = "(http.request.uri.path eq \"example.com\")"
31+
ref = "e5b61605d6cf4ce08f729c17d42d76ef"
3532
}
3633
rules {
3734
action = "rewrite"
@@ -42,13 +39,10 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
4239
value = "my-http-header-1"
4340
}
4441
}
45-
description = "test transform set"
46-
enabled = true
47-
expression = "(http.request.uri.path eq \"example.com\")"
48-
id = "8ec764cf386940c89dd83dbab7bb4c16"
49-
last_updated = "2022-02-07T16:58:54.317608Z"
50-
ref = "8ec764cf386940c89dd83dbab7bb4c16"
51-
version = "1"
42+
description = "test transform set"
43+
enabled = true
44+
expression = "(http.request.uri.path eq \"example.com\")"
45+
ref = "8ec764cf386940c89dd83dbab7bb4c16"
5246
}
5347
rules {
5448
action = "rewrite"
@@ -59,12 +53,9 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
5953
}
6054
}
6155
}
62-
description = "test uri rewrite set"
63-
enabled = false
64-
expression = "(http.request.uri.path eq \"pumpkin.com\")"
65-
id = "d0f1b4fdb4234adf9c6de9b614424836"
66-
last_updated = "2022-05-07T16:58:54.317608Z"
67-
ref = "d0f1b4fdb4234adf9c6de9b614424836"
68-
version = "1"
56+
description = "test uri rewrite set"
57+
enabled = false
58+
expression = "(http.request.uri.path eq \"pumpkin.com\")"
59+
ref = "d0f1b4fdb4234adf9c6de9b614424836"
6960
}
7061
}

‎testdata/terraform/cloudflare_ruleset_zone_http_request_sanitize/test.tf

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
1515
}
1616
version = "latest"
1717
}
18-
enabled = true
19-
expression = "true"
20-
id = "0789dc4343054d1e981f8c44bedc6fbd"
21-
last_updated = "2021-08-19T23:41:34.985519Z"
22-
ref = "0789dc4343054d1e981f8c44bedc6fbd"
23-
version = "1"
18+
enabled = true
19+
expression = "true"
20+
ref = "0789dc4343054d1e981f8c44bedc6fbd"
2421
}
2522
}

‎testdata/terraform/cloudflare_ruleset_zone_rewrite_to_empty_query_parameter/test.tf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ resource "cloudflare_ruleset" "terraform_managed_resource" {
1212
}
1313
}
1414
}
15-
description = "rewrite with no query string"
16-
enabled = true
17-
expression = "true"
18-
id = "1fb6a3117e864d46bcda192d14a1e1dc"
19-
last_updated = "2023-02-16T00:26:08.978517Z"
20-
ref = "1fb6a3117e864d46bcda192d14a1e1dc"
21-
version = "5"
15+
description = "rewrite with no query string"
16+
enabled = true
17+
expression = "true"
18+
ref = "1fb6a3117e864d46bcda192d14a1e1dc"
2219
}
2320
}

0 commit comments

Comments
 (0)