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

Merge pull request #18757 from hashicorp/b-check-all-workspaces 

backend/migrations: check all workspaces
This commit is contained in:
Sander van Harmelen 2018-08-29 20:01:11 +02:00 committed by GitHub
parent cf8516287e 1696ade924
commit 4d9a284114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
command/meta_backend.go
View File

@ -907,9 +907,14 @@ func (m *Meta) backend_C_r_s(
return nil, fmt.Errorf(errBackendLocalRead, err)
}
env := m.Workspace()
workspaces, err := localB.States()
if err != nil {
return nil, fmt.Errorf(errBackendLocalRead, err)
}
localState, err := localB.State(env)
var localStates []state.State
for _, workspace := range workspaces {
localState, err := localB.State(workspace)
if err != nil {
return nil, fmt.Errorf(errBackendLocalRead, err)
}
@ -917,10 +922,13 @@ func (m *Meta) backend_C_r_s(
return nil, fmt.Errorf(errBackendLocalRead, err)
}
// If the local state is not empty, we need to potentially do a
// state migration to the new backend (with user permission), unless the
// destination is also "local"
// We only care about non-empty states.
if localS := localState.State(); !localS.Empty() {
localStates = append(localStates, localState)
}
}
if len(localStates) > 0 {
// Perform the migration
err = m.backendMigrateState(&backendMigrateOpts{
OneType: "local",
@ -946,6 +954,7 @@ func (m *Meta) backend_C_r_s(
}
if erase {
for _, localState := range localStates {
// We always delete the local state, unless that was our new state too.
if err := localState.WriteState(nil); err != nil {
return nil, fmt.Errorf(errBackendMigrateLocalDelete, err)
@ -955,6 +964,7 @@ func (m *Meta) backend_C_r_s(
}
}
}
}
if m.stateLock {
stateLocker := clistate.NewLocker(context.Background(), m.stateLockTimeout, m.Ui, m.Colorize())