bosh_cli 1.2978.0 → 1.2980.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cli/client/director.rb +2 -1
  3. data/lib/cli/client/uaa.rb +2 -2
  4. data/lib/cli/client/uaa/client_token_issuer.rb +3 -1
  5. data/lib/cli/version.rb +1 -1
  6. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: be935dcc92dc6f7536c085b586e9929f18a7de60
4
- data.tar.gz: fcc3762539fb1f738a42843e4576bdc678461af6
3
+ metadata.gz: b746e2346f147c8bcb5ab4e32ffd42ee2068ba5e
4
+ data.tar.gz: e272f8007bfb9d325d11cbcc055ca082c9288a6b
5
5
  SHA512:
6
- metadata.gz: e5effdc8644bd914e6948c0ad1a8d6b3824742831cf1f0a6e18877c984f2baddd71b68b63435384ae6196146940b7453e655620fa8ef3a78a4706e7e66d042ec
7
- data.tar.gz: f88d999391a3ce02d4537a8f369b235a615ddfc93ad4e87ef6cd939066e740ac3350ac8d5723538117874fbec7983c76c1b3c34bc32fdbd3294efd7fce74a460
6
+ metadata.gz: 9ceffbe0e4a7eae7b9cecd7db1a1813fd41c72506f38f459628d7b63782472e9e42ca30145fbc70093a3652320e9856e92c3e34802867aa7fef9558d18ca2a76
7
+ data.tar.gz: 4d2aeedcdaa87c14c0d48ea9422e184dda6872b506c4348e8f6eb8176fc241d838bd5fbf08344b52a337d9cc990890add37c5d3511fb3eff2e0430ef2a514c0b
data/lib/cli/client/director.rb CHANGED
@@ -723,7 +723,8 @@ module Bosh
723
723
  Timeout::Error,
724
724
  HTTPClient::TimeoutError,
725
725
  HTTPClient::KeepAliveDisconnected,
726
- OpenSSL::SSL::SSLError => e
726
+ OpenSSL::SSL::SSLError,
727
+ OpenSSL::X509::StoreError => e
727
728
  raise DirectorInaccessible, "cannot access director (#{e.message})"
728
729
 
729
730
  rescue HTTPClient::BadResponseError => e
data/lib/cli/client/uaa.rb CHANGED
@@ -24,13 +24,13 @@ module Bosh
24
24
  @token_issuer.prompts
25
25
  rescue CF::UAA::SSLException => e
26
26
  raise e unless @ssl_ca_file.nil?
27
- err('Invalid SSL Cert. Use --ca-cert to specify SSL certificate') #FIXME: the uaa client shouldn't know about 'err'
27
+ err('Invalid SSL Cert. Use --ca-cert to specify SSL certificate')
28
28
  end
29
29
 
30
30
  def login(credentials)
31
31
  @token_issuer.access_info(credentials)
32
32
  rescue CF::UAA::TargetError => e
33
- err("Failed to log in: #{e.info['error_description']}") #FIXME: the uaa client shouldn't know about 'err'
33
+ err("Failed to log in: #{e.info['error_description']}")
34
34
  rescue CF::UAA::BadResponse
35
35
  nil
36
36
  end
data/lib/cli/client/uaa/client_token_issuer.rb CHANGED
@@ -17,7 +17,9 @@ module Bosh
17
17
  decoded = @token_decoder.decode(token)
18
18
 
19
19
  username = decoded['client_id'] if decoded
20
- AccessInfo.new(username, nil)
20
+
21
+ access_token = "#{token.info['token_type']} #{token.info['access_token']}"
22
+ AccessInfo.new(username, access_token)
21
23
  end
22
24
  end
23
25
  end
data/lib/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Cli
3
- VERSION = '1.2978.0'
3
+ VERSION = '1.2980.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2978.0
4
+ version: 1.2980.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-29 00:00:00.000000000 Z
11
+ date: 2015-06-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.2978.0
19
+ version: 1.2980.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.2978.0
26
+ version: 1.2980.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh-template
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2978.0
33
+ version: 1.2980.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.2978.0
40
+ version: 1.2980.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: cf-uaa-lib
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.2978.0
131
+ version: 1.2980.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.2978.0
138
+ version: 1.2980.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: net-ssh
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
306
306
  version: '0'
307
307
  description: |-
308
308
  BOSH CLI
309
- 6e538e
309
+ cb6c5e
310
310
  email: support@cloudfoundry.com
311
311
  executables:
312
312
  - bosh