more fixes

mtojek · mtojek · commit 659bfa2ed8fc · 2023-03-06T15:15:19.000+01:00
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -16,7 +16,7 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,
 		lastBuildParameter, foundLastBuildParameter := findBuildParameter(lastBuildParameters, richParameter.Name)
 
 		if richParameter.Required && !foundBuildParameter && !foundLastBuildParameter {
-			return xerrors.Errorf("workspace build parameter %q is required", buildParameter.Name)
+			return xerrors.Errorf("workspace build parameter %q is required", richParameter.Name)
 		}
 
 		if !foundBuildParameter && foundLastBuildParameter {
@@ -25,7 +25,7 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,
 
 		err := ValidateWorkspaceBuildParameter(richParameter, *buildParameter, lastBuildParameter)
 		if err != nil {
-			return xerrors.Errorf("can't validate build parameter %q: %w", buildParameter.Name, err)
+			return xerrors.Errorf("can't validate build parameter %q: %w", richParameter.Name, err)
 		}
 	}
 	return nil
@@ -92,6 +92,10 @@ func findTemplateVersionParameter(params []TemplateVersionParameter, parameterNa
 }
 
 func findBuildParameter(params []WorkspaceBuildParameter, parameterName string) (*WorkspaceBuildParameter, bool) {
+	if params == nil {
+		return nil, false
+	}
+
 	for _, p := range params {
 		if p.Name == parameterName {
 			return &p, true

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,`
`16`	`16`	`lastBuildParameter, foundLastBuildParameter := findBuildParameter(lastBuildParameters, richParameter.Name)`
`17`	`17`
`18`	`18`	`if richParameter.Required && !foundBuildParameter && !foundLastBuildParameter {`
`19`		`- return xerrors.Errorf("workspace build parameter %q is required", buildParameter.Name)`
	`19`	`+ return xerrors.Errorf("workspace build parameter %q is required", richParameter.Name)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`if !foundBuildParameter && foundLastBuildParameter {`
`@@ -25,7 +25,7 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,`
`25`	`25`
`26`	`26`	`err := ValidateWorkspaceBuildParameter(richParameter, *buildParameter, lastBuildParameter)`
`27`	`27`	`if err != nil {`
`28`		`- return xerrors.Errorf("can't validate build parameter %q: %w", buildParameter.Name, err)`
	`28`	`+ return xerrors.Errorf("can't validate build parameter %q: %w", richParameter.Name, err)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`return nil`
`@@ -92,6 +92,10 @@ func findTemplateVersionParameter(params []TemplateVersionParameter, parameterNa`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`func findBuildParameter(params []WorkspaceBuildParameter, parameterName string) (*WorkspaceBuildParameter, bool) {`
	`95`	`+ if params == nil {`
	`96`	`+ return nil, false`
	`97`	`+ }`
	`98`	`+`
`95`	`99`	`for _, p := range params {`
`96`	`100`	`if p.Name == parameterName {`
`97`	`101`	`return &p, true`