prompt rich parameters

sreya · sreya · commit 46c06df8a441 · 2023-11-02T00:37:35.000Z
diff --git a/cli/restart.go b/cli/restart.go
@@ -36,10 +36,10 @@ func (r *RootCmd) restart() *clibase.Cmd {
 			}
 
 			startReq, err := workspaceStartRequest(inv, client, startWorkspaceArgs{
-				workspace:      workspace,
-				action:         WorkspaceRestart,
-				parameterFlags: parameterFlags,
-				alwaysPrompt:   true,
+				workspace:            workspace,
+				action:               WorkspaceRestart,
+				parameterFlags:       parameterFlags,
+				promptRichParameters: true,
 			})
 			if err != nil {
 				return err
@@ -70,10 +70,10 @@ func (r *RootCmd) restart() *clibase.Cmd {
 			// workspaces with the active version.
 			if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusUnauthorized {
 				build, err = startWorkspace(inv, client, startWorkspaceArgs{
-					workspace:      workspace,
-					parameterFlags: parameterFlags,
-					action:         WorkspaceUpdate,
-					alwaysPrompt:   true,
+					workspace:            workspace,
+					parameterFlags:       parameterFlags,
+					action:               WorkspaceUpdate,
+					promptRichParameters: true,
 				})
 				if err != nil {
 					return xerrors.Errorf("start workspace with active template version: %w", err)
diff --git a/cli/start.go b/cli/start.go
@@ -32,19 +32,19 @@ func (r *RootCmd) start() *clibase.Cmd {
 			}
 
 			build, err := startWorkspace(inv, client, startWorkspaceArgs{
-				workspace:      workspace,
-				parameterFlags: parameterFlags,
-				action:         WorkspaceStart,
-				alwaysPrompt:   false,
+				workspace:            workspace,
+				parameterFlags:       parameterFlags,
+				action:               WorkspaceStart,
+				promptRichParameters: true,
 			})
 			// It's possible for a workspace build to fail due to the template requiring starting
 			// workspaces with the active version.
 			if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusUnauthorized {
 				build, err = startWorkspace(inv, client, startWorkspaceArgs{
-					workspace:      workspace,
-					parameterFlags: parameterFlags,
-					action:         WorkspaceUpdate,
-					alwaysPrompt:   false,
+					workspace:            workspace,
+					parameterFlags:       parameterFlags,
+					action:               WorkspaceUpdate,
+					promptRichParameters: true,
 				})
 				if err != nil {
 					return xerrors.Errorf("start workspace with active template version: %w", err)
@@ -69,10 +69,10 @@ func (r *RootCmd) start() *clibase.Cmd {
 }
 
 type startWorkspaceArgs struct {
-	workspace      codersdk.Workspace
-	parameterFlags workspaceParameterFlags
-	action         WorkspaceCLIAction
-	alwaysPrompt   bool
+	workspace            codersdk.Workspace
+	parameterFlags       workspaceParameterFlags
+	action               WorkspaceCLIAction
+	promptRichParameters bool
 }
 
 func workspaceStartRequest(inv *clibase.Invocation, client *codersdk.Client, args startWorkspaceArgs) (codersdk.CreateWorkspaceBuildRequest, error) {
@@ -108,7 +108,7 @@ func workspaceStartRequest(inv *clibase.Invocation, client *codersdk.Client, arg
 
 		PromptBuildOptions:   args.parameterFlags.promptBuildOptions,
 		BuildOptions:         buildOptions,
-		PromptRichParameters: args.alwaysPrompt,
+		PromptRichParameters: args.promptRichParameters,
 		RichParameters:       cliRichParameters,
 		RichParameterFile:    args.parameterFlags.richParameterFile,
 	})
diff --git a/cli/update.go b/cli/update.go
@@ -37,10 +37,10 @@ func (r *RootCmd) update() *clibase.Cmd {
 			}
 
 			build, err := startWorkspace(inv, client, startWorkspaceArgs{
-				workspace:      workspace,
-				parameterFlags: parameterFlags,
-				action:         WorkspaceUpdate,
-				alwaysPrompt:   alwaysPrompt,
+				workspace:            workspace,
+				parameterFlags:       parameterFlags,
+				action:               WorkspaceUpdate,
+				promptRichParameters: alwaysPrompt,
 			})
 			if err != nil {
 				return xerrors.Errorf("start workspace: %w", err)
