arvados-login-sync 2.4.4rc1 → 2.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/bin/arvados-login-sync +11 -6
  3. metadata +15 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b9d44be8964d1fb414a0c4da8199212ed966cc261fd990fb015e12b42472b7a9
4
- data.tar.gz: 77eb7d64bd8d7da9b1895fe43e193b41adf3d8b95483ff61432fe618b8bf01b8
3
+ metadata.gz: f1098d1247fcad2f3e1c71c6ee6a629ae34ec21a838009ddcb09b27425e42ef5
4
+ data.tar.gz: 943ffd362f7f8af596378109a8f21b2ec00953051ad902cfc534e33e1f5aef42
5
5
  SHA512:
6
- metadata.gz: 1bbee305ad36923cf5ddfec05f70e7b4a1cf59c36723b0135f7dad053d4d0456323906b64ced60b1a639cb7d1654f668035487fdee53fc613c23cdd9e2e5c5cf
7
- data.tar.gz: 2947fa8f2060c6dd24910980ff48a0b53feb829b1108f9d39531e10cc90fd6f1881c6e4e5c0b4966a09375185e8ec166af2147ac1be3048687c378edea8668ca
6
+ metadata.gz: 10dc0177db72bf2a0a1378c702c7a9e8ceccb7fe7bead9357b0e137852f45b67664212b4528aaf06daffa86e6361a69d851478c0cd70e78bcc7eb96488282845
7
+ data.tar.gz: f7cf7017636ab6ff9b09750379660bd8fff1df52bbe5c87632234cdab34f4f2613740a7365253e571f07358594510d95074cccc7c394b544891a7c02c2281c16
data/bin/arvados-login-sync CHANGED
@@ -42,9 +42,14 @@ begin
42
42
  debug = true
43
43
  end
44
44
  arv = Arvados.new({ :suppress_ssl_warnings => false })
45
- logincluster_arv = Arvados.new({ :api_host => (ENV['LOGINCLUSTER_ARVADOS_API_HOST'] || ENV['ARVADOS_API_HOST']),
46
- :api_token => (ENV['LOGINCLUSTER_ARVADOS_API_TOKEN'] || ENV['ARVADOS_API_TOKEN']),
47
- :suppress_ssl_warnings => false })
45
+ logincluster_host = ENV['ARVADOS_API_HOST']
46
+ logincluster_name = arv.cluster_config['Login']['LoginCluster'] or ''
47
+
48
+ if logincluster_name != '' and logincluster_name != arv.cluster_config['ClusterID']
49
+ logincluster_host = arv.cluster_config['RemoteClusters'][logincluster_name]['Host']
50
+ end
51
+ logincluster_arv = Arvados.new({ :api_host => logincluster_host,
52
+ :suppress_ssl_warnings => false })
48
53
 
49
54
  vm_uuid = ENV['ARVADOS_VIRTUAL_MACHINE_UUID']
50
55
 
@@ -219,9 +224,9 @@ begin
219
224
  userEnv = IO::read(tokenfile)
220
225
  if (m = /^ARVADOS_API_TOKEN=(.*?\n)/m.match(userEnv))
221
226
  begin
222
- tmp_arv = Arvados.new({ :api_host => (ENV['LOGINCLUSTER_ARVADOS_API_HOST'] || ENV['ARVADOS_API_HOST']),
223
- :api_token => (m[1]),
224
- :suppress_ssl_warnings => false })
227
+ tmp_arv = Arvados.new({ :api_host => logincluster_host,
228
+ :api_token => (m[1]),
229
+ :suppress_ssl_warnings => false })
225
230
  tmp_arv.user.current
226
231
  rescue Arvados::TransactionFailedError => e
227
232
  if e.to_s =~ /401 Unauthorized/
metadata CHANGED
@@ -1,29 +1,35 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-login-sync
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.4rc1
4
+ version: 2.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arvados Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-30 00:00:00.000000000 Z
11
+ date: 2022-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arvados
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: '2.4'
20
+ - - ">"
18
21
  - !ruby/object:Gem::Version
19
- version: 1.3.3.20190320201707
22
+ version: 2.4.4a
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
- - - ">="
27
+ - - "~>"
25
28
  - !ruby/object:Gem::Version
26
- version: 1.3.3.20190320201707
29
+ version: '2.4'
30
+ - - ">"
31
+ - !ruby/object:Gem::Version
32
+ version: 2.4.4a
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: launchy
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -73,7 +79,7 @@ dependencies:
73
79
  - !ruby/object:Gem::Version
74
80
  version: '0.12'
75
81
  description: Creates and updates local login accounts for Arvados users. Built from
76
- git commit b8c1729e63dcf8e94b296d6ee90cf7c16c79d72c
82
+ git commit 83974ae9df4060f7aaa6bba61997404a2a7405b2
77
83
  email: packaging@arvados.org
78
84
  executables:
79
85
  - arvados-login-sync
@@ -97,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
97
103
  version: 2.1.0
98
104
  required_rubygems_version: !ruby/object:Gem::Requirement
99
105
  requirements:
100
- - - ">"
106
+ - - ">="
101
107
  - !ruby/object:Gem::Version
102
- version: 1.3.1
108
+ version: '0'
103
109
  requirements: []
104
110
  rubyforge_project:
105
111
  rubygems_version: 2.7.10