Skip to content

Commit 67d6f69

Browse files
committed
Rename state manager var, fix bug where PersistState was called on wrong state manager
1 parent f39887f commit 67d6f69

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
@@ -1691,7 +1691,7 @@ func (m *Meta) stateStore_C_s(c *configs.StateStore, cHash int, backendSMgr *cli
16911691

16921692
// TODO: Confirm if defaulting to creation on first use (rather than error) is a good idea
16931693
// Make the default workspace. All other workspaces are user-created via the workspace commands.
1694-
bStateMgr, sDiags := b.StateMgr(backend.DefaultStateName)
1694+
defaultSMgr, sDiags := b.StateMgr(backend.DefaultStateName)
16951695
diags = diags.Append(sDiags)
16961696
if sDiags.HasErrors() {
16971697
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",
@@ -1702,11 +1702,11 @@ func (m *Meta) stateStore_C_s(c *configs.StateStore, cHash int, backendSMgr *cli
17021702
return nil, diags
17031703
}
17041704
emptyState := states.NewState()
1705-
if err := bStateMgr.WriteState(emptyState); err != nil {
1705+
if err := defaultSMgr.WriteState(emptyState); err != nil {
17061706
diags = diags.Append(fmt.Errorf(errStateStoreWorkspaceCreate, c.Type, err))
17071707
return nil, diags
17081708
}
1709-
if err := backendSMgr.PersistState(); err != nil {
1709+
if err := defaultSMgr.PersistState(nil); err != nil {
17101710
diags = diags.Append(fmt.Errorf(errStateStoreWorkspaceCreate, c.Type, err))
17111711
return nil, diags
17121712
}

0 commit comments

Comments
 (0)