Skip to content

Commit f42cb88

Browse files
committed
Rename state manager var, fix bug where PersistState was called on wrong state manager
1 parent af94d52 commit f42cb88

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

internal/command/meta_backend.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,7 @@ func (m *Meta) stateStore_C_s(c *configs.StateStore, cHash int, backendSMgr *cli
16861686

16871687
// TODO: Confirm if defaulting to creation on first use (rather than error) is a good idea
16881688
// Make the default workspace. All other workspaces are user-created via the workspace commands.
1689-
bStateMgr, err := b.StateMgr(backend.DefaultStateName)
1689+
defaultSMgr, err := b.StateMgr(backend.DefaultStateName)
16901690
if err != nil {
16911691
diags = diags.Append(fmt.Errorf("Failed to create a state manager for state store %q in provider %s (%q). This is a bug in Terraform and should be reported: %w",
16921692
c.Type,
@@ -1696,11 +1696,11 @@ func (m *Meta) stateStore_C_s(c *configs.StateStore, cHash int, backendSMgr *cli
16961696
return nil, diags
16971697
}
16981698
emptyState := states.NewState()
1699-
if err := bStateMgr.WriteState(emptyState); err != nil {
1699+
if err := defaultSMgr.WriteState(emptyState); err != nil {
17001700
diags = diags.Append(fmt.Errorf(errStateStoreWorkspaceCreate, c.Type, err))
17011701
return nil, diags
17021702
}
1703-
if err := backendSMgr.PersistState(); err != nil {
1703+
if err := defaultSMgr.PersistState(nil); err != nil {
17041704
diags = diags.Append(fmt.Errorf(errStateStoreWorkspaceCreate, c.Type, err))
17051705
return nil, diags
17061706
}

0 commit comments

Comments
 (0)