diff --git a/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/notification_policy_webhooks.tf b/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/notification_policy_webhooks.tf index b85dcea..929681f 100644 --- a/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/notification_policy_webhooks.tf +++ b/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/notification_policy_webhooks.tf @@ -11,9 +11,9 @@ variable "cloudflare_zone_id" { type = string } -# Use pre-existing webhook endpoint worker -# Worker URL: https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/ -# This worker responds with 200 OK to all requests for webhook validation +# Use Cloudflare trace endpoint for webhook testing +# URL: https://www.cloudflare.com/cdn-cgi/trace +# This endpoint responds with 200 OK to all requests for webhook validation # ======================================== # Locals @@ -21,7 +21,7 @@ variable "cloudflare_zone_id" { locals { common_account = var.cloudflare_account_id name_prefix = "test-integration" - webhook_base_url = "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev" + webhook_base_url = "https://www.cloudflare.com/cdn-cgi/trace" enable_backup = true enable_test = false } @@ -34,14 +34,14 @@ locals { resource "cloudflare_notification_policy_webhooks" "basic_webhook" { account_id = var.cloudflare_account_id name = "basic-webhook" - url = "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/basic" + url = "https://www.cloudflare.com/cdn-cgi/trace/basic" } # Test Case 2: Full webhook with all fields resource "cloudflare_notification_policy_webhooks" "full_webhook" { account_id = var.cloudflare_account_id name = "production-webhook" - url = "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/full" + url = "https://www.cloudflare.com/cdn-cgi/trace/full" secret = "webhook-secret-token-12345" } diff --git a/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/terraform.tfstate b/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/terraform.tfstate index 192696c..8b5a1af 100644 --- a/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/terraform.tfstate +++ b/integration/v4_to_v5/testdata/notification_policy_webhooks/expected/terraform.tfstate @@ -17,7 +17,7 @@ "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "basic-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/basic", + "url": "https://www.cloudflare.com/cdn-cgi/trace/basic", "secret": null, "type": "generic", "created_at": "2023-01-01T12:00:00Z", @@ -39,7 +39,7 @@ "id": "a284b91d-5fa5-4532-abcd-3b1ed5fc9527", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "production-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/full", + "url": "https://www.cloudflare.com/cdn-cgi/trace/full", "secret": "webhook-secret-token-12345", "type": "generic", "created_at": "2023-01-01T12:00:00Z", @@ -62,7 +62,7 @@ "id": "map-alerts-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "alerts-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/alerts", + "url": "https://www.cloudflare.com/cdn-cgi/trace/alerts", "secret": "alerts-secret-123", "type": "generic", "created_at": "2023-01-02T10:00:00Z", @@ -77,7 +77,7 @@ "id": "map-monitoring-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "monitoring-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/monitoring", + "url": "https://www.cloudflare.com/cdn-cgi/trace/monitoring", "secret": "monitoring-secret-456", "type": "generic", "created_at": "2023-01-02T10:00:00Z", @@ -92,7 +92,7 @@ "id": "map-security-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "security-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/security", + "url": "https://www.cloudflare.com/cdn-cgi/trace/security", "secret": "security-secret-789", "type": "generic", "created_at": "2023-01-02T10:00:00Z", @@ -115,7 +115,7 @@ "id": "set-alpha-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-alpha", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-alpha", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-alpha", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -130,7 +130,7 @@ "id": "set-beta-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-beta", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-beta", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-beta", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -145,7 +145,7 @@ "id": "set-delta-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-delta", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-delta", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-delta", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -160,7 +160,7 @@ "id": "set-gamma-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-gamma", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-gamma", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-gamma", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -183,7 +183,7 @@ "id": "counted-0-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "webhook-0", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/counted-0", + "url": "https://www.cloudflare.com/cdn-cgi/trace/counted-0", "secret": null, "type": "generic", "created_at": "2023-01-04T12:00:00Z", @@ -198,7 +198,7 @@ "id": "counted-1-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "webhook-1", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/counted-1", + "url": "https://www.cloudflare.com/cdn-cgi/trace/counted-1", "secret": null, "type": "generic", "created_at": "2023-01-04T12:00:00Z", @@ -213,7 +213,7 @@ "id": "counted-2-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "webhook-2", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/counted-2", + "url": "https://www.cloudflare.com/cdn-cgi/trace/counted-2", "secret": null, "type": "generic", "created_at": "2023-01-04T12:00:00Z", @@ -236,7 +236,7 @@ "id": "conditional-enabled-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "conditional-enabled", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/conditional-enabled", + "url": "https://www.cloudflare.com/cdn-cgi/trace/conditional-enabled", "secret": null, "type": "generic", "created_at": "2023-01-05T13:00:00Z", @@ -258,7 +258,7 @@ "id": "functions-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "test-integration-function-example", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/function-test", + "url": "https://www.cloudflare.com/cdn-cgi/trace/function-test", "secret": "function-test-secret", "type": "generic", "created_at": "2023-01-06T14:00:00Z", @@ -280,7 +280,7 @@ "id": "lifecycle-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "lifecycle-test", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/lifecycle", + "url": "https://www.cloudflare.com/cdn-cgi/trace/lifecycle", "secret": null, "type": "generic", "created_at": "2023-01-07T15:00:00Z", @@ -302,7 +302,7 @@ "id": "prevent-destroy-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "prevent-destroy-test", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/prevent-destroy", + "url": "https://www.cloudflare.com/cdn-cgi/trace/prevent-destroy", "secret": null, "type": "generic", "created_at": "2023-01-07T15:30:00Z", @@ -324,7 +324,7 @@ "id": "minimal-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "minimal", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/minimal", + "url": "https://www.cloudflare.com/cdn-cgi/trace/minimal", "secret": null, "type": "generic", "created_at": "2023-01-08T16:00:00Z", @@ -346,7 +346,7 @@ "id": "maximal-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "maximal-webhook-with-all-fields", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/maximal?param=value&test=123", + "url": "https://www.cloudflare.com/cdn-cgi/trace/maximal?param=value&test=123", "secret": "maximal-secret-token-with-special-chars-!@#$", "type": "generic", "created_at": "2023-01-09T17:00:00Z", @@ -368,7 +368,7 @@ "id": "special-chars-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "special-chars-test", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/path?query=value¶m=test", + "url": "https://www.cloudflare.com/cdn-cgi/trace/path?query=value¶m=test", "secret": null, "type": "generic", "created_at": "2023-01-10T18:00:00Z", diff --git a/integration/v4_to_v5/testdata/notification_policy_webhooks/input/notification_policy_webhooks.tf b/integration/v4_to_v5/testdata/notification_policy_webhooks/input/notification_policy_webhooks.tf index d1f924d..218a62b 100644 --- a/integration/v4_to_v5/testdata/notification_policy_webhooks/input/notification_policy_webhooks.tf +++ b/integration/v4_to_v5/testdata/notification_policy_webhooks/input/notification_policy_webhooks.tf @@ -11,9 +11,9 @@ variable "cloudflare_zone_id" { type = string } -# Use pre-existing webhook endpoint worker -# Worker URL: https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/ -# This worker responds with 200 OK to all requests for webhook validation +# Use Cloudflare trace endpoint for webhook testing +# URL: https://www.cloudflare.com/cdn-cgi/trace +# This endpoint responds with 200 OK to all requests for webhook validation # ======================================== # Locals @@ -21,7 +21,7 @@ variable "cloudflare_zone_id" { locals { common_account = var.cloudflare_account_id name_prefix = "test-integration" - webhook_base_url = "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev" + webhook_base_url = "https://www.cloudflare.com/cdn-cgi/trace" enable_backup = true enable_test = false } @@ -34,14 +34,14 @@ locals { resource "cloudflare_notification_policy_webhooks" "basic_webhook" { account_id = var.cloudflare_account_id name = "basic-webhook" - url = "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/basic" + url = "https://www.cloudflare.com/cdn-cgi/trace/basic" } # Test Case 2: Full webhook with all fields resource "cloudflare_notification_policy_webhooks" "full_webhook" { account_id = var.cloudflare_account_id name = "production-webhook" - url = "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/full" + url = "https://www.cloudflare.com/cdn-cgi/trace/full" secret = "webhook-secret-token-12345" } diff --git a/integration/v4_to_v5/testdata/notification_policy_webhooks/input/terraform.tfstate b/integration/v4_to_v5/testdata/notification_policy_webhooks/input/terraform.tfstate index 192696c..8b5a1af 100644 --- a/integration/v4_to_v5/testdata/notification_policy_webhooks/input/terraform.tfstate +++ b/integration/v4_to_v5/testdata/notification_policy_webhooks/input/terraform.tfstate @@ -17,7 +17,7 @@ "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "basic-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/basic", + "url": "https://www.cloudflare.com/cdn-cgi/trace/basic", "secret": null, "type": "generic", "created_at": "2023-01-01T12:00:00Z", @@ -39,7 +39,7 @@ "id": "a284b91d-5fa5-4532-abcd-3b1ed5fc9527", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "production-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/full", + "url": "https://www.cloudflare.com/cdn-cgi/trace/full", "secret": "webhook-secret-token-12345", "type": "generic", "created_at": "2023-01-01T12:00:00Z", @@ -62,7 +62,7 @@ "id": "map-alerts-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "alerts-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/alerts", + "url": "https://www.cloudflare.com/cdn-cgi/trace/alerts", "secret": "alerts-secret-123", "type": "generic", "created_at": "2023-01-02T10:00:00Z", @@ -77,7 +77,7 @@ "id": "map-monitoring-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "monitoring-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/monitoring", + "url": "https://www.cloudflare.com/cdn-cgi/trace/monitoring", "secret": "monitoring-secret-456", "type": "generic", "created_at": "2023-01-02T10:00:00Z", @@ -92,7 +92,7 @@ "id": "map-security-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "security-webhook", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/security", + "url": "https://www.cloudflare.com/cdn-cgi/trace/security", "secret": "security-secret-789", "type": "generic", "created_at": "2023-01-02T10:00:00Z", @@ -115,7 +115,7 @@ "id": "set-alpha-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-alpha", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-alpha", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-alpha", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -130,7 +130,7 @@ "id": "set-beta-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-beta", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-beta", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-beta", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -145,7 +145,7 @@ "id": "set-delta-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-delta", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-delta", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-delta", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -160,7 +160,7 @@ "id": "set-gamma-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "set-gamma", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/set-gamma", + "url": "https://www.cloudflare.com/cdn-cgi/trace/set-gamma", "secret": null, "type": "generic", "created_at": "2023-01-03T11:00:00Z", @@ -183,7 +183,7 @@ "id": "counted-0-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "webhook-0", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/counted-0", + "url": "https://www.cloudflare.com/cdn-cgi/trace/counted-0", "secret": null, "type": "generic", "created_at": "2023-01-04T12:00:00Z", @@ -198,7 +198,7 @@ "id": "counted-1-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "webhook-1", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/counted-1", + "url": "https://www.cloudflare.com/cdn-cgi/trace/counted-1", "secret": null, "type": "generic", "created_at": "2023-01-04T12:00:00Z", @@ -213,7 +213,7 @@ "id": "counted-2-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "webhook-2", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/counted-2", + "url": "https://www.cloudflare.com/cdn-cgi/trace/counted-2", "secret": null, "type": "generic", "created_at": "2023-01-04T12:00:00Z", @@ -236,7 +236,7 @@ "id": "conditional-enabled-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "conditional-enabled", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/conditional-enabled", + "url": "https://www.cloudflare.com/cdn-cgi/trace/conditional-enabled", "secret": null, "type": "generic", "created_at": "2023-01-05T13:00:00Z", @@ -258,7 +258,7 @@ "id": "functions-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "test-integration-function-example", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/function-test", + "url": "https://www.cloudflare.com/cdn-cgi/trace/function-test", "secret": "function-test-secret", "type": "generic", "created_at": "2023-01-06T14:00:00Z", @@ -280,7 +280,7 @@ "id": "lifecycle-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "lifecycle-test", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/lifecycle", + "url": "https://www.cloudflare.com/cdn-cgi/trace/lifecycle", "secret": null, "type": "generic", "created_at": "2023-01-07T15:00:00Z", @@ -302,7 +302,7 @@ "id": "prevent-destroy-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "prevent-destroy-test", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/prevent-destroy", + "url": "https://www.cloudflare.com/cdn-cgi/trace/prevent-destroy", "secret": null, "type": "generic", "created_at": "2023-01-07T15:30:00Z", @@ -324,7 +324,7 @@ "id": "minimal-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "minimal", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/minimal", + "url": "https://www.cloudflare.com/cdn-cgi/trace/minimal", "secret": null, "type": "generic", "created_at": "2023-01-08T16:00:00Z", @@ -346,7 +346,7 @@ "id": "maximal-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "maximal-webhook-with-all-fields", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/maximal?param=value&test=123", + "url": "https://www.cloudflare.com/cdn-cgi/trace/maximal?param=value&test=123", "secret": "maximal-secret-token-with-special-chars-!@#$", "type": "generic", "created_at": "2023-01-09T17:00:00Z", @@ -368,7 +368,7 @@ "id": "special-chars-webhook-id", "account_id": "f037e56e89293a057740de681ac9abbe", "name": "special-chars-test", - "url": "https://e2e-webhook-endpoint.terraform-testing-a09.workers.dev/path?query=value¶m=test", + "url": "https://www.cloudflare.com/cdn-cgi/trace/path?query=value¶m=test", "secret": null, "type": "generic", "created_at": "2023-01-10T18:00:00Z",