direct: refactor: query graph for IsReferenced info (#3458)

Follow up to #3455

Author: denik

bundle/bundle.go

@@ -140,10 +140,6 @@ type Bundle struct {
 	// (direct only) planned action for each resource
 	PlannedActions map[deployplan.ResourceNode]deployplan.ActionType
 
-	// (direct only) flag that tells if a given node has references to it
-	// TODO: move this inside Graph
-	IsReferenced map[deployplan.ResourceNode]bool
-
 	// if true, we skip approval checks for deploy, destroy resources and delete
 	// files
 	AutoApprove bool

bundle/terranova/apply.go

@@ -127,7 +127,7 @@ func (m *terranovaApplyMutator) Apply(ctx context.Context, b *bundle.Bundle) dia
 		}
 
 		// Update resources.id after successful deploy so that future ${resources...id} refs are replaced
-		if b.IsReferenced[node] {
+		if b.Graph.HasOutgoingEdges(node) {
 			err = resolveIDReference(ctx, b, node.Group, node.Key)
 			if err != nil {
 				// not using errorPrefix because resource was deployed

bundle/terranova/graph.go

@@ -24,9 +24,7 @@ type fieldRef struct {
 }
 
 // makeResourceGraph creates node graph based on ${resources.group.name.id} references.
-// Returns a graph and a map of all references that have references to them
-func makeResourceGraph(ctx context.Context, b *bundle.Bundle) (*dagrun.Graph[deployplan.ResourceNode], map[deployplan.ResourceNode]bool, error) {
-	isReferenced := make(map[deployplan.ResourceNode]bool)
+func makeResourceGraph(ctx context.Context, b *bundle.Bundle) (*dagrun.Graph[deployplan.ResourceNode], error) {
 	g := dagrun.NewGraph[deployplan.ResourceNode]()
 
 	// Collect and sort nodes first, because MapByPattern gives them in randomized order
@@ -49,7 +47,7 @@ func makeResourceGraph(ctx context.Context, b *bundle.Bundle) (*dagrun.Graph[dep
 		},
 	)
 	if err != nil {
-		return nil, nil, fmt.Errorf("reading config: %w", err)
+		return nil, fmt.Errorf("reading config: %w", err)
 	}
 
 	slices.SortFunc(nodes, func(a, b deployplan.ResourceNode) int {
@@ -64,7 +62,7 @@ func makeResourceGraph(ctx context.Context, b *bundle.Bundle) (*dagrun.Graph[dep
 
 		fieldRefs, err := extractReferences(b.Config.Value(), node)
 		if err != nil {
-			return nil, nil, fmt.Errorf("failed to read references from config for %s: %w", node.String(), err)
+			return nil, fmt.Errorf("failed to read references from config for %s: %w", node.String(), err)
 		}
 
 		for _, fieldRef := range fieldRefs {
@@ -78,12 +76,11 @@ func makeResourceGraph(ctx context.Context, b *bundle.Bundle) (*dagrun.Graph[dep
 					node,
 					label,
 				)
-				isReferenced[referencedNode] = true
 			}
 		}
 	}
 
-	return g, isReferenced, nil
+	return g, nil
 }
 
 func extractReferences(root dyn.Value, node deployplan.ResourceNode) ([]fieldRef, error) {

bundle/terranova/plan.go

@@ -99,7 +99,7 @@ func CalculatePlanForDeploy(ctx context.Context, b *bundle.Bundle) error {
 
 	client := b.WorkspaceClient()
 
-	b.Graph, b.IsReferenced, err = makeResourceGraph(ctx, b)
+	b.Graph, err = makeResourceGraph(ctx, b)
 	if err != nil {
 		return fmt.Errorf("reading config: %w", err)
 	}
@@ -150,7 +150,7 @@ func CalculatePlanForDeploy(ctx context.Context, b *bundle.Bundle) error {
 			return false
 		}
 
-		if b.IsReferenced[node] && actionType.KeepsID() {
+		if b.Graph.HasOutgoingEdges(node) && actionType.KeepsID() {
 			err = resolveIDReference(ctx, b, pl.group, pl.resourceName)
 			if err != nil {
 				logdiag.LogError(ctx, fmt.Errorf("failed to replace ref to resources.%s.%s.id: %w", pl.group, pl.resourceName, err))

libs/dagrun/dagrun.go

@@ -41,6 +41,10 @@ func (g *Graph[N]) HasNode(n N) bool {
 	return ok
 }
 
+// HasOutgoingEdges reports whether this node has at least one outgoing edge.
+// In this graph, an outgoing edge from X->Y means Y references X.
+func (g *Graph[N]) HasOutgoingEdges(n N) bool { return len(g.adj[n]) > 0 }
+
 func (g *Graph[N]) AddDirectedEdge(from, to N, label string) {
 	g.AddNode(from)
 	g.AddNode(to)