X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5ee93e408c0e547dfb03b2f3d039a7715126395b..60801a7c485c50e3c2f518f9b3ad6f86c8783fca:/lib/controller/federation/generated.go

diff --git a/lib/controller/federation/generated.go b/lib/controller/federation/generated.go
index 0a66644985..20edd90b95 100755
--- a/lib/controller/federation/generated.go
+++ b/lib/controller/federation/generated.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 //
@@ -100,6 +100,8 @@ func (conn *Conn) generated_SpecimenList(ctx context.Context, options arvados.Li
 func (conn *Conn) generated_UserList(ctx context.Context, options arvados.ListOptions) (arvados.UserList, error) {
 	var mtx sync.Mutex
 	var merged arvados.UserList
+	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.UserList(ctx, options)
 		if err != nil {
@@ -109,8 +111,9 @@ func (conn *Conn) generated_UserList(ctx context.Context, options arvados.ListOp
 		defer mtx.Unlock()
 		if len(merged.Items) == 0 {
 			merged = cl
-		} else {
+		} else if len(cl.Items) > 0 {
 			merged.Items = append(merged.Items, cl.Items...)
+			needSort.Store(true)
 		}
 		uuids := make([]string, 0, len(cl.Items))
 		for _, item := range cl.Items {
@@ -118,6 +121,18 @@ func (conn *Conn) generated_UserList(ctx context.Context, options arvados.ListOp
 		}
 		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.User{}
+	}
 	return merged, err
 }