Merge branch 'main' into chore/update-gitignore

Author: jhutchings1

.github/workflows/acceptance-tests.yml

@@ -48,11 +48,24 @@ jobs:
       #
       # - name: Pre-Sweeper
       #  run: go test ./internal/services/... -v -sweep="1" -timeout 60m
+      - name: Run Magic acceptance tests
+        id: magic_acc_tests
+        # tests need to be run one-by-one to avoid account lock contention
+        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"
+        env:
+          TF_ACC: 1
+        continue-on-error: true
       - name: Run acceptance tests
+        id: acc_tests
         # note: not all resources are covered here, only passing ones should be included here (for now).
-        run: go test ./internal/services/{account,account_api_token_permission_groups,account_dns_settings,account_dns_settings_internal_view,account_permission_group,account_role,account_subscription,account_token,address_map,api_shield,api_shield_discovery_operation,api_shield_schema,api_token_permission_groups,argo_smart_routing,argo_tiered_caching,authenticated_origin_pulls,authenticated_origin_pulls_certificate,authenticated_origin_pulls_settings,botnet_feed_config_asn,byo_ip_prefix,calls_sfu_app,calls_turn_app,certificate_pack,cloud_connector_rules,cloudforce_one_request,cloudforce_one_request_asset,cloudforce_one_request_message,cloudforce_one_request_priority,content_scanning_expression,custom_pages,custom_ssl,dcv_delegation,dns_record,dns_settings_internal_view,dns_zone_transfers_acl,dns_zone_transfers_peer,dns_zone_transfers_tsig,email_routing_address,email_routing_catch_all,email_routing_dns,email_routing_rule,email_security_block_sender,email_security_impersonation_registry,email_security_trusted_domains,image,image_variant,ip_ranges,leaked_credential_check,leaked_credential_check_rule,list,logpull_retention,logpush_dataset_field,logpush_dataset_job,logpush_job,logpush_ownership_challenge,magic_network_monitoring_configuration,magic_network_monitoring_rule,magic_transit_connector,magic_transit_site,magic_transit_site_acl,magic_transit_site_lan,magic_transit_site_wan,magic_wan_gre_tunnel,magic_wan_ipsec_tunnel,magic_wan_static_route,observatory_scheduled_test,origin_ca_certificate,page_rule,page_shield_connections,page_shield_cookies,page_shield_policy,page_shield_scripts,pages_domain,pages_project,queue,queue_consumer,r2_bucket,r2_bucket_cors,r2_bucket_event_notification,r2_bucket_lifecycle,r2_bucket_lock,r2_bucket_sippy,r2_custom_domain,r2_managed_domain,regional_hostname,regional_tiered_cache,registrar_domain,resource_group,ruleset,snippet_rules,snippets,stream,stream_audio_track,stream_caption_language,stream_download,stream_key,stream_live_input,stream_watermark,stream_webhook,tiered_cache,turnstile_widget,url_normalization_settings,user,waiting_room_settings,workers_cron_trigger,workers_custom_domain,workers_deployment,workers_for_platforms_dispatch_namespace,workers_kv_namespace,workers_route,workers_script,workers_script_subdomain,zero_trust_access_infrastructure_target,zero_trust_access_key_configuration,zero_trust_access_mtls_hostname_settings,zero_trust_access_service_token,zero_trust_access_tag,zero_trust_device_custom_profile,zero_trust_device_default_profile,zero_trust_device_default_profile_certificates,zero_trust_device_managed_networks,zero_trust_dlp_custom_profile,zero_trust_dlp_dataset,zero_trust_dlp_entry,zero_trust_dlp_predefined_profile,zero_trust_gateway_app_types,zero_trust_gateway_categories,zero_trust_gateway_certificate,zero_trust_gateway_logging,zero_trust_gateway_proxy_endpoint,zero_trust_list,zero_trust_risk_behavior,zero_trust_risk_scoring_integration,zero_trust_tunnel_cloudflared,zero_trust_tunnel_cloudflared_route,zero_trust_tunnel_cloudflared_token,zero_trust_tunnel_warp_connector_token,zone,zone_cache_reserve,zone_cache_variants,zone_dns_settings,zone_hold,zone_lockdown,zone_setting,zone_subscription} -run "^TestAcc" -count 1
+        run: ./scripts/run-ci-acceptance-tests
         env:
           TF_ACC: 1
