use new TransformPropertyValueDirectional walker

pulumi · Dec 18, 2024 · 7b8db7c · 7b8db7c
1 parent e09c20b
commit 7b8db7c
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/pkg/tfbridge/property_path.go b/pkg/tfbridge/property_path.go
@@ -137,13 +137,19 @@ func isPlanCompatibleWithInputs(
 	ps map[string]*info.Schema,
 ) bool {
 	abortErr := errors.New("abort")
-	visitor := func(subpath resource.PropertyPath, planSubVal resource.PropertyValue) (resource.PropertyValue, error) {
+	visitor := func(
+		subpath resource.PropertyPath, planSubVal resource.PropertyValue, entering bool,
+	) (resource.PropertyValue, error) {
+		if !entering {
+			return planSubVal, nil
+		}
+
 		// Do not compare and do not descend into internal properties.
 		{
 			lastPathStep := subpath[len(subpath)-1]
 			if stepStr, ok := lastPathStep.(string); ok {
 				if resource.IsInternalPropertyKey(resource.PropertyKey(stepStr)) {
-					return planSubVal, propertyvalue.LimitDescentError{}
+					return planSubVal, propertyvalue.SkipChildrenError{}
 				}
 			}
 		}
@@ -176,7 +182,7 @@ func isPlanCompatibleWithInputs(
 		if tfs.Type() == shim.TypeSet {
 			// TODO: more sophisticated comparison of nested sets
 			if planSubVal.DeepEquals(inputsSubVal) {
-				return planSubVal, propertyvalue.LimitDescentError{}
+				return planSubVal, propertyvalue.SkipChildrenError{}
 			}
 			return resource.NewNullProperty(), abortErr
 		}
@@ -187,7 +193,7 @@ func isPlanCompatibleWithInputs(
 
 		return resource.NewNullProperty(), abortErr
 	}
-	_, err := propertyvalue.TransformPropertyValueLimitDescent(
+	_, err := propertyvalue.TransformPropertyValueDirectional(
 		resource.PropertyPath(path),
 		visitor,
 		plan,
@@ -207,13 +213,18 @@ func isInputCompatibleWithPlan(
 	ps map[string]*info.Schema,
 ) bool {
 	abortErr := errors.New("abort")
-	visitor := func(subpath resource.PropertyPath, inputsSubVal resource.PropertyValue) (resource.PropertyValue, error) {
+	visitor := func(
+		subpath resource.PropertyPath, inputsSubVal resource.PropertyValue, entering bool,
+	) (resource.PropertyValue, error) {
+		if !entering {
+			return inputsSubVal, nil
+		}
 		// Do not compare and do not descend into internal properties.
 		{
 			lastPathStep := subpath[len(subpath)-1]
 			if stepStr, ok := lastPathStep.(string); ok {
 				if resource.IsInternalPropertyKey(resource.PropertyKey(stepStr)) {
-					return inputsSubVal, propertyvalue.LimitDescentError{}
+					return inputsSubVal, propertyvalue.SkipChildrenError{}
 				}
 			}
 		}
@@ -247,7 +258,7 @@ func isInputCompatibleWithPlan(
 		if tfs.Type() == shim.TypeSet {
 			// TODO: more sophisticated comparison of nested sets
 			if inputsSubVal.DeepEquals(planSubVal) {
-				return inputsSubVal, propertyvalue.LimitDescentError{}
+				return inputsSubVal, propertyvalue.SkipChildrenError{}
 			}
 			return resource.NewNullProperty(), abortErr
 		}
@@ -258,7 +269,7 @@ func isInputCompatibleWithPlan(
 
 		return resource.NewNullProperty(), abortErr
 	}
-	_, err := propertyvalue.TransformPropertyValueLimitDescent(
+	_, err := propertyvalue.TransformPropertyValueDirectional(
 		resource.PropertyPath(path),
 		visitor,
 		inputs,