Update variable test case to pull value from state

Author: cortlyons

integration/v4_to_v5/testdata/tiered_cache/expected/tiered_cache.tf

@@ -48,7 +48,11 @@ resource "cloudflare_argo_tiered_caching" "generic" {
 }
 resource "cloudflare_tiered_cache" "variable" {
   zone_id = var.cloudflare_zone_id
-  value   = var.cache_type
+  value   = "off"
+}
+resource "cloudflare_argo_tiered_caching" "variable" {
+  zone_id = var.cloudflare_zone_id
+  value   = "off"
 }
 resource "cloudflare_tiered_cache" "lifecycle" {
   zone_id = var.cloudflare_zone_id

internal/resources/tiered_cache/v4_to_v5.go

@@ -55,7 +55,17 @@ func (m *V4ToV5Migrator) TransformConfig(ctx *transform.Context, block *hclwrite
 	tfhcl.RenameAttribute(body, "cache_type", "value")
 
 	resourceName := tfhcl.GetResourceName(block)
-	value := tfhcl.ExtractStringFromAttribute(body.GetAttribute("value"))
+	valueAttr := body.GetAttribute("value")
+
+	// Try to get the actual value
+	var value string
+	if tfhcl.IsExpressionAttribute(valueAttr) {
+		// It's a variable reference - look up the actual value in state
+		value = state.GetResourceAttribute(ctx.StateJSON, "cloudflare_tiered_cache", resourceName, "cache_type")
+	} else {
+		// It's a literal value
+		value = tfhcl.ExtractStringFromAttribute(valueAttr)
+	}
 
 	if value == "smart" {
 		// cache_type="smart" → value="on" for both resources

internal/resources/tiered_cache/v4_to_v5_test.go

@@ -60,19 +60,6 @@ resource "cloudflare_tiered_cache" "example" {
 resource "cloudflare_argo_tiered_caching" "example" {
   zone_id = "test-zone-id"
   value   = "off"
-}`,
-		},
-		{
-			Name: "tiered_cache with variable cache_type",
-			Input: `
-resource "cloudflare_tiered_cache" "example" {
-  zone_id    = "test-zone-id"
-  cache_type = var.cache_type_value
-}`,
-			Expected: `
-resource "cloudflare_tiered_cache" "example" {
-  zone_id = "test-zone-id"
-  value   = var.cache_type_value
 }`,
 		},
 		{

internal/transform/state/fields.go

@@ -443,3 +443,67 @@ func IsEmptyValue(value gjson.Result) bool {
 		return false
 	}
 }
+
+// GetResourceAttribute retrieves an attribute value from the state for a given resource.
+// This is useful when config transformation needs to resolve variable values by looking
+// up the actual value that was applied in the state.
+//
+// Example - Getting the actual cache_type value from state when config uses a variable:
+//
+// Config:
+//
+//	resource "cloudflare_tiered_cache" "example" {
+//	  zone_id    = "test-zone-id"
+//	  cache_type = var.cache_type_value  // Variable reference
+//	}
+//
+// State JSON:
+//
+//	{
+//	  "resources": [{
+//	    "type": "cloudflare_tiered_cache",
+//	    "name": "example",
+//	    "instances": [{
+//	      "attributes": {
+//	        "zone_id": "test-zone-id",
+//	        "cache_type": "smart"  // Actual resolved value
+//	      }
+//	    }]
+//	  }]
+//	}
+//
+// Usage:
+//
+//	value := GetResourceAttribute(stateJSON, "cloudflare_tiered_cache", "example", "cache_type")
+//	// Returns: "smart"
+//
+// If the resource or attribute doesn't exist, returns an empty string.
+func GetResourceAttribute(stateJSON, resourceType, resourceName, attributeName string) string {
+	if stateJSON == "" {
+		return ""
+	}
+
+	state := gjson.Parse(stateJSON)
+	resources := state.Get("resources")
+	if !resources.Exists() {
+		return ""
+	}
+
+	var result string
+	resources.ForEach(func(_, resource gjson.Result) bool {
+		if resource.Get("type").String() == resourceType &&
+			resource.Get("name").String() == resourceName {
+			instances := resource.Get("instances")
+			if instances.Exists() && len(instances.Array()) > 0 {
+				attrValue := instances.Get("0.attributes." + attributeName)
+				if attrValue.Exists() {
+					result = attrValue.String()
+					return false // Stop iteration
+				}
+			}
+		}
+		return true // Continue iteration
+	})
+
+	return result
+}

internal/transform/state/fields_test.go

@@ -630,3 +630,209 @@ func TestConvertGjsonToJSON(t *testing.T) {
 		})
 	}
 }
+
+func TestGetResourceAttribute(t *testing.T) {
+	tests := []struct {
+		name          string
+		stateJSON     string
+		resourceType  string
+		resourceName  string
+		attributeName string
+		expected      string
+	}{
+		{
+			name: "Get string attribute from existing resource",
+			stateJSON: `{
+				"resources": [
+					{
+						"type": "cloudflare_tiered_cache",
+						"name": "example",
+						"instances": [
+							{
+								"attributes": {
+									"zone_id": "test-zone-id",
+									"cache_type": "smart",
+									"id": "test-id"
+								}
+							}
+						]
+					}
+				]
+			}`,
+			resourceType:  "cloudflare_tiered_cache",
+			resourceName:  "example",
+			attributeName: "cache_type",
+			expected:      "smart",
+		},
+		{
+			name: "Get attribute from resource with multiple instances",
+			stateJSON: `{
+				"resources": [
+					{
+						"type": "cloudflare_dns_record",
+						"name": "test",
+						"instances": [
+							{
+								"attributes": {
+									"zone_id": "zone1",
+									"name": "test",
+									"type": "A",
+									"content": "192.0.2.1"
+								}
+							},
+							{
+								"attributes": {
+									"zone_id": "zone2",
+									"name": "test2",
+									"type": "AAAA"
+								}
+							}
+						]
+					}
+				]
+			}`,
+			resourceType:  "cloudflare_dns_record",
+			resourceName:  "test",
+			attributeName: "type",
+			expected:      "A", // Should get first instance
+		},
+		{
+			name: "Resource does not exist",
+			stateJSON: `{
+				"resources": [
+					{
+						"type": "cloudflare_tiered_cache",
+						"name": "example",
+						"instances": [
+							{
+								"attributes": {
+									"zone_id": "test-zone-id",
+									"cache_type": "smart"
+								}
+							}
+						]
+					}
+				]
+			}`,
+			resourceType:  "cloudflare_tiered_cache",
+			resourceName:  "nonexistent",
+			attributeName: "cache_type",
+			expected:      "",
+		},
+		{
+			name: "Attribute does not exist",
+			stateJSON: `{
+				"resources": [
+					{
+						"type": "cloudflare_tiered_cache",
+						"name": "example",
+						"instances": [
+							{
+								"attributes": {
+									"zone_id": "test-zone-id",
+									"cache_type": "smart"
+								}
+							}
+						]
+					}
+				]
+			}`,
+			resourceType:  "cloudflare_tiered_cache",
+			resourceName:  "example",
+			attributeName: "nonexistent_attr",
+			expected:      "",
+		},
+		{
+			name: "Empty state JSON",
+			stateJSON: `{
+				"resources": []
+			}`,
+			resourceType:  "cloudflare_tiered_cache",
+			resourceName:  "example",
+			attributeName: "cache_type",
+			expected:      "",
+		},
+		{
+			name:          "Empty string as state",
+			stateJSON:     "",
+			resourceType:  "cloudflare_tiered_cache",
+			resourceName:  "example",
+			attributeName: "cache_type",
+			expected:      "",
+		},
+		{
+			name: "Multiple resources, find correct one",
+			stateJSON: `{
+				"resources": [
+					{
+						"type": "cloudflare_tiered_cache",
+						"name": "first",
+						"instances": [
+							{
+								"attributes": {
+									"cache_type": "off"
+								}
+							}
+						]
+					},
+					{
+						"type": "cloudflare_tiered_cache",
+						"name": "second",
+						"instances": [
+							{
+								"attributes": {
+									"cache_type": "smart"
+								}
+							}
+						]
+					},
+					{
+						"type": "cloudflare_tiered_cache",
+						"name": "third",
+						"instances": [
+							{
+								"attributes": {
+									"cache_type": "generic"
+								}
+							}
+						]
+					}
+				]
+			}`,
+			resourceType:  "cloudflare_tiered_cache",
+			resourceName:  "second",
+			attributeName: "cache_type",
+			expected:      "smart",
+		},
+		{
+			name: "Get nested attribute path",
+			stateJSON: `{
+				"resources": [
+					{
+						"type": "cloudflare_load_balancer",
+						"name": "example",
+						"instances": [
+							{
+								"attributes": {
+									"zone_id": "test-zone-id",
+									"id": "test-id"
+								}
+							}
+						]
+					}
+				]
+			}`,
+			resourceType:  "cloudflare_load_balancer",
+			resourceName:  "example",
+			attributeName: "zone_id",
+			expected:      "test-zone-id",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := GetResourceAttribute(tt.stateJSON, tt.resourceType, tt.resourceName, tt.attributeName)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}