CLI: create

mtojek · mtojek · commit 3b54e52f45ca · 2023-02-15T16:42:16.000+01:00
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -25,6 +25,7 @@ func templateCreate() *cobra.Command {
 		provisioner     string
 		provisionerTags []string
 		parameterFile   string
+		variablesFile   string
 		defaultTTL      time.Duration
 
 		uploadFlags templateUploadFlags
@@ -76,6 +77,7 @@ func templateCreate() *cobra.Command {
 				FileID:          resp.ID,
 				ParameterFile:   parameterFile,
 				ProvisionerTags: tags,
+				VariablesFile:   variablesFile,
 			})
 			if err != nil {
 				return err
@@ -113,6 +115,7 @@ func templateCreate() *cobra.Command {
 		},
 	}
 	cmd.Flags().StringVarP(&parameterFile, "parameter-file", "", "", "Specify a file path with parameter values.")
+	cmd.Flags().StringVarP(&variablesFile, "variables-file", "", "", "Specify a file path with values for managed variables.")
 	cmd.Flags().StringArrayVarP(&provisionerTags, "provisioner-tag", "", []string{}, "Specify a set of tags to target provisioner daemons.")
 	cmd.Flags().DurationVarP(&defaultTTL, "default-ttl", "", 24*time.Hour, "Specify a default TTL for workspaces created from this template.")
 	uploadFlags.register(cmd.Flags())
@@ -133,7 +136,7 @@ type createValidTemplateVersionArgs struct {
 	Provisioner   database.ProvisionerType
 	FileID        uuid.UUID
 	ParameterFile string
-	ValuesFile    string
+	VariablesFile string
 	// Template is only required if updating a template's active version.
 	Template *codersdk.Template
 	// ReuseParameters will attempt to reuse params from the Template field
@@ -146,9 +149,7 @@ type createValidTemplateVersionArgs struct {
 func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVersionArgs, parameters ...codersdk.CreateParameterRequest) (*codersdk.TemplateVersion, []codersdk.CreateParameterRequest, error) {
 	client := args.Client
 
-	// FIXME(mtojek): I will iterate on CLI experience in the follow-up.
-	// see: https://github.com/coder/coder/issues/5980
-	variableValues, err := loadVariableValues(args.ValuesFile)
+	variableValues, err := loadVariableValues(args.VariablesFile)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -93,7 +93,7 @@ func templatePush() *cobra.Command {
 		versionName     string
 		provisioner     string
 		parameterFile   string
-		valuesFile      string
+		variablesFile   string
 		alwaysPrompt    bool
 		provisionerTags []string
 		uploadFlags     templateUploadFlags
@@ -140,7 +140,7 @@ func templatePush() *cobra.Command {
 				Provisioner:     database.ProvisionerType(provisioner),
 				FileID:          resp.ID,
 				ParameterFile:   parameterFile,
-				ValuesFile:      valuesFile,
+				VariablesFile:   variablesFile,
 				Template:        &template,
 				ReuseParameters: !alwaysPrompt,
 				ProvisionerTags: tags,
@@ -167,7 +167,7 @@ func templatePush() *cobra.Command {
 
 	cmd.Flags().StringVarP(&provisioner, "test.provisioner", "", "terraform", "Customize the provisioner backend")
 	cmd.Flags().StringVarP(&parameterFile, "parameter-file", "", "", "Specify a file path with parameter values.")
-	cmd.Flags().StringVarP(&valuesFile, "values-file", "", "", "Specify a file path with values for managed variables.")
+	cmd.Flags().StringVarP(&variablesFile, "variables-file", "", "", "Specify a file path with values for managed variables.")
 	cmd.Flags().StringVarP(&versionName, "name", "", "", "Specify a name for the new template version. It will be automatically generated if not provided.")
 	cmd.Flags().StringArrayVarP(&provisionerTags, "provisioner-tag", "", []string{}, "Specify a set of tags to target provisioner daemons.")
 	cmd.Flags().BoolVar(&alwaysPrompt, "always-prompt", false, "Always prompt all parameters. Does not pull parameter values from active template version")
