fix: default

mtojek · mtojek · commit 2e7c5f496d96 · 2023-01-23T16:59:36.000+01:00
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -22,10 +22,14 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,
 }
 
 func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter) error {
-	if buildParameter.Value == "" {
+	if buildParameter.Value == "" && richParameter.DefaultValue == "" {
 		return xerrors.Errorf("parameter value can't be empty")
 	}
 
+	if buildParameter.Value == "" {
+		return nil // Default value wins
+	}
+
 	if len(richParameter.Options) > 0 {
 		var matched bool
 		for _, opt := range richParameter.Options {

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,14 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter) error {`
`25`		`- if buildParameter.Value == "" {`
	`25`	`+ if buildParameter.Value == "" && richParameter.DefaultValue == "" {`
`26`	`26`	`return xerrors.Errorf("parameter value can't be empty")`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ if buildParameter.Value == "" {`
	`30`	`+ return nil // Default value wins`
	`31`	`+ }`
	`32`	`+`
`29`	`33`	`if len(richParameter.Options) > 0 {`
`30`	`34`	`var matched bool`
`31`	`35`	`for _, opt := range richParameter.Options {`