14287: Remove zero/missing values when req uses select or count=none.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index 9a2891140155f80bb01a1c29f3250417077bda67..4536380fd9cff22a368369440c3f27f63d7bdefa 100644 (file)
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -20,6 +20,7 @@ const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
 
 type responseOptions struct {
        Select []string
+       Count  string
 }
 
 func (rtr *router) responseOptions(opts interface{}) (responseOptions, error) {
@@ -27,6 +28,9 @@ func (rtr *router) responseOptions(opts interface{}) (responseOptions, error) {
        switch opts := opts.(type) {
        case *arvados.GetOptions:
                rOpts.Select = opts.Select
+       case *arvados.ListOptions:
+               rOpts.Select = opts.Select
+               rOpts.Count = opts.Count
        }
        return rOpts, nil
 }

diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index a1c79068039e2ac928c10fd41ebfbdd16cdfc643..d5390730810b0f9f668d396cf8b1cfdef590dc5b 100644 (file)
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -43,6 +43,7 @@ type ListOptions struct {
        Limit   int      `json:"limit"`
        Offset  int      `json:"offset"`
        Order   string   `json:"order"`
+       Count   string   `json:"count"`
 }
 
 type CreateOptions struct {