Merge branch 'next' into fix-modules

musa-cf · web-flow · commit 11d4efcc465c · 2025-08-01T12:21:08.000-05:00
diff --git a/.stats.yml b/.stats.yml
@@ -1,4 +1,4 @@
-configured_endpoints: 1781
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-a8e2f9b43dab071e1560856014f5de528bf67743c5e3f129f42f0a6d08d88c1b.yml
-openapi_spec_hash: ff9ad2afc74c6556007cde31b96c0453
+configured_endpoints: 1783
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-e408a7cdec2dae3d1a18842dcc59280c56050fb042569139aec3fe0f12e0d461.yml
+openapi_spec_hash: 7e210c76f5dd4c79b3e67204ad279b81
 config_hash: a433f3793b734bc6fcc9d9e0c27ff8c2
diff --git a/examples/resources/cloudflare_r2_custom_domain/resource.tf b/examples/resources/cloudflare_r2_custom_domain/resource.tf
@@ -4,6 +4,5 @@ resource "cloudflare_r2_custom_domain" "example_r2_custom_domain" {
   domain = "domain"
   enabled = true
   zone_id = "zoneId"
-  ciphers = ["string"]
   min_tls = "1.0"
 }
diff --git a/examples/resources/cloudflare_zero_trust_gateway_settings/resource.tf b/examples/resources/cloudflare_zero_trust_gateway_settings/resource.tf
@@ -24,7 +24,7 @@ resource "cloudflare_zero_trust_gateway_settings" "example_zero_trust_gateway_se
       logo_path = "https://logos.com/a.png"
       mailto_address = "admin@example.com"
       mailto_subject = "Blocked User Inquiry"
-      mode = ""
+      mode = "customized_block_page"
       name = "Cloudflare"
       suppress_footer = false
       target_uri = "https://example.com"
diff --git a/internal/services/r2_custom_domain/data_source_model.go b/internal/services/r2_custom_domain/data_source_model.go
@@ -24,7 +24,6 @@ type R2CustomDomainDataSourceModel struct {
 	MinTLS     types.String                                                  `tfsdk:"min_tls" json:"minTLS,computed"`
 	ZoneID     types.String                                                  `tfsdk:"zone_id" json:"zoneId,computed"`
 	ZoneName   types.String                                                  `tfsdk:"zone_name" json:"zoneName,computed"`
-	Ciphers    customfield.List[types.String]                                `tfsdk:"ciphers" json:"ciphers,computed"`
 	Status     customfield.NestedObject[R2CustomDomainStatusDataSourceModel] `tfsdk:"status" json:"status,computed"`
 }
 
diff --git a/internal/services/r2_custom_domain/data_source_schema.go b/internal/services/r2_custom_domain/data_source_schema.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
-	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 var _ datasource.DataSourceWithConfigValidators = (*R2CustomDomainDataSource)(nil)
@@ -54,12 +53,6 @@ func DataSourceSchema(ctx context.Context) schema.Schema {
 				Description: "Zone that the custom domain resides in.",
 				Computed:    true,
 			},
-			"ciphers": schema.ListAttribute{
-				Description: "An allowlist of ciphers for TLS termination. These ciphers must be in the BoringSSL format.",
-				Computed:    true,
-				CustomType:  customfield.NewListType[types.String](ctx),
-				ElementType: types.StringType,
-			},
 			"status": schema.SingleNestedAttribute{
 				Computed:   true,
 				CustomType: customfield.NewNestedObjectType[R2CustomDomainStatusDataSourceModel](ctx),
diff --git a/internal/services/r2_custom_domain/model.go b/internal/services/r2_custom_domain/model.go
@@ -20,7 +20,6 @@ type R2CustomDomainModel struct {
 	ZoneID       types.String                                        `tfsdk:"zone_id" json:"zoneId,required"`
 	Enabled      types.Bool                                          `tfsdk:"enabled" json:"enabled,required"`
 	MinTLS       types.String                                        `tfsdk:"min_tls" json:"minTLS,optional"`
-	Ciphers    *[]types.String                                     `tfsdk:"ciphers" json:"ciphers,optional"`
 	ZoneName     types.String                                        `tfsdk:"zone_name" json:"zoneName,computed"`
 	Status       customfield.NestedObject[R2CustomDomainStatusModel] `tfsdk:"status" json:"status,computed"`
 }
diff --git a/internal/services/r2_custom_domain/schema.go b/internal/services/r2_custom_domain/schema.go
@@ -13,7 +13,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
-	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 var _ resource.ResourceWithConfigValidators = (*R2CustomDomainResource)(nil)
@@ -70,11 +69,6 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 					),
 				},
 			},
