[ARVADOS] updated: 2.1.0-115-g67ac5dcd7

[Git user]

Summary of changes:
 lib/controller/federation_test.go | 1 +
 lib/controller/localdb/login.go   | 4 ++++
 lib/controller/rpc/conn.go        | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

       via  67ac5dcd79fa6f0549bb4f7646cb624e0baa60e5 (commit)
      from  2cae3cc1f425548259316425eaa80bdff305801e (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 67ac5dcd79fa6f0549bb4f7646cb624e0baa60e5
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Dec 8 18:03:10 2020 -0500

    SystemRootToken was missing in the test
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/federation_test.go b/lib/controller/federation_test.go
index 072ec009a..94c0a0aac 100644
--- a/lib/controller/federation_test.go
+++ b/lib/controller/federation_test.go
@@ -654,6 +654,7 @@ func (s *FederationSuite) TestCreateRemoteContainerRequestCheckRuntimeToken(c *c
 
 	arvadostest.SetServiceURL(&s.testHandler.Cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
 	s.testHandler.Cluster.ClusterID = "zzzzz"
+	s.testHandler.Cluster.SystemRootToken = arvadostest.SystemRootToken
 
 	resp := s.testRequest(req).Result()
 	c.Check(resp.StatusCode, check.Equals, http.StatusOK)
diff --git a/lib/controller/localdb/login.go b/lib/controller/localdb/login.go
index 61bad465f..ed7938296 100644
--- a/lib/controller/localdb/login.go
+++ b/lib/controller/localdb/login.go
@@ -142,6 +142,10 @@ func noopLogout(cluster *arvados.Cluster, opts arvados.LogoutOptions) (arvados.L
 }
 
 func (conn *Conn) CreateAPIClientAuthorization(ctx context.Context, rootToken string, authinfo rpc.UserSessionAuthInfo) (resp arvados.APIClientAuthorization, err error) {
+	// rootToken is "" then complain!
+	if rootToken == "" {
+		return arvados.APIClientAuthorization{}, errors.New("In CreateAPIClientAuthorization() rootToken can't be empty string")
+	}
 	ctxRoot := auth.NewContext(ctx, &auth.Credentials{Tokens: []string{rootToken}})
 	newsession, err := conn.railsProxy.UserSessionCreate(ctxRoot, rpc.UserSessionCreateOptions{
 		// Send a fake ReturnTo value instead of the caller's
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 254f0adfc..be95710ee 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -288,7 +288,7 @@ func (conn *Conn) ContainerUnlock(ctx context.Context, options arvados.GetOption
 }
 
 func (conn *Conn) ContainerRequestCreate(ctx context.Context, options arvados.CreateOptions) (arvados.ContainerRequest, error) {
-	log.Printf("THIS IS THE rcp.Conn.ContainerRequestCreate() for %s we are %s", options.ClusterID, conn.clusterID)
+	log.Printf("THIS IS rcp.Conn.ContainerRequestCreate() for %s we are %s", options.ClusterID, conn.clusterID)
 	ep := arvados.EndpointContainerRequestCreate
 	var resp arvados.ContainerRequest
 	err := conn.requestAndDecode(ctx, &resp, ep, nil, options)

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


hooks/post-receive
--