[ARVADOS] updated: 1.3.0-3102-g49a89ce98

[Git user]

Summary of changes:
 lib/controller/federation/conn.go  | 36 ++++++++++++++++--
 lib/controller/integration_test.go | 77 ++++++++++++++++++++++++++++++++++----
 2 files changed, 103 insertions(+), 10 deletions(-)

       via  49a89ce984eb69ef4316882e91dec652dc353e39 (commit)
       via  3ee2186cb06b822f113696ccb24a78b79269d318 (commit)
       via  47aa52f1b343c93e09908b69d40bf8b389e8b15c (commit)
       via  51d7a5b2a23074a130aa6dd74cbaf5f335920769 (commit)
      from  472fff42d6105a4457deeb1579e9d14caffc82dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 49a89ce984eb69ef4316882e91dec652dc353e39
Merge: 472fff42d 3ee2186cb
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Sep 4 11:25:42 2020 -0400

    Merge branch '16778-setup-fed-user' refs #16778
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit 3ee2186cb06b822f113696ccb24a78b79269d318
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Sep 4 11:25:15 2020 -0400

    16778: Make a copy of options
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index a84f1b017..d715734c6 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -486,20 +486,14 @@ func (conn *Conn) UserSetup(ctx context.Context, options arvados.UserSetupOption
 		// it should be created on the local cluster,
 		// not the remote one.
 
-		setupVM := options.VMUUID
-		setupRepo := options.RepoName
-		options.VMUUID = ""
-		options.RepoName = ""
+		upstreamOptions := options
+		upstreamOptions.VMUUID = ""
+		upstreamOptions.RepoName = ""
 
-		ret, err := upstream.UserSetup(ctx, options)
+		ret, err := upstream.UserSetup(ctx, upstreamOptions)
 		if err != nil {
 			return ret, err
 		}
-
-		// Restore VMUUID and RepoName for the call to local
-		// UserSetup below.
-		options.VMUUID = setupVM
-		options.RepoName = setupRepo
 	}
 
 	return conn.local.UserSetup(ctx, options)

-----------------------------------------------------------------------


hooks/post-receive
--