Merge pull request #1501 from cloudflare/dont-upgrade-rate-limit-if-i…

…t-doesnt-exist resource/cloudflare_ruleset: don't attempt to upgrade ratelimit if it isn't set
cloudflare · Mar 10, 2022 · b26ab29 · b26ab29
2 parents f22e829 + 14fcef3
commit b26ab29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.changelog/1501.txt b/.changelog/1501.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/cloudflare_ruleset: don't attempt to upgrade ratelimit if it isn't set
+```
diff --git a/cloudflare/resource_cloudflare_ruleset_migrate.go b/cloudflare/resource_cloudflare_ruleset_migrate.go
@@ -341,6 +341,10 @@ func resourceCloudflareRulesetSchemaV0() *schema.Resource {
 }
 
 func resourceCloudflareRulesetStateUpgradeV0ToV1(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+	if rawState["ratelimit"] == nil {
+		return rawState, nil
+	}
+
 	rawState["ratelimit"].([]map[string]interface{})[0]["counting_expression"] = rawState["ratelimit"].([]map[string]interface{})[0]["mitigation_expression"]
 	delete(rawState["ratelimit"].([]map[string]interface{})[0], "mitigation_expression")