Merge pull request #29805 from hashicorp/alisdair/fix-init-workspace-select-input-false

command/init: Fail if -input=false but required
This commit is contained in:
Alisdair McDiarmid 2021-10-26 11:37:22 -04:00 committed by GitHub
commit ded4f1a0fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 0 deletions

View File

@ -241,6 +241,10 @@ func (m *Meta) selectWorkspace(b backend.Backend) error {
return m.SetWorkspace(workspaces[0]) return m.SetWorkspace(workspaces[0])
} }
if !m.input {
return fmt.Errorf("Currently selected workspace %q does not exist", workspace)
}
// Otherwise, ask the user to select a workspace from the list of existing workspaces. // Otherwise, ask the user to select a workspace from the list of existing workspaces.
v, err := m.UIInput().Input(context.Background(), &terraform.InputOpts{ v, err := m.UIInput().Input(context.Background(), &terraform.InputOpts{
Id: "select-workspace", Id: "select-workspace",

View File

@ -6,6 +6,7 @@ import (
"path/filepath" "path/filepath"
"reflect" "reflect"
"sort" "sort"
"strings"
"testing" "testing"
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
@ -867,6 +868,28 @@ func TestMetaBackend_initSelectedWorkspaceDoesNotExistAutoSelect(t *testing.T) {
} }
} }
// Initializing a backend which supports workspaces and does *not* have
// the currently selected workspace with input=false should fail.
func TestMetaBackend_initSelectedWorkspaceDoesNotExistInputFalse(t *testing.T) {
// Create a temporary working directory that is empty
td := tempDir(t)
testCopyDir(t, testFixturePath("init-backend-selected-workspace-doesnt-exist-multi"), td)
defer os.RemoveAll(td)
defer testChdir(t, td)()
// Setup the meta
m := testMetaBackend(t, nil)
m.input = false
// Get the backend
_, diags := m.Backend(&BackendOpts{Init: true})
// Should fail immediately
if got, want := diags.ErrWithWarnings().Error(), `Currently selected workspace "bar" does not exist`; !strings.Contains(got, want) {
t.Fatalf("wrong error\ngot: %s\nwant: %s", got, want)
}
}
// Changing a configured backend, copying state // Changing a configured backend, copying state
func TestMetaBackend_configuredChangeCopy(t *testing.T) { func TestMetaBackend_configuredChangeCopy(t *testing.T) {
// Create a temporary working directory that is empty // Create a temporary working directory that is empty