From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Mon, 25 Nov 2019 20:20:21 +0000 (-0500)
Subject: 15720: Merge branch 'master' into 15720-fed-user-list
X-Git-Tag: 2.0.0~107^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5ee93e408c0e547dfb03b2f3d039a7715126395b

15720: Merge branch 'master' into 15720-fed-user-list

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

5ee93e408c0e547dfb03b2f3d039a7715126395b
diff --cc lib/controller/federation/generated.go
index 961cd5a401,fb91a84960..0a66644985
--- a/lib/controller/federation/generated.go
+++ b/lib/controller/federation/generated.go
@@@ -16,9 -17,11 +17,11 @@@ import 
  // -- this file is auto-generated -- do not edit -- edit list.go and run "go generate" instead --
  //
  
 -func (conn *Conn) ContainerList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerList, error) {
 +func (conn *Conn) generated_ContainerList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerList, error) {
  	var mtx sync.Mutex
  	var merged arvados.ContainerList
+ 	var needSort atomic.Value
+ 	needSort.Store(false)
  	err := conn.splitListRequest(ctx, options, func(ctx context.Context, _ string, backend arvados.API, options arvados.ListOptions) ([]string, error) {
  		cl, err := backend.ContainerList(ctx, options)
  		if err != nil {
@@@ -41,9 -57,11 +57,11 @@@
  	return merged, err
  }
  
 -func (conn *Conn) SpecimenList(ctx context.Context, options arvados.ListOptions) (arvados.SpecimenList, error) {
 +func (conn *Conn) generated_SpecimenList(ctx context.Context, options arvados.ListOptions) (arvados.SpecimenList, error) {
  	var mtx sync.Mutex
  	var merged arvados.SpecimenList
+ 	var needSort atomic.Value
+ 	needSort.Store(false)
  	err := conn.splitListRequest(ctx, options, func(ctx context.Context, _ string, backend arvados.API, options arvados.ListOptions) ([]string, error) {
  		cl, err := backend.SpecimenList(ctx, options)
  		if err != nil {
@@@ -62,31 -81,18 +81,43 @@@
  		}
  		return uuids, nil
  	})
- 	sort.Slice(merged.Items, func(i, j int) bool { return merged.Items[i].UUID < merged.Items[j].UUID })
+ 	if needSort.Load().(bool) {
+ 		// Apply the default/implied order, "modified_at desc"
+ 		sort.Slice(merged.Items, func(i, j int) bool {
+ 			mi, mj := merged.Items[i].ModifiedAt, merged.Items[j].ModifiedAt
+ 			return mj.Before(mi)
+ 		})
+ 	}
+ 	if merged.Items == nil {
+ 		// Return empty results as [], not null
+ 		// (https://github.com/golang/go/issues/27589 might be
+ 		// a better solution in the future)
+ 		merged.Items = []arvados.Specimen{}
+ 	}
  	return merged, err
  }
 +
 +func (conn *Conn) generated_UserList(ctx context.Context, options arvados.ListOptions) (arvados.UserList, error) {
 +	var mtx sync.Mutex
 +	var merged arvados.UserList
 +	err := conn.splitListRequest(ctx, options, func(ctx context.Context, _ string, backend arvados.API, options arvados.ListOptions) ([]string, error) {
 +		cl, err := backend.UserList(ctx, options)
 +		if err != nil {
 +			return nil, err
 +		}
 +		mtx.Lock()
 +		defer mtx.Unlock()
 +		if len(merged.Items) == 0 {
 +			merged = cl
 +		} else {
 +			merged.Items = append(merged.Items, cl.Items...)
 +		}
 +		uuids := make([]string, 0, len(cl.Items))
 +		for _, item := range cl.Items {
 +			uuids = append(uuids, item.UUID)
 +		}
 +		return uuids, nil
 +	})
 +	sort.Slice(merged.Items, func(i, j int) bool { return merged.Items[i].UUID < merged.Items[j].UUID })
 +	return merged, err
 +}
diff --cc lib/controller/federation/list.go
index 7178d7b0af,54f59812a0..26b6b254e8
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@@ -20,9 -21,11 +21,11 @@@ import 
  // CollectionList is used as a template to auto-generate List()
  // methods for other types; see generate.go.
  
 -func (conn *Conn) CollectionList(ctx context.Context, options arvados.ListOptions) (arvados.CollectionList, error) {
 +func (conn *Conn) generated_CollectionList(ctx context.Context, options arvados.ListOptions) (arvados.CollectionList, error) {
  	var mtx sync.Mutex
  	var merged arvados.CollectionList
+ 	var needSort atomic.Value
+ 	needSort.Store(false)
  	err := conn.splitListRequest(ctx, options, func(ctx context.Context, _ string, backend arvados.API, options arvados.ListOptions) ([]string, error) {
  		cl, err := backend.CollectionList(ctx, options)
  		if err != nil {
diff --cc lib/controller/federation/list_test.go
index 5a630a9450,35d201028b..a9c4f588f1
--- a/lib/controller/federation/list_test.go
+++ b/lib/controller/federation/list_test.go
@@@ -8,9 -8,18 +8,10 @@@ import 
  	"context"
  	"fmt"
  	"net/http"
 -	"net/url"
 -	"os"
+ 	"sort"
 -	"testing"
  
 -	"git.curoverse.com/arvados.git/lib/controller/router"
 -	"git.curoverse.com/arvados.git/lib/controller/rpc"
  	"git.curoverse.com/arvados.git/sdk/go/arvados"
  	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 -	"git.curoverse.com/arvados.git/sdk/go/auth"
 -	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
 -	"git.curoverse.com/arvados.git/sdk/go/httpserver"
  	check "gopkg.in/check.v1"
  )