Merge pull request #4465 from cloudflare/add-ssl_automatic_mode-support

resource/cloudflare_zone_setting_override: add support for `ssl_automatic_mode`
cloudflare · Jan 6, 2025 · 861bdb9 · 861bdb9
2 parents 5547898 + 8929351
commit 861bdb9
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 1 deletion.
diff --git a/.changelog/4465.txt b/.changelog/4465.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/cloudflare_zone_settings_override: add support for `ssl_automatic_mode`
+```
diff --git a/docs/resources/zone_settings_override.md b/docs/resources/zone_settings_override.md
@@ -128,6 +128,7 @@ Optional:
 - `sort_query_string_for_cache` (String)
 - `speed_brain` (String)
 - `ssl` (String)
+- `ssl_automatic_mode` (String)
 - `tls_1_2_only` (String, Deprecated)
 - `tls_1_3` (String)
 - `tls_client_auth` (String)
@@ -144,7 +145,7 @@ Optional:
 
 Optional:
 
-- `enabled` (Boolean) Whether Aegis zone setting is enabled.
+- `enabled` (Boolean) Whether Aegis zone setting is enabled. Defaults to `true`.
 - `pool_id` (String) Egress pool id which refers to a grouping of dedicated egress IPs through which Cloudflare will connect to origin.
 
 
@@ -244,6 +245,7 @@ Read-Only:
 - `sort_query_string_for_cache` (String)
 - `speed_brain` (String)
 - `ssl` (String)
+- `ssl_automatic_mode` (String)
 - `tls_1_2_only` (String)
 - `tls_1_3` (String)
 - `tls_client_auth` (String)

diff --git a/internal/sdkv2provider/resource_cloudflare_zone_settings_override.go b/internal/sdkv2provider/resource_cloudflare_zone_settings_override.go
@@ -51,6 +51,7 @@ var fetchAsSingleSetting = []string{
 	"nel",
 	"replace_insecure_js",
 	"speed_brain",
+	"ssl_automatic_mode",
 	"aegis",
 }
 

diff --git a/internal/sdkv2provider/resource_cloudflare_zone_settings_override_test.go b/internal/sdkv2provider/resource_cloudflare_zone_settings_override_test.go
@@ -381,6 +381,36 @@ resource "cloudflare_zone_settings_override" "%[1]s" {
 }`, rnd, zoneID)
 }
 
+func TestAccCloudflareZoneSettingsOverride_SSLAutomaticMode(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: testAccCheckCloudflareZoneSettingsOverrideSSLAutomaticMode(rnd, zoneID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudflareZoneSettings(name),
+					resource.TestCheckResourceAttr(name, "settings.0.ssl_automatic_mode", "auto"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckCloudflareZoneSettingsOverrideSSLAutomaticMode(rnd, zoneID string) string {
+	return fmt.Sprintf(`
+resource "cloudflare_zone_settings_override" "%[1]s" {
+  zone_id = "%[2]s"
+  settings {
+    ssl_automatic_mode = "auto"
+  }
+}`, rnd, zoneID)
+}
+
 func TestCloudflareZoneSettingsOverrideStateUpgradeV0(t *testing.T) {
 	v0 := map[string]interface{}{
 		"settings": []interface{}{map[string]interface{}{

diff --git a/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go b/internal/sdkv2provider/schema_cloudflare_zone_settings_override.go
@@ -379,6 +379,13 @@ var resourceCloudflareZoneSettingsSchema = map[string]*schema.Schema{
 		ValidateFunc: validation.StringInSlice([]string{"off", "flexible", "full", "strict", "origin_pull"}, false), // depends on plan
 	},
 
+	"ssl_automatic_mode": {
+		Type:         schema.TypeString,
+		Optional:     true,
+		Computed:     true,
+		ValidateFunc: validation.StringInSlice([]string{"auto", "custom"}, false),
+	},
+
 	"universal_ssl": {
 		Type:         schema.TypeString,
 		Optional:     true,