Skip to content

Commit eff2c0b

Browse files
SirCortlytamas-jozsacortlyons
authored
(Phase 0): v4->v5 zero_trust_access_application (#52)
* ci: migrate e2e runner to Go * v4->v5 zero_trust_access_application # Conflicts: # integration/v4_to_v5/integration_test.go # internal/registry/registry.go * WIP: Empty value -> Default transformations (Integration tests failing) * feat(zero_trust_access_application): v4 to v5 migration * feat(zero_trust_access_policy): v4 to v5 migration --------- Co-authored-by: Tamas Jozsa <[email protected]> Co-authored-by: cortlyons <[email protected]>
1 parent cfe95b4 commit eff2c0b

File tree

24 files changed

+12093
-92
lines changed

24 files changed

+12093
-92
lines changed

e2e/drift-exemptions.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,39 @@ exemptions:
2020
- 'status.*->.*"active"'
2121
enabled: true
2222

23+
# Ignore empty nested objects being normalized to null in access policy condition elements
24+
- name: "access_policy_empty_objects_to_null"
25+
description: "Empty nested objects in condition elements normalized to null (terraform init behavior)"
26+
resource_types:
27+
- "cloudflare_zero_trust_access_policy"
28+
patterns:
29+
- '= \{\} -> null'
30+
enabled: true
31+
32+
# Ignore nested object restructuring in access policy condition elements
33+
- name: "access_policy_nested_object_restructuring"
34+
description: "Nested objects in condition elements being restructured (empty object removal)"
35+
resource_types:
36+
- "cloudflare_zero_trust_access_policy"
37+
patterns:
38+
- '\+ email = \{'
39+
- '- email\s+= \{'
40+
- '\+ email_domain = \{'
41+
- '- email_domain = \{'
42+
- '\+ ip = \{'
43+
- '- ip\s+= \{'
44+
- '\+ geo = \{'
45+
- '- geo\s+= \{'
46+
- '- email = .* -> null'
47+
- '\+ email = '
48+
- '- domain = .* -> null'
49+
- '\+ domain = '
50+
- '- ip = .* -> null'
51+
- '\+ ip = '
52+
- '- country_code = .* -> null'
53+
- '\+ country_code = '
54+
enabled: true
55+
2356
# Example: Ignore specific resource types
2457
# - name: "zone_dnssec_computed"
2558
# description: "Ignore computed changes in zone DNSSEC resources"

integration/v4_to_v5/integration_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@ import (
1313
_ "github.com/cloudflare/tf-migrate/internal/resources/dns_record"
1414
_ "github.com/cloudflare/tf-migrate/internal/resources/healthcheck"
1515
_ "github.com/cloudflare/tf-migrate/internal/resources/logpull_retention"
16-
_ "github.com/cloudflare/tf-migrate/internal/resources/page_rule"
1716
_ "github.com/cloudflare/tf-migrate/internal/resources/managed_transforms"
17+
_ "github.com/cloudflare/tf-migrate/internal/resources/page_rule"
1818
_ "github.com/cloudflare/tf-migrate/internal/resources/pages_project"
1919
_ "github.com/cloudflare/tf-migrate/internal/resources/r2_bucket"
2020
_ "github.com/cloudflare/tf-migrate/internal/resources/regional_hostname"
21-
_ "github.com/cloudflare/tf-migrate/internal/resources/tiered_cache"
2221
_ "github.com/cloudflare/tf-migrate/internal/resources/spectrum_application"
22+
_ "github.com/cloudflare/tf-migrate/internal/resources/tiered_cache"
2323
_ "github.com/cloudflare/tf-migrate/internal/resources/url_normalization_settings"
2424
_ "github.com/cloudflare/tf-migrate/internal/resources/workers_kv"
2525
_ "github.com/cloudflare/tf-migrate/internal/resources/workers_kv_namespace"
26+
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_access_application"
2627
_ "github.com/cloudflare/tf-migrate/internal/resources/workers_script"
2728
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_access_group"
28-
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_access_service_token"
2929
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_access_identity_provider"
30+
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_access_policy"
31+
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_access_service_token"
3032
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_dlp_custom_profile"
3133
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_gateway_policy"
3234
_ "github.com/cloudflare/tf-migrate/internal/resources/zero_trust_list"

0 commit comments

Comments
 (0)