CLI validation

mtojek · mtojek · commit cfd033037b82 · 2023-01-23T16:33:12.000+01:00
diff --git a/cli/cliui/parameter.go b/cli/cliui/parameter.go
@@ -67,7 +67,6 @@ func RichParameter(cmd *cobra.Command, templateVersionParameter codersdk.Templat
 		_, _ = fmt.Fprintln(cmd.OutOrStdout(), "  "+strings.TrimSpace(strings.Join(strings.Split(templateVersionParameter.Description, "\n"), "\n  "))+"\n")
 	}
 
-	// TODO Implement full validation and show descriptions.
 	var err error
 	var value string
 	if len(templateVersionParameter.Options) > 0 {
@@ -91,6 +90,9 @@ func RichParameter(cmd *cobra.Command, templateVersionParameter codersdk.Templat
 
 		value, err = Prompt(cmd, PromptOptions{
 			Text: Styles.Bold.Render(text),
+			Validate: func(value string) error {
+				return validateRichPrompt(value, templateVersionParameter)
+			},
 		})
 		value = strings.TrimSpace(value)
 	}
@@ -113,3 +115,10 @@ func templateVersionParameterOptionValues(param codersdk.TemplateVersionParamete
 	}
 	return options
 }
+
+func validateRichPrompt(value string, p codersdk.TemplateVersionParameter) error {
+	return codersdk.ValidateWorkspaceBuildParameter(p, codersdk.WorkspaceBuildParameter{
+		Name:  p.Name,
+		Value: value,
+	})
+}
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -43,7 +43,7 @@ func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, bui
 
 	// Method provider.Validation.Valid() does not check the boolean type correctness, so it has to be checked here.
 	if richParameter.Type == "bool" && (buildParameter.Value != "true" && buildParameter.Value != "false") {
-		return xerrors.Errorf("%q is not a bool", richParameter.Type)
+		return xerrors.Errorf(`boolean value can be either "true" or "false"`)
 	}
 
 	if !validationEnabled(richParameter) {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, bui`
`43`	`43`
`44`	`44`	`// Method provider.Validation.Valid() does not check the boolean type correctness, so it has to be checked here.`
`45`	`45`	`if richParameter.Type == "bool" && (buildParameter.Value != "true" && buildParameter.Value != "false") {`
`46`		`- return xerrors.Errorf("%q is not a bool", richParameter.Type)`
	`46`	+ return xerrors.Errorf(`boolean value can be either "true" or "false"`)
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if !validationEnabled(richParameter) {`