From ad4f92c7bc75f0d7c3c09a2131a8a45f9aa76283 Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Sat, 11 Oct 2014 18:26:06 -0700 Subject: [PATCH] command/output: Remote enable --- command/output.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/command/output.go b/command/output.go index 8e783d9230..32d49de691 100644 --- a/command/output.go +++ b/command/output.go @@ -3,10 +3,7 @@ package command import ( "flag" "fmt" - "os" "strings" - - "github.com/hashicorp/terraform/terraform" ) // OutputCommand is a Command implementation that reads an output @@ -16,12 +13,10 @@ type OutputCommand struct { } func (c *OutputCommand) Run(args []string) int { - var statePath string - args = c.Meta.process(args, false) cmdFlags := flag.NewFlagSet("output", flag.ContinueOnError) - cmdFlags.StringVar(&statePath, "state", DefaultStateFilename, "path") + cmdFlags.StringVar(&c.Meta.statePath, "state", DefaultStateFilename, "path") cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } if err := cmdFlags.Parse(args); err != nil { return 1 @@ -37,14 +32,7 @@ func (c *OutputCommand) Run(args []string) int { } name := args[0] - f, err := os.Open(statePath) - if err != nil { - c.Ui.Error(fmt.Sprintf("Error loading file: %s", err)) - return 1 - } - - state, err := terraform.ReadState(f) - f.Close() + state, err := c.Meta.loadState() if err != nil { c.Ui.Error(fmt.Sprintf("Error reading state: %s", err)) return 1