chore: refactor

Author: tamas-jozsa

REFACTORING_PLAN.md

@@ -283,7 +283,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 
 	attributes = gjson.Get(result, attributesPath)
 	result = state.EnsureField(result, attributesPath, attributes, "last_used_on", nil)
-	result, _ = sjson.Set(result, "schema_version", 1)
+	result = state.SetSchemaVersion(result, 1)
 
 	return result, nil
 }

REFACTORING_SUMMARY.md

@@ -176,7 +176,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	}
 
 	// Set schema_version to 0 for v5
-	result, _ = sjson.Set(result, "schema_version", 0)
+	result = state.SetSchemaVersion(result, 0)
 
 	transform.SetStateTypeRename(ctx, resourceName, "cloudflare_argo", targetType)
 

internal/resources/api_token/v4_to_v5.go

@@ -8,6 +8,7 @@ import (
 	"github.com/cloudflare/tf-migrate/internal"
 	"github.com/cloudflare/tf-migrate/internal/transform"
 	tfhcl "github.com/cloudflare/tf-migrate/internal/transform/hcl"
+	"github.com/cloudflare/tf-migrate/internal/transform/state"
 )
 
 // V4ToV5Migrator handles the migration of cloudflare_custom_pages from v4 to v5.
@@ -74,7 +75,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	// Check if it's a valid custom_pages instance
 	if !stateJSON.Exists() || !stateJSON.Get("attributes").Exists() {
 		// Even for invalid instances, set schema_version for v5
-		result, _ = sjson.Set(result, "schema_version", 0)
+		result = state.SetSchemaVersion(result, 0)
 		return result, nil
 	}
 
@@ -93,7 +94,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	}
 
 	// 3. Set schema_version to 0 for v5
-	result, _ = sjson.Set(result, "schema_version", 0)
+	result = state.SetSchemaVersion(result, 0)
 
 	return result, nil
 }

internal/resources/argo/v4_to_v5.go

@@ -173,15 +173,15 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	attrs := stateJSON.Get("attributes")
 	if !attrs.Get("name").Exists() || !attrs.Get("type").Exists() || !attrs.Get("zone_id").Exists() {
 		// Even for invalid/incomplete instances, we need to set schema_version for v5
-		result, _ = sjson.Set(result, "schema_version", 0)
+		result = state.SetSchemaVersion(result, 0)
 		return result, nil
 	}
 
 	// Transform the single instance
 	result = m.transformSingleDNSInstance(result, stateJSON)
 
 	// Ensure schema_version is set to 0 for v5
-	result, _ = sjson.Set(result, "schema_version", 0)
+	result = state.SetSchemaVersion(result, 0)
 
 	return result, nil
 }

internal/resources/custom_pages/v4_to_v5.go

@@ -191,7 +191,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, instance gjson.R
 
 	if !attrs.Exists() {
 		// Set schema_version even for invalid instances
-		result, _ = sjson.Set(result, "schema_version", 0)
+		result = state.SetSchemaVersion(result, 0)
 		return result, nil
 	}
 
@@ -224,7 +224,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, instance gjson.R
 	// We should NOT remove them, just leave them as-is for provider to handle
 
 	// Set schema_version
-	result, _ = sjson.Set(result, "schema_version", 0)
+	result = state.SetSchemaVersion(result, 0)
 
 	return result, nil
 }
@@ -263,15 +263,12 @@ func (m *V4ToV5Migrator) createHTTPConfig(stateJSON string, attrs gjson.Result)
 		stateJSON, _ = sjson.Set(stateJSON, "attributes.http_config", httpConfig)
 
 		// Remove the root-level fields that moved into http_config
+		fieldNames := make([]string, 0, len(httpFields)+1)
 		for oldField := range httpFields {
-			if attrs.Get(oldField).Exists() {
-				stateJSON, _ = sjson.Delete(stateJSON, "attributes."+oldField)
-			}
-		}
-		// Remove header from root if it exists
-		if attrs.Get("header").Exists() {
-			stateJSON, _ = sjson.Delete(stateJSON, "attributes.header")
+			fieldNames = append(fieldNames, oldField)
 		}
+		fieldNames = append(fieldNames, "header")
+		stateJSON = state.RemoveFieldsIfExist(stateJSON, "attributes", attrs, fieldNames...)
 	}
 
 	return stateJSON
@@ -294,12 +291,7 @@ func (m *V4ToV5Migrator) createTCPConfig(stateJSON string, attrs gjson.Result) s
 		stateJSON, _ = sjson.Set(stateJSON, "attributes.tcp_config", tcpConfig)
 
 		// Remove the root-level fields that moved into tcp_config
