Merge pull request #403 from ColOfAbRiX/bugfix/402

Fix of issue #402: load given state file when specified.
gruntwork-io · Jan 19, 2018 · 9ee518b · 9ee518b
2 parents 4123182 + 1c383e9
commit 9ee518b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/remote/remote_state.go b/remote/remote_state.go
@@ -65,7 +65,7 @@ func (remoteState *RemoteState) Initialize(terragruntOptions *options.Terragrunt
 // 2. Remote state has been configured, but with a different configuration
 // 3. The remote state initializer for this backend type, if there is one, says initialization is necessary
 func (remoteState *RemoteState) NeedsInit(terragruntOptions *options.TerragruntOptions) (bool, error) {
-	state, err := ParseTerraformStateFileFromLocation(terragruntOptions.WorkingDir)
+	state, err := ParseTerraformStateFileFromLocation(remoteState.Backend, remoteState.Config, terragruntOptions.WorkingDir)
 	if err != nil {
 		return false, err
 	}

diff --git a/remote/terraform_state_file.go b/remote/terraform_state_file.go
@@ -44,10 +44,15 @@ func (state *TerraformState) IsRemote() bool {
 	return state.Backend != nil && state.Backend.Type != "local"
 }
 
-// Parse the Terraform .tfstate file from the location specified by workingDir. If no location is specified,
-// search the current directory. If the file doesn't exist at any of the default locations, return nil.
-func ParseTerraformStateFileFromLocation(workingDir string) (*TerraformState, error) {
-	if util.FileExists(util.JoinPath(workingDir, DEFAULT_PATH_TO_LOCAL_STATE_FILE)) {
+// Parses the Terraform .tfstate file. If a local backend is used then search the given path, or
+// return nil if the file is missing. If the backend is not local then parse the Terraform .tfstate
+// file from the location specified by workingDir. If no location is specified, search the current
+// directory. If the file doesn't exist at any of the default locations, return nil.
+func ParseTerraformStateFileFromLocation(backend string, config map[string]interface{}, workingDir string) (*TerraformState, error) {
+	stateFile, ok := config["path"].(string)
+	if backend == "local" && ok && util.FileExists(stateFile) {
+		return ParseTerraformStateFile(stateFile)
+	} else if util.FileExists(util.JoinPath(workingDir, DEFAULT_PATH_TO_LOCAL_STATE_FILE)) {
 		return ParseTerraformStateFile(util.JoinPath(workingDir, DEFAULT_PATH_TO_LOCAL_STATE_FILE))
 	} else if util.FileExists(util.JoinPath(workingDir, DEFAULT_PATH_TO_REMOTE_STATE_FILE)) {
 		return ParseTerraformStateFile(util.JoinPath(workingDir, DEFAULT_PATH_TO_REMOTE_STATE_FILE))