resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename NodeDestroyableDataResourceInstance 

Make this node consistent with the naming if the other instances.
This commit is contained in:
James Bardin 2018-12-18 13:16:01 -05:00
parent e73a8bb627
commit 87a375d49c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
terraform/node_data_destroy.go
View File

@ -5,14 +5,14 @@ import (
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states"
) )
// NodeDestroyableDataResource represents a resource that is "destroyable": // NodeDestroyableDataResourceInstance represents a resource that is "destroyable":
// it is ready to be destroyed. // it is ready to be destroyed.
type NodeDestroyableDataResource struct { type NodeDestroyableDataResourceInstance struct {
*NodeAbstractResourceInstance *NodeAbstractResourceInstance
} }
// GraphNodeEvalable // GraphNodeEvalable
func (n *NodeDestroyableDataResource) EvalTree() EvalNode { func (n *NodeDestroyableDataResourceInstance) EvalTree() EvalNode {
addr := n.ResourceInstanceAddr() addr := n.ResourceInstanceAddr()
var providerSchema *ProviderSchema var providerSchema *ProviderSchema

2
terraform/node_data_refresh.go
View File

@ -60,7 +60,7 @@ func (n *NodeRefreshableDataResource) DynamicExpand(ctx EvalContext) (*Graph, er
a.Config = n.Config a.Config = n.Config
a.ResolvedProvider = n.ResolvedProvider a.ResolvedProvider = n.ResolvedProvider
return &NodeDestroyableDataResource{ return &NodeDestroyableDataResourceInstance{
NodeAbstractResourceInstance: a, NodeAbstractResourceInstance: a,
} }
} }

10
terraform/node_data_refresh_test.go
View File

@ -152,20 +152,20 @@ func TestNodeRefreshableDataResourceDynamicExpand_scaleIn(t *testing.T) {
expected := `data.aws_instance.foo[0] - *terraform.NodeRefreshableDataResourceInstance expected := `data.aws_instance.foo[0] - *terraform.NodeRefreshableDataResourceInstance
data.aws_instance.foo[1] - *terraform.NodeRefreshableDataResourceInstance data.aws_instance.foo[1] - *terraform.NodeRefreshableDataResourceInstance
data.aws_instance.foo[2] - *terraform.NodeRefreshableDataResourceInstance data.aws_instance.foo[2] - *terraform.NodeRefreshableDataResourceInstance
data.aws_instance.foo[3] - *terraform.NodeDestroyableDataResource data.aws_instance.foo[3] - *terraform.NodeDestroyableDataResourceInstance
root - terraform.graphNodeRoot root - terraform.graphNodeRoot
data.aws_instance.foo[0] - *terraform.NodeRefreshableDataResourceInstance data.aws_instance.foo[0] - *terraform.NodeRefreshableDataResourceInstance
data.aws_instance.foo[1] - *terraform.NodeRefreshableDataResourceInstance data.aws_instance.foo[1] - *terraform.NodeRefreshableDataResourceInstance
data.aws_instance.foo[2] - *terraform.NodeRefreshableDataResourceInstance data.aws_instance.foo[2] - *terraform.NodeRefreshableDataResourceInstance
data.aws_instance.foo[3] - *terraform.NodeDestroyableDataResource data.aws_instance.foo[3] - *terraform.NodeDestroyableDataResourceInstance
` `
if expected != actual { if expected != actual {
t.Fatalf("Expected:\n%s\nGot:\n%s", expected, actual) t.Fatalf("Expected:\n%s\nGot:\n%s", expected, actual)
} }
var destroyableDataResource *NodeDestroyableDataResource var destroyableDataResource *NodeDestroyableDataResourceInstance
for _, v := range g.Vertices() { for _, v := range g.Vertices() {
if r, ok := v.(*NodeDestroyableDataResource); ok { if r, ok := v.(*NodeDestroyableDataResourceInstance); ok {
destroyableDataResource = r destroyableDataResource = r
} }
} }
@ -175,6 +175,6 @@ root - terraform.graphNodeRoot
} }
if destroyableDataResource.ResolvedProvider.ProviderConfig.Type == "" { if destroyableDataResource.ResolvedProvider.ProviderConfig.Type == "" {
t.Fatal("NodeDestroyableDataResource missing provider config") t.Fatal("NodeDestroyableDataResourceInstance missing provider config")
} }
} }

2
terraform/node_resource_refresh.go
View File

@ -149,7 +149,7 @@ func (n *NodeRefreshableManagedResourceInstance) EvalTree() EvalNode {
NodeAbstractResourceInstance: n.NodeAbstractResourceInstance, NodeAbstractResourceInstance: n.NodeAbstractResourceInstance,
} }
} else { } else {
dn = &NodeDestroyableDataResource{ dn = &NodeDestroyableDataResourceInstance{
NodeAbstractResourceInstance: n.NodeAbstractResourceInstance, NodeAbstractResourceInstance: n.NodeAbstractResourceInstance,
} }
} }