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

Simplify/Consolidate the cloud conditionals

This commit is contained in:
Barrett Clark 2021-10-21 14:29:12 -05:00 committed by Chris Arcand
parent ab304d831f
commit e16c53b561
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
internal/command/meta_backend.go
View File

@ -592,31 +592,25 @@ func (m *Meta) backendFromConfig(opts *BackendOpts) (backend.Backend, tfdiags.Di
return m.backend_c_r_S(c, cHash, sMgr, true) return m.backend_c_r_S(c, cHash, sMgr, true)
// Configuring Terraform Cloud for the first time.
// NOTE: There may be an implicit local backend with state that is not visible to this block.
case c != nil && c.Type == "cloud" && s.Backend.Empty():
log.Printf("[TRACE] Meta.Backend: moving from default local state only to Terraform Cloud")
if !opts.Init {
diags = diags.Append(tfdiags.Sourceless(
tfdiags.Error,
"Terraform Cloud has been configured but needs to be initialized.",
strings.TrimSpace(errBackendInitCloud),
))
return nil, diags
}
return m.backend_C_r_s(c, cHash, sMgr)
// Configuring a backend for the first time. // Configuring a backend for the first time.
case c != nil && s.Backend.Empty(): case c != nil && s.Backend.Empty():
log.Printf("[TRACE] Meta.Backend: moving from default local state only to %q backend", c.Type) log.Printf("[TRACE] Meta.Backend: moving from default local state only to %q backend", c.Type)
if !opts.Init { if !opts.Init {
initReason := fmt.Sprintf("Initial configuration of the requested backend %q", c.Type) if c.Type == "cloud" {
diags = diags.Append(tfdiags.Sourceless( // NOTE: There may be an implicit local backend with state that is not visible to this block.
tfdiags.Error, diags = diags.Append(tfdiags.Sourceless(
"Backend initialization required, please run \"terraform init\"", tfdiags.Error,
fmt.Sprintf(strings.TrimSpace(errBackendInit), initReason), "Terraform Cloud has been configured but needs to be initialized.",
)) strings.TrimSpace(errBackendInitCloud),
))
} else {
initReason := fmt.Sprintf("Initial configuration of the requested backend %q", c.Type)
diags = diags.Append(tfdiags.Sourceless(
tfdiags.Error,
"Backend initialization required, please run \"terraform init\"",
fmt.Sprintf(strings.TrimSpace(errBackendInit), initReason),
))
}
return nil, diags return nil, diags
} }