fix handling of excluding all query string parameters from page rules

cloudflare · Jun 22, 2023 · 85a4666 · 85a4666
1 parent b3bd601
commit 85a4666
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/internal/app/cf-terraforming/cmd/generate.go b/internal/app/cf-terraforming/cmd/generate.go
@@ -662,7 +662,7 @@ func generateResources() func(cmd *cobra.Command, args []string) {
 				// Remap cache_key_fields.query_string.include & .exclude wildcards (not in an array) to the appropriate "ignore" field value in Terraform.
 				if c, ok := jsonStructData[i].(map[string]interface{})["actions"].(map[string]interface{})["cache_key_fields"].(map[string]interface{}); ok {
 					if s, sok := c["query_string"].(map[string]interface{})["include"].(string); sok && s == "*" {
-						jsonStructData[i].(map[string]interface{})["actions"].(map[string]interface{})["cache_key_fields"].(map[string]interface{})["query_string"].(map[string]interface{})["include"] = []interface{}{}
+						jsonStructData[i].(map[string]interface{})["actions"].(map[string]interface{})["cache_key_fields"].(map[string]interface{})["query_string"].(map[string]interface{})["include"] = nil
 						jsonStructData[i].(map[string]interface{})["actions"].(map[string]interface{})["cache_key_fields"].(map[string]interface{})["query_string"].(map[string]interface{})["ignore"] = false
 					}
 					if s, sok := c["query_string"].(map[string]interface{})["exclude"].(string); sok && s == "*" {

diff --git a/testdata/cloudflare/cloudflare_page_rule.yaml b/testdata/cloudflare/cloudflare_page_rule.yaml
@@ -46,9 +46,7 @@ interactions:
                   },
                   "query_string": {
                     "include": [],
-                    "exclude": [
-                      "*"
-                    ]
+                    "exclude": "*"
                   },
                   "host": {
                     "resolved": true