Skip to content

Commit

Permalink
Merge pull request #3305 from cloudflare/add-nel-zone-setting
Browse files Browse the repository at this point in the history
resource/cloudflare_zone_settings_override: add support for `nel`
  • Loading branch information
jacobbednarz committed May 14, 2024
2 parents 710feec + 38f59c1 commit cc3b87f
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/3305.txt
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/cloudflare_zone_settings_override: add support for NEL
```
Expand Up @@ -35,6 +35,7 @@ var fetchAsSingleSetting = []string{
"early_hints",
"origin_max_http_version",
"fonts",
"nel",
}

func resourceCloudflareZoneSettingsOverrideCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down Expand Up @@ -186,7 +187,7 @@ func flattenZoneSettings(ctx context.Context, d *schema.ResourceData, settings [
continue
}

if s.ID == "minify" || s.ID == "mobile_redirect" {
if s.ID == "minify" || s.ID == "mobile_redirect" || s.ID == "nel" {
cfg[s.ID] = []interface{}{s.Value.(map[string]interface{})}
} else if s.ID == "security_header" {
cfg[s.ID] = []interface{}{s.Value.(map[string]interface{})["strict_transport_security"]}
Expand Down Expand Up @@ -354,7 +355,7 @@ func expandZoneSetting(d *schema.ResourceData, keyFormatString, k string, settin
zoneSettingValue = settingValue
}
}
case "minify", "mobile_redirect":
case "minify", "mobile_redirect", "nel":
{
listValue := settingValue.([]interface{})
if len(listValue) > 0 && listValue != nil {
Expand Down
Expand Up @@ -218,3 +218,35 @@ resource "cloudflare_zone_settings_override" "%[1]s" {
}
}`, rnd, zoneID)
}

func TestAccCloudflareZoneSettingsOverride_NEL(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: testAccCheckCloudflareZoneSettingsOverrideNEL(rnd, zoneID),
Check: resource.ComposeTestCheckFunc(
testAccCheckCloudflareZoneSettings(name),
resource.TestCheckResourceAttr(name, "settings.0.nel.0.enabled", "true"),
),
},
},
})
}

func testAccCheckCloudflareZoneSettingsOverrideNEL(rnd, zoneID string) string {
return fmt.Sprintf(`
resource "cloudflare_zone_settings_override" "%[1]s" {
zone_id = "%[2]s"
settings {
nel {
enabled = true
}
}
}`, rnd, zoneID)
}
16 changes: 16 additions & 0 deletions internal/sdkv2provider/schema_cloudflare_zone_settings_override.go
Expand Up @@ -536,4 +536,20 @@ var resourceCloudflareZoneSettingsSchema = map[string]*schema.Schema{
Optional: true,
Computed: true,
},

"nel": {
Type: schema.TypeList,
Optional: true,
Computed: true,
MinItems: 1,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"enabled": {
Type: schema.TypeBool,
Required: true,
},
},
},
},
}

0 comments on commit cc3b87f

Please sign in to comment.