arvados-login-sync 2.4.4 → 2.6.0rc3

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: 1c7f553b017fcf0da584557e46232cac075a615cff6d63632f6bd736436a21c0
4
- data.tar.gz: fc1cfca91f7cfcfa37a28542bd694f35ba3aff36af913933d530619e74ee09bd
3
+ metadata.gz: 9037cb84a7645f6c7d0aacdd817c868721dc7379393aac0afbd35b62cd902d47
4
+ data.tar.gz: 5393038f0e8fa7bdcbaf93bc61192a543aa4c7c63fdd06f00b3ac1c391b86927
5
5
  SHA512:
6
- metadata.gz: 00d7910ad7974d9e345b347307727c1894c714a68c611f5b736b68321006f4e5fba4a5ae943219ddb542622720f98d9b22af54902b18258e60b10009e4ac9353
7
- data.tar.gz: 691e4b0b40c58e95d81043228392a18d8b9b60d4ebabf461d094ed75859a8b51be4709aa3ac27e99cba69a8ca7cc4b4bfe9e391791e7de95c88b8937481382d8
6
+ metadata.gz: 905ea035e87d93a67425c2bd15ff3d9b84bdd76ace3a3d12b46f59666ea0d3f883fc89c1907bf7b2566e407aab06046774064ca736c233a9a4bc1067915450e6
7
+ data.tar.gz: e93946285ae778574c954a8772c7d095d96399eabd5cb9efa5640d00db9f9668478b0298d7443beac7868ffd08771e4b822ae3a48082b98743ab1fec93296e27
@@ -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.4
4
+ version: 2.6.0rc3
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: '0'
108
+ version: 1.3.1
103
109
  requirements: []
104
110
  rubyforge_project:
105
111
  rubygems_version: 2.7.10