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

refactor: only fetch variables if unset variables are not allowed

This commit is contained in:
Brandon Croft 2021-10-11 11:43:39 -06:00 committed by Chris Arcand
parent dd856f8a1b
commit 9963bf940a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/cloud/backend_context.go
View File

@ -82,6 +82,13 @@ func (b *Cloud) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Ful
} }
ret.Config = config ret.Config = config
if op.AllowUnsetVariables {
// If we're not going to use the variables in an operation we'll be
// more lax about them, stubbing out any unset ones as unknown.
// This gives us enough information to produce a consistent context,
// but not enough information to run a real operation (plan, apply, etc)
ret.PlanOpts.SetVariables = stubAllVariables(op.Variables, config.Module.Variables)
} else {
// The underlying API expects us to use the opaque workspace id to request // The underlying API expects us to use the opaque workspace id to request
// variables, so we'll need to look that up using our organization name // variables, so we'll need to look that up using our organization name
// and workspace name. // and workspace name.
@ -98,13 +105,6 @@ func (b *Cloud) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Ful
return nil, nil, diags return nil, nil, diags
} }
if op.AllowUnsetVariables {
// If we're not going to use the variables in an operation we'll be
// more lax about them, stubbing out any unset ones as unknown.
// This gives us enough information to produce a consistent context,
// but not enough information to run a real operation (plan, apply, etc)
ret.PlanOpts.SetVariables = stubAllVariables(op.Variables, config.Module.Variables)
} else {
if tfeVariables != nil { if tfeVariables != nil {
if op.Variables == nil { if op.Variables == nil {
op.Variables = make(map[string]backend.UnparsedVariableValue) op.Variables = make(map[string]backend.UnparsedVariableValue)