diff --git a/acceptance/bundle/variables/flag_overrides/script b/acceptance/bundle/variables/flag_overrides/script index afd3418d8..bfdbdf427 100644 --- a/acceptance/bundle/variables/flag_overrides/script +++ b/acceptance/bundle/variables/flag_overrides/script @@ -1,5 +1,5 @@ # variable file -$CLI bundle validate -o json --vars-file-path=vars.json | jq .resources.jobs.job1.job_clusters[0] +$CLI bundle validate -o json --var-file=vars.json | jq .resources.jobs.job1.job_clusters[0] # variable flag $CLI bundle validate -o json --var="cluster_key=mlops_stacks-cluster" | jq .resources.jobs.job1.job_clusters[0].job_cluster_key diff --git a/bundle/config/variable/variable.go b/bundle/config/variable/variable.go index 34f58f19f..76feebaad 100644 --- a/bundle/config/variable/variable.go +++ b/bundle/config/variable/variable.go @@ -38,7 +38,7 @@ type Variable struct { // // 1. Command line flag, one of these is used // a. Variable value obtained from arguments, example: `--var="foo=bar"` - // b. Variable value obtained from the file, example: `--vars-file-path="/path/to/file"` + // b. Variable value obtained from the file, example: `--var-file="/path/to/file"` // 2. Environment variable. eg: BUNDLE_VAR_foo=bar // 3. Default value as defined in the applicable targets block // 4. Default value defined in variable definition diff --git a/cmd/bundle/utils/utils.go b/cmd/bundle/utils/utils.go index fca19e03e..f46d467df 100644 --- a/cmd/bundle/utils/utils.go +++ b/cmd/bundle/utils/utils.go @@ -54,13 +54,13 @@ func ConfigureBundleWithVariables(cmd *cobra.Command) (*bundle.Bundle, diag.Diag if err != nil { return b, diag.FromErr(err) } - variableFilePath, err := cmd.Flags().GetString("vars-file-path") + variableFilePath, err := cmd.Flags().GetString("var-file") if err != nil { return b, diag.FromErr(err) } if len(variables) > 0 && variableFilePath != "" { - return b, diag.Errorf("cannot specify both --var and --vars-file-path flags") + return b, diag.Errorf("cannot specify both --var and --var-file flags") } else if len(variables) > 0 { // Initialize variables by assigning them values passed as command line flags diags = diags.Extend(configureVariables(cmd, b, variables)) diff --git a/cmd/bundle/variables.go b/cmd/bundle/variables.go index 8251e28fa..e409e8946 100644 --- a/cmd/bundle/variables.go +++ b/cmd/bundle/variables.go @@ -6,5 +6,5 @@ import ( func initVariableFlag(cmd *cobra.Command) { cmd.PersistentFlags().StringSlice("var", []string{}, `set values for variables defined in bundle config. Example: --var="foo=bar"`) - cmd.PersistentFlags().String("vars-file-path", "", `file path to a JSON file containing variables. Example: --vars-file-path="/path/to/vars.json"`) + cmd.PersistentFlags().String("var-file", "", `file path to a JSON file containing variables. Example: --var-file="/path/to/vars.json"`) }