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

command: make state unexported on Meta

This commit is contained in:
Mitchell Hashimoto 2014-07-27 22:58:35 -07:00
parent 80ce9ad513
commit b172f45b94
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/apply.go
View File

@ -78,11 +78,11 @@ func (c *ApplyCommand) Run(args []string) int {
} }
// Create a backup of the state before updating // Create a backup of the state before updating
if backupPath != "-" && c.State != nil { if backupPath != "-" && c.state != nil {
log.Printf("[INFO] Writing backup state to: %s", backupPath) log.Printf("[INFO] Writing backup state to: %s", backupPath)
f, err := os.Create(backupPath) f, err := os.Create(backupPath)
if err == nil { if err == nil {
err = terraform.WriteState(c.State, f) err = terraform.WriteState(c.state, f)
f.Close() f.Close()
} }
if err != nil { if err != nil {

8
command/meta.go
View File

@ -16,7 +16,10 @@ type Meta struct {
Color bool Color bool
ContextOpts *terraform.ContextOpts ContextOpts *terraform.ContextOpts
Ui cli.Ui Ui cli.Ui
State *terraform.State
// State read when calling `Context`. This is available after calling
// `Context`.
state *terraform.State
// This can be set by the command itself to provide extra hooks. // This can be set by the command itself to provide extra hooks.
extraHooks []terraform.Hook extraHooks []terraform.Hook
@ -79,7 +82,7 @@ func (m *Meta) Context(path, statePath string) (*terraform.Context, bool, error)
} }
// Store the loaded state // Store the loaded state
m.State = state m.state = state
config, err := config.LoadDir(path) config, err := config.LoadDir(path)
if err != nil { if err != nil {
@ -93,7 +96,6 @@ func (m *Meta) Context(path, statePath string) (*terraform.Context, bool, error)
opts.State = state opts.State = state
ctx := terraform.NewContext(opts) ctx := terraform.NewContext(opts)
return ctx, false, nil return ctx, false, nil
} }
// contextOpts returns the options to use to initialize a Terraform // contextOpts returns the options to use to initialize a Terraform

4
command/plan.go
View File

@ -76,11 +76,11 @@ func (c *PlanCommand) Run(args []string) int {
if refresh { if refresh {
// Create a backup of the state before updating // Create a backup of the state before updating
if backupPath != "-" && c.State != nil { if backupPath != "-" && c.state != nil {
log.Printf("[INFO] Writing backup state to: %s", backupPath) log.Printf("[INFO] Writing backup state to: %s", backupPath)
f, err := os.Create(backupPath) f, err := os.Create(backupPath)
if err == nil { if err == nil {
err = terraform.WriteState(c.State, f) err = terraform.WriteState(c.state, f)
f.Close() f.Close()
} }
if err != nil { if err != nil {

4
command/refresh.go
View File

@ -94,11 +94,11 @@ func (c *RefreshCommand) Run(args []string) int {
} }
// Create a backup of the state before updating // Create a backup of the state before updating
if backupPath != "-" && c.State != nil { if backupPath != "-" && c.state != nil {
log.Printf("[INFO] Writing backup state to: %s", backupPath) log.Printf("[INFO] Writing backup state to: %s", backupPath)
f, err := os.Create(backupPath) f, err := os.Create(backupPath)
if err == nil { if err == nil {
err = terraform.WriteState(c.State, f) err = terraform.WriteState(c.state, f)
f.Close() f.Close()
} }
if err != nil { if err != nil {