Skip to content

Commit b8d7e1e

Browse files
committed
Rename variable to backendHash so relation to backend is clearer
1 parent ef82357 commit b8d7e1e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

internal/command/meta_backend.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
672672
// Get the local 'backend' or 'state_store' configuration.
673673
var backendConfig *configs.Backend
674674
var stateStoreConfig *configs.StateStore
675-
var cHash int // backend hash
675+
var backendHash int
676676
var stateStoreHash int
677677
var stateStoreProviderHash int
678678
if opts.StateStoreConfig != nil {
@@ -687,7 +687,7 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
687687
// backend config may or may not have been parsed and included in opts,
688688
// or may not exist in config at all (default/implied local backend)
689689
var beDiags tfdiags.Diagnostics
690-
backendConfig, cHash, beDiags = m.backendConfig(opts)
690+
backendConfig, backendHash, beDiags = m.backendConfig(opts)
691691
diags = diags.Append(beDiags)
692692
if beDiags.HasErrors() {
693693
return nil, diags
@@ -782,7 +782,7 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
782782
return nil, diags
783783
}
784784

785-
return m.backend_c_r_S(backendConfig, cHash, sMgr, true, opts)
785+
return m.backend_c_r_S(backendConfig, backendHash, sMgr, true, opts)
786786

787787
// We're unsetting a state_store (moving from state_store => local)
788788
case stateStoreConfig == nil && !s.StateStore.Empty() &&
@@ -820,7 +820,7 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
820820
}
821821
return nil, diags
822822
}
823-
return m.backend_C_r_s(backendConfig, cHash, sMgr, opts)
823+
return m.backend_C_r_s(backendConfig, backendHash, sMgr, opts)
824824

825825
// Configuring a state store for the first time or -reconfigure flag was used
826826
case stateStoreConfig != nil && s.StateStore.Empty() &&
@@ -885,7 +885,7 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
885885
// We're not initializing
886886
// AND the backend cache hash values match, indicating that the stored config is valid and completely unchanged.
887887
// AND we're not providing any overrides. An override can mean a change overriding an unchanged backend block (indicated by the hash value).
888-
if (uint64(cHash) == s.Backend.Hash) && (!opts.Init || opts.ConfigOverride == nil) {
888+
if (uint64(backendHash) == s.Backend.Hash) && (!opts.Init || opts.ConfigOverride == nil) {
889889
log.Printf("[TRACE] Meta.Backend: using already-initialized, unchanged %q backend configuration", backendConfig.Type)
890890
savedBackend, diags := m.savedBackend(sMgr)
891891
// Verify that selected workspace exist. Otherwise prompt user to create one
@@ -913,7 +913,7 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
913913
// It's possible for a backend to be unchanged, and the config itself to
914914
// have changed by moving a parameter from the config to `-backend-config`
915915
// In this case, we update the Hash.
916-
moreDiags = m.updateSavedBackendHash(cHash, sMgr)
916+
moreDiags = m.updateSavedBackendHash(backendHash, sMgr)
917917
if moreDiags.HasErrors() {
918918
return nil, diags
919919
}
@@ -944,7 +944,7 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
944944
}
945945

946946
log.Printf("[WARN] backend config has changed since last init")
947-
return m.backend_C_r_S_changed(backendConfig, cHash, sMgr, true, opts)
947+
return m.backend_C_r_S_changed(backendConfig, backendHash, sMgr, true, opts)
948948

949949
// Potentially changing a state store configuration
950950
case backendConfig == nil && s.Backend.Empty() &&

0 commit comments

Comments
 (0)