cloudflare · steve-thousand · Nov 21, 2025 · Nov 21, 2025 · Nov 24, 2025 · Nov 24, 2025
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -13,8 +13,8 @@ jobs:
     runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-terraform' && 'depot-ubuntu-24.04' || 'lx64' }}
     env:
       CLOUDFLARE_ACCOUNT_ID: f037e56e89293a057740de681ac9abbe
-      CLOUDFLARE_ALT_DOMAIN: terraform2.cfapi.net
-      CLOUDFLARE_ALT_ZONE_ID: b72110c08e3382597095c29ba7e661ea
+      CLOUDFLARE_ALT_DOMAIN: terraform-alt.cfapi.net
+      CLOUDFLARE_ALT_ZONE_ID: ed9caae55809bfe3209699f602ce17fc
       CLOUDFLARE_DOMAIN: terraform.cfapi.net
       CLOUDFLARE_EMAIL: terraform-acceptance-test@cfapi.net
       CLOUDFLARE_ZONE_ID: 0da42c8d2132a9ddaf714f9e7c920711

diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,20 @@
+# yaml-language-server: schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json
+---
+version: '2'
+linters:
+  settings:
+    staticcheck:
+      checks:
+        - all
+
+        - -SA1019
+        - -SA5008
+        - -ST1000
+        - -ST1003
+        - -ST1020
+        - -ST1022
+
+        - -QF1008
+    govet:
+      disable:
+        - structtag
diff --git a/.stats.yml b/.stats.yml
@@ -1,4 +1,4 @@
-configured_endpoints: 1905
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-cc732ca8d1d7f1c11a1ee579060ddfd8f953a3ad94fd5053056b53370129d040.yml
-openapi_spec_hash: a3e1e833dfe13845abd1e2227993a979
-config_hash: 9e3a3f3e68822e0dc6f40af202c6c57e
+configured_endpoints: 1922
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-6183ef87f1b8eea6ad4bae542bfde2ec23a5526ae2b7bacdf6c6a4c48d990995.yml
+openapi_spec_hash: 9c8ac3d56571ebf1e170d993b71ccb4d
+config_hash: 56e587ca83a584af152a4bf8a9cfb29e
diff --git a/docs/resources/account_subscription.md b/docs/resources/account_subscription.md
@@ -2,13 +2,10 @@
 page_title: "cloudflare_account_subscription Resource - Cloudflare"
 subcategory: ""
 description: |-
-
 ---
 
 # cloudflare_account_subscription (Resource)
 
-
-
 ## Example Usage
 
 ```terraform
@@ -28,6 +25,7 @@ resource "cloudflare_account_subscription" "example_account_subscription" {
 ```
 
 <!-- schema generated by tfplugindocs -->
+
 ## Schema
 
 ### Required
