diff --git a/terraform/context.go b/terraform/context.go index d5d865e776..b6fc2d1723 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -1104,9 +1104,6 @@ func (c *walkContext) genericWalkFn(cb genericWalkFunc) depgraph.WalkFunc { return wc.Walk() case *GraphNodeResource: // Continue, we care about this the most - case *GraphNodeResourceMeta: - // Skip it - return nil case *GraphNodeResourceProvider: sharedProvider := m.Provider diff --git a/terraform/graph.go b/terraform/graph.go index 087d049f20..3d1cf6c10f 100644 --- a/terraform/graph.go +++ b/terraform/graph.go @@ -97,16 +97,6 @@ type GraphNodeResource struct { ExpandMode ResourceExpandMode } -// GraphNodeResourceMeta is a node type in the graph that represents the -// metadata for a resource. There will be one meta node for every resource -// in the configuration. -type GraphNodeResourceMeta struct { - ID string - Name string - Type string - Count int -} - // GraphNodeResourceProvider is a node type in the graph that represents // the configuration for a resource provider. type GraphNodeResourceProvider struct { @@ -335,13 +325,6 @@ func graphEncodeDependencies(g *depgraph.Graph) { } inject = append(inject, target.Resource.Id) - case *GraphNodeResourceMeta: - // Inject each sub-resource as a depedency - for i := 0; i < target.Count; i++ { - id := fmt.Sprintf("%s.%d", target.ID, i) - inject = append(inject, id) - } - case *GraphNodeResourceProvider: // Do nothing @@ -702,33 +685,6 @@ func graphAddDiff(g *depgraph.Graph, d *ModuleDiff) error { num-- i-- - case *GraphNodeResourceMeta: - // Check if any of the resources part of the meta node - // are being destroyed, because we must be destroyed first. - for i := 0; i < target.Count; i++ { - id := fmt.Sprintf("%s.%d", target.ID, i) - for _, n2 := range nlist { - rn2 := n2.Meta.(*GraphNodeResource) - if id == rn2.Resource.Id { - newDep := &depgraph.Dependency{ - Name: n.Name, - Source: n2, - Target: n, - } - injected[newDep] = struct{}{} - n2.Deps = append(n2.Deps, newDep) - break - } - } - } - - // Drop the dependency, since there is - // nothing that needs to be done for a meta - // resource on destroy. - deps[i], deps[num-1] = deps[num-1], nil - num-- - i-- - case *GraphNodeModule: // We invert any module dependencies so we're destroyed // first, before any modules are applied. @@ -1049,8 +1005,6 @@ func graphAddRoot(g *depgraph.Graph) { if m.Index != -1 { continue } - case *GraphNodeResourceMeta: - // Always in the graph case *GraphNodeResourceProvider: // ResourceProviders don't need to be in the root deps because // they're always pointed to by some resource. diff --git a/terraform/graph_dot.go b/terraform/graph_dot.go index cca757b421..ce4a08d7fd 100644 --- a/terraform/graph_dot.go +++ b/terraform/graph_dot.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/hashicorp/terraform/depgraph" - "github.com/hashicorp/terraform/digraph" ) // GraphDotOpts are options for turning a graph into dot format. @@ -221,6 +220,7 @@ func graphDotAddResources( } // Handle the meta resources + /* edgeBuf.Reset() for _, n := range g.Nouns { _, ok := n.Meta.(*GraphNodeResourceMeta) @@ -264,6 +264,7 @@ func graphDotAddResources( buf.WriteString(edgeBuf.String()) buf.WriteString("\n") } + */ } func graphDotAddResourceProviders(