CLI create: support for optional fields

mtojek · mtojek · commit e804f40ccac4 · 2023-03-06T11:48:58.000+01:00
diff --git a/cli/cliui/parameter.go b/cli/cliui/parameter.go
@@ -85,7 +85,7 @@ func RichParameter(cmd *cobra.Command, templateVersionParameter codersdk.Templat
 		}
 	} else {
 		text := "Enter a value"
-		if templateVersionParameter.DefaultValue != "" {
+		if !templateVersionParameter.Required {
 			text += fmt.Sprintf(" (default: %q)", templateVersionParameter.DefaultValue)
 		}
 		text += ":"
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -30,7 +30,11 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,
 
 func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter, lastBuildParameter *WorkspaceBuildParameter) error {
 	value := buildParameter.Value
-	if value == "" {
+	if value == "" && richParameter.Required {
+		return xerrors.Errorf("parameter value is required")
+	}
+
+	if value == "" { // parameter is optional
 		value = richParameter.DefaultValue
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func RichParameter(cmd *cobra.Command, templateVersionParameter codersdk.Templat`
`85`	`85`	`}`
`86`	`86`	`} else {`
`87`	`87`	`text := "Enter a value"`
`88`		`- if templateVersionParameter.DefaultValue != "" {`
	`88`	`+ if !templateVersionParameter.Required {`
`89`	`89`	`text += fmt.Sprintf(" (default: %q)", templateVersionParameter.DefaultValue)`
`90`	`90`	`}`
`91`	`91`	`text += ":"`