+      - name: Check Test Status
+        if: ${{ steps.magic_acc_tests.outcome == 'failure' || steps.acc_tests.outcome == 'failure' }}
+        run: exit 1
+
+
     # when all resources support sweepers, re-enable.
     #
     # - name: Post-Sweeper

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ on:
 jobs:
   lint:
     runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-terraform' && 'depot-ubuntu-24.04' || 'lx64' }}
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.fork
     steps:
       - uses: actions/checkout@v4
 
@@ -31,6 +32,7 @@ jobs:
 
   test:
     runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-terraform' && 'depot-ubuntu-24.04' || 'lx64' }}
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.fork
     steps:
       - uses: actions/checkout@v4
 

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "5.6.0"
+  ".": "5.7.0"
 }

.stats.yml

@@ -1,4 +1,4 @@
-configured_endpoints: 1752
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-b9cf8d97f015bd3c7509f68b4dea2c37dc5f97183372064702ea540b6dd999f8.yml
-openapi_spec_hash: 83243c9ee06f88d0fa91e9b185d8a42e
-config_hash: cce40d4d65a4d67d5df957a75a15b567
+configured_endpoints: 1769
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-5e53659eea1b4f1fb11addaddb82880c177d8fa3e7a93f0d664a65e43ac526f4.yml
+openapi_spec_hash: 3e0f59ac2722028954566a4c850e8849
+config_hash: fba73e92c75cff1909420025367fd0c0

CHANGELOG.md

@@ -1,5 +1,76 @@
 # Changelog
 
+## 5.7.0 (2025-07-14)
+
+Full Changelog: [v5.6.0...v5.7.0](https://github.com/cloudflare/terraform-provider-cloudflare/compare/v5.6.0...v5.7.0)
+
+### Features
+
+* **api:** Add 'zero_trust_tunnel_warp_connector' Terraform resource ([204d752](https://github.com/cloudflare/terraform-provider-cloudflare/commit/204d7529af116f0d3104da3de798142e8d75917d))
+* **api:** Add DELETE and POST routes for Magic Connector ([b3c8c0a](https://github.com/cloudflare/terraform-provider-cloudflare/commit/b3c8c0a2ec82ae06423277f1f23376d61799d0e1))
+* **api:** api update ([85a1a2f](https://github.com/cloudflare/terraform-provider-cloudflare/commit/85a1a2f3bdab52cb663d81bee0012cae79a6d560))
+* **api:** api update ([c20c04c](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c20c04cb8992b98e94a62b507a9933040f8c5e1b))
+* **api:** api update ([f936dc9](https://github.com/cloudflare/terraform-provider-cloudflare/commit/f936dc9259deecfff96a63bff7deef5d03d8d645))
+* **api:** api update ([a5634a8](https://github.com/cloudflare/terraform-provider-cloudflare/commit/a5634a8547f3f9ca714f000d2f8511cdfcdc4bb6))
+* **api:** api update ([d7e118c](https://github.com/cloudflare/terraform-provider-cloudflare/commit/d7e118c41bd6187321e7346075699fb8c0dc0125))
+* **api:** api update ([7a1200e](https://github.com/cloudflare/terraform-provider-cloudflare/commit/7a1200ebe55933f6dcadb0c198cfdf3250c2b75d))
+* **api:** api update ([97ea6d6](https://github.com/cloudflare/terraform-provider-cloudflare/commit/97ea6d6100946c3c5581e256b71ddc2403613677))
+* **api:** api update ([75e1515](https://github.com/cloudflare/terraform-provider-cloudflare/commit/75e151546d902d622e91ce7a2713c5efa89b92b9))
+* **api:** api update ([223c0ff](https://github.com/cloudflare/terraform-provider-cloudflare/commit/223c0ff085394facb2b22ff958429c2571601a75))
+* **api:** api update ([7e9304b](https://github.com/cloudflare/terraform-provider-cloudflare/commit/7e9304b15fb637574a72729b76596cb8e536070e))
+* **api:** api update ([b98281d](https://github.com/cloudflare/terraform-provider-cloudflare/commit/b98281d9d84966e39f0b3b1c96d7d0d652c676f5))
+* **api:** api update ([d94fb1f](https://github.com/cloudflare/terraform-provider-cloudflare/commit/d94fb1f2b8959a0893066fdb4ff28e624d98224e))
+* **api:** api update ([7861f45](https://github.com/cloudflare/terraform-provider-cloudflare/commit/7861f45da923902abad48efaa1a02ec3dab5989e))
+* **api:** api update ([534cc05](https://github.com/cloudflare/terraform-provider-cloudflare/commit/534cc05eed010839f29d05c5c7e7df843ebb4938))
+* **api:** api update ([39676a0](https://github.com/cloudflare/terraform-provider-cloudflare/commit/39676a0de28e699286354db0cae59ba083860ebc))
+* **api:** api update ([c449ded](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c449dedccade8be6fb9c8b1ac02e293bb9cae709))
+* **api:** api update ([de3965a](https://github.com/cloudflare/terraform-provider-cloudflare/commit/de3965a07b17feda13b99b91e2330e22803288d7))
+* **api:** api update ([ab0e41a](https://github.com/cloudflare/terraform-provider-cloudflare/commit/ab0e41a010524202c0efb3558d369b4c666cb744))
+* **api:** api update ([c8168f2](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c8168f2009890904f7aca4ac189a632d379885a9))
+* **api:** api update ([371b58e](https://github.com/cloudflare/terraform-provider-cloudflare/commit/371b58e01eba0b306b193697f5d99660ff7e064e))
+* new option to send computed values back to server ([2b9c5d5](https://github.com/cloudflare/terraform-provider-cloudflare/commit/2b9c5d5bc52f6da073a288142e7af58187f4422f))
+* **workers_script:** support `content_file` and `content_sha256` attribute pair as alternative to `content` ([6c850b0](https://github.com/cloudflare/terraform-provider-cloudflare/commit/6c850b0bb397f4bb18abd51d7ddfe1d46575fcec))
+* **zero_trust_dlp:** Added individual resources and new routes ([2b7185f](https://github.com/cloudflare/terraform-provider-cloudflare/commit/2b7185fce3cf74d1a8dfedc459dcc2fc2fa351cb))
+
+
+### Bug Fixes
+
+* assertion ([58392a5](https://github.com/cloudflare/terraform-provider-cloudflare/commit/58392a5141bc557a14988e8ea822b144002b1fd5))
+* ci jobs ([8fd4d84](https://github.com/cloudflare/terraform-provider-cloudflare/commit/8fd4d8471e0d72caa393e2b52d3c7b3e27db6574))
+* ci run setup ([b38f788](https://github.com/cloudflare/terraform-provider-cloudflare/commit/b38f78828f0da27815a86e68f21d5a79bc23f95d))
+* **ci:** release-doctor — report correct token name ([87e54a5](https://github.com/cloudflare/terraform-provider-cloudflare/commit/87e54a55bf0e7cde2bc1ee44960d58486a357ebc))
+* **logpull_retention:** Fix Terraform ID property ([de3811f](https://github.com/cloudflare/terraform-provider-cloudflare/commit/de3811f0f618118051b3a473c2b1042b95321c65))
+* null nested attribute decoding ([5ba7d5b](https://github.com/cloudflare/terraform-provider-cloudflare/commit/5ba7d5bf759b16d487c3279c6d4df825092b253a))
+* **terraform:** strip leading/trailing underscores from attribute names ([e00ca4b](https://github.com/cloudflare/terraform-provider-cloudflare/commit/e00ca4b1d504633efcb7c6d47e8b8664b149b5f2))
+* **zone_subscription:** Fix incorrect path identifier on Update and Read ([e00223d](https://github.com/cloudflare/terraform-provider-cloudflare/commit/e00223d0a3d7db40fe65c7ef73111059993c03e4))
+
+
+### Chores
+
+* **api:** Specify default value for Zone Lockdown 'paused' property ([808598c](https://github.com/cloudflare/terraform-provider-cloudflare/commit/808598caf1d203221c1dc9670582d8c03c42da6f))
+* **api:** Specify default value for Zone Lockdown 'paused' property ([072f9f7](https://github.com/cloudflare/terraform-provider-cloudflare/commit/072f9f7f18d637c2294e78dd0487dccc75fb5bbd))
+* **ci:** only run for pushes and fork pull requests ([df566b9](https://github.com/cloudflare/terraform-provider-cloudflare/commit/df566b932510480199bd777106fdc97a727c7450))
+* **config:** bump cloudflare-go ([8671c9a](https://github.com/cloudflare/terraform-provider-cloudflare/commit/8671c9af5f95a6e689aff515b3d96d11eb1a0ebd))
+* **internal:** codegen related update ([70ba827](https://github.com/cloudflare/terraform-provider-cloudflare/commit/70ba8274bdf4037784f5bbc0aa0e83afd33506d9))
+* **internal:** codegen related update ([f29c24a](https://github.com/cloudflare/terraform-provider-cloudflare/commit/f29c24aa73da1644f611a2b58d266c930f938f93))
+* run steps on failure ([c7360a5](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c7360a56e7a4c305b63431907b59da3d84a8a542))
+* skip flaky list item tests due to rate limit ([85f5b78](https://github.com/cloudflare/terraform-provider-cloudflare/commit/85f5b780a075d6894a47722ddb1882232ddc078f))
+* skip flaky list item tests due to rate limit ([c980fdc](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c980fdc0553bf89ec7571a36c9a0786fdd49c009))
+* **test:** Fix acceptance test runner ([c964479](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c9644793b092dd3e2f60c6f9abdb616c3542e49f))
+* **test:** Fix model parity tests ([52446ec](https://github.com/cloudflare/terraform-provider-cloudflare/commit/52446eced05e34eabba827971bdbad4f00e146b6))
+* **test:** Skip GRE tunnel tests ([7278846](https://github.com/cloudflare/terraform-provider-cloudflare/commit/72788461f0e4a0727670966585f877f22fea2ccf))
+* **test:** Skip magic tests when we don't have the right environment ([c8c505b](https://github.com/cloudflare/terraform-provider-cloudflare/commit/c8c505bb8002907211224c674415f65506e1f653))
+* **test:** Skip some Access IDP tests ([9e13c6f](https://github.com/cloudflare/terraform-provider-cloudflare/commit/9e13c6fbf5aa7d5ef694ea6786b0714614337ebb))
+* **test:** Skip some rulesets tests ([263f43c](https://github.com/cloudflare/terraform-provider-cloudflare/commit/263f43c31c6d0ee82f61e485a387ea2228d2ca50))
+* **test:** Skip TestAccCloudflareAPIShieldBasic ([b5a6ba3](https://github.com/cloudflare/terraform-provider-cloudflare/commit/b5a6ba3a7da82463b4d5147bed9ebd0871a8c0e8))
+* **test:** Skip TestAccCloudflareAPITokenData ([11f728d](https://github.com/cloudflare/terraform-provider-cloudflare/commit/11f728d8a47c330c5122f1997cc3713526af36d5))
+* **test:** Skip TestAccCloudflareTeamsList_LottaListItems ([7e6c4da](https://github.com/cloudflare/terraform-provider-cloudflare/commit/7e6c4da4777897892b8c746ab177f729f9b4a264))
+* **test:** Skip zone lockdown tests ([bfe7436](https://github.com/cloudflare/terraform-provider-cloudflare/commit/bfe7436517c2a58675dcc7fbee5b026cb2b42d5d))
+* **test:** Skip zone subscription tests ([a533043](https://github.com/cloudflare/terraform-provider-cloudflare/commit/a533043ab06e32c147f6574fbf5d589722ab3acd))
+* update docs ([884dcd8](https://github.com/cloudflare/terraform-provider-cloudflare/commit/884dcd816133381abf6c4edf309f56e36c80b02a))
+* update docs ([cd30cb5](https://github.com/cloudflare/terraform-provider-cloudflare/commit/cd30cb5f311c9941bf58b9c901c8317cd4776084))
+* **zone_subscription:** Fix ID property configuration ([b762cf2](https://github.com/cloudflare/terraform-provider-cloudflare/commit/b762cf2484097dbe26d01b9a7dff99d90a1bb4d2))
+
 ## 5.6.0 (2025-06-17)
 
 Full Changelog: [v5.5.0...v5.6.0](https://github.com/cloudflare/terraform-provider-cloudflare/compare/v5.5.0...v5.6.0)

README.md

@@ -20,7 +20,7 @@ terraform {
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 5.6.0"
+      version = "~> 5.7.0"
     }
   }
 }

bin/check-release-environment

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+errors=()
+
+if [ -z "${GPG_SIGNING_KEY}" ]; then
+  errors+=("The GPG_SIGNING_KEY secret has not been set. Please set it in either this repository's secrets or your organization secrets")
+fi
+
+if [ -z "${GPG_SIGNING_PASSWORD}" ]; then
+  errors+=("The GPG_SIGNING_PASSWORD secret has not been set. Please set it in either this repository's secrets or your organization secrets")
+fi
+
+lenErrors=${#errors[@]}
+
+if [[ lenErrors -gt 0 ]]; then
+  echo -e "Found the following errors in the release environment:\n"
+
+  for error in "${errors[@]}"; do
+    echo -e "- $error\n"
+  done
+
+  exit 1
+fi
+
+echo "The environment is ready to push releases!"

docs/data-sources/logpush_dataset_job.md

@@ -39,8 +39,8 @@ Available values: "access_requests", "audit_logs", "biso_user_actions", "casb_fi
 - `frequency` (String, Deprecated) This field is deprecated. Please use `max_upload_*` parameters instead. The frequency at which Cloudflare sends batches of logs to your destination. Setting frequency to high sends your logs in larger quantities of smaller files. Setting frequency to low sends logs in smaller quantities of larger files.
 Available values: "high", "low".
 - `id` (Number) Unique id of the job.
-- `kind` (String) The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs. Currently, Edge Log Delivery is only supported for the `http_requests` dataset.
-Available values: "edge".
+- `kind` (String) The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs (when supported by the dataset).
+Available values: "", "edge".
 - `last_complete` (String) Records the last time for which logs have been successfully pushed. If the last successful push was for logs range 2018-07-23T10:00:00Z to 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. If the job has never run or has just been enabled and hasn't run yet then the field will be empty.
 - `last_error` (String) Records the last time the job failed. If not null, the job is currently failing. If null, the job has either never failed or has run successfully at least once since last failure. See also the error_message field.
 - `logpull_options` (String, Deprecated) This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately.

docs/data-sources/logpush_job.md

@@ -38,8 +38,8 @@ Available values: "access_requests", "audit_logs", "biso_user_actions", "casb_fi
 - `frequency` (String, Deprecated) This field is deprecated. Please use `max_upload_*` parameters instead. The frequency at which Cloudflare sends batches of logs to your destination. Setting frequency to high sends your logs in larger quantities of smaller files. Setting frequency to low sends logs in smaller quantities of larger files.
 Available values: "high", "low".
 - `id` (Number) Unique id of the job.
-- `kind` (String) The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs. Currently, Edge Log Delivery is only supported for the `http_requests` dataset.
-Available values: "edge".
+- `kind` (String) The kind parameter (optional) is used to differentiate between Logpush and Edge Log Delivery jobs (when supported by the dataset).
+Available values: "", "edge".
 - `last_complete` (String) Records the last time for which logs have been successfully pushed. If the last successful push was for logs range 2018-07-23T10:00:00Z to 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. If the job has never run or has just been enabled and hasn't run yet then the field will be empty.
 - `last_error` (String) Records the last time the job failed. If not null, the job is currently failing. If null, the job has either never failed or has run successfully at least once since last failure. See also the error_message field.
 - `logpull_options` (String, Deprecated) This field is deprecated. Use `output_options` instead. Configuration string. It specifies things like requested fields and timestamp formats. If migrating from the logpull api, copy the url (full url or just the query string) of your call here, and logpush will keep on making this call for you, setting start and end times appropriately.