move requiring a single value further in the process where more context exists'

Emyrk · Emyrk · commit 061909bd82fb · 2024-03-20T11:44:36.000-05:00
diff --git a/coderd/httpapi/queryparams.go b/coderd/httpapi/queryparams.go
@@ -297,7 +297,16 @@ func ParseCustomList[T any](parser *QueryParamParser, vals url.Values, def []T,
 func parseQueryParam[T any](parser *QueryParamParser, vals url.Values, parse func(v string) (T, error), def T, queryParam string) (T, error) {
 	setParse := func(set []string) (T, error) {
 		if len(set) > 1 {
-			return def, xerrors.Errorf("multiple values provided for the query param %q, only 1 is supported", queryParam)
+			// Set as a parser.Error rather than return an error.
+			// Returned errors are errors from the passed in `parse` function, and
+			// imply the query param value had attempted to be parsed.
+			// By raising the error this way, we can also more easily control how it
+			// is presented to the user. A returned error is wrapped with more text.
+			parser.Errors = append(parser.Errors, codersdk.ValidationError{
+				Field:  queryParam,
+				Detail: fmt.Sprintf("Query param %q provided more than once, found %d times. Only provide 1 instance of this query param.", queryParam, len(set)),
+			})
+			return def, nil
 		}
 		return parse(set[0])
 	}
diff --git a/coderd/httpapi/queryparams_test.go b/coderd/httpapi/queryparams_test.go
@@ -32,7 +32,7 @@ type queryParamTestCase[T any] struct {
 
 func TestParseQueryParams(t *testing.T) {
 	t.Parallel()
-	const multipleValuesError = "multiple values provided"
+	const multipleValuesError = "provided more than once"
 
 	t.Run("Enum", func(t *testing.T) {
 		t.Parallel()
diff --git a/coderd/searchquery/search.go b/coderd/searchquery/search.go
@@ -163,17 +163,6 @@ func searchTerms(query string, defaultKey func(term string, values url.Values) e
 		}
 	}
 
-	for k := range searchValues {
-		if len(searchValues[k]) > 1 {
-			return nil, []codersdk.ValidationError{
-				{
-					Field:  "q",
-					Detail: fmt.Sprintf("Query parameter %q provided more than once, found %d times", k, len(searchValues[k])),
-				},
-			}
-		}
-	}
-
 	return searchValues, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -163,17 +163,6 @@ func searchTerms(query string, defaultKey func(term string, values url.Values) e`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`166`		`- for k := range searchValues {`
`167`		`- if len(searchValues[k]) > 1 {`
`168`		`- return nil, []codersdk.ValidationError{`
`169`		`- {`
`170`		`- Field: "q",`
`171`		`- Detail: fmt.Sprintf("Query parameter %q provided more than once, found %d times", k, len(searchValues[k])),`
`172`		`- },`
`173`		`- }`
`174`		`- }`
`175`		`- }`
`176`		`-`
`177`	`166`	`return searchValues, nil`
`178`	`167`	`}`
`179`	`168`