From f70e46150aa0cd904c4b93e166df3f05788bf499 Mon Sep 17 00:00:00 2001 From: Jacob Fowler Date: Tue, 18 Jul 2023 10:43:38 -0400 Subject: [PATCH] fix test data --- .../terraform/cloudflare_certificate_pack_acm/test.tf | 2 +- testdata/terraform/cloudflare_custom_hostname/test.tf | 2 +- testdata/terraform/cloudflare_load_balancer/test.tf | 8 ++++---- testdata/terraform/cloudflare_load_balancer_pool/test.tf | 2 +- .../terraform/cloudflare_origin_ca_certificate/test.tf | 2 +- .../test.tf | 6 +++--- .../cloudflare_ruleset_zone_http_ratelimit/test.tf | 2 +- .../test.tf | 2 +- .../terraform/cloudflare_zone_settings_override/test.tf | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/testdata/terraform/cloudflare_certificate_pack_acm/test.tf b/testdata/terraform/cloudflare_certificate_pack_acm/test.tf index 97893241d..74303e37b 100644 --- a/testdata/terraform/cloudflare_certificate_pack_acm/test.tf +++ b/testdata/terraform/cloudflare_certificate_pack_acm/test.tf @@ -1,7 +1,7 @@ resource "cloudflare_certificate_pack" "terraform_managed_resource" { certificate_authority = "digicert" cloudflare_branding = false - hosts = ["example.com", "*.example.com", "www.example.com"] + hosts = ["*.example.com", "example.com", "www.example.com"] type = "advanced" validation_method = "txt" validity_days = 365 diff --git a/testdata/terraform/cloudflare_custom_hostname/test.tf b/testdata/terraform/cloudflare_custom_hostname/test.tf index 2ec19291f..f6ec26ffe 100644 --- a/testdata/terraform/cloudflare_custom_hostname/test.tf +++ b/testdata/terraform/cloudflare_custom_hostname/test.tf @@ -12,7 +12,7 @@ resource "cloudflare_custom_hostname" "terraform_managed_resource" { 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" method = "http" settings { - ciphers = ["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"] + ciphers = ["AES128-SHA", "ECDHE-RSA-AES128-GCM-SHA256"] http2 = "on" min_tls_version = "1.2" } diff --git a/testdata/terraform/cloudflare_load_balancer/test.tf b/testdata/terraform/cloudflare_load_balancer/test.tf index 826d04c62..378a2385a 100644 --- a/testdata/terraform/cloudflare_load_balancer/test.tf +++ b/testdata/terraform/cloudflare_load_balancer/test.tf @@ -1,5 +1,5 @@ resource "cloudflare_load_balancer" "terraform_managed_resource" { - default_pool_ids = ["17b5962d775c646f3f9725cbc7a53df4", "9290f38c5d07c2e2f4df57b1f61d4196", "00920f38ce07c2e2f4df50b1f61d4194"] + default_pool_ids = ["00920f38ce07c2e2f4df50b1f61d4194", "17b5962d775c646f3f9725cbc7a53df4", "9290f38c5d07c2e2f4df57b1f61d4196"] description = "Load Balancer for www.example.com" enabled = true fallback_pool_id = "17b5962d775c646f3f9725cbc7a53df4" @@ -12,7 +12,7 @@ resource "cloudflare_load_balancer" "terraform_managed_resource" { zone_id = "0da42c8d2132a9ddaf714f9e7c920711" country_pools { country = "AU" - pool_ids = ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"] + pool_ids = ["9290f38c5d07c2e2f4df57b1f61d4196", "de90f38ced07c2e2f4df50b1f61d4194"] } country_pools { country = "ME" @@ -23,7 +23,7 @@ resource "cloudflare_load_balancer" "terraform_managed_resource" { pool_ids = ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"] } pop_pools { - pool_ids = ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"] + pool_ids = ["9290f38c5d07c2e2f4df57b1f61d4196", "de90f38ced07c2e2f4df50b1f61d4194"] pop = "LAX" } pop_pools { @@ -39,7 +39,7 @@ resource "cloudflare_load_balancer" "terraform_managed_resource" { region = "ENAM" } region_pools { - pool_ids = ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"] + pool_ids = ["9290f38c5d07c2e2f4df57b1f61d4196", "de90f38ced07c2e2f4df50b1f61d4194"] region = "WNAM" } session_affinity_attributes { diff --git a/testdata/terraform/cloudflare_load_balancer_pool/test.tf b/testdata/terraform/cloudflare_load_balancer_pool/test.tf index 15b95c26c..3870f9128 100644 --- a/testdata/terraform/cloudflare_load_balancer_pool/test.tf +++ b/testdata/terraform/cloudflare_load_balancer_pool/test.tf @@ -1,6 +1,6 @@ resource "cloudflare_load_balancer_pool" "terraform_managed_resource" { account_id = "f037e56e89293a057740de681ac9abbe" - check_regions = ["WEU", "ENAM"] + check_regions = ["ENAM", "WEU"] description = "Primary data center - Provider XYZ" enabled = false minimum_origins = 2 diff --git a/testdata/terraform/cloudflare_origin_ca_certificate/test.tf b/testdata/terraform/cloudflare_origin_ca_certificate/test.tf index 986efbf3f..51c4a9f25 100644 --- a/testdata/terraform/cloudflare_origin_ca_certificate/test.tf +++ b/testdata/terraform/cloudflare_origin_ca_certificate/test.tf @@ -1,6 +1,6 @@ resource "cloudflare_origin_ca_certificate" "terraform_managed_resource" { csr = "-----BEGIN CERTIFICATE REQUEST-----\nMIICxzCCAa8CAQAwSDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDVNhbiBGcmFuY2lz\nY28xCzAJBgNVBAcTAkNBMRQwEgYDVQQDEwtleGFtcGxlLm5ldDCCASIwDQYJKoZI\nhvcNAQEBBQADggEPADCCAQoCggEBALxejtu4b+jPdFeFi6OUsye8TYJQBm3WfCvL\nHu5EvijMO/4Z2TImwASbwUF7Ir8OLgH+mGlQZeqyNvGoSOMEaZVXcYfpR1hlVak8\n4GGVr+04IGfOCqaBokaBFIwzclGZbzKmLGwIQioNxGfqFm6RGYGA3be2Je2iseBc\nN8GV1wYmvYE0RR+yWweJCTJ157exyRzu7sVxaEW9F87zBQLyOnwXc64rflXslRqi\ng7F7w5IaQYOl8yvmk/jEPCAha7fkiUfEpj4N12+oPRiMvleJF98chxjD4MH39c5I\nuOslULhrWunfh7GB1jwWNA9y44H0snrf+xvoy2TcHmxvma9Eln8CAwEAAaA6MDgG\nCSqGSIb3DQEJDjErMCkwJwYDVR0RBCAwHoILZXhhbXBsZS5uZXSCD3d3dy5leGFt\ncGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAcBaX6dOnI8ncARrI9ZSF2AJX+8mx\npTHY2+Y2C0VvrVDGMtbBRH8R9yMbqWtlxeeNGf//LeMkSKSFa4kbpdx226lfui8/\nauRDBTJGx2R1ccUxmLZXx4my0W5iIMxunu+kez+BDlu7bTT2io0uXMRHue4i6quH\nyc5ibxvbJMjR7dqbcanVE10/34oprzXQsJ/VmSuZNXtjbtSKDlmcpw6To/eeAJ+J\nhXykcUihvHyG4A1m2R6qpANBjnA0pHexfwM/SgfzvpbvUg0T1ubmer8BgTwCKIWs\ndcWYTthM51JIqRBfNqy4QcBnX+GY05yltEEswQI55wdiS3CjTTA67sdbcQ==\n-----END CERTIFICATE REQUEST-----" - hostnames = ["example.com", "*.example.com"] + hostnames = ["*.example.com", "example.com"] request_type = "origin-rsa" requested_validity = 5475 } diff --git a/testdata/terraform/cloudflare_ruleset_zone_http_log_custom_fields/test.tf b/testdata/terraform/cloudflare_ruleset_zone_http_log_custom_fields/test.tf index ba4ea3378..80e076baf 100644 --- a/testdata/terraform/cloudflare_ruleset_zone_http_log_custom_fields/test.tf +++ b/testdata/terraform/cloudflare_ruleset_zone_http_log_custom_fields/test.tf @@ -6,9 +6,9 @@ resource "cloudflare_ruleset" "terraform_managed_resource" { rules { action = "log_custom_field" action_parameters { - cookie_fields = ["cookie", "fields"] - request_fields = ["request", "fields"] - response_fields = ["response", "fields"] + cookie_fields = ["fields", "cookie"] + request_fields = ["fields", "request"] + response_fields = ["fields", "response"] } description = "zone" enabled = true diff --git a/testdata/terraform/cloudflare_ruleset_zone_http_ratelimit/test.tf b/testdata/terraform/cloudflare_ruleset_zone_http_ratelimit/test.tf index 0feb4e9d1..180e0efbf 100644 --- a/testdata/terraform/cloudflare_ruleset_zone_http_ratelimit/test.tf +++ b/testdata/terraform/cloudflare_ruleset_zone_http_ratelimit/test.tf @@ -9,7 +9,7 @@ resource "cloudflare_ruleset" "terraform_managed_resource" { enabled = false expression = "(http.cookie eq \"namwe=value\")" ratelimit { - characteristics = ["ip.src", "cf.colo.id"] + characteristics = ["cf.colo.id", "ip.src"] mitigation_timeout = 30 period = 60 requests_per_period = 100 diff --git a/testdata/terraform/cloudflare_ruleset_zone_http_request_firewall_custom/test.tf b/testdata/terraform/cloudflare_ruleset_zone_http_request_firewall_custom/test.tf index f9c06d3f1..12a74b368 100644 --- a/testdata/terraform/cloudflare_ruleset_zone_http_request_firewall_custom/test.tf +++ b/testdata/terraform/cloudflare_ruleset_zone_http_request_firewall_custom/test.tf @@ -7,7 +7,7 @@ resource "cloudflare_ruleset" "terraform_managed_resource" { action = "skip" action_parameters { phases = ["http_ratelimit", "http_request_firewall_managed"] - products = ["zoneLockdown", "uaBlock", "bic", "hot", "securityLevel", "rateLimit", "waf"] + products = ["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf","zoneLockdown"] ruleset = "current" } description = "test.example.com" diff --git a/testdata/terraform/cloudflare_zone_settings_override/test.tf b/testdata/terraform/cloudflare_zone_settings_override/test.tf index 27621f2a4..38358cf9d 100644 --- a/testdata/terraform/cloudflare_zone_settings_override/test.tf +++ b/testdata/terraform/cloudflare_zone_settings_override/test.tf @@ -9,7 +9,7 @@ resource "cloudflare_zone_settings_override" "terraform_managed_resource" { browser_check = "on" cache_level = "aggressive" challenge_ttl = 2700 - ciphers = ["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"] + ciphers = ["AES128-SHA", "ECDHE-RSA-AES128-GCM-SHA256"] cname_flattening = "flatten_at_root" development_mode = "off" email_obfuscation = "on"