From 3776455cbd89a4cbcf13d9a937b7777d9d947a77 Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Mon, 12 Aug 2024 10:51:42 +0200 Subject: [PATCH 1/7] chore: Add replace_insecure_js zone_settings_override toggle. --- docs/resources/zone_settings_override.md | 2 ++ ...chema_cloudflare_zone_settings_override.go | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/docs/resources/zone_settings_override.md b/docs/resources/zone_settings_override.md index f23fb86046..1a4ff0c6af 100644 --- a/docs/resources/zone_settings_override.md +++ b/docs/resources/zone_settings_override.md @@ -118,6 +118,7 @@ Optional: - `privacy_pass` (String) - `proxy_read_timeout` (String) - `pseudo_ipv4` (String) +- `replace_insecure_js` (String) - `response_buffering` (String) - `rocket_loader` (String) - `security_header` (Block List, Max: 1) (see [below for nested schema](#nestedblock--settings--security_header)) @@ -222,6 +223,7 @@ Read-Only: - `privacy_pass` (String) - `proxy_read_timeout` (String) - `pseudo_ipv4` (String) +- `replace_insecure_js` (String) - `response_buffering` (String) - `rocket_loader` (String) - `security_header` (List of Object) (see [below for nested schema](#nestedobjatt--initial_settings--security_header)) diff --git a/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go b/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go index 1e268dc416..632c0d8c0d 100644 --- a/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go +++ b/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go @@ -287,6 +287,13 @@ var resourceCloudflareZoneSettingsSchema = map[string]*schema.Schema{ Computed: true, }, + "replace_insecure_js": { + Type: schema.TypeString, + ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), + Optional: true, + Computed: true, + }, + "response_buffering": { Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), @@ -784,6 +791,13 @@ var resourceCloudflareZoneSettingsSchemaV0 = map[string]*schema.Schema{ Computed: true, }, + "replace_insecure_js": { + Type: schema.TypeString, + ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), + Optional: true, + Computed: true, + }, + "response_buffering": { Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), @@ -1282,6 +1296,13 @@ var resourceCloudflareZoneSettingsSchemaV1 = map[string]*schema.Schema{ Computed: true, }, + "replace_insecure_js": { + Type: schema.TypeString, + ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), + Optional: true, + Computed: true, + }, + "response_buffering": { Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), From 1a502090251173f6b4d69844e2af13bf54f452ea Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Mon, 12 Aug 2024 11:01:50 +0200 Subject: [PATCH 2/7] chore: Add changelog entry for replace_insecure_js. --- .changelog/3585.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3585.txt diff --git a/.changelog/3585.txt b/.changelog/3585.txt new file mode 100644 index 0000000000..f4d20b088c --- /dev/null +++ b/.changelog/3585.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/cloudflare_zone_settings_override: Add optional setting replace_insecure_js. +``` From 20d76990aa800d35a548f2f2d8f9bfdcf7775b19 Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Mon, 12 Aug 2024 11:37:18 +0200 Subject: [PATCH 3/7] chore: Changelog nitpick. --- .changelog/3585.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/3585.txt b/.changelog/3585.txt index f4d20b088c..6ec8dc95a8 100644 --- a/.changelog/3585.txt +++ b/.changelog/3585.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/cloudflare_zone_settings_override: Add optional setting replace_insecure_js. +resource/cloudflare_zone_settings_override: Add optional setting `replace_insecure_js` ``` From de4720725c0020e6db71f78013800c93b5cd4727 Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Mon, 12 Aug 2024 13:08:09 +0200 Subject: [PATCH 4/7] chore: Correct PR number in changelog entry. --- .changelog/{3585.txt => 3602.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{3585.txt => 3602.txt} (100%) diff --git a/.changelog/3585.txt b/.changelog/3602.txt similarity index 100% rename from .changelog/3585.txt rename to .changelog/3602.txt From 9d7039df52dc06e15b2e5c11b6d41e28acd67773 Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Mon, 2 Sep 2024 14:04:43 +0200 Subject: [PATCH 5/7] chore: Remove replace_insecure_js from migration schemas. --- .../schema_cloudflare_zone_settings_override.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go b/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go index 632c0d8c0d..37974c2303 100644 --- a/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go +++ b/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go @@ -791,13 +791,6 @@ var resourceCloudflareZoneSettingsSchemaV0 = map[string]*schema.Schema{ Computed: true, }, - "replace_insecure_js": { - Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), - Optional: true, - Computed: true, - }, - "response_buffering": { Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), @@ -1296,13 +1289,6 @@ var resourceCloudflareZoneSettingsSchemaV1 = map[string]*schema.Schema{ Computed: true, }, - "replace_insecure_js": { - Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), - Optional: true, - Computed: true, - }, - "response_buffering": { Type: schema.TypeString, ValidateFunc: validation.StringInSlice([]string{"on", "off"}, false), From 8811c86a0bb58d931456a2a4b4ad95a8ee53a81a Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Mon, 2 Sep 2024 15:13:59 +0200 Subject: [PATCH 6/7] chore: Add test for replace_insecure_js. --- ..._cloudflare_zone_settings_override_test.go | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/internal/sdkv2provider/resource_cloudflare_zone_settings_override_test.go b/internal/sdkv2provider/resource_cloudflare_zone_settings_override_test.go index fb3f0e2c8f..be0dcc94db 100644 --- a/internal/sdkv2provider/resource_cloudflare_zone_settings_override_test.go +++ b/internal/sdkv2provider/resource_cloudflare_zone_settings_override_test.go @@ -248,6 +248,36 @@ resource "cloudflare_zone_settings_override" "%[1]s" { }`, rnd, zoneID) } +func TestAccCloudflareZoneSettingsOverride_ReplaceInsecureJS(t *testing.T) { + zoneID := os.Getenv("CLOUDFLARE_ZONE_ID") + rnd := generateRandomResourceName() + name := "cloudflare_zone_settings_override." + rnd + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: providerFactories, + Steps: []resource.TestStep{ + { + Config: testAccCheckCloudflareZoneSettingsOverrideReplaceInsecureJS(rnd, zoneID), + Check: resource.ComposeTestCheckFunc( + testAccCheckCloudflareZoneSettings(name), + resource.TestCheckResourceAttr(name, "settings.0.replace_insecure_js", "on"), + ), + }, + }, + }) +} + +func testAccCheckCloudflareZoneSettingsOverrideReplaceInsecureJS(rnd, zoneID string) string { + return fmt.Sprintf(` +resource "cloudflare_zone_settings_override" "%[1]s" { + zone_id = "%[2]s" + settings { + replace_insecure_js = "on" + } +}`, rnd, zoneID) +} + func TestCloudflareZoneSettingsOverrideStateUpgradeV0(t *testing.T) { v0 := map[string]interface{}{ "settings": []interface{}{map[string]interface{}{ From 5e57f8ecb9ff3565ba12e28d32ff291002ba9970 Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Tue, 3 Sep 2024 09:24:28 +0200 Subject: [PATCH 7/7] chore: Fetch replace_insecure_js as single setting. --- .../sdkv2provider/resource_cloudflare_zone_settings_override.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/sdkv2provider/resource_cloudflare_zone_settings_override.go b/internal/sdkv2provider/resource_cloudflare_zone_settings_override.go index 0aa6321cfa..9e437f120a 100644 --- a/internal/sdkv2provider/resource_cloudflare_zone_settings_override.go +++ b/internal/sdkv2provider/resource_cloudflare_zone_settings_override.go @@ -49,6 +49,7 @@ var fetchAsSingleSetting = []string{ "origin_max_http_version", "fonts", "nel", + "replace_insecure_js", } func resourceCloudflareZoneSettingsOverrideCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {