Build options

coder · mtojek · Aug 9, 2023 · Aug 4, 2023 · Aug 4, 2023 · Aug 4, 2023
commit c8cbfe17e9f536c11422f6987c01fdb4afcd2e83
diff --git a/cli/create.go b/cli/create.go
@@ -205,8 +205,10 @@ type prepWorkspaceBuildArgs struct {
 	NewWorkspaceName   string
 
 	UpdateWorkspace bool
-	BuildOptions    bool
 	WorkspaceID     uuid.UUID
+
+	PromptBuildOptions bool
+	BuildOptions       []codersdk.WorkspaceBuildParameter
 }
 
 type buildParameters struct {
@@ -244,7 +246,7 @@ func prepWorkspaceBuild(inv *clibase.Invocation, client *codersdk.Client, args p
 	richParameters := make([]codersdk.WorkspaceBuildParameter, 0)
 PromptRichParamLoop:
 	for _, templateVersionParameter := range templateVersionParameters {
-		if !args.BuildOptions && templateVersionParameter.Ephemeral {
+		if !args.PromptBuildOptions && templateVersionParameter.Ephemeral {
 			continue
 		}
 

diff --git a/cli/restart.go b/cli/restart.go
@@ -36,9 +36,15 @@ func (r *RootCmd) restart() *clibase.Cmd {
 				return err
 			}
 
+			buildOptions, err := asWorkspaceBuildParameters(parameterFlags.buildOptions)
+			if err != nil {
+				return err
+			}
+
 			buildParams, err := prepStartWorkspace(inv, client, prepStartWorkspaceArgs{
 				Template:           template,
 				PromptBuildOptions: parameterFlags.promptBuildOptions,
+				BuildOptions:       buildOptions,
 			})
 			if err != nil {
 				return err

diff --git a/cli/start.go b/cli/start.go
@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"golang.org/x/xerrors"
@@ -77,9 +78,15 @@ func (r *RootCmd) start() *clibase.Cmd {
 				return err
 			}
 
+			buildOptions, err := asWorkspaceBuildParameters(parameterFlags.buildOptions)
+			if err != nil {
+				return err
+			}
+
 			buildParams, err := prepStartWorkspace(inv, client, prepStartWorkspaceArgs{
 				Template:           template,
 				PromptBuildOptions: parameterFlags.promptBuildOptions,
+				BuildOptions:       buildOptions,
 			})
 			if err != nil {
 				return err
@@ -106,8 +113,10 @@ func (r *RootCmd) start() *clibase.Cmd {
 }
 
 type prepStartWorkspaceArgs struct {
-	Template           codersdk.Template
+	Template codersdk.Template
+
 	PromptBuildOptions bool
+	BuildOptions       []codersdk.WorkspaceBuildParameter
 }
 
 func prepStartWorkspace(inv *clibase.Invocation, client *codersdk.Client, args prepStartWorkspaceArgs) (*buildParameters, error) {
@@ -150,3 +159,18 @@ func prepStartWorkspace(inv *clibase.Invocation, client *codersdk.Client, args p
 		richParameters: richParameters,
 	}, nil
 }
+
+func asWorkspaceBuildParameters(nameValuePairs []string) ([]codersdk.WorkspaceBuildParameter, error) {
+	var params []codersdk.WorkspaceBuildParameter
+	for _, nameValue := range nameValuePairs {
+		split := strings.SplitN(nameValue, "=", 2)
+		if len(split) < 2 {
+			return nil, xerrors.Errorf("format key=value expected, but got %s", nameValue)
+		}
+		params = append(params, codersdk.WorkspaceBuildParameter{
+			Name:  split[0],
+			Value: split[1],
+		})
+	}
+	return params, nil
+}
diff --git a/cli/update.go b/cli/update.go
@@ -33,6 +33,12 @@ func (r *RootCmd) update() *clibase.Cmd {
 				_, _ = fmt.Fprintf(inv.Stdout, "Workspace isn't outdated!\n")
 				return nil
 			}
+
+			buildOptions, err := asWorkspaceBuildParameters(parameterFlags.buildOptions)
+			if err != nil {
+				return err
+			}
+
 			template, err := client.Template(inv.Context(), workspace.TemplateID)
 			if err != nil {
 				return err
@@ -55,7 +61,8 @@ func (r *RootCmd) update() *clibase.Cmd {
 				UpdateWorkspace: true,
 				WorkspaceID:     workspace.LatestBuild.ID,
 
-				BuildOptions: parameterFlags.promptBuildOptions,
+				PromptBuildOptions: parameterFlags.promptBuildOptions,
+				BuildOptions:       buildOptions,
 			})
 			if err != nil {
 				return err