Merge pull request #18894 from hashicorp/b-state-locking

Make sure the state is locked before it is used
hashicorp · Sep 18, 2018 · 76a4621 · 76a4621
2 parents 813b5fd + 36bd5d6
commit 76a4621
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/command/taint.go b/command/taint.go
@@ -77,10 +77,6 @@ func (c *TaintCommand) Run(args []string) int {
 		c.Ui.Error(fmt.Sprintf("Failed to load state: %s", err))
 		return 1
 	}
-	if err := st.RefreshState(); err != nil {
-		c.Ui.Error(fmt.Sprintf("Failed to load state: %s", err))
-		return 1
-	}
 
 	if c.stateLock {
 		stateLocker := clistate.NewLocker(context.Background(), c.stateLockTimeout, c.Ui, c.Colorize())
@@ -91,6 +87,11 @@ func (c *TaintCommand) Run(args []string) int {
 		defer stateLocker.Unlock(nil)
 	}
 
+	if err := st.RefreshState(); err != nil {
+		c.Ui.Error(fmt.Sprintf("Failed to load state: %s", err))
+		return 1
+	}
+
 	// Get the actual state structure
 	s := st.State()
 	if s.Empty() {

diff --git a/command/untaint.go b/command/untaint.go
@@ -65,10 +65,6 @@ func (c *UntaintCommand) Run(args []string) int {
 		c.Ui.Error(fmt.Sprintf("Failed to load state: %s", err))
 		return 1
 	}
-	if err := st.RefreshState(); err != nil {
-		c.Ui.Error(fmt.Sprintf("Failed to load state: %s", err))
-		return 1
-	}
 
 	if c.stateLock {
 		stateLocker := clistate.NewLocker(context.Background(), c.stateLockTimeout, c.Ui, c.Colorize())
@@ -79,6 +75,11 @@ func (c *UntaintCommand) Run(args []string) int {
 		defer stateLocker.Unlock(nil)
 	}
 
+	if err := st.RefreshState(); err != nil {
+		c.Ui.Error(fmt.Sprintf("Failed to load state: %s", err))
+		return 1
+	}
+
 	// Get the actual state structure
 	s := st.State()
 	if s.Empty() {