-		if attrs.Get("method").Exists() {
-			stateJSON, _ = sjson.Delete(stateJSON, "attributes.method")
-		}
-		if attrs.Get("port").Exists() {
-			stateJSON, _ = sjson.Delete(stateJSON, "attributes.port")
-		}
+		stateJSON = state.RemoveFieldsIfExist(stateJSON, "attributes", attrs, "method", "port")
 	}
 
 	return stateJSON

internal/resources/dns_record/v4_to_v5.go

@@ -86,7 +86,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	attrs := stateJSON.Get("attributes")
 
 	if !attrs.Exists() {
-		result, _ = sjson.Set(result, "schema_version", 0)
+		result = state.SetSchemaVersion(result, 0)
 		return result, nil
 	}
 
@@ -114,7 +114,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 		result, _ = sjson.Set(result, "attributes.num_items", floatVal)
 	}
 
-	result, _ = sjson.Set(result, "schema_version", 0)
+	result = state.SetSchemaVersion(result, 0)
 
 	return result, nil
 }

internal/resources/healthcheck/v4_to_v5.go

@@ -10,6 +10,7 @@ import (
 	"github.com/cloudflare/tf-migrate/internal"
 	"github.com/cloudflare/tf-migrate/internal/transform"
 	tfhcl "github.com/cloudflare/tf-migrate/internal/transform/hcl"
+	"github.com/cloudflare/tf-migrate/internal/transform/state"
 )
 
 // V4ToV5Migrator handles migration of load balancer resources from v4 to v5
@@ -146,6 +147,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	// v4: session_affinity_attributes as array → v5: as object
 
 	result := stateJSON.String()
+	attrs := stateJSON.Get("attributes")
 
 	// Use regex to rename attributes in JSON
 	// Replace "default_pool_ids" with "default_pools"
@@ -154,35 +156,14 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	// Replace "fallback_pool_id" with "fallback_pool"
 	result = strings.Replace(result, `"fallback_pool_id"`, `"fallback_pool"`, -1)
 
-	// Transform session_affinity_attributes from array to object
-	// v4: "session_affinity_attributes": [{ ... }] or []
-	// v5: "session_affinity_attributes": { ... } or null
-	sessionAffinityAttrs := stateJSON.Get("attributes.session_affinity_attributes")
-	if sessionAffinityAttrs.Exists() && sessionAffinityAttrs.IsArray() {
-		if len(sessionAffinityAttrs.Array()) > 0 {
-			firstElement := sessionAffinityAttrs.Array()[0]
-			result, _ = sjson.Set(result, "attributes.session_affinity_attributes", firstElement.Value())
-		} else {
-			// Empty array -> null
-			result, _ = sjson.Set(result, "attributes.session_affinity_attributes", nil)
-		}
-	}
-
 	// Transform single-object fields from arrays to objects or null
 	// v4: field: [{ ... }] or []
 	// v5: field: { ... } or null
-	singleObjectFields := []string{"adaptive_routing", "location_strategy", "random_steering"}
+	singleObjectFields := []string{"session_affinity_attributes", "adaptive_routing", "location_strategy", "random_steering"}
 	for _, field := range singleObjectFields {
-		fieldData := stateJSON.Get("attributes." + field)
-		if fieldData.Exists() && fieldData.IsArray() {
-			if len(fieldData.Array()) > 0 {
-				firstElement := fieldData.Array()[0]
-				result, _ = sjson.Set(result, "attributes."+field, firstElement.Value())
-			} else {
-				// Empty array -> null
-				result, _ = sjson.Set(result, "attributes."+field, nil)
-			}
-		}
+		result = state.TransformFieldArrayToObject(result, "attributes", attrs, field, state.ArrayToObjectOptions{
+			TransformEmptyToNull: true,
+		})
 	}
 
 	// Transform empty arrays to null for map fields that v5 expects as null or maps
@@ -204,7 +185,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	}
 
 	// Reset schema_version to 0 for v5 (v4 uses schema_version 1)
-	result, _ = sjson.Set(result, "schema_version", 0)
+	result = state.SetSchemaVersion(result, 0)
 
 	return result, nil
 }

internal/resources/list/v4_to_v5.go

@@ -115,7 +115,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, instance gjson.R
 
 	if !attrs.Exists() {
 		// Set schema_version even for invalid instances
-		result, _ = sjson.Set(result, "schema_version", 0)
+		result = state.SetSchemaVersion(result, 0)
 		return result, nil
 	}
 
@@ -172,7 +172,7 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, instance gjson.R
 	})
 
 	// Set schema_version
-	result, _ = sjson.Set(result, "schema_version", 0)
+	result = state.SetSchemaVersion(result, 0)
 
 	return result, nil
 }