command/graph: update for new graphs

command/graph.go

@@ -20,6 +20,7 @@ func (c *GraphCommand) Run(args []string) int {
 	var moduleDepth int
 	var verbose bool
 	var drawCycles bool
+	var graphTypeStr string
 
 	args = c.Meta.process(args, false)
 
@@ -27,6 +28,7 @@ func (c *GraphCommand) Run(args []string) int {
 	c.addModuleDepthFlag(cmdFlags, &moduleDepth)
 	cmdFlags.BoolVar(&verbose, "verbose", false, "verbose")
 	cmdFlags.BoolVar(&drawCycles, "draw-cycles", false, "draw-cycles")
+	cmdFlags.StringVar(&graphTypeStr, "type", "", "type")
 	cmdFlags.Usage = func() { c.Ui.Error(c.Help()) }
 	if err := cmdFlags.Parse(args); err != nil {
 		return 1
@@ -48,7 +50,7 @@ func (c *GraphCommand) Run(args []string) int {
 		}
 	}
 
-	ctx, _, err := c.Context(contextOpts{
+	ctx, planFile, err := c.Context(contextOpts{
 		Path:      path,
 		StatePath: "",
 	})
@@ -57,9 +59,25 @@ func (c *GraphCommand) Run(args []string) int {
 		return 1
 	}
 
+	// Determine the graph type
+	graphType := terraform.GraphTypePlan
+	if planFile {
+		graphType = terraform.GraphTypeApply
+	}
+
+	if graphTypeStr != "" {
+		v, ok := terraform.GraphTypeMap[graphTypeStr]
+		if !ok {
+			c.Ui.Error(fmt.Sprintf("Invalid graph type requested: %s", graphTypeStr))
+			return 1
+		}
+
+		graphType = v
+	}
+
 	// Skip validation during graph generation - we want to see the graph even if
 	// it is invalid for some reason.
-	g, err := ctx.Graph(&terraform.ContextGraphOpts{
+	g, err := ctx.Graph(graphType, &terraform.ContextGraphOpts{
 		Verbose:  verbose,
 		Validate: false,
 	})
@@ -87,25 +105,28 @@ func (c *GraphCommand) Help() string {
 	helpText := `
 Usage: terraform graph [options] [DIR]
 
-  Outputs the visual dependency graph of Terraform resources according to
+  Outputs the visual execution graph of Terraform resources according to
   configuration files in DIR (or the current directory if omitted).
 
   The graph is outputted in DOT format. The typical program that can
   read this format is GraphViz, but many web services are also available
   to read this format.
 
+  The -type flag can be used to control the type of graph shown. Terraform
+  creates different graphs for different operations. See the options below
+  for the list of types supported. The default type is "plan" if a
+  configuration is given, and "apply" if a plan file is passed as an
+  argument.
+
 Options:
 
-  -draw-cycles         Highlight any cycles in the graph with colored edges.
+  -draw-cycles   Highlight any cycles in the graph with colored edges.
-                       This helps when diagnosing cycle errors.
+                 This helps when diagnosing cycle errors.
 
-  -module-depth=n      The maximum depth to expand modules. By default this is
+  -no-color      If specified, output won't contain any color.
-                       -1, which will expand resources within all modules.
 
-  -verbose             Generate a verbose, "worst-case" graph, with all nodes
+  -type=plan     Type of graph to output. Can be: plan, plan-destroy, apply,
-                       for potential operations in place.
+                 legacy.
-
-  -no-color           If specified, output won't contain any color.
 
 `
 	return strings.TrimSpace(helpText)

command/graph_test.go

@@ -80,6 +80,19 @@ func TestGraph_noArgs(t *testing.T) {
 
 func TestGraph_plan(t *testing.T) {
 	planPath := testPlanFile(t, &terraform.Plan{
+		Diff: &terraform.Diff{
+			Modules: []*terraform.ModuleDiff{
+				&terraform.ModuleDiff{
+					Path: []string{"root"},
+					Resources: map[string]*terraform.InstanceDiff{
+						"test_instance.bar": &terraform.InstanceDiff{
+							Destroy: true,
+						},
+					},
+				},
+			},
+		},
+
 		Module: testModule(t, "graph"),
 	})