Skip to content

Commit 9d208d6

Browse files
committedJan 29, 2025··
fix: update migration guide to use source, not stdlib
1 parent 9016fb6 commit 9d208d6

7 files changed

+114
-10
lines changed
 

‎.grit/patterns/cloudflare_terraform_v5.grit

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language hcl
22

33
pattern cloudflare_terraform_v5() {
44
any {
5-
cloudflare_terraform_v5_attribute_renames_config(),
6-
cloudflare_terraform_v5_block_to_attribute_config(),
5+
cloudflare_terraform_v5_attribute_renames_configuration(),
6+
cloudflare_terraform_v5_block_to_attribute_configuration(),
77
}
88
}

‎.grit/patterns/cloudflare_terraform_v5_attribute_renames_config.grit ‎.grit/patterns/cloudflare_terraform_v5_attribute_renames_configuration.grit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language hcl
22

3-
pattern cloudflare_terraform_v5_attribute_renames_config() {
3+
pattern cloudflare_terraform_v5_attribute_renames_configuration() {
44
any {
55
// provider
66
`version = $version` => `version = "~> 5"` where { $match <: within `provider "cloudflare" { $_ }` },

‎.grit/patterns/cloudflare_terraform_v5_block_to_attribute_config.grit ‎.grit/patterns/cloudflare_terraform_v5_block_to_attribute_configuration.grit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language hcl
22

3-
pattern cloudflare_terraform_v5_block_to_attribute_config() {
3+
pattern cloudflare_terraform_v5_block_to_attribute_configuration() {
44
any {
55
inline_cloudflare_block_to_map(`cors_headers`) as $block where { $block <: within `resource "cloudflare_access_application" $_ { $_ }` },
66
inline_cloudflare_block_to_list(`footer_links`) as $block where { $block <: within `resource "cloudflare_access_application" $_ { $_ }` },

‎.grit/patterns/cloudflare_terraform_v5_resource_renames_config.grit ‎.grit/patterns/cloudflare_terraform_v5_resource_renames_configuration.grit

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// You likely don't want to run this _unless_ you know what you're doing.
22
//
3-
// Applying this solely against state files will likely break your
4-
// configuration. However, used in conjunction with a custom
5-
// `terraform state mv` operation _may_ get you what want.
3+
// See https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/guides/migrating-renamed-resources
4+
// for full details on how to handle mass renames.
65
language hcl
76

8-
pattern cloudflare_terraform_v5_resource_renames() {
7+
pattern cloudflare_terraform_v5_resource_renames_configuration() {
98
any {
109
`"cloudflare_access_application"` => `"cloudflare_zero_trust_access_application"`,
1110
`"cloudflare_access_ca_certificate"` => `"cloudflare_zero_trust_access_short_lived_certificate"`,
@@ -56,3 +55,5 @@ pattern cloudflare_terraform_v5_resource_renames() {
5655
$old_name <: within `resource $_ { $_ }`
5756
}
5857
}
58+
59+
cloudflare_terraform_v5_resource_renames_configuration()
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
// You likely don't want to run this _unless_ you know what you're doing.
2+
//
3+
// See https://registry.terraform.io/providers/cloudflare/cloudflare/latest/docs/guides/migrating-renamed-resources
4+
// for full details on how to handle mass renames.
5+
engine marzano(0.1)
6+
language json
7+
8+
pattern cloudflare_terraform_v5_resource_renames_state() {
9+
any {
10+
`"cloudflare_access_application"` => `"cloudflare_zero_trust_access_application"`,
11+
`"cloudflare_access_ca_certificate"` => `"cloudflare_zero_trust_access_short_lived_certificate"`,
12+
`"cloudflare_access_custom_page"` => `"cloudflare_zero_trust_access_custom_page"`,
13+
`"cloudflare_access_group"` => `"cloudflare_zero_trust_access_group"`,
14+
`"cloudflare_access_identity_provider"` => `"cloudflare_zero_trust_access_identity_provider"`,
15+
`"cloudflare_access_keys_configuration"` => `"cloudflare_zero_trust_access_key_configuration"`,
16+
`"cloudflare_access_mutual_tls_certificate"` => `"cloudflare_zero_trust_access_mtls_certificate"`,
17+
`"cloudflare_access_mutual_tls_hostname_settings"` => `"cloudflare_zero_trust_access_mtls_hostname_settings"`,
18+
`"cloudflare_access_organization"` => `"cloudflare_zero_trust_organization"`,
19+
`"cloudflare_access_policy"` => `"cloudflare_zero_trust_access_policy"`,
20+
`"cloudflare_access_service_token"` => `"cloudflare_zero_trust_access_service_token"`,
21+
`"cloudflare_access_tag"` => `"cloudflare_zero_trust_access_tag"`,
22+
`"cloudflare_device_dex_test"` => `"cloudflare_zero_trust_dex_test"`,
23+
`"cloudflare_device_managed_networks"` => `"cloudflare_zero_trust_device_managed_networks"`,
24+
`"cloudflare_device_policy_certificates"` => `"cloudflare_zero_trust_device_certificates"`,
25+
`"cloudflare_device_posture_integration"` => `"cloudflare_zero_trust_device_posture_integration"`,
26+
`"cloudflare_device_posture_rule"` => `"cloudflare_zero_trust_device_posture_rule"`,
27+
`"cloudflare_device_settings_policy"` => `"cloudflare_zero_trust_device_profiles"`,
28+
`"cloudflare_dlp_profile"` => `"cloudflare_zero_trust_dlp_profile"`,
29+
`"cloudflare_dlp_custom_profile"` => `"cloudflare_zero_trust_dlp_custom_profile"`,
30+
`"cloudflare_dlp_predefined_profile"` => `"cloudflare_zero_trust_dlp_predefined_profile"`,
31+
`"cloudflare_fallback_domain"` => `"cloudflare_zero_trust_local_domain_fallback"`,
32+
`"cloudflare_risk_behavior"` => `"cloudflare_zero_trust_risk_behavior"`,
33+
`"cloudflare_split_tunnel"` => `"cloudflare_zero_trust_split_tunnels"`,
34+
`"cloudflare_teams_account"` => `"cloudflare_zero_trust_gateway_settings"`,
35+
`"cloudflare_teams_list"` => `"cloudflare_zero_trust_list"`,
36+
`"cloudflare_teams_location"` => `"cloudflare_zero_trust_dns_location"`,
37+
`"cloudflare_teams_proxy_endpoint"` => `"cloudflare_zero_trust_gateway_proxy_endpoint"`,
38+
`"cloudflare_teams_rule"` => `"cloudflare_zero_trust_gateway_policy"`,
39+
`"cloudflare_tunnel"` => `"cloudflare_zero_trust_tunnel_cloudflared"`,
40+
`"cloudflare_tunnel_config"` => `"cloudflare_zero_trust_tunnel_cloudflared_config"`,
41+
`"cloudflare_tunnel_route"` => `"cloudflare_zero_trust_tunnel_route"`,
42+
`"cloudflare_tunnel_virtual_network"` => `"cloudflare_zero_trust_tunnel_virtual_network"`,
43+
44+
// handle dependencies
45+
`"cloudflare_access_application.$dep"` => `"cloudflare_zero_trust_access_application.$dep"`,
46+
`"cloudflare_access_ca_certificate.$dep"` => `"cloudflare_zero_trust_access_short_lived_certificate.$dep"`,
47+
`"cloudflare_access_custom_page.$dep"` => `"cloudflare_zero_trust_access_custom_page.$dep"`,
48+
`"cloudflare_access_group.$dep"` => `"cloudflare_zero_trust_access_group.$dep"`,
49+
`"cloudflare_access_identity_provider.$dep"` => `"cloudflare_zero_trust_access_identity_provider.$dep"`,
50+
`"cloudflare_access_keys_configuration.$dep"` => `"cloudflare_zero_trust_access_key_configuration.$dep"`,
51+
`"cloudflare_access_mutual_tls_certificate.$dep"` => `"cloudflare_zero_trust_access_mtls_certificate.$dep"`,
52+
`"cloudflare_access_mutual_tls_hostname_settings.$dep"` => `"cloudflare_zero_trust_access_mtls_hostname_settings.$dep"`,
53+
`"cloudflare_access_organization.$dep"` => `"cloudflare_zero_trust_organization.$dep"`,
54+
`"cloudflare_access_policy.$dep"` => `"cloudflare_zero_trust_access_policy.$dep"`,
55+
`"cloudflare_access_service_token.$dep"` => `"cloudflare_zero_trust_access_service_token.$dep"`,
56+
`"cloudflare_access_tag.$dep"` => `"cloudflare_zero_trust_access_tag.$dep"`,
57+
`"cloudflare_device_dex_test.$dep"` => `"cloudflare_zero_trust_dex_test.$dep"`,
58+
`"cloudflare_device_managed_networks.$dep"` => `"cloudflare_zero_trust_device_managed_networks.$dep"`,
59+
`"cloudflare_device_policy_certificates.$dep"` => `"cloudflare_zero_trust_device_certificates.$dep"`,
60+
`"cloudflare_device_posture_integration.$dep"` => `"cloudflare_zero_trust_device_posture_integration.$dep"`,
61+
`"cloudflare_device_posture_rule.$dep"` => `"cloudflare_zero_trust_device_posture_rule.$dep"`,
62+
`"cloudflare_device_settings_policy.$dep"` => `"cloudflare_zero_trust_device_profiles.$dep"`,
63+
`"cloudflare_dlp_custom_profile.$dep"` => `"cloudflare_zero_trust_dlp_custom_profile.$dep"`,
64+
`"cloudflare_dlp_predefined_profile.$dep"` => `"cloudflare_zero_trust_dlp_predefined_profile.$dep"`,
65+
`"cloudflare_dlp_profile.$dep"` => `"cloudflare_zero_trust_dlp_profile.$dep"`,
66+
`"cloudflare_fallback_domain.$dep"` => `"cloudflare_zero_trust_local_domain_fallback.$dep"`,
67+
`"cloudflare_gateway_app_types.$dep"` => `"cloudflare_zero_trust_gateway_app_types.$dep"`,
68+
`"cloudflare_gre_tunnel.$dep"` => `"cloudflare_magic_wan_gre_tunnel.$dep"`,
69+
`"cloudflare_ipsec_tunnel.$dep"` => `"cloudflare_magic_wan_ipsec_tunnel.$dep"`,
70+
`"cloudflare_record.$dep"` => `"cloudflare_dns_record.$dep"`,
71+
`"cloudflare_risk_behavior.$dep"` => `"cloudflare_zero_trust_risk_behavior.$dep"`,
72+
`"cloudflare_split_tunnel.$dep"` => `"cloudflare_zero_trust_split_tunnels.$dep"`,
73+
`"cloudflare_static_route.$dep"` => `"cloudflare_magic_wan_static_route.$dep"`,
74+
`"cloudflare_teams_account.$dep"` => `"cloudflare_zero_trust_gateway_settings.$dep"`,
75+
`"cloudflare_teams_list.$dep"` => `"cloudflare_zero_trust_list.$dep"`,
76+
`"cloudflare_teams_location.$dep"` => `"cloudflare_zero_trust_dns_location.$dep"`,
77+
`"cloudflare_teams_proxy_endpoint.$dep"` => `"cloudflare_zero_trust_gateway_proxy_endpoint.$dep"`,
78+
`"cloudflare_teams_rule.$dep"` => `"cloudflare_zero_trust_gateway_policy.$dep"`,
79+
`"cloudflare_tunnel.$dep"` => `"cloudflare_zero_trust_tunnel_cloudflared.$dep"`,
80+
`"cloudflare_tunnel_config.$dep"` => `"cloudflare_zero_trust_tunnel_cloudflared_config.$dep"`,
81+
`"cloudflare_tunnel_route.$dep"` => `"cloudflare_zero_trust_tunnel_route.$dep"`,
82+
`"cloudflare_tunnel_virtual_network.$dep"` => `"cloudflare_zero_trust_tunnel_virtual_network.$dep"`,
83+
`"cloudflare_worker_cron_trigger.$dep"` => `"cloudflare_workers_cron_trigger.$dep"`,
84+
`"cloudflare_worker_domain.$dep"` => `"cloudflare_workers_custom_domain.$dep"`,
85+
`"cloudflare_worker_script.$dep"` => `"cloudflare_workers_script.$dep"`,
86+
`"cloudflare_worker_secret.$dep"` => `"cloudflare_workers_secret.$dep"`,
87+
`"cloudflare_workers_for_platforms_namespace.$dep"` => `"cloudflare_workers_for_platforms_dispatch_namespace.$dep"`,
88+
`"cloudflare_zone_dnssec.$dep"` => `"cloudflare_dns_zone_dnssec.$dep"`,
89+
`"cloudflare_managed_headers.$dep"` => `"cloudflare_managed_transforms.$dep"`,
90+
}
91+
}
92+
93+
cloudflare_terraform_v4_40_0_zero_trust_namespace_renames_state()

‎docs/guides/version-5-upgrade.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ provider "cloudflare" {
4747
For an in depth guide on how to perform migrations for resources or datasources that
4848
have been renamed, check out [migrating renamed resources].
4949

50+
The pattern files for v5 resource renames are:
51+
52+
- `cloudflare_terraform_v5_resource_renames_configuration`
53+
- `cloudflare_terraform_v5_resource_renames_state`
54+
5055
## Automatic migration
5156

5257
For assisting with automatic migrations, we have provided a [GritQL] pattern.
@@ -63,7 +68,7 @@ as effective. We recommend reviewing the migration notes below to verify all the
6368
changes.
6469

6570
```bash
66-
$ grit apply cloudflare_terraform_v5
71+
$ grit apply github.com/cloudflare/terraform-provider-cloudflare#terraform_cloudflare_v5
6772
```
6873

6974
We recommend ensuring you are using version control for these changes or make a

‎templates/guides/version-5-upgrade.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ provider "cloudflare" {
4747
For an in depth guide on how to perform migrations for resources or datasources that
4848
have been renamed, check out [migrating renamed resources].
4949

50+
The pattern files for v5 resource renames are:
51+
52+
- `cloudflare_terraform_v5_resource_renames_configuration`
53+
- `cloudflare_terraform_v5_resource_renames_state`
54+
5055
## Automatic migration
5156

5257
For assisting with automatic migrations, we have provided a [GritQL] pattern.
@@ -63,7 +68,7 @@ as effective. We recommend reviewing the migration notes below to verify all the
6368
changes.
6469

6570
```bash
66-
$ grit apply cloudflare_terraform_v5
71+
$ grit apply github.com/cloudflare/terraform-provider-cloudflare#terraform_cloudflare_v5
6772
```
6873

6974
We recommend ensuring you are using version control for these changes or make a

0 commit comments

Comments
 (0)
Please sign in to comment.