-			"ciphers": schema.ListAttribute{
-				Description: "An allowlist of ciphers for TLS termination. These ciphers must be in the BoringSSL format.",
-				Optional:    true,
-				ElementType: types.StringType,
-			},
 			"zone_name": schema.StringAttribute{
 				Description: "Zone that the custom domain resides in.",
 				Computed:    true,
diff --git a/internal/services/zero_trust_gateway_settings/data_source_schema.go b/internal/services/zero_trust_gateway_settings/data_source_schema.go
@@ -125,14 +125,10 @@ func DataSourceSchema(ctx context.Context) schema.Schema {
 								Computed:    true,
 							},
 							"mode": schema.StringAttribute{
-								Description: "Controls whether the user is redirected to a Cloudflare-hosted block page or to a customer-provided URI.\nAvailable values: \"\", \"customized_block_page\", \"redirect_uri\".",
+								Description: "Controls whether the user is redirected to a Cloudflare-hosted block page or to a customer-provided URI.\nAvailable values: \"customized_block_page\", \"redirect_uri\".",
 								Computed:    true,
 								Validators: []validator.String{
-									stringvalidator.OneOfCaseInsensitive(
-										"",
-										"customized_block_page",
-										"redirect_uri",
-									),
+									stringvalidator.OneOfCaseInsensitive("customized_block_page", "redirect_uri"),
 								},
 							},
 							"name": schema.StringAttribute{
diff --git a/internal/services/zero_trust_gateway_settings/model.go b/internal/services/zero_trust_gateway_settings/model.go
@@ -4,6 +4,7 @@ package zero_trust_gateway_settings
 
 import (
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/apijson"
+	"github.com/cloudflare/terraform-provider-cloudflare/internal/customfield"
 	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
@@ -50,10 +51,10 @@ type ZeroTrustGatewaySettingsSettingsActivityLogModel struct {
 }
 
 type ZeroTrustGatewaySettingsSettingsAntivirusModel struct {
-	EnabledDownloadPhase types.Bool                                                          `tfsdk:"enabled_download_phase" json:"enabled_download_phase,computed_optional"`
-	EnabledUploadPhase   types.Bool                                                          `tfsdk:"enabled_upload_phase" json:"enabled_upload_phase,computed_optional"`
-	FailClosed           types.Bool                                                          `tfsdk:"fail_closed" json:"fail_closed,computed_optional"`
-	NotificationSettings *ZeroTrustGatewaySettingsSettingsAntivirusNotificationSettingsModel `tfsdk:"notification_settings" json:"notification_settings,optional"`
+	EnabledDownloadPhase types.Bool                                                                                   `tfsdk:"enabled_download_phase" json:"enabled_download_phase,computed_optional"`
+	EnabledUploadPhase   types.Bool                                                                                   `tfsdk:"enabled_upload_phase" json:"enabled_upload_phase,computed_optional"`
+	FailClosed           types.Bool                                                                                   `tfsdk:"fail_closed" json:"fail_closed,computed_optional"`
+	NotificationSettings customfield.NestedObject[ZeroTrustGatewaySettingsSettingsAntivirusNotificationSettingsModel] `tfsdk:"notification_settings" json:"notification_settings,computed_optional"`
 }
 
 type ZeroTrustGatewaySettingsSettingsAntivirusNotificationSettingsModel struct {
diff --git a/internal/services/zero_trust_gateway_settings/schema.go b/internal/services/zero_trust_gateway_settings/schema.go
@@ -5,6 +5,7 @@ package zero_trust_gateway_settings
 import (
 	"context"
 
+	"github.com/cloudflare/terraform-provider-cloudflare/internal/customfield"
 	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -62,7 +63,9 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 							},
 							"notification_settings": schema.SingleNestedAttribute{
 								Description: "Configure a message to display on the user's device when an antivirus search is performed.",
+								Computed:    true,
 								Optional:    true,
+								CustomType:  customfield.NewNestedObjectType[ZeroTrustGatewaySettingsSettingsAntivirusNotificationSettingsModel](ctx),
 								Attributes: map[string]schema.Attribute{
 									"enabled": schema.BoolAttribute{
 										Description: "Set notification on",
@@ -121,14 +124,10 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 								Optional:    true,
 							},
 							"mode": schema.StringAttribute{
-								Description: "Controls whether the user is redirected to a Cloudflare-hosted block page or to a customer-provided URI.\nAvailable values: \"\", \"customized_block_page\", \"redirect_uri\".",
+								Description: "Controls whether the user is redirected to a Cloudflare-hosted block page or to a customer-provided URI.\nAvailable values: \"customized_block_page\", \"redirect_uri\".",
 								Optional:    true,
 								Validators: []validator.String{
-									stringvalidator.OneOfCaseInsensitive(
-										"",
-										"customized_block_page",
-										"redirect_uri",
-									),
+									stringvalidator.OneOfCaseInsensitive("customized_block_page", "redirect_uri"),
 								},
 							},
 							"name": schema.StringAttribute{

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,5 @@ resource "cloudflare_r2_custom_domain" "example_r2_custom_domain" {`
`4`	`4`	`domain = "domain"`
`5`	`5`	`enabled = true`
`6`	`6`	`zone_id = "zoneId"`
`7`		`- ciphers = ["string"]`
`8`	`7`	`min_tls = "1.0"`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ type R2CustomDomainDataSourceModel struct {`
`24`	`24`	MinTLS types.String `tfsdk:"min_tls" json:"minTLS,computed"`
`25`	`25`	ZoneID types.String `tfsdk:"zone_id" json:"zoneId,computed"`
`26`	`26`	ZoneName types.String `tfsdk:"zone_name" json:"zoneName,computed"`
`27`		- Ciphers customfield.List[types.String] `tfsdk:"ciphers" json:"ciphers,computed"`
`28`	`27`	Status customfield.NestedObject[R2CustomDomainStatusDataSourceModel] `tfsdk:"status" json:"status,computed"`
`29`	`28`	`}`
`30`	`29`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ type R2CustomDomainModel struct {`
`20`	`20`	ZoneID types.String `tfsdk:"zone_id" json:"zoneId,required"`
`21`	`21`	Enabled types.Bool `tfsdk:"enabled" json:"enabled,required"`
`22`	`22`	MinTLS types.String `tfsdk:"min_tls" json:"minTLS,optional"`
`23`		- Ciphers *[]types.String `tfsdk:"ciphers" json:"ciphers,optional"`
`24`	`23`	ZoneName types.String `tfsdk:"zone_name" json:"zoneName,computed"`
`25`	`24`	Status customfield.NestedObject[R2CustomDomainStatusModel] `tfsdk:"status" json:"status,computed"`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ package zero_trust_gateway_settings`
`4`	`4`
`5`	`5`	`import (`
`6`	`6`	`"github.com/cloudflare/terraform-provider-cloudflare/internal/apijson"`
	`7`	`+ "github.com/cloudflare/terraform-provider-cloudflare/internal/customfield"`
`7`	`8`	`"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"`
`8`	`9`	`"github.com/hashicorp/terraform-plugin-framework/types"`
`9`	`10`	`)`
`@@ -50,10 +51,10 @@ type ZeroTrustGatewaySettingsSettingsActivityLogModel struct {`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`type ZeroTrustGatewaySettingsSettingsAntivirusModel struct {`
`53`		- EnabledDownloadPhase types.Bool `tfsdk:"enabled_download_phase" json:"enabled_download_phase,computed_optional"`
`54`		- EnabledUploadPhase types.Bool `tfsdk:"enabled_upload_phase" json:"enabled_upload_phase,computed_optional"`
`55`		- FailClosed types.Bool `tfsdk:"fail_closed" json:"fail_closed,computed_optional"`
`56`		- NotificationSettings *ZeroTrustGatewaySettingsSettingsAntivirusNotificationSettingsModel `tfsdk:"notification_settings" json:"notification_settings,optional"`
	`54`	+ EnabledDownloadPhase types.Bool `tfsdk:"enabled_download_phase" json:"enabled_download_phase,computed_optional"`
	`55`	+ EnabledUploadPhase types.Bool `tfsdk:"enabled_upload_phase" json:"enabled_upload_phase,computed_optional"`
	`56`	+ FailClosed types.Bool `tfsdk:"fail_closed" json:"fail_closed,computed_optional"`
	`57`	+ NotificationSettings customfield.NestedObject[ZeroTrustGatewaySettingsSettingsAntivirusNotificationSettingsModel] `tfsdk:"notification_settings" json:"notification_settings,computed_optional"`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`type ZeroTrustGatewaySettingsSettingsAntivirusNotificationSettingsModel struct {`