IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove unused fields from DestroyEdgeTransformer

Browse Source
This commit is contained in:
James Bardin 2022-05-27 10:54:58 -04:00
parent b8e362d24c
commit e3a6e1f6e8
3 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/terraform/graph_builder_apply.go
View File

@ -136,10 +136,7 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer {
&ForcedCBDTransformer{},
// Destruction ordering
&DestroyEdgeTransformer{
Config: b.Config,
State: b.State,
},
&DestroyEdgeTransformer{},
&CBDEdgeTransformer{
Config: b.Config,
State: b.State,

11
internal/terraform/transform_destroy_edge.go
View File

@ -4,9 +4,7 @@ import (
"log"
"github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/dag"
)
@ -40,12 +38,7 @@ type GraphNodeCreator interface {
// dependent resources will block parent resources from deleting. Concrete
// example: VPC with subnets, the VPC can't be deleted while there are
// still subnets.
type DestroyEdgeTransformer struct {
// These are needed to properly build the graph of dependencies
// to determine what a destroy node depends on. Any of these can be nil.
Config *configs.Config
State *states.State
}
type DestroyEdgeTransformer struct{}
func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
// Build a map of what is being destroyed (by address string) to
@ -89,7 +82,7 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
return nil
}
// Connect destroy despendencies as stored in the state
// Connect destroy dependencies as stored in the state
for _, ds := range destroyers {
for _, des := range ds {
ri, ok := des.(GraphNodeResourceInstance)

31
internal/terraform/transform_destroy_edge_test.go
View File

@ -37,9 +37,7 @@ func TestDestroyEdgeTransformer_basic(t *testing.T) {
t.Fatal(err)
}
tf := &DestroyEdgeTransformer{
Config: testModule(t, "transform-destroy-edge-basic"),
}
tf := &DestroyEdgeTransformer{}
if err := tf.Transform(&g); err != nil {
t.Fatalf("err: %s", err)
}
@ -93,9 +91,7 @@ func TestDestroyEdgeTransformer_multi(t *testing.T) {
t.Fatal(err)
}
tf := &DestroyEdgeTransformer{
Config: testModule(t, "transform-destroy-edge-multi"),
}
tf := &DestroyEdgeTransformer{}
if err := tf.Transform(&g); err != nil {
t.Fatalf("err: %s", err)
}
@ -110,9 +106,7 @@ func TestDestroyEdgeTransformer_multi(t *testing.T) {
func TestDestroyEdgeTransformer_selfRef(t *testing.T) {
g := Graph{Path: addrs.RootModuleInstance}
g.Add(testDestroyNode("test_object.A"))
tf := &DestroyEdgeTransformer{
Config: testModule(t, "transform-destroy-edge-self-ref"),
}
tf := &DestroyEdgeTransformer{}
if err := tf.Transform(&g); err != nil {
t.Fatalf("err: %s", err)
}
@ -153,9 +147,7 @@ func TestDestroyEdgeTransformer_module(t *testing.T) {
t.Fatal(err)
}
tf := &DestroyEdgeTransformer{
Config: testModule(t, "transform-destroy-edge-module"),
}
tf := &DestroyEdgeTransformer{}
if err := tf.Transform(&g); err != nil {
t.Fatalf("err: %s", err)
}
@ -214,9 +206,7 @@ func TestDestroyEdgeTransformer_moduleOnly(t *testing.T) {
t.Fatal(err)
}
tf := &DestroyEdgeTransformer{
Config: testModule(t, "transform-destroy-edge-module-only"),
}
tf := &DestroyEdgeTransformer{}
if err := tf.Transform(&g); err != nil {
t.Fatalf("err: %s", err)
}
@ -284,16 +274,7 @@ func TestDestroyEdgeTransformer_destroyThenUpdate(t *testing.T) {
t.Fatal(err)
}
m := testModuleInline(t, map[string]string{
"main.tf": `
resource "test_instance" "a" {
test_string = "udpated"
}
`,
})
tf := &DestroyEdgeTransformer{
Config: m,
}
tf := &DestroyEdgeTransformer{}
if err := tf.Transform(&g); err != nil {
t.Fatalf("err: %s", err)
}