terraform: fill in more flat interfaces

terraform/graph_config_node.go

@@ -1,11 +1,7 @@
 package terraform
 
 import (
-	"fmt"
-
-	"github.com/hashicorp/terraform/config"
 	"github.com/hashicorp/terraform/dag"
-	"github.com/hashicorp/terraform/dot"
 )
 
 // graphNodeConfig is an interface that all graph nodes for the
@@ -43,66 +39,3 @@ type GraphNodeTargetable interface {
 
 	SetTargets([]ResourceAddress)
 }
-
-// GraphNodeConfigProvider represents a configured provider within the
-// configuration graph. These are only immediately in the graph when an
-// explicit `provider` configuration block is in the configuration.
-type GraphNodeConfigProvider struct {
-	Provider *config.ProviderConfig
-}
-
-func (n *GraphNodeConfigProvider) Name() string {
-	return fmt.Sprintf("provider.%s", n.ProviderName())
-}
-
-func (n *GraphNodeConfigProvider) ConfigType() GraphNodeConfigType {
-	return GraphNodeConfigTypeProvider
-}
-
-func (n *GraphNodeConfigProvider) DependableName() []string {
-	return []string{n.Name()}
-}
-
-func (n *GraphNodeConfigProvider) DependentOn() []string {
-	vars := n.Provider.RawConfig.Variables
-	result := make([]string, 0, len(vars))
-	for _, v := range vars {
-		if vn := varNameForVar(v); vn != "" {
-			result = append(result, vn)
-		}
-	}
-
-	return result
-}
-
-// GraphNodeEvalable impl.
-func (n *GraphNodeConfigProvider) EvalTree() EvalNode {
-	return ProviderEvalTree(n.ProviderName(), n.Provider.RawConfig)
-}
-
-// GraphNodeProvider implementation
-func (n *GraphNodeConfigProvider) ProviderName() string {
-	if n.Provider.Alias == "" {
-		return n.Provider.Name
-	} else {
-		return fmt.Sprintf("%s.%s", n.Provider.Name, n.Provider.Alias)
-	}
-}
-
-// GraphNodeProvider implementation
-func (n *GraphNodeConfigProvider) ProviderConfig() *config.RawConfig {
-	return n.Provider.RawConfig
-}
-
-// GraphNodeDotter impl.
-func (n *GraphNodeConfigProvider) DotNode(name string, opts *GraphDotOpts) *dot.Node {
-	return dot.NewNode(name, map[string]string{
-		"label": n.Name(),
-		"shape": "diamond",
-	})
-}
-
-// GraphNodeDotterOrigin impl.
-func (n *GraphNodeConfigProvider) DotOrigin() bool {
-	return true
-}

terraform/graph_config_node_provider.go

@@ -0,0 +1,115 @@
+package terraform
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform/config"
+	"github.com/hashicorp/terraform/dag"
+	"github.com/hashicorp/terraform/dot"
+)
+
+// GraphNodeConfigProvider represents a configured provider within the
+// configuration graph. These are only immediately in the graph when an
+// explicit `provider` configuration block is in the configuration.
+type GraphNodeConfigProvider struct {
+	Provider *config.ProviderConfig
+}
+
+func (n *GraphNodeConfigProvider) Name() string {
+	return fmt.Sprintf("provider.%s", n.ProviderName())
+}
+
+func (n *GraphNodeConfigProvider) ConfigType() GraphNodeConfigType {
+	return GraphNodeConfigTypeProvider
+}
+
+func (n *GraphNodeConfigProvider) DependableName() []string {
+	return []string{n.Name()}
+}
+
+func (n *GraphNodeConfigProvider) DependentOn() []string {
+	vars := n.Provider.RawConfig.Variables
+	result := make([]string, 0, len(vars))
+	for _, v := range vars {
+		if vn := varNameForVar(v); vn != "" {
+			result = append(result, vn)
+		}
+	}
+
+	return result
+}
+
+// GraphNodeEvalable impl.
+func (n *GraphNodeConfigProvider) EvalTree() EvalNode {
+	return ProviderEvalTree(n.ProviderName(), n.Provider.RawConfig)
+}
+
+// GraphNodeProvider implementation
+func (n *GraphNodeConfigProvider) ProviderName() string {
+	if n.Provider.Alias == "" {
+		return n.Provider.Name
+	} else {
+		return fmt.Sprintf("%s.%s", n.Provider.Name, n.Provider.Alias)
+	}
+}
+
+// GraphNodeProvider implementation
+func (n *GraphNodeConfigProvider) ProviderConfig() *config.RawConfig {
+	return n.Provider.RawConfig
+}
+
+// GraphNodeDotter impl.
+func (n *GraphNodeConfigProvider) DotNode(name string, opts *GraphDotOpts) *dot.Node {
+	return dot.NewNode(name, map[string]string{
+		"label": n.Name(),
+		"shape": "diamond",
+	})
+}
+
+// GraphNodeDotterOrigin impl.
+func (n *GraphNodeConfigProvider) DotOrigin() bool {
+	return true
+}
+
+// GraphNodeFlattenable impl.
+func (n *GraphNodeConfigProvider) Flatten(p []string) (dag.Vertex, error) {
+	return &GraphNodeConfigProviderFlat{
+		GraphNodeConfigProvider: n,
+		PathValue:               p,
+	}, nil
+}
+
+// Same as GraphNodeConfigProvider, but for flattening
+type GraphNodeConfigProviderFlat struct {
+	*GraphNodeConfigProvider
+
+	PathValue []string
+}
+
+func (n *GraphNodeConfigProviderFlat) Name() string {
+	return fmt.Sprintf(
+		"%s.%s", modulePrefixStr(n.PathValue), n.GraphNodeConfigProvider.Name())
+}
+
+func (n *GraphNodeConfigProviderFlat) Path() []string {
+	return n.PathValue
+}
+
+func (n *GraphNodeConfigProviderFlat) DependableName() []string {
+	return modulePrefixList(
+		n.GraphNodeConfigProvider.DependableName(),
+		modulePrefixStr(n.PathValue))
+}
+
+func (n *GraphNodeConfigProviderFlat) DependentOn() []string {
+	prefix := modulePrefixStr(n.PathValue)
+	return modulePrefixList(
+		n.GraphNodeConfigProvider.DependentOn(),
+		prefix)
+}
+
+func (n *GraphNodeConfigProviderFlat) ProviderName() string {
+	return fmt.Sprintf(
+		"%s.%s", modulePrefixStr(n.PathValue),
+		n.GraphNodeConfigProvider.ProviderName())
+}

terraform/graph_config_node_resource.go

@@ -260,6 +260,13 @@ func (n *GraphNodeConfigResourceFlat) DependentOn() []string {
 		prefix)
 }
 
+func (n *GraphNodeConfigResourceFlat) ProvidedBy() []string {
+	prefix := modulePrefixStr(n.PathValue)
+	return modulePrefixList(
+		n.GraphNodeConfigResource.ProvidedBy(),
+		prefix)
+}
+
 // graphNodeResourceDestroy represents the logical destruction of a
 // resource. This node doesn't mean it will be destroyed for sure, but
 // instead that if a destroy were to happen, it must happen at this point.

terraform/transform_root.go

@@ -34,3 +34,7 @@ type graphNodeRoot struct{}
 func (n graphNodeRoot) Name() string {
 	return "root"
 }
+
+func (n graphNodeRoot) Flatten(p []string) (dag.Vertex, error) {
+	return n, nil
+}