mirror of
https://github.com/opentofu/opentofu.git
synced 2024-12-29 10:21:01 -06:00
Allow targeting of orphan nodes
Fixes #3852. We now run the OrphanTransformer even when targeting, and pass it the list of targets following resource expansion.
This commit is contained in:
parent
bfb770ee89
commit
38bb9f2416
@ -105,9 +105,8 @@ func (b *BuiltinGraphBuilder) Steps(path []string) []GraphTransformer {
|
||||
// Create all our resources from the configuration and state
|
||||
&ConfigTransformer{Module: b.Root},
|
||||
&OrphanTransformer{
|
||||
State: b.State,
|
||||
Module: b.Root,
|
||||
Targeting: len(b.Targets) > 0,
|
||||
State: b.State,
|
||||
Module: b.Root,
|
||||
},
|
||||
|
||||
// Output-related transformations
|
||||
|
@ -163,9 +163,9 @@ func (n *GraphNodeConfigResource) DynamicExpand(ctx EvalContext) (*Graph, error)
|
||||
// expand orphans, which have all the same semantics in a destroy
|
||||
// as a primary.
|
||||
steps = append(steps, &OrphanTransformer{
|
||||
State: state,
|
||||
View: n.Resource.Id(),
|
||||
Targeting: len(n.Targets) > 0,
|
||||
State: state,
|
||||
View: n.Resource.Id(),
|
||||
Targets: n.Targets,
|
||||
})
|
||||
|
||||
steps = append(steps, &DeposedTransformer{
|
||||
|
@ -2,7 +2,7 @@ package terraform
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"strings"
|
||||
|
||||
"github.com/hashicorp/terraform/config"
|
||||
"github.com/hashicorp/terraform/config/module"
|
||||
@ -29,7 +29,7 @@ type OrphanTransformer struct {
|
||||
// Targets are user-specified resources to target. We need to be aware of
|
||||
// these so we don't improperly identify orphans when they've just been
|
||||
// filtered out of the graph via targeting.
|
||||
Targeting bool
|
||||
Targets []ResourceAddress
|
||||
|
||||
// View, if non-nil will set a view on the module state.
|
||||
View string
|
||||
@ -41,13 +41,6 @@ func (t *OrphanTransformer) Transform(g *Graph) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
if t.Targeting {
|
||||
log.Printf("Skipping orphan transformer because we have targets.")
|
||||
// If we are in a run where we are targeting nodes, we won't process
|
||||
// orphans for this run.
|
||||
return nil
|
||||
}
|
||||
|
||||
// Build up all our state representatives
|
||||
resourceRep := make(map[string]struct{})
|
||||
for _, v := range g.Vertices() {
|
||||
@ -74,8 +67,24 @@ func (t *OrphanTransformer) Transform(g *Graph) error {
|
||||
state = state.View(t.View)
|
||||
}
|
||||
|
||||
// Go over each resource orphan and add it to the graph.
|
||||
resourceOrphans := state.Orphans(config)
|
||||
if len(t.Targets) > 0 {
|
||||
var targetedOrphans []string
|
||||
for _, o := range resourceOrphans {
|
||||
targeted := false
|
||||
for _, t := range t.Targets {
|
||||
prefix := fmt.Sprintf("%s.%s.%d", t.Type, t.Name, t.Index)
|
||||
if strings.HasPrefix(o, prefix) {
|
||||
targeted = true
|
||||
}
|
||||
}
|
||||
if targeted {
|
||||
targetedOrphans = append(targetedOrphans, o)
|
||||
}
|
||||
}
|
||||
resourceOrphans = targetedOrphans
|
||||
}
|
||||
|
||||
resourceVertexes = make([]dag.Vertex, len(resourceOrphans))
|
||||
for i, k := range resourceOrphans {
|
||||
// If this orphan is represented by some other node somehow,
|
||||
@ -173,6 +182,10 @@ type graphNodeOrphanResource struct {
|
||||
dependentOn []string
|
||||
}
|
||||
|
||||
func (n *graphNodeOrphanResource) ResourceAddress() *ResourceAddress {
|
||||
return n.ResourceAddress()
|
||||
}
|
||||
|
||||
func (n *graphNodeOrphanResource) DependableName() []string {
|
||||
return []string{n.dependableName()}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user