upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-02-18 18:29:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

use centralized arguments collection in console

Browse source
This commit is contained in:
Daniel Schmidt 2026-02-18 09:44:24 +01:00
parent f6a3f271be
commit 065794ba8b
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
internal/command/console.go
View file

@ -35,12 +35,6 @@ func (c *ConsoleCommand) Run(args []string) int {
c.Meta.compactWarnings = parsedArgs.CompactWarnings
c.Meta.targetFlags = parsedArgs.TargetFlags
varItems := parsedArgs.Vars.All()
c.Meta.variableArgs = arguments.FlagNameValueSlice{
FlagName: "-var",
Items: &varItems,
}
if diags.HasErrors() {
c.showDiagnostics(diags)
return 1
@ -86,10 +80,21 @@ func (c *ConsoleCommand) Run(args []string) int {
}
{
var moreDiags tfdiags.Diagnostics
opReq.Variables, moreDiags = c.collectVariableValues()
diags = diags.Append(moreDiags)
if moreDiags.HasErrors() {
loader, err := c.initConfigLoader()
if err != nil {
diags = diags.Append(err)
c.showDiagnostics(diags)
return 1
}
// Collect variable value and add them to the operation request
var varDiags tfdiags.Diagnostics
opReq.Variables, varDiags = parsedArgs.Vars.CollectValues(func(filename string, src []byte) {
loader.Parser().ForceFileSource(filename, src)
})
diags = diags.Append(varDiags)
if varDiags.HasErrors() {
c.showDiagnostics(diags)
return 1
}