coder · mtojek · Feb 15, 2023 · Feb 9, 2023 · Feb 9, 2023 · Feb 9, 2023
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -133,6 +133,7 @@ type createValidTemplateVersionArgs struct {
 	Provisioner   database.ProvisionerType
 	FileID        uuid.UUID
 	ParameterFile string
+	ValuesFile    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
@@ -145,13 +146,21 @@ 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)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	req := codersdk.CreateTemplateVersionRequest{
-		Name:            args.Name,
-		StorageMethod:   codersdk.ProvisionerStorageMethodFile,
-		FileID:          args.FileID,
-		Provisioner:     codersdk.ProvisionerType(args.Provisioner),
-		ParameterValues: parameters,
-		ProvisionerTags: args.ProvisionerTags,
+		Name:               args.Name,
+		StorageMethod:      codersdk.ProvisionerStorageMethodFile,
+		FileID:             args.FileID,
+		Provisioner:        codersdk.ProvisionerType(args.Provisioner),
+		ParameterValues:    parameters,
+		ProvisionerTags:    args.ProvisionerTags,
+		UserVariableValues: variableValues,
 	}
 	if args.Template != nil {
 		req.TemplateID = args.Template.ID

diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -93,6 +93,7 @@ func templatePush() *cobra.Command {
 		versionName     string
 		provisioner     string
 		parameterFile   string
+		valuesFile      string
 		alwaysPrompt    bool
 		provisionerTags []string
 		uploadFlags     templateUploadFlags
@@ -139,6 +140,7 @@ func templatePush() *cobra.Command {
 				Provisioner:     database.ProvisionerType(provisioner),
 				FileID:          resp.ID,
 				ParameterFile:   parameterFile,
+				ValuesFile:      valuesFile,
 				Template:        &template,
 				ReuseParameters: !alwaysPrompt,
 				ProvisionerTags: tags,
@@ -165,6 +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(&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")

diff --git a/cli/templatevariables.go b/cli/templatevariables.go
@@ -0,0 +1,50 @@
+package cli
+
+import (
+	"os"
+
+	"golang.org/x/xerrors"
+	"gopkg.in/yaml.v3"
+
+	"github.com/coder/coder/codersdk"
+)
+
+func loadVariableValues(variablesFile string) ([]codersdk.VariableValue, error) {
+	var values []codersdk.VariableValue
+	if variablesFile == "" {
+		return values, nil
+	}
+
+	variablesMap, err := createVariablesMapFromFile(variablesFile)
+	if err != nil {
+		return nil, err
+	}
+
+	for name, value := range variablesMap {
+		values = append(values, codersdk.VariableValue{
+			Name:  name,
+			Value: value,
+		})
+	}
+	return values, nil
+}
+
+// Reads a YAML file and populates a string -> string map.
+// Throws an error if the file name is empty.
+func createVariablesMapFromFile(variablesFile string) (map[string]string, error) {
+	if variablesFile == "" {
+		return nil, xerrors.Errorf("variable file name is not specified")
+	}
+
+	variablesMap := make(map[string]string)
+	variablesFileContents, err := os.ReadFile(variablesFile)
+	if err != nil {
+		return nil, err
+	}
+
+	err = yaml.Unmarshal(variablesFileContents, &variablesMap)
+	if err != nil {
+		return nil, err
+	}
+	return variablesMap, nil
+}
diff --git a/cli/testdata/coder_templates_push_--help.golden b/cli/testdata/coder_templates_push_--help.golden
@@ -13,6 +13,7 @@ Flags:
                                       automatically generated if not provided.
       --parameter-file string         Specify a file path with parameter values.
       --provisioner-tag stringArray   Specify a set of tags to target provisioner daemons.
+      --values-file string            Specify a file path with values for managed variables.
   -y, --yes                           Bypass prompts
 
 Global Flags:

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go
@@ -13,6 +13,7 @@ import (
 	"github.com/coder/coder/coderd/autobuild/schedule"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/database/dbauthz"
+	"github.com/coder/coder/coderd/provisionerdserver"
 )
 
 // Executor automatically starts or stops workspaces.
@@ -249,10 +250,8 @@ func build(ctx context.Context, store database.Store, workspace database.Workspa
 	// This must happen in a transaction to ensure history can be inserted, and
 	// the prior history can update it's "after" column to point at the new.
 	workspaceBuildID := uuid.New()
-	input, err := json.Marshal(struct {
-		WorkspaceBuildID string `json:"workspace_build_id"`
-	}{
-		WorkspaceBuildID: workspaceBuildID.String(),
+	input, err := json.Marshal(provisionerdserver.WorkspaceProvisionJob{
+		WorkspaceBuildID: workspaceBuildID,
 	})
 	if err != nil {
 		return xerrors.Errorf("marshal provision job: %w", err)

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -478,6 +478,7 @@ func New(options *Options) *API {
 			r.Get("/schema", api.templateVersionSchema)
 			r.Get("/parameters", api.templateVersionParameters)
 			r.Get("/rich-parameters", api.templateVersionRichParameters)
+			r.Get("/variables", api.templateVersionVariables)
 			r.Get("/resources", api.templateVersionResources)
 			r.Get("/logs", api.templateVersionLogs)
 			r.Route("/dry-run", func(r chi.Router) {

diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -522,17 +522,23 @@ func createAnotherUserRetry(t *testing.T, client *codersdk.Client, organizationI
 // CreateTemplateVersion creates a template import provisioner job
 // with the responses provided. It uses the "echo" provisioner for compatibility
 // with testing.
-func CreateTemplateVersion(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, res *echo.Responses) codersdk.TemplateVersion {
+func CreateTemplateVersion(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, res *echo.Responses, mutators ...func(*codersdk.CreateTemplateVersionRequest)) codersdk.TemplateVersion {
 	t.Helper()
 	data, err := echo.Tar(res)
 	require.NoError(t, err)
 	file, err := client.Upload(context.Background(), codersdk.ContentTypeTar, bytes.NewReader(data))
 	require.NoError(t, err)
-	templateVersion, err := client.CreateTemplateVersion(context.Background(), organizationID, codersdk.CreateTemplateVersionRequest{
+
+	req := codersdk.CreateTemplateVersionRequest{
 		FileID:        file.ID,
 		StorageMethod: codersdk.ProvisionerStorageMethodFile,
 		Provisioner:   codersdk.ProvisionerTypeEcho,
-	})
+	}
+	for _, mut := range mutators {
+		mut(&req)
+	}
+
+	templateVersion, err := client.CreateTemplateVersion(context.Background(), organizationID, req)
 	require.NoError(t, err)
 	return templateVersion
 }