Fix

mtojek · mtojek · commit f317891462a1 · 2023-01-23T17:05:05.000+01:00
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -22,18 +22,19 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,
 }
 
 func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter) error {
-	if buildParameter.Value == "" && richParameter.DefaultValue == "" {
-		return xerrors.Errorf("parameter value can't be empty")
+	value := buildParameter.Value
+	if value == "" {
+		value = richParameter.DefaultValue
 	}
 
-	if buildParameter.Value == "" {
-		return nil // Default value wins
+	if value == "" {
+		return xerrors.Errorf("parameter value can't be empty")
 	}
 
 	if len(richParameter.Options) > 0 {
 		var matched bool
 		for _, opt := range richParameter.Options {
-			if opt.Value == buildParameter.Value {
+			if opt.Value == value {
 				matched = true
 				break
 			}
@@ -46,7 +47,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") {
+	if richParameter.Type == "bool" && (value != "true" && value != "false") {
 		return xerrors.Errorf(`boolean value can be either "true" or "false"`)
 	}
 
@@ -60,7 +61,7 @@ func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, bui
 		Regex: richParameter.ValidationRegex,
 		Error: richParameter.ValidationError,
 	}
-	return validation.Valid(richParameter.Type, buildParameter.Value)
+	return validation.Valid(richParameter.Type, value)
 }
 
 func findTemplateVersionParameter(params []TemplateVersionParameter, parameterName string) (*TemplateVersionParameter, bool) {

Original file line number	Diff line number	Diff line change
`@@ -22,18 +22,19 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter) error {`
`25`		`- if buildParameter.Value == "" && richParameter.DefaultValue == "" {`
`26`		`- return xerrors.Errorf("parameter value can't be empty")`
	`25`	`+ value := buildParameter.Value`
	`26`	`+ if value == "" {`
	`27`	`+ value = richParameter.DefaultValue`
`27`	`28`	`}`
`28`	`29`
`29`		`- if buildParameter.Value == "" {`
`30`		`- return nil // Default value wins`
	`30`	`+ if value == "" {`
	`31`	`+ return xerrors.Errorf("parameter value can't be empty")`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`if len(richParameter.Options) > 0 {`
`34`	`35`	`var matched bool`
`35`	`36`	`for _, opt := range richParameter.Options {`
`36`		`- if opt.Value == buildParameter.Value {`
	`37`	`+ if opt.Value == value {`
`37`	`38`	`matched = true`
`38`	`39`	`break`
`39`	`40`	`}`
`@@ -46,7 +47,7 @@ func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, bui`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`// Method provider.Validation.Valid() does not check the boolean type correctness, so it has to be checked here.`
`49`		`- if richParameter.Type == "bool" && (buildParameter.Value != "true" && buildParameter.Value != "false") {`
	`50`	`+ if richParameter.Type == "bool" && (value != "true" && value != "false") {`
`50`	`51`	return xerrors.Errorf(`boolean value can be either "true" or "false"`)
`51`	`52`	`}`
`52`	`53`
`@@ -60,7 +61,7 @@ func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, bui`
`60`	`61`	`Regex: richParameter.ValidationRegex,`
`61`	`62`	`Error: richParameter.ValidationError,`
`62`	`63`	`}`
`63`		`- return validation.Valid(richParameter.Type, buildParameter.Value)`
	`64`	`+ return validation.Valid(richParameter.Type, value)`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`func findTemplateVersionParameter(params []TemplateVersionParameter, parameterName string) (*TemplateVersionParameter, bool) {`