From 07903189f1637c0a39861ac3d6372c509ab63a8d Mon Sep 17 00:00:00 2001 From: James Bardin Date: Mon, 6 Feb 2017 09:58:04 -0500 Subject: [PATCH] s/Meta.lockState/Meta.stateLock/g --- command/apply.go | 4 ++-- command/meta.go | 2 +- command/plan.go | 4 ++-- command/refresh.go | 4 ++-- command/taint.go | 4 ++-- command/untaint.go | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/command/apply.go b/command/apply.go index 4e29262a9..e772a8e01 100644 --- a/command/apply.go +++ b/command/apply.go @@ -47,7 +47,7 @@ func (c *ApplyCommand) Run(args []string) int { cmdFlags.StringVar(&c.Meta.statePath, "state", "", "path") cmdFlags.StringVar(&c.Meta.stateOutPath, "state-out", "", "path") cmdFlags.StringVar(&c.Meta.backupPath, "backup", "", "path") - cmdFlags.BoolVar(&c.Meta.lockState, "state-lock", true, "lock state") + cmdFlags.BoolVar(&c.Meta.stateLock, "state-lock", true, "lock state") cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } if err := cmdFlags.Parse(args); err != nil { return 1 @@ -183,7 +183,7 @@ func (c *ApplyCommand) Run(args []string) int { opReq.Plan = plan opReq.PlanRefresh = refresh opReq.Type = backend.OperationTypeApply - opReq.LockState = c.Meta.lockState + opReq.LockState = c.Meta.stateLock // Perform the operation ctx, ctxCancel := context.WithCancel(context.Background()) diff --git a/command/meta.go b/command/meta.go index 75e66355d..cc29b2aaf 100644 --- a/command/meta.go +++ b/command/meta.go @@ -91,7 +91,7 @@ type Meta struct { parallelism int shadow bool provider string - lockState bool + stateLock bool } // initStatePaths is used to initialize the default values for diff --git a/command/plan.go b/command/plan.go index 0bae85292..485202e2a 100644 --- a/command/plan.go +++ b/command/plan.go @@ -31,7 +31,7 @@ func (c *PlanCommand) Run(args []string) int { &c.Meta.parallelism, "parallelism", DefaultParallelism, "parallelism") cmdFlags.StringVar(&c.Meta.statePath, "state", "", "path") cmdFlags.BoolVar(&detailed, "detailed-exitcode", false, "detailed-exitcode") - cmdFlags.BoolVar(&c.Meta.lockState, "state-lock", true, "lock state") + cmdFlags.BoolVar(&c.Meta.stateLock, "state-lock", true, "lock state") cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } if err := cmdFlags.Parse(args); err != nil { return 1 @@ -85,7 +85,7 @@ func (c *PlanCommand) Run(args []string) int { opReq.PlanRefresh = refresh opReq.PlanOutPath = outPath opReq.Type = backend.OperationTypePlan - opReq.LockState = c.Meta.lockState + opReq.LockState = c.Meta.stateLock // Perform the operation op, err := b.Operation(context.Background(), opReq) diff --git a/command/refresh.go b/command/refresh.go index f51386648..decc3a968 100644 --- a/command/refresh.go +++ b/command/refresh.go @@ -23,7 +23,7 @@ func (c *RefreshCommand) Run(args []string) int { cmdFlags.IntVar(&c.Meta.parallelism, "parallelism", 0, "parallelism") cmdFlags.StringVar(&c.Meta.stateOutPath, "state-out", "", "path") cmdFlags.StringVar(&c.Meta.backupPath, "backup", "", "path") - cmdFlags.BoolVar(&c.Meta.lockState, "state-lock", true, "lock state") + cmdFlags.BoolVar(&c.Meta.stateLock, "state-lock", true, "lock state") cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } if err := cmdFlags.Parse(args); err != nil { return 1 @@ -53,7 +53,7 @@ func (c *RefreshCommand) Run(args []string) int { opReq := c.Operation() opReq.Type = backend.OperationTypeRefresh opReq.Module = mod - opReq.LockState = c.Meta.lockState + opReq.LockState = c.Meta.stateLock // Perform the operation op, err := b.Operation(context.Background(), opReq) diff --git a/command/taint.go b/command/taint.go index 6d652fdf4..6cacdd398 100644 --- a/command/taint.go +++ b/command/taint.go @@ -26,7 +26,7 @@ func (c *TaintCommand) Run(args []string) int { cmdFlags.StringVar(&c.Meta.statePath, "state", DefaultStateFilename, "path") cmdFlags.StringVar(&c.Meta.stateOutPath, "state-out", "", "path") cmdFlags.StringVar(&c.Meta.backupPath, "backup", "", "path") - cmdFlags.BoolVar(&c.Meta.lockState, "state-lock", true, "lock state") + cmdFlags.BoolVar(&c.Meta.stateLock, "state-lock", true, "lock state") cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } if err := cmdFlags.Parse(args); err != nil { return 1 @@ -72,7 +72,7 @@ func (c *TaintCommand) Run(args []string) int { return 1 } - if s, ok := st.(state.Locker); c.Meta.lockState && ok { + if s, ok := st.(state.Locker); c.Meta.stateLock && ok { if err := s.Lock("taint"); err != nil { c.Ui.Error(fmt.Sprintf("Failed to lock state: %s", err)) return 1 diff --git a/command/untaint.go b/command/untaint.go index 6612d1940..ca3050c73 100644 --- a/command/untaint.go +++ b/command/untaint.go @@ -25,7 +25,7 @@ func (c *UntaintCommand) Run(args []string) int { cmdFlags.StringVar(&c.Meta.statePath, "state", DefaultStateFilename, "path") cmdFlags.StringVar(&c.Meta.stateOutPath, "state-out", "", "path") cmdFlags.StringVar(&c.Meta.backupPath, "backup", "", "path") - cmdFlags.BoolVar(&c.Meta.lockState, "state-lock", true, "lock state") + cmdFlags.BoolVar(&c.Meta.stateLock, "state-lock", true, "lock state") cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } if err := cmdFlags.Parse(args); err != nil { return 1 @@ -60,7 +60,7 @@ func (c *UntaintCommand) Run(args []string) int { return 1 } - if s, ok := st.(state.Locker); c.Meta.lockState && ok { + if s, ok := st.(state.Locker); c.Meta.stateLock && ok { if err := s.Lock("untaint"); err != nil { c.Ui.Error(fmt.Sprintf("Failed to lock state: %s", err)) return 1