Merge pull request #3829 from jramosf/fix-panic-migratestate

fix: add nil check for ZoneSettingsOverrideUpgrade
cloudflare · Aug 30, 2024 · 34701ff · 34701ff
2 parents 04b4974 + c9f6e27
commit 34701ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.changelog/3829.txt b/.changelog/3829.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/cloudflare_zone_settings_override: fix migration process with nil initial_settings
+```
diff --git a/internal/sdkv2provider/resource_cloudflare_zone_settings_override_migrate.go b/internal/sdkv2provider/resource_cloudflare_zone_settings_override_migrate.go
@@ -43,7 +43,9 @@ func resourceCloudflareZoneSettingsOverrideStateUpgradeV1(
 	}
 
 	upgrade := func(state map[string]interface{}, name string) map[string]interface{} {
-		delete(state[name].([]interface{})[0].(map[string]interface{}), "mobile_redirect")
+		if val, ok := state[name]; ok && val != nil {
+			delete(state[name].([]interface{})[0].(map[string]interface{}), "mobile_redirect")
+		}
 		return state
 	}
 
@@ -89,7 +91,9 @@ func resourceCloudflareZoneSettingsOverrideStateUpgradeV2(
 	}
 
 	upgrade := func(state map[string]interface{}, name string) map[string]interface{} {
-		delete(state[name].([]interface{})[0].(map[string]interface{}), "minify")
+		if val, ok := state[name]; ok && val != nil {
+			delete(state[name].([]interface{})[0].(map[string]interface{}), "minify")
+		}
 		return state
 	}