golden

sreya · sreya · commit 16feaa1ecba0 · 2023-11-02T06:09:47.000Z
diff --git a/cli/parameter.go b/cli/parameter.go
@@ -24,6 +24,11 @@ type workspaceParameterFlags struct {
 	promptRichParameters bool
 }
 
+func (wpf *workspaceParameterFlags) allOptions() []clibase.Option {
+	options := append(wpf.cliBuildOptions(), wpf.cliParameters()...)
+	return append(options, wpf.alwaysPrompt())
+}
+
 func (wpf *workspaceParameterFlags) cliBuildOptions() []clibase.Option {
 	return clibase.OptionSet{
 		{
@@ -54,11 +59,14 @@ func (wpf *workspaceParameterFlags) cliParameters() []clibase.Option {
 			Description: "Specify a file path with values for rich parameters defined in the template.",
 			Value:       clibase.StringOf(&wpf.richParameterFile),
 		},
-		{
-			Flag:        "always-prompt",
-			Description: "Always prompt all parameters. Does not pull parameter values from existing workspace.",
-			Value:       clibase.BoolOf(&wpf.promptRichParameters),
-		},
+	}
+}
+
+func (wpf *workspaceParameterFlags) alwaysPrompt() clibase.Option {
+	return clibase.Option{
+		Flag:        "always-prompt",
+		Description: "Always prompt all parameters. Does not pull parameter values from existing workspace.",
+		Value:       clibase.BoolOf(&wpf.promptRichParameters),
 	}
 }
 
diff --git a/cli/restart.go b/cli/restart.go
@@ -93,8 +93,7 @@ func (r *RootCmd) restart() *clibase.Cmd {
 		},
 	}
 
-	cmd.Options = append(cmd.Options, parameterFlags.cliBuildOptions()...)
-	cmd.Options = append(cmd.Options, parameterFlags.cliParameters()...)
+	cmd.Options = append(cmd.Options, parameterFlags.allOptions()...)
 
 	return cmd
 }
diff --git a/cli/start.go b/cli/start.go
@@ -64,8 +64,7 @@ func (r *RootCmd) start() *clibase.Cmd {
 		},
 	}
 
-	cmd.Options = append(cmd.Options, parameterFlags.cliBuildOptions()...)
-	cmd.Options = append(cmd.Options, parameterFlags.cliParameters()...)
+	cmd.Options = append(cmd.Options, parameterFlags.allOptions()...)
 
 	return cmd
 }
diff --git a/cli/testdata/coder_restart_--help.golden b/cli/testdata/coder_restart_--help.golden
@@ -6,12 +6,23 @@ USAGE:
   Restart a workspace
 
 OPTIONS:
+      --always-prompt bool
+          Always prompt all parameters. Does not pull parameter values from
+          existing workspace.
+
       --build-option string-array, $CODER_BUILD_OPTION
           Build option value in the format "name=value".
 
       --build-options bool
           Prompt for one-time build options defined with ephemeral parameters.
 
+      --parameter string-array, $CODER_RICH_PARAMETER
+          Rich parameter value in the format "name=value".
+
+      --rich-parameter-file string, $CODER_RICH_PARAMETER_FILE
+          Specify a file path with values for rich parameters defined in the
+          template.
+
   -y, --yes bool
           Bypass prompts.
 
diff --git a/cli/testdata/coder_start_--help.golden b/cli/testdata/coder_start_--help.golden
@@ -6,12 +6,23 @@ USAGE:
   Start a workspace
 
 OPTIONS:
+      --always-prompt bool
+          Always prompt all parameters. Does not pull parameter values from
+          existing workspace.
+
       --build-option string-array, $CODER_BUILD_OPTION
           Build option value in the format "name=value".
 
       --build-options bool
           Prompt for one-time build options defined with ephemeral parameters.
 
+      --parameter string-array, $CODER_RICH_PARAMETER
+          Rich parameter value in the format "name=value".
+
+      --rich-parameter-file string, $CODER_RICH_PARAMETER_FILE
+          Specify a file path with values for rich parameters defined in the
+          template.
+
   -y, --yes bool
           Bypass prompts.
 
diff --git a/cli/update.go b/cli/update.go
@@ -59,7 +59,6 @@ func (r *RootCmd) update() *clibase.Cmd {
 		},
 	}
 
-	cmd.Options = append(cmd.Options, parameterFlags.cliBuildOptions()...)
-	cmd.Options = append(cmd.Options, parameterFlags.cliParameters()...)
+	cmd.Options = append(cmd.Options, parameterFlags.allOptions()...)
 	return cmd
 }
diff --git a/docs/cli/restart.md b/docs/cli/restart.md
diff --git a/docs/cli/start.md b/docs/cli/start.md

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,7 @@ func (r RootCmd) restart() clibase.Cmd {`
`93`	`93`	`},`
`94`	`94`	`}`
`95`	`95`
`96`		`- cmd.Options = append(cmd.Options, parameterFlags.cliBuildOptions()...)`
`97`		`- cmd.Options = append(cmd.Options, parameterFlags.cliParameters()...)`
	`96`	`+ cmd.Options = append(cmd.Options, parameterFlags.allOptions()...)`
`98`	`97`
`99`	`98`	`return cmd`
`100`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,7 @@ func (r RootCmd) start() clibase.Cmd {`
`64`	`64`	`},`
`65`	`65`	`}`
`66`	`66`
`67`		`- cmd.Options = append(cmd.Options, parameterFlags.cliBuildOptions()...)`
`68`		`- cmd.Options = append(cmd.Options, parameterFlags.cliParameters()...)`
	`67`	`+ cmd.Options = append(cmd.Options, parameterFlags.allOptions()...)`
`69`	`68`
`70`	`69`	`return cmd`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ func (r RootCmd) update() clibase.Cmd {`
`59`	`59`	`},`
`60`	`60`	`}`
`61`	`61`
`62`		`- cmd.Options = append(cmd.Options, parameterFlags.cliBuildOptions()...)`
`63`		`- cmd.Options = append(cmd.Options, parameterFlags.cliParameters()...)`
	`62`	`+ cmd.Options = append(cmd.Options, parameterFlags.allOptions()...)`
`64`	`63`	`return cmd`
`65`	`64`	`}`