Merge pull request #1925 from turbomaze/turbomaze/fix-zone-settings

cloudflare · Sep 27, 2022 · 8f76096 · 8f76096
2 parents a14b049 + 4c09210
commit 8f76096
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.changelog/1925.txt b/.changelog/1925.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/cloudflare_zone_settings_override: Fix array manipulation bug related to single zone settings
+```
diff --git a/internal/provider/resource_cloudflare_zone_settings_override.go b/internal/provider/resource_cloudflare_zone_settings_override.go
@@ -229,8 +229,11 @@ func updateSingleZoneSettings(ctx context.Context, zoneSettings []cloudflare.Zon
 		}
 	}
 
+	offset := 0
 	for _, indexToCut := range indexesToCut {
-		zoneSettings = append(zoneSettings[:indexToCut], zoneSettings[indexToCut+1:]...)
+		adjustedIndexToCut := indexToCut - offset
+		zoneSettings = append(zoneSettings[:adjustedIndexToCut], zoneSettings[adjustedIndexToCut+1:]...)
+		offset += 1
 	}
 	return zoneSettings, nil
 }