Maintain old behavior

Emyrk · Emyrk · commit fab5d8cf1f2e · 2022-06-09T23:32:02.000-05:00
diff --git a/coderd/httpapi/queryparams.go b/coderd/httpapi/queryparams.go
@@ -101,7 +101,7 @@ func (p *QueryParamParser) ParseString(r *http.Request, def string, queryParam s
 }
 
 func parse[T any](r *http.Request, parse func(v string) (T, error), def T, queryParam string) (T, error) {
-	if !r.URL.Query().Has(queryParam) {
+	if !r.URL.Query().Has(queryParam) || r.URL.Query().Get(queryParam) == "" {
 		return def, nil
 	}
 	str := r.URL.Query().Get(queryParam)
diff --git a/coderd/httpapi/queryparams_test.go b/coderd/httpapi/queryparams_test.go
@@ -57,9 +57,9 @@ func TestParseQueryParams(t *testing.T) {
 				Expected:   uuid.MustParse("11111111-1111-1111-1111-111111111111"),
 			},
 			{
-				QueryParam:            "empty",
-				Value:                 "",
-				ExpectedErrorContains: "must be a valid uuid",
+				QueryParam: "empty",
+				Value:      "",
+				Expected:   uuid.Nil,
 			},
 		}
 
@@ -103,10 +103,9 @@ func TestParseQueryParams(t *testing.T) {
 				Expected:   100,
 			},
 			{
-				QueryParam:            "empty",
-				Value:                 "",
-				Expected:              0,
-				ExpectedErrorContains: "must be a valid integer",
+				QueryParam: "empty",
+				Value:      "",
+				Expected:   0,
 			},
 			{
 				QueryParam: "no_value",
@@ -147,6 +146,7 @@ func TestParseQueryParams(t *testing.T) {
 			{
 				QueryParam: "empty",
 				Value:      "",
+				Default:    []uuid.UUID{},
 				Expected:   []uuid.UUID{},
 			},
 			{
diff --git a/coderd/pagination_internal_test.go b/coderd/pagination_internal_test.go
@@ -14,6 +14,7 @@ import (
 
 func TestPagination(t *testing.T) {
 	t.Parallel()
+	const invalidValues = "Query parameters have invalid values"
 	testCases := []struct {
 		Name string
 
@@ -27,27 +28,27 @@ func TestPagination(t *testing.T) {
 		{
 			Name:          "BadAfterID",
 			AfterID:       "bogus",
-			ExpectedError: "Query param 'after_id' must be a valid UUID",
+			ExpectedError: invalidValues,
 		},
 		{
 			Name:          "ShortAfterID",
 			AfterID:       "ff22a7b-bb6f-43d8-83e1-eefe0a1f5197",
-			ExpectedError: "Query param 'after_id' must be a valid UUID",
+			ExpectedError: invalidValues,
 		},
 		{
 			Name:          "LongAfterID",
 			AfterID:       "cff22a7b-bb6f-43d8-83e1-eefe0a1f51972",
-			ExpectedError: "Query param 'after_id' must be a valid UUID",
+			ExpectedError: invalidValues,
 		},
 		{
 			Name:          "BadLimit",
 			Limit:         "bogus",
-			ExpectedError: "Query param 'limit' must be a valid integer",
+			ExpectedError: invalidValues,
 		},
 		{
 			Name:          "BadOffset",
 			Offset:        "bogus",
-			ExpectedError: "Query param 'offset' must be a valid integer",
+			ExpectedError: invalidValues,
 		},
 
 		// Valid values

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (p QueryParamParser) ParseString(r http.Request, def string, queryParam s`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func parse[T any](r *http.Request, parse func(v string) (T, error), def T, queryParam string) (T, error) {`
`104`		`- if !r.URL.Query().Has(queryParam) {`
	`104`	`+ if !r.URL.Query().Has(queryParam) \|\| r.URL.Query().Get(queryParam) == "" {`
`105`	`105`	`return def, nil`
`106`	`106`	`}`
`107`	`107`	`str := r.URL.Query().Get(queryParam)`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,9 @@ func TestParseQueryParams(t *testing.T) {`
`57`	`57`	`Expected: uuid.MustParse("11111111-1111-1111-1111-111111111111"),`
`58`	`58`	`},`
`59`	`59`	`{`
`60`		`- QueryParam: "empty",`
`61`		`- Value: "",`
`62`		`- ExpectedErrorContains: "must be a valid uuid",`
	`60`	`+ QueryParam: "empty",`
	`61`	`+ Value: "",`
	`62`	`+ Expected: uuid.Nil,`
`63`	`63`	`},`
`64`	`64`	`}`
`65`	`65`
`@@ -103,10 +103,9 @@ func TestParseQueryParams(t *testing.T) {`
`103`	`103`	`Expected: 100,`
`104`	`104`	`},`
`105`	`105`	`{`
`106`		`- QueryParam: "empty",`
`107`		`- Value: "",`
`108`		`- Expected: 0,`
`109`		`- ExpectedErrorContains: "must be a valid integer",`
	`106`	`+ QueryParam: "empty",`
	`107`	`+ Value: "",`
	`108`	`+ Expected: 0,`
`110`	`109`	`},`
`111`	`110`	`{`
`112`	`111`	`QueryParam: "no_value",`
`@@ -147,6 +146,7 @@ func TestParseQueryParams(t *testing.T) {`
`147`	`146`	`{`
`148`	`147`	`QueryParam: "empty",`
`149`	`148`	`Value: "",`
	`149`	`+ Default: []uuid.UUID{},`
`150`	`150`	`Expected: []uuid.UUID{},`
`151`	`151`	`},`
`152`	`152`	`{`