Skip to content

Commit b58a910

Browse files
committed
remove invalid values after testing e2e
1 parent 8ce8c51 commit b58a910

File tree

4 files changed

+22
-49
lines changed

4 files changed

+22
-49
lines changed

integration/v4_to_v5/testdata/healthcheck/expected/healthcheck.tf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# This file contains comprehensive test cases covering all migration scenarios
33

44
# Standard variables (auto-provided by E2E infrastructure)
5+
variable "cloudflare_account_id" {
6+
description = "Cloudflare account ID for testing"
7+
type = string
8+
}
59
variable "cloudflare_zone_id" {
610
description = "Cloudflare zone ID for testing"
711
type = string
@@ -235,12 +239,12 @@ resource "cloudflare_healthcheck" "with_functions" {
235239

236240
description = "Healthcheck for zone ${local.zone_id}"
237241

238-
check_regions = tolist(["WNAM", "EEUR"])
242+
check_regions = tolist(["WNAM", "EEU"])
239243

240244
interval = 60
241245
http_config = {
242246
expected_codes = tolist(["200", "202"])
243-
method = "POST"
247+
method = "GET"
244248
path = "/health"
245249
port = 443
246250
}
@@ -355,7 +359,7 @@ resource "cloudflare_healthcheck" "suspended" {
355359
# Test Case 15: Different HTTP methods
356360
# ==============================================================================
357361
locals {
358-
http_methods = ["GET", "HEAD", "POST"]
362+
http_methods = ["GET", "HEAD"]
359363
}
360364

361365
resource "cloudflare_healthcheck" "http_methods" {
@@ -389,7 +393,7 @@ resource "cloudflare_healthcheck" "regions_multi" {
389393
name = "${local.name_prefix}-region-multi"
390394
address = "global.${local.test_domain}"
391395
type = "HTTP"
392-
check_regions = ["WNAM", "ENAM", "WEU", "EEU", "SEAS", "WEAS"]
396+
check_regions = ["WNAM", "ENAM", "WEU", "EEU", "SEAS"]
393397
}
394398

395399
# ==============================================================================

integration/v4_to_v5/testdata/healthcheck/expected/terraform.tfstate

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
"address": "example.com",
392392
"check_regions": [
393393
"WNAM",
394-
"EEUR"
394+
"EEU"
395395
],
396396
"created_on": "2024-01-01T00:00:00Z",
397397
"description": "Healthcheck for zone zone123",
@@ -400,7 +400,7 @@
400400
"200",
401401
"202"
402402
],
403-
"method": "POST",
403+
"method": "GET",
404404
"path": "/health",
405405
"port": 443
406406
},
@@ -614,24 +614,6 @@
614614
},
615615
"index_key": "HEAD",
616616
"schema_version": 0
617-
},
618-
{
619-
"attributes": {
620-
"address": "methods.example.com",
621-
"created_on": "2024-01-01T00:00:00Z",
622-
"http_config": {
623-
"method": "POST",
624-
"path": "/health",
625-
"port": 80
626-
},
627-
"id": "method-post-id",
628-
"modified_on": "2024-01-01T00:00:00Z",
629-
"name": "migration-test-method-post",
630-
"type": "HTTP",
631-
"zone_id": "zone123"
632-
},
633-
"index_key": "POST",
634-
"schema_version": 0
635617
}
636618
],
637619
"mode": "managed",
@@ -672,8 +654,7 @@
672654
"ENAM",
673655
"WEU",
674656
"EEU",
675-
"SEAS",
676-
"WEAS"
657+
"SEAS"
677658
],
678659
"created_on": "2024-01-01T00:00:00Z",
679660
"id": "regions-multi-id",

integration/v4_to_v5/testdata/healthcheck/input/healthcheck.tf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# This file contains comprehensive test cases covering all migration scenarios
33

44
# Standard variables (auto-provided by E2E infrastructure)
5+
variable "cloudflare_account_id" {
6+
description = "Cloudflare account ID for testing"
7+
type = string
8+
}
59
variable "cloudflare_zone_id" {
610
description = "Cloudflare zone ID for testing"
711
type = string
@@ -226,11 +230,11 @@ resource "cloudflare_healthcheck" "with_functions" {
226230

227231
port = 443
228232
path = "/health"
229-
method = "POST"
233+
method = "GET"
230234
description = "Healthcheck for zone ${local.zone_id}"
231235

232236
expected_codes = tolist(["200", "202"])
233-
check_regions = tolist(["WNAM", "EEUR"])
237+
check_regions = tolist(["WNAM", "EEU"])
234238

235239
interval = 60
236240
}
@@ -341,7 +345,7 @@ resource "cloudflare_healthcheck" "suspended" {
341345
# Test Case 15: Different HTTP methods
342346
# ==============================================================================
343347
locals {
344-
http_methods = ["GET", "HEAD", "POST"]
348+
http_methods = ["GET", "HEAD"]
345349
}
346350

347351
resource "cloudflare_healthcheck" "http_methods" {
@@ -373,7 +377,7 @@ resource "cloudflare_healthcheck" "regions_multi" {
373377
name = "${local.name_prefix}-region-multi"
374378
address = "global.${local.test_domain}"
375379
type = "HTTP"
376-
check_regions = ["WNAM", "ENAM", "WEU", "EEU", "SEAS", "WEAS"]
380+
check_regions = ["WNAM", "ENAM", "WEU", "EEU", "SEAS"]
377381
}
378382

379383
# ==============================================================================

integration/v4_to_v5/testdata/healthcheck/input/terraform.tfstate

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@
369369
"type": "HTTPS",
370370
"port": 443,
371371
"path": "/health",
372-
"method": "POST",
372+
"method": "GET",
373373
"description": "Healthcheck for zone zone123",
374374
"expected_codes": ["200", "202"],
375-
"check_regions": ["WNAM", "EEUR"],
375+
"check_regions": ["WNAM", "EEU"],
376376
"interval": 60,
377377
"created_on": "2024-01-01T00:00:00Z",
378378
"modified_on": "2024-01-01T00:00:00Z"
@@ -567,22 +567,6 @@
567567
"created_on": "2024-01-01T00:00:00Z",
568568
"modified_on": "2024-01-01T00:00:00Z"
569569
}
570-
},
571-
{
572-
"index_key": "POST",
573-
"schema_version": 0,
574-
"attributes": {
575-
"id": "method-post-id",
576-
"zone_id": "zone123",
577-
"name": "migration-test-method-post",
578-
"address": "methods.example.com",
579-
"type": "HTTP",
580-
"port": 80,
581-
"path": "/health",
582-
"method": "POST",
583-
"created_on": "2024-01-01T00:00:00Z",
584-
"modified_on": "2024-01-01T00:00:00Z"
585-
}
586570
}
587571
]
588572
},
@@ -621,7 +605,7 @@
621605
"name": "migration-test-region-multi",
622606
"address": "global.example.com",
623607
"type": "HTTP",
624-
"check_regions": ["WNAM", "ENAM", "WEU", "EEU", "SEAS", "WEAS"],
608+
"check_regions": ["WNAM", "ENAM", "WEU", "EEU", "SEAS"],
625609
"created_on": "2024-01-01T00:00:00Z",
626610
"modified_on": "2024-01-01T00:00:00Z"
627611
}

0 commit comments

Comments
 (0)