SystemRootToken was missing in the test

Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico@curii.com>

diff --git a/lib/controller/federation_test.go b/lib/controller/federation_test.go
index 072ec009a7ddca90103ef6a96bdfa8c03e91fb81..94c0a0aac0843d7eac4e7fae1b38c160590fe5f3 100644 (file)
--- 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 61bad465ff2b6efb7653b952338772c3eff15af4..ed7938296d0e4c04524135c26e5cafb2abe127ce 100644 (file)
--- 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 254f0adfce6058c9ac7e9661c107e7a73b6c48d0..be95710ee462b297857a9506ae94ded8b59dfb61 100644 (file)
--- 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)