[ARVADOS] updated: 2.1.0-239-gf53363ea4

[Git user]

Summary of changes:
 sdk/ruby/lib/arvados.rb | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

  discards  304fe1f76d1a8bc27011c65c5dfa61ae5a6f1351 (commit)
  discards  4f2e950d93c4969a70587d654bb147e1434f7e0e (commit)
  discards  bb878d5668a08845462166a301bce27476b38026 (commit)
       via  f53363ea4642dd165decc6786b835979a1dc9f73 (commit)
       via  0861b6befc12dc9e7bf64c573f82b3f4b470ab53 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (304fe1f76d1a8bc27011c65c5dfa61ae5a6f1351)
            \
             N -- N -- N (f53363ea4642dd165decc6786b835979a1dc9f73)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 f53363ea4642dd165decc6786b835979a1dc9f73
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 23 16:19:39 2020 -0500

    17224: Provide alternate credentials to use for creating user tokens
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/login-sync/bin/arvados-login-sync b/services/login-sync/bin/arvados-login-sync
index 8162e22a2..a9bff0546 100755
--- a/services/login-sync/bin/arvados-login-sync
+++ b/services/login-sync/bin/arvados-login-sync
@@ -31,6 +31,9 @@ keys = ''
 
 begin
   arv = Arvados.new({ :suppress_ssl_warnings => false })
+  logincluster_arv = Arvados.new({ :api_host => (ENV['LOGINCLUSTER_ARVADOS_API_HOST'] || ENV['ARVADOS_API_HOST']),
+                                   :api_token => (ENV['LOGINCLUSTER_ARVADOS_API_TOKEN'] || ENV['ARVADOS_API_TOKEN']),
+                      :suppress_ssl_warnings => false })
 
   vm_uuid = ENV['ARVADOS_VIRTUAL_MACHINE_UUID']
 
@@ -190,7 +193,7 @@ begin
 
     begin
       if !File.exist?(tokenfile)
-        user_token = arv.api_client_authorization.create(api_client_authorization: {owner_uuid: l[:user_uuid], api_client_id: 0})
+        user_token = logincluster_arv.api_client_authorization.create(api_client_authorization: {owner_uuid: l[:user_uuid], api_client_id: 0})
         f = File.new(tokenfile, 'w')
         f.write("ARVADOS_API_HOST=#{ENV['ARVADOS_API_HOST']}\n")
         f.write("ARVADOS_API_TOKEN=v2/#{user_token[:uuid]}/#{user_token[:api_token]}\n")

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


hooks/post-receive
--