@@ -37,7 +35,7 @@ resource "cloudflare_account_subscription" "example_account_subscription" {
 ### Optional
 
 - `frequency` (String) How often the subscription is renewed automatically.
-Available values: "weekly", "monthly", "quarterly", "yearly".
+  Available values: "weekly", "monthly", "quarterly", "yearly".
 - `rate_plan` (Attributes) The rate plan applied to the subscription. (see [below for nested schema](#nestedatt--rate_plan))
 
 ### Read-Only
@@ -48,28 +46,29 @@ Available values: "weekly", "monthly", "quarterly", "yearly".
 - `id` (String) Subscription identifier tag.
 - `price` (Number) The price of the subscription that will be billed, in US dollars.
 - `state` (String) The state that the subscription is in.
-Available values: "Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired".
+  Available values: "Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired".
 
 <a id="nestedatt--rate_plan"></a>
+
 ### Nested Schema for `rate_plan`
 
 Optional:
 
+- `id` (String) The ID of the rate plan.
+- `scope` (String) The scope that this rate plan applies to.
+
+Read-Only:
+
 - `currency` (String) The currency applied to the rate plan subscription.
 - `externally_managed` (Boolean) Whether this rate plan is managed externally from Cloudflare.
-- `id` (String) The ID of the rate plan.
-Available values: "free", "lite", "pro", "pro_plus", "business", "enterprise", "partners_free", "partners_pro", "partners_business", "partners_enterprise".
 - `is_contract` (Boolean) Whether a rate plan is enterprise-based (or newly adopted term contract).
 - `public_name` (String) The full name of the rate plan.
-- `scope` (String) The scope that this rate plan applies to.
 - `sets` (List of String) The list of sets this rate plan applies to.
 
 ## Import
 
 Import is supported using the following syntax:
 
 ```shell
-$ terraform import cloudflare_account_subscription.example '<account_id>'
+$ terraform import cloudflare_account_subscription.example '<account_id>/<subscription_id>'
 ```
-
-
diff --git a/docs/resources/zone_subscription.md b/docs/resources/zone_subscription.md
@@ -2,13 +2,10 @@
 page_title: "cloudflare_zone_subscription Resource - Cloudflare"
 subcategory: ""
 description: |-
-
 ---
 
 # cloudflare_zone_subscription (Resource)
 
-
-
 ## Example Usage
 
 ```terraform
@@ -28,6 +25,7 @@ resource "cloudflare_zone_subscription" "example_zone_subscription" {
 ```
 
 <!-- schema generated by tfplugindocs -->
+
 ## Schema
 
 ### Required
@@ -37,7 +35,7 @@ resource "cloudflare_zone_subscription" "example_zone_subscription" {
 ### Optional
 
 - `frequency` (String) How often the subscription is renewed automatically.
-Available values: "weekly", "monthly", "quarterly", "yearly".
+  Available values: "weekly", "monthly", "quarterly", "yearly".
 - `rate_plan` (Attributes) The rate plan applied to the subscription. (see [below for nested schema](#nestedatt--rate_plan))
 
 ### Read-Only
@@ -48,20 +46,24 @@ Available values: "weekly", "monthly", "quarterly", "yearly".
 - `id` (String) Subscription identifier tag.
 - `price` (Number) The price of the subscription that will be billed, in US dollars.
 - `state` (String) The state that the subscription is in.
-Available values: "Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired".
+  Available values: "Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired".
 
 <a id="nestedatt--rate_plan"></a>
+
 ### Nested Schema for `rate_plan`
 
 Optional:
 
+- `id` (String) The ID of the rate plan.
+  Available values: "free", "lite", "pro", "pro_plus", "business", "enterprise", "partners_free", "partners_pro", "partners_business", "partners_ent".
+- `scope` (String) The scope that this rate plan applies to.
+
+Read-Only:
+
 - `currency` (String) The currency applied to the rate plan subscription.
 - `externally_managed` (Boolean) Whether this rate plan is managed externally from Cloudflare.
-- `id` (String) The ID of the rate plan.
-Available values: "free", "lite", "pro", "pro_plus", "business", "enterprise", "partners_free", "partners_pro", "partners_business", "partners_enterprise".
 - `is_contract` (Boolean) Whether a rate plan is enterprise-based (or newly adopted term contract).
 - `public_name` (String) The full name of the rate plan.
-- `scope` (String) The scope that this rate plan applies to.
 - `sets` (List of String) The list of sets this rate plan applies to.
 
 ## Import
@@ -71,5 +73,3 @@ Import is supported using the following syntax:
 ```shell
 $ terraform import cloudflare_zone_subscription.example '<zone_id>'
 ```
-
-
diff --git a/examples/resources/cloudflare_byo_ip_prefix/resource.tf b/examples/resources/cloudflare_byo_ip_prefix/resource.tf
@@ -4,4 +4,5 @@ resource "cloudflare_byo_ip_prefix" "example_byo_ip_prefix" {
   cidr = "192.0.2.0/24"
   delegate_loa_creation = true
   description = "Internal test prefix"
+  loa_document_id = "d933b1530bc56c9953cf8ce166da8004"
 }
diff --git a/examples/resources/cloudflare_cloud_connector_rules/resource.tf b/examples/resources/cloudflare_cloud_connector_rules/resource.tf
@@ -8,6 +8,6 @@ resource "cloudflare_cloud_connector_rules" "example_cloud_connector_rules" {
     parameters = {
       host = "examplebucket.s3.eu-north-1.amazonaws.com"
     }
-    provider = "aws_s3"
+    cloud_connector_rules_provider = "aws_s3"
   }]
 }
diff --git a/examples/resources/cloudflare_pages_domain/resource.tf b/examples/resources/cloudflare_pages_domain/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_pages_domain" "example_pages_domain" {
   account_id = "023e105f4ecef8ad9ca31a8372d0c353"
   project_name = "this-is-my-project-01"
-  name = "example.com"
+  name = "this-is-my-domain-01.com"
 }
diff --git a/examples/resources/cloudflare_pages_project/resource.tf b/examples/resources/cloudflare_pages_project/resource.tf
@@ -76,15 +76,15 @@ resource "cloudflare_pages_project" "example_pages_project" {
       }
       r2_buckets = {
         R2_BINDING = {
-          jurisdiction = "eu"
           name = "some-bucket"
+          jurisdiction = "eu"
         }
       }
       services = {
         SERVICE_BINDING = {
+          service = "example-worker"
           entrypoint = "MyHandler"
           environment = "production"
-          service = "example-worker"
         }
       }
       usage_model = "standard"
@@ -160,15 +160,15 @@ resource "cloudflare_pages_project" "example_pages_project" {
       }
       r2_buckets = {
         R2_BINDING = {
-          jurisdiction = "eu"
           name = "some-bucket"
+          jurisdiction = "eu"
         }
       }
       services = {
         SERVICE_BINDING = {
+          service = "example-worker"
           entrypoint = "MyHandler"
           environment = "production"
-          service = "example-worker"
         }
       }
       usage_model = "standard"
@@ -184,6 +184,7 @@ resource "cloudflare_pages_project" "example_pages_project" {
     config = {
       deployments_enabled = true
       owner = "my-org"
+      owner_id = "12345678"
       path_excludes = ["string"]
       path_includes = ["string"]
       pr_comments_enabled = true
@@ -192,6 +193,7 @@ resource "cloudflare_pages_project" "example_pages_project" {
       preview_deployment_setting = "all"
       production_branch = "main"
       production_deployments_enabled = true
+      repo_id = "12345678"
       repo_name = "my-repo"
     }
     type = "github"

diff --git a/examples/resources/cloudflare_workers_custom_domain/resource.tf b/examples/resources/cloudflare_workers_custom_domain/resource.tf
@@ -1,7 +1,7 @@
 resource "cloudflare_workers_custom_domain" "example_workers_custom_domain" {
   account_id = "9a7806061c88ada191ed06f989cc3dac"
-  environment = "production"
   hostname = "foo.example.com"
   service = "foo"
   zone_id = "593c9c94de529bbbfaac7c53ced0447d"
+  environment = "production"
 }
diff --git a/examples/resources/cloudflare_zero_trust_device_settings/resource.tf b/examples/resources/cloudflare_zero_trust_device_settings/resource.tf
@@ -1,6 +1,10 @@
 resource "cloudflare_zero_trust_device_settings" "example_zero_trust_device_settings" {
   account_id = "699d98642c564d2e855e9661899b7252"
   disable_for_time = 0
+  external_emergency_signal_enabled = true
+  external_emergency_signal_fingerprint = "abcd1234567890abcd1234567890abcd1234567890abcd1234567890abcd1234"
+  external_emergency_signal_interval = "5m"
+  external_emergency_signal_url = "https://192.0.2.1/signal"
   gateway_proxy_enabled = true
   gateway_udp_proxy_enabled = true
   root_certificate_installation_enabled = true

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.34
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.63.0
 	github.com/cloudflare/cloudflare-go v0.115.0
-	github.com/cloudflare/cloudflare-go/v6 v6.3.0
+	github.com/cloudflare/cloudflare-go/v6 v6.4.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/terraform-plugin-docs v0.21.0

diff --git a/go.sum b/go.sum
@@ -67,8 +67,8 @@ github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ
 github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cloudflare/cloudflare-go v0.115.0 h1:84/dxeeXweCc0PN5Cto44iTA8AkG1fyT11yPO5ZB7sM=
 github.com/cloudflare/cloudflare-go v0.115.0/go.mod h1:Ds6urDwn/TF2uIU24mu7H91xkKP8gSAHxQ44DSZgVmU=
-github.com/cloudflare/cloudflare-go/v6 v6.3.0 h1:6oL/iTOv1fYe6nVT14gRQWp49EyJxVe+OPrO92c/mmE=
-github.com/cloudflare/cloudflare-go/v6 v6.3.0/go.mod h1:Lj3MUqjvKctXRpdRhLQxZYRrNZHuRs0XYuH8JtQGyoI=
+github.com/cloudflare/cloudflare-go/v6 v6.4.0 h1:uigzhmfDfve+zFAYYWIBOAMEuDoPEJXdPS3NBrEm8/Q=
+github.com/cloudflare/cloudflare-go/v6 v6.4.0/go.mod h1:Lj3MUqjvKctXRpdRhLQxZYRrNZHuRs0XYuH8JtQGyoI=
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
 github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go
@@ -130,22 +130,22 @@ func TestAccPreCheck_LogpushToken(t *testing.T) {
 	}
 }
 
-// Test helper method checking the Workspace One environment variables are present.
-func TestAccPreCheck_WorkspaceOne(t *testing.T) {
-	if v := os.Getenv("CLOUDFLARE_WORKSPACE_ONE_CLIENT_ID"); v == "" {
-		t.Fatal("CLOUDFLARE_WORKSPACE_ONE_CLIENT_ID must be set for this acceptance test.")
+// Test helper method checking the CrowdStrike environment variables are present.
+func TestAccPreCheck_CrowdStrike(t *testing.T) {
+	if v := os.Getenv("CLOUDFLARE_CROWDSTRIKE_CLIENT_ID"); v == "" {
+		t.Skip("Skipping acceptance test as CLOUDFLARE_CROWDSTRIKE_CLIENT_ID is not set")
 	}
 
-	if v := os.Getenv("CLOUDFLARE_WORKSPACE_ONE_CLIENT_SECRET"); v == "" {
-		t.Fatal("CLOUDFLARE_WORKSPACE_ONE_CLIENT_SECRET must be set for this acceptance test.")
+	if v := os.Getenv("CLOUDFLARE_CROWDSTRIKE_CLIENT_SECRET"); v == "" {
+		t.Skip("Skipping acceptance test as CLOUDFLARE_CROWDSTRIKE_CLIENT_SECRET is not set")
 	}
 
-	if v := os.Getenv("CLOUDFLARE_WORKSPACE_ONE_API_URL"); v == "" {
-		t.Fatal("CLOUDFLARE_WORKSPACE_ONE_API_URL must be set for this acceptance test.")
+	if v := os.Getenv("CLOUDFLARE_CROWDSTRIKE_API_URL"); v == "" {
+		t.Skip("Skipping acceptance test as CLOUDFLARE_CROWDSTRIKE_API_URL is not set")
 	}
 
-	if v := os.Getenv("CLOUDFLARE_WORKSPACE_ONE_AUTH_URL"); v == "" {
-		t.Fatal("CLOUDFLARE_WORKSPACE_ONE_AUTH_URL must be set for this acceptance test.")
+	if v := os.Getenv("CLOUDFLARE_CROWDSTRIKE_CUSTOMER_ID"); v == "" {
+		t.Skip("Skipping acceptance test as CLOUDFLARE_CROWDSTRIKE_CUSTOMER_ID is not set")
 	}
 }
 

diff --git a/internal/apiform/form_test.go b/internal/apiform/form_test.go
@@ -580,8 +580,11 @@ func TestEncode(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			buf := bytes.NewBuffer(nil)
 			writer := multipart.NewWriter(buf)
-			writer.SetBoundary("xxx")
-			err := MarshalRoot(test.val, writer)
+			err := writer.SetBoundary("xxx")
+			if err != nil {
+				t.Errorf("serialization of %v\nfailed with error:\n%v", test.val, err)
+			}
+			err = MarshalRoot(test.val, writer)
 			if err != nil {
 				t.Errorf("serialization of %v\nfailed with error:\n%v", test.val, err)
 			}