remove unused Meta.variableArgs

Author: DanielMSchmidt

internal/command/init_run.go

@@ -35,14 +35,6 @@ func (c *InitCommand) run(initArgs *arguments.Init, view views.Init) int {
 	c.Meta.targetFlags = initArgs.TargetFlags
 	c.Meta.compactWarnings = initArgs.CompactWarnings
 
-	varArgs := initArgs.Vars.All()
-	items := make([]arguments.FlagNameValue, len(varArgs))
-	for i := range varArgs {
-		items[i].Name = varArgs[i].Name
-		items[i].Value = varArgs[i].Value
-	}
-	c.Meta.variableArgs = arguments.FlagNameValueSlice{Items: &items}
-
 	// Copying the state only happens during backend migration, so setting
 	// -force-copy implies -migrate-state
 	if c.forceInitCopy {

internal/command/init_run_experiment.go

@@ -44,14 +44,6 @@ func (c *InitCommand) runPssInit(initArgs *arguments.Init, view views.Init) int
 	c.Meta.targetFlags = initArgs.TargetFlags
 	c.Meta.compactWarnings = initArgs.CompactWarnings
 
-	varArgs := initArgs.Vars.All()
-	items := make([]arguments.FlagNameValue, len(varArgs))
-	for i := range varArgs {
-		items[i].Name = varArgs[i].Name
-		items[i].Value = varArgs[i].Value
-	}
-	c.Meta.variableArgs = arguments.FlagNameValueSlice{Items: &items}
-
 	// Copying the state only happens during backend migration, so setting
 	// -force-copy implies -migrate-state
 	if c.forceInitCopy {

internal/command/meta.go

@@ -215,9 +215,7 @@ type Meta struct {
 	// This is used when creating plan files.
 	stateStoreConfigState *workdir.StateStoreConfigState
 
-	// Variables for the context (private)
-	variableArgs arguments.FlagNameValueSlice
-	input        bool
+	input bool
 
 	// Targets for this context (private)
 	targets     []addrs.Targetable
@@ -584,14 +582,6 @@ func (m *Meta) extendedFlagSet(n string) *flag.FlagSet {
 	f.Var((*arguments.FlagStringSlice)(&m.targetFlags), "target", "resource to target")
 	f.BoolVar(&m.compactWarnings, "compact-warnings", false, "use compact warnings")
 
-	if m.variableArgs.Items == nil {
-		m.variableArgs = arguments.NewFlagNameValueSlice("-var")
-	}
-	varValues := m.variableArgs.Alias("-var")
-	varFiles := m.variableArgs.Alias("-var-file")
-	f.Var(varValues, "var", "variables")
-	f.Var(varFiles, "var-file", "variable file")
-
 	// commands that bypass locking will supply their own flag on this var,
 	// but set the initial meta value to true as a failsafe.
 	m.stateLock = true

internal/command/test.go

@@ -377,17 +377,6 @@ func (m *Meta) setupTestExecution(mode moduletest.CommandMode, command string, r
 		return
 	}
 
-	// Users can also specify variables via the command line, so we'll parse
-	// all that here.
-	var items []arguments.FlagNameValue
-	for _, variable := range preparation.Args.Vars.All() {
-		items = append(items, arguments.FlagNameValue{
-			Name:  variable.Name,
-			Value: variable.Value,
-		})
-	}
-	m.variableArgs = arguments.FlagNameValueSlice{Items: &items}
-
 	loader, err := m.initConfigLoader()
 	if err != nil {
 		diags = diags.Append(err)