Skip to content

Commit 18544db

Browse files
stainless-app[bot]musa-cfvaishakdineshtamas-jozsamgirouard
authored
release: 5.10.1 (#6164)
* fix: ruleset migration issues (#6163) * Revert "fix: ruleset migration issues (#6163)" (#6165) This reverts commit 44b653c. * chore: enable mconn tests (#6166) * fix: magic connector tests * chore: remove skip * fix: ruleset migration issues (#6168) * feat: grit to go (#6162) * feat: grit to go * fix: unused import in load_balancer_monitor * chore: remove debugging printf statement --------- Co-authored-by: Musa Jundi <musa@cloudflare.com> * fix: lb and lb pool config migration (#6170) * fix: cloudflare_load_balancer transformation issues (#6171) * Test improvements (#6172) * chore: add sweeper for logpush job * chore: define ci test product groups * chore: limit max retries (#6173) * fix: fix grit in migration tests (#6175) * fix: ruleset migration in nogrit (#6174) * chore: point transformations to gh/next (#6177) * chore: zero trust config issues (#6179) fix: fix zero trust access application state migration * fix: lb monitor state migration (#6180) * fix: lb monitor state * fix: build * fix(migrate): improve `zone_setting` migrations (#6169) Improves how zone settings are migrated from v4 -> v5 of the provider by adding two new flags: - `--zone-settings-module` for handling a common pattern in the v4 provider where `zone_settings_override` is wrapped in a module and settings are passed in as module input variables. When provided, we will expand the vars into `zone_setting` resources and imports at the call site. - `--skip-imports` for skipping import generation, which is useful in cases where imports could be generated in invalid locations (read: outside the root module). Module definition: `modules/zone_settings/main.tf` ```hcl resource "cloudflare_zone_settings_override" "zone_settings" { zone_id = var.zone_id settings { security_level = var.security_level ssl = var.ssl } } ``` Module call: `sites/example_com/main.tf` ```hcl module "zone_settings" { source = "../modules/zone_settings" zone_id = cloudflare_zone.example_com.id security_level = "high" ssl = "origin_pull" } ``` When the `--zone-settings-module` flag is set, the migrator tool will replace module calls with inline zone setting definitions and their imports. ```hcl resource "cloudflare_zone_setting" "zone_settings_zone_settings_security_level" { zone_id = cloudflare_zone.example_com.id setting_id = "security_level" value = "high" } resource "cloudflare_zone_setting" "zone_settings_zone_settings_ssl" { zone_id = cloudflare_zone.example_com.id setting_id = "ssl" value = "origin_pull" } import { to = cloudflare_zone_setting.zone_settings_zone_settings_security_level id = "${cloudflare_zone.example_com.id}/security_level" } import { to = cloudflare_zone_setting.zone_settings_zone_settings_ssl id = "${cloudflare_zone.example_com.id}/ssl" } ``` Import generation can be skipped entirely with the `--skip-imports` flag. * fix: remove 'disable_railgun' from state after v4 migration (#6186) * fix: handling of nested arrays in ruleset migration (#6187) * fix: handling of nested arrays in ruleset migration * chore: fix test data for transformation * chore: compare better (#6192) * fix: ruleset state (#6191) * fix(zone_setting): ensure clean state after migrate (#6190) * fix(zone_setting): ensure clean state after migrate Fixes an issue with the migrate flow for `cloudflare_zone_setting` where we weren't removing all settings from state after migrating from v4 -> v5. The root cause was indexes shifting in slices while deleting items (forward deletes vs backward deletes). - updates state removal method for cleaning up `cloudflare_zone_setting` resources to delete items in reverse * test(zone_setting): ensure attribute order Fixes an issue with migrated attribute order revealed in flaky tests. --------- Co-authored-by: Vaishak Dinesh <vaishakpdinesh@gmail.com> * fix: variable interpolation (#6193) * fix: variable interpolation * chore: missed page rule migrations test * chore: restore deleted test cases * fix(workers_script): fix incorect model type of `run_worker_first` attribute (#6199) * fix: remove zone settings with null values (#6201) * docs(list_item): add import documentation (#6202) List item uses custom code for imports so its invisible to codegen. Since docs are generated automatically, any custom docs changes will be ovewritten with every release. This patch updates the generator script to first create any missing examples that couldn't be codegen'd, then it runs `tfplugindocs` which ensures that import examples are appended to the generated markdown docs. Changes: - adds manual `import.sh` for `cloudflare_list_item` * fix(migrate): block transformations (#6203) * Revert "fix: variable interpolation (#6193)" This reverts commit 332de8d. * fix(migrate): block transformation * fix(migrate): lb and lb pools * fix(migrate): fix main_module value migration (#6204) * ci(page_rule): disable parallel tests (#6205) Fixes flaky `page_rule` tests in CI. Parallel tests causes issues with it's strange `priority` behavior. Changes: - set `parallel=1` for `page_rule` tests * ci: skip flaky tests (#6206) Skipping consistently failing tests due to cert conflicts. - `TestMigrateZeroTrustAccessMTLSCertificate_Basic` - `TestAccCloudflareAccessMutualTLSHostnameSettings_Account` - `TestAccCloudflareAccessMutualTLSHostnameSettings_Update` - `TestAccCloudflareAccessMutualTLSHostnameSettings_BooleanCombinations` - `TestAccCloudflareAccessMutualTLSHostnameSettings_Import` * release: 5.10.1 --------- Co-authored-by: Musa Jundi <musa@cloudflare.com> Co-authored-by: Vaishak Dinesh <vaishakpdinesh@gmail.com> Co-authored-by: Tamás Józsa <jtomi92@gmail.com> Co-authored-by: Michael Girouard <206137+mgirouard@users.noreply.github.com> Co-authored-by: Cina Saffary <cina@cloudflare.com> Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com>
1 parent 7877ed3 commit 18544db

File tree

92 files changed

+13247
-694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+13247
-694
lines changed

‎.github/workflows/acceptance-tests.yml‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,61 @@ jobs:
3838
CLOUDFLARE_HYPERDRIVE_DATABASE_HOSTNAME: ${{ secrets.CLOUDFLARE_HYPERDRIVE_DATABASE_HOSTNAME }}
3939
steps:
4040
- uses: actions/checkout@v4
41+
4142
- name: Setup go
4243
uses: actions/setup-go@v5
4344
with:
4445
go-version-file: ./go.mod
46+
4547
- name: Setup node
4648
uses: actions/setup-node@v4
4749
with:
4850
node-version: 24
51+
4952
- name: Install grit
5053
run: npm install -g @getgrit/cli
54+
5155
- name: Bootstrap
5256
run: ./scripts/bootstrap
53-
- name: Run Magic acceptance tests
57+
58+
######## Magic Tests ########
59+
- name: Run Magic Acceptance Tests
5460
id: magic_acceptance_tests
55-
# tests need to be run one-by-one to avoid account lock contention
56-
# TODO:: refactor to pass the resources into run-ci-tests
57-
run: go test -parallel=1 -p=1 -count=1 ./internal/services/{magic_wan_ipsec_tunnel,magic_wan_gre_tunnel,magic_wan_static_route} -run "^TestAcc"
61+
run: ./scripts/run-ci-tests magic acceptance
62+
env:
63+
TF_ACC: 1
64+
NO_GRIT: true
65+
continue-on-error: true
66+
67+
- name: Run Magic Migration Tests
68+
id: magic_migration_tests
69+
run: ./scripts/run-ci-tests magic migration
5870
env:
5971
TF_ACC: 1
72+
NO_GRIT: true
6073
continue-on-error: true
61-
- name: Run Acceptance Tests
62-
id: acceptance_tests
63-
# note: not all resources are covered here, only passing ones should be included here (for now).
64-
run: ./scripts/run-ci-tests acceptance
74+
75+
######## Everything Else ########
76+
- name: Run Default Acceptance Tests
77+
id: default_acceptance_tests
78+
run: ./scripts/run-ci-tests default acceptance
6579
env:
6680
TF_ACC: 1
81+
NO_GRIT: true
6782
continue-on-error: true
68-
- name: Run Migration Tests
69-
id: migration_tests
70-
run: ./scripts/run-ci-tests migration
83+
84+
- name: Run Default Migration Tests
85+
id: default_migration_tests
86+
run: ./scripts/run-ci-tests default migration
7187
env:
7288
TF_ACC: 1
89+
NO_GRIT: true
7390
continue-on-error: true
91+
7492
- name: Check Test Status
75-
if: ${{ steps.acceptance_tests.outcome == 'failure' || steps.migration_tests.outcome == 'failure' || steps.magic_acceptance_tests.outcome == 'failure' }}
93+
if: ${{
94+
steps.magic_acceptance_tests.outcome == 'failure' ||
95+
steps.magic_migration_tests.outcome == 'failure' ||
96+
steps.default_acceptance_tests.outcome == 'failure' ||
97+
steps.default_migration_tests.outcome == 'failure'}}
7698
run: exit 1

‎.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "5.10.0"
2+
".": "5.10.1"
33
}

‎CHANGELOG.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,49 @@
11
# Changelog
22

3+
## 5.10.1 (2025-09-17)
4+
5+
Full Changelog: [v5.10.0...v5.10.1](https://github.com/cloudflare/terraform-provider-cloudflare/compare/v5.10.0...v5.10.1)
6+
7+
### Features
8+
9+
* grit to go ([#6162](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6162)) ([b3c4779](https://github.com/cloudflare/terraform-provider-cloudflare/commit/b3c47796075888b92723ee8888bd8de9e3ab00b3))
10+
11+
12+
### Bug Fixes
13+
14+
* cloudflare_load_balancer transformation issues ([#6171](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6171)) ([92f4a4a](https://github.com/cloudflare/terraform-provider-cloudflare/commit/92f4a4ac3cdf493d0c543a6a234d74772f349236))
15+
* fix grit in migration tests ([#6175](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6175)) ([0a25a5e](https://github.com/cloudflare/terraform-provider-cloudflare/commit/0a25a5e05c3f63866e493839419a0a253ac19fee))
16+
* fix zero trust access application state migration ([07a5d06](https://github.com/cloudflare/terraform-provider-cloudflare/commit/07a5d06b6ef6a8b1513ffb74ec7ce501e7c42b33))
17+
* handling of nested arrays in ruleset migration ([#6187](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6187)) ([a00b67f](https://github.com/cloudflare/terraform-provider-cloudflare/commit/a00b67f55cf19a0a7d963c16e29530a27e75983e))
18+
* lb and lb pool config migration ([#6170](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6170)) ([2af41f8](https://github.com/cloudflare/terraform-provider-cloudflare/commit/2af41f86cd166578f227f27ef4edbbb0d2feb4eb))
19+
* lb monitor state migration ([#6180](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6180)) ([c9811ba](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c9811bad042a8cb312b7c4db1c734db65730140b))
20+
* **migrate:** block transformations ([#6203](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6203)) ([245166d](https://github.com/cloudflare/terraform-provider-cloudflare/commit/245166d6f4b3e348d9d3b7f5cca55d9fc51e3f60))
21+
* **migrate:** fix main_module value migration ([#6204](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6204)) ([fd24c07](https://github.com/cloudflare/terraform-provider-cloudflare/commit/fd24c0743e745a5954ecc1e4a94a4415fbb5aa8f))
22+
* **migrate:** improve `zone_setting` migrations ([#6169](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6169)) ([6ba251f](https://github.com/cloudflare/terraform-provider-cloudflare/commit/6ba251f7c99e04588534399bd03d34aa7e88fd7b))
23+
* remove 'disable_railgun' from state after v4 migration ([#6186](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6186)) ([453d774](https://github.com/cloudflare/terraform-provider-cloudflare/commit/453d774ee162565e2b080ba2291cb2f319eac3d1))
24+
* remove zone settings with null values ([#6201](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6201)) ([f99bac4](https://github.com/cloudflare/terraform-provider-cloudflare/commit/f99bac421f6ba694312357a963dfffb6fe431cc6))
25+
* ruleset migration in nogrit ([#6174](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6174)) ([ecb450d](https://github.com/cloudflare/terraform-provider-cloudflare/commit/ecb450d4adde5adb19a49bbbf5026d1995792705))
26+
* ruleset migration issues ([#6163](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6163)) ([44b653c](https://github.com/cloudflare/terraform-provider-cloudflare/commit/44b653c81b591b3e865fe3d9cae6b88033914c48))
27+
* ruleset migration issues ([#6168](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6168)) ([11b3961](https://github.com/cloudflare/terraform-provider-cloudflare/commit/11b396108147fdad462bb0fb839f1f0766a7fc9b))
28+
* ruleset state ([#6191](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6191)) ([dfd36a2](https://github.com/cloudflare/terraform-provider-cloudflare/commit/dfd36a22b9c45f7d7a13855cfb8bbcdb0fa9ac3b))
29+
* variable interpolation ([#6193](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6193)) ([332de8d](https://github.com/cloudflare/terraform-provider-cloudflare/commit/332de8dd71f5526cf55087428f5f069378198730))
30+
* **workers_script:** fix incorect model type of `run_worker_first` attribute ([#6199](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6199)) ([13bf28d](https://github.com/cloudflare/terraform-provider-cloudflare/commit/13bf28d11e16eebcbc7ef5c31e7152e47fd02df7))
31+
* **zone_setting:** ensure clean state after migrate ([#6190](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6190)) ([41ae093](https://github.com/cloudflare/terraform-provider-cloudflare/commit/41ae0938374a3a8bde92c002b4a69ba06a60c73f))
32+
33+
34+
### Chores
35+
36+
* compare better ([#6192](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6192)) ([ff67b9e](https://github.com/cloudflare/terraform-provider-cloudflare/commit/ff67b9ee390e7964ce0e79fc6cdaadee606d9486))
37+
* enable mconn tests ([#6166](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6166)) ([9c6653b](https://github.com/cloudflare/terraform-provider-cloudflare/commit/9c6653bab8b8b4ca35fe14bb24bdc68e4d39c268))
38+
* limit max retries ([#6173](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6173)) ([8c1c81c](https://github.com/cloudflare/terraform-provider-cloudflare/commit/8c1c81c76d97e932e91287700c44c844d15040cd))
39+
* point transformations to gh/next ([#6177](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6177)) ([c35109a](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c35109a5d11d1e03b56f043e1491ccde577d8467))
40+
* zero trust config issues ([#6179](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6179)) ([07a5d06](https://github.com/cloudflare/terraform-provider-cloudflare/commit/07a5d06b6ef6a8b1513ffb74ec7ce501e7c42b33))
41+
42+
43+
### Documentation
44+
45+
* **list_item:** add import documentation ([#6202](https://github.com/cloudflare/terraform-provider-cloudflare/issues/6202)) ([55e12bc](https://github.com/cloudflare/terraform-provider-cloudflare/commit/55e12bc5b1faed26af312ddd129b9111073b21a7))
46+
347
## 5.10.0 (2025-09-12)
448

549
Full Changelog: [v5.9.0...v5.10.0](https://github.com/cloudflare/terraform-provider-cloudflare/compare/v5.9.0...v5.10.0)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ terraform {
2020
required_providers {
2121
cloudflare = {
2222
source = "cloudflare/cloudflare"
23-
version = "~> 5.10.0"
23+
version = "~> 5.10.1"
2424
}
2525
}
2626
}

‎cmd/migrate/access_application_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func TestAccessApplicationPoliciesTransformation(t *testing.T) {
105105
},
106106
}
107107

108-
RunTransformationTests(t, tests, transformFile)
108+
RunTransformationTests(t, tests, transformFileDefault)
109109
}
110110

111111
func TestAccessApplicationDomainTypeRemoval(t *testing.T) {
@@ -169,7 +169,7 @@ func TestAccessApplicationDomainTypeRemoval(t *testing.T) {
169169
},
170170
}
171171

172-
RunTransformationTests(t, tests, transformFile)
172+
RunTransformationTests(t, tests, transformFileDefault)
173173
}
174174

175175
func TestAccessApplicationDestinationsBlocksToAttribute(t *testing.T) {
@@ -299,7 +299,7 @@ func TestAccessApplicationDestinationsBlocksToAttribute(t *testing.T) {
299299
},
300300
}
301301

302-
RunTransformationTests(t, tests, transformFile)
302+
RunTransformationTests(t, tests, transformFileDefault)
303303
}
304304

305305
func TestAccessApplicationCombinedMigrations(t *testing.T) {
@@ -372,7 +372,7 @@ func TestAccessApplicationCombinedMigrations(t *testing.T) {
372372
},
373373
}
374374

375-
RunTransformationTests(t, tests, transformFile)
375+
RunTransformationTests(t, tests, transformFileDefault)
376376
}
377377

378378

@@ -454,5 +454,5 @@ func TestAccessApplicationSkipAppLauncherLoginPageRemoval(t *testing.T) {
454454
},
455455
}
456456

457-
RunTransformationTests(t, tests, transformFile)
457+
RunTransformationTests(t, tests, transformFileDefault)
458458
}

‎cmd/migrate/argo_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,5 @@ func TestArgoTransformation(t *testing.T) {
143143
},
144144
}
145145

146-
RunTransformationTests(t, tests, transformFile)
146+
RunTransformationTests(t, tests, transformFileDefault)
147147
}

0 commit comments

Comments
 (0)