From 475758c8db8bffdd13c46379bd6bb8346bd6f6c3 Mon Sep 17 00:00:00 2001 From: Pedro Sousa <680496+pedrosousa@users.noreply.github.com> Date: Wed, 30 Apr 2025 17:41:44 +0100 Subject: [PATCH 1/2] [WAF] Update code block language --- .../firewall-rules-to-custom-rules.mdx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx b/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx index 2e67c1b56a9528f..0262c61efb49b71 100644 --- a/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx +++ b/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx @@ -182,7 +182,7 @@ The recommended steps for replacing your firewall rules (and filters) configurat terraform import cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31 zone//3c0b456bc2aa443089c5f40f45f51b31 ``` -```sh output +```txt output cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Importing from ID "zone//3c0b456bc2aa443089c5f40f45f51b31"... cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Import prepared! Prepared cloudflare_ruleset for import @@ -200,7 +200,7 @@ your Terraform state and will henceforth be managed by Terraform. terraform plan ``` - ```sh output + ```txt output cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Refreshing state... [id=3c0b456bc2aa443089c5f40f45f51b31] [...] @@ -221,7 +221,7 @@ your Terraform state and will henceforth be managed by Terraform. terraform state list | grep -E '^cloudflare_(filter|firewall_rule)\.' ``` - ```sh output + ```txt output cloudflare_filter.my_filter cloudflare_firewall_rule.my_firewall_rule ``` @@ -232,7 +232,7 @@ your Terraform state and will henceforth be managed by Terraform. terraform state rm -dry-run cloudflare_filter.my_filter cloudflare_firewall_rule.my_firewall_rule ``` - ```sh output + ```txt output Would remove cloudflare_filter.my_filter Would remove cloudflare_firewall_rule.my_firewall_rule ``` @@ -243,7 +243,7 @@ your Terraform state and will henceforth be managed by Terraform. terraform state rm cloudflare_filter.my_filter cloudflare_firewall_rule.my_firewall_rule ``` - ```sh output + ```txt output Removed cloudflare_filter.my_filter Removed cloudflare_firewall_rule.my_firewall_rule Successfully removed 2 resource instance(s). @@ -257,7 +257,7 @@ your Terraform state and will henceforth be managed by Terraform. terraform plan ``` -```sh output +```txt output cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Refreshing state... [id=3c0b456bc2aa443089c5f40f45f51b31] [...] From c8004c5a3458f4a97ff8d16f8826b21c21f7053a Mon Sep 17 00:00:00 2001 From: Pedro Sousa <680496+pedrosousa@users.noreply.github.com> Date: Wed, 30 Apr 2025 18:16:51 +0100 Subject: [PATCH 2/2] Fix code block indentation --- .../firewall-rules-to-custom-rules.mdx | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx b/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx index 0262c61efb49b71..2ea7c300e426352 100644 --- a/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx +++ b/src/content/docs/waf/reference/migration-guides/firewall-rules-to-custom-rules.mdx @@ -158,9 +158,11 @@ The recommended steps for replacing your firewall rules (and filters) configurat 1. Run the following command to generate all ruleset configurations for a zone: - ```sh null {3,6} + ```sh cf-terraforming generate --zone --resource-type "cloudflare_ruleset" + ``` + ```txt output {1,4} resource "cloudflare_ruleset" "terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31" { kind = "zone" name = "default" @@ -178,21 +180,21 @@ The recommended steps for replacing your firewall rules (and filters) configurat 3. Import the `cloudflare_ruleset` resource you previously identified into Terraform state using the `terraform import` command. For example: -```sh -terraform import cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31 zone//3c0b456bc2aa443089c5f40f45f51b31 -``` + ```sh + terraform import cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31 zone//3c0b456bc2aa443089c5f40f45f51b31 + ``` -```txt output -cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Importing from ID "zone//3c0b456bc2aa443089c5f40f45f51b31"... -cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Import prepared! - Prepared cloudflare_ruleset for import -cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Refreshing state... [id=3c0b456bc2aa443089c5f40f45f51b31] + ```txt output + cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Importing from ID "zone//3c0b456bc2aa443089c5f40f45f51b31"... + cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Import prepared! + Prepared cloudflare_ruleset for import + cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Refreshing state... [id=3c0b456bc2aa443089c5f40f45f51b31] -Import successful! + Import successful! -The resources that were imported are shown above. These resources are now in -your Terraform state and will henceforth be managed by Terraform. -``` + The resources that were imported are shown above. These resources are now in + your Terraform state and will henceforth be managed by Terraform. + ``` 4. Run `terraform plan` to validate that Terraform now checks the state of the new `cloudflare_ruleset` resource, in addition to other existing resources already managed by Terraform. For example: @@ -253,18 +255,18 @@ your Terraform state and will henceforth be managed by Terraform. 7. Run `terraform plan` to verify that the resources you deleted from configuration files no longer appear. You should not have any pending changes. -```sh -terraform plan -``` + ```sh + terraform plan + ``` -```txt output -cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Refreshing state... [id=3c0b456bc2aa443089c5f40f45f51b31] -[...] + ```txt output + cloudflare_ruleset.terraform_managed_resource_3c0b456bc2aa443089c5f40f45f51b31: Refreshing state... [id=3c0b456bc2aa443089c5f40f45f51b31] + [...] -No changes. Your infrastructure matches the configuration. + No changes. Your infrastructure matches the configuration. -Terraform has compared your real infrastructure against your configuration and found no differences, so no changes are needed. -``` + Terraform has compared your real infrastructure against your configuration and found no differences, so no changes are needed. + ``` For details on importing Cloudflare resources to Terraform and using the `cf-terraforming` tool, refer to the following resources: