Fix: restart, create

coder · mtojek · Aug 9, 2023 · Aug 4, 2023 · Aug 4, 2023 · Aug 4, 2023
commit 9e05ce61853ca8ed82519a1cebfd45801c8f6db5
diff --git a/cli/parameter_resolver.go b/cli/parameter_resolver.go
@@ -180,7 +180,8 @@ func (pr *ParameterResolver) resolveWithInput(resolved []codersdk.WorkspaceBuild
 
 		if (tvp.Ephemeral && pr.promptBuildOptions) ||
 			tvp.Required ||
-			(!tvp.Mutable && action == WorkspaceUpdate) {
+			(!tvp.Mutable && action == WorkspaceUpdate) ||
+			(!tvp.Ephemeral && action == WorkspaceCreate) {
 
 			parameterValue, err := cliui.RichParameter(inv, tvp)
 			if err != nil {

diff --git a/cli/restart.go b/cli/restart.go
@@ -33,6 +33,11 @@ func (r *RootCmd) restart() *clibase.Cmd {
 				return err
 			}
 
+			lastBuildParameters, err := client.WorkspaceBuildParameters(inv.Context(), workspace.LatestBuild.ID)
+			if err != nil {
+				return err
+			}
+
 			template, err := client.Template(inv.Context(), workspace.TemplateID)
 			if err != nil {
 				return err
@@ -44,8 +49,11 @@ func (r *RootCmd) restart() *clibase.Cmd {
 			}
 
 			buildParameters, err := prepStartWorkspace(inv, client, prepStartWorkspaceArgs{
-				Action:             WorkspaceRestart,
-				Template:           template,
+				Action:   WorkspaceRestart,
+				Template: template,
+
+				LastBuildParameters: lastBuildParameters,
+
 				PromptBuildOptions: parameterFlags.promptBuildOptions,
 				BuildOptions:       buildOptions,
 			})

diff --git a/cli/start.go b/cli/start.go
@@ -30,6 +30,11 @@ func (r *RootCmd) start() *clibase.Cmd {
 				return err
 			}
 
+			lastBuildParameters, err := client.WorkspaceBuildParameters(inv.Context(), workspace.LatestBuild.ID)
+			if err != nil {
+				return err
+			}
+
 			template, err := client.Template(inv.Context(), workspace.TemplateID)
 			if err != nil {
 				return err
@@ -41,8 +46,11 @@ func (r *RootCmd) start() *clibase.Cmd {
 			}
 
 			buildParameters, err := prepStartWorkspace(inv, client, prepStartWorkspaceArgs{
-				Action:             WorkspaceStart,
-				Template:           template,
+				Action:   WorkspaceStart,
+				Template: template,
+
+				LastBuildParameters: lastBuildParameters,
+
 				PromptBuildOptions: parameterFlags.promptBuildOptions,
 				BuildOptions:       buildOptions,
 			})
@@ -71,8 +79,11 @@ func (r *RootCmd) start() *clibase.Cmd {
 }
 
 type prepStartWorkspaceArgs struct {
-	Action             WorkspaceCLIAction
-	Template           codersdk.Template
+	Action   WorkspaceCLIAction
+	Template codersdk.Template
+
+	LastBuildParameters []codersdk.WorkspaceBuildParameter
+
 	PromptBuildOptions bool
 	BuildOptions       []codersdk.WorkspaceBuildParameter
 }
@@ -91,6 +102,7 @@ func prepStartWorkspace(inv *clibase.Invocation, client *codersdk.Client, args p
 	}
 
 	resolver := new(ParameterResolver).
+		WithLastBuildParameters(args.LastBuildParameters).
 		WithPromptBuildOptions(args.PromptBuildOptions).
 		WithBuildOptions(args.BuildOptions)
 	return resolver.Resolve(inv, args.Action, templateVersionParameters)