bosh_cli 1.2981.0 → 1.2982.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e1d3bf5c54dd7d88ea097bc989c0fee02b2481
-  data.tar.gz: 52c1003f0a7f996c73e66987953a4087e58ccca8
+  metadata.gz: 6f9901f35b38a8d19557f025c539b6429ad6d1cb
+  data.tar.gz: c0b59a2d9ddfa2d1c5827d3cb899eb97cf278b27
 SHA512:
-  metadata.gz: 9c16af5b713b12caa76ad0711b80905d9cfca32cb24fbf6f57a94bfd3588425b58c9aed8ef7b817ac91c466e6f5a04176fcc5a04ed61fb08527f1bd83b6af19f
-  data.tar.gz: 3cdbb9050100b5f0ee45ce0ac2c957f682072aca593fcbe08ac29ad337433a203392110760ba156447086915a53f6cd3a4ee0b66bffb9a2af3b5d372539ff3c4
+  metadata.gz: f80da0368d9d91d331e37d0c225e250a287e9881a7ea5f587158487149a0e1bc1c16c34f4ecfdb9f401d5ee7eb8b2f48fe475d2289e5742865446de18ff75336
+  data.tar.gz: 08a5c19f09873e03bf20b6208330ca167549d248387df76d813746c92d672ef3c1f070c337cc91f543e4c42af5a4298f2e8c17932bbfdf1fbf0a98fbe30168bb

data/lib/cli/base_command.rb

@@ -100,10 +100,6 @@ module Bosh::Cli
       end
 
       def credentials
-        director_client = Client::Director.new(target)
-        auth_info = Client::Uaa::AuthInfo.new(director_client, ENV, config.ca_cert(target))
-        token_decoder = Client::Uaa::TokenDecoder.new
-        uaa_token_provider = Client::Uaa::TokenProvider.new(auth_info, config, token_decoder, target)
         auth_token = uaa_token_provider.token
         return Client::UaaCredentials.new(auth_token) if auth_token
 
@@ -114,6 +110,15 @@ module Bosh::Cli
         nil
       end
 
+      def uaa_token_provider
+        @uaa_token_provider ||= begin
+          director_client = Client::Director.new(target)
+          auth_info = Client::Uaa::AuthInfo.new(director_client, ENV, config.ca_cert(target))
+          token_decoder = Client::Uaa::TokenDecoder.new
+          Client::Uaa::TokenProvider.new(auth_info, config, token_decoder, target)
+        end
+      end
+
       def target_name
         options[:target] || config.target_name || target_url
       end

data/lib/cli/client/uaa/access_info.rb

@@ -5,18 +5,6 @@ module Bosh
         class AccessInfo
           EXPIRATION_DEADLINE_IN_SECONDS = 30
 
-          def self.from_config(config_access_token, refresh_token, token_decoder)
-            token_type, access_token = config_access_token.split(' ')
-            return nil unless token_type && access_token
-
-            token_info = CF::UAA::TokenInfo.new({
-              access_token: access_token,
-              refresh_token: refresh_token,
-              token_type: token_type,
-            })
-            new(token_info, token_decoder)
-          end
-
           def initialize(token_info, token_decoder)
             @token_info = token_info
             @token_decoder = token_decoder
@@ -58,6 +46,18 @@ module Bosh
         end
 
         class PasswordAccessInfo < AccessInfo
+          def self.create(full_access_token, refresh_token, token_decoder)
+            token_type, access_token = full_access_token.split(' ')
+            return nil unless token_type && access_token
+
+            token_info = CF::UAA::TokenInfo.new({
+                access_token: access_token,
+                refresh_token: refresh_token,
+                token_type: token_type,
+              })
+            new(token_info, token_decoder)
+          end
+
           def username
             token_data['user_name']
           end

data/lib/cli/client/uaa/client.rb

@@ -11,6 +11,7 @@ module Bosh
         class Client
           def initialize(target, auth_info, config)
             @target = target
+            @auth_info = auth_info
             token_decoder = TokenDecoder.new
             if auth_info.client_auth?
               token_issuer = ClientTokenIssuer.new(auth_info, token_decoder)
@@ -47,7 +48,7 @@ module Bosh
 
           def with_save
             access_info = yield
-            if access_info.auth_header
+            if access_info.auth_header && !@auth_info.client_auth?
               @config.set_credentials(@target, access_info.to_hash)
               @config.save
             end

data/lib/cli/client/uaa/token_provider.rb

@@ -13,12 +13,10 @@ module Bosh
           end
 
           def token
-            config_access_token = @config.access_token(@target)
-
             if @auth_info.client_auth?
-              access_info = client_access_info(config_access_token)
+              access_info = client_access_info
             else
-              access_info = password_access_info(config_access_token)
+              access_info = password_access_info
             end
 
             access_info.auth_header if access_info
@@ -30,24 +28,19 @@ module Bosh
             @uaa_client ||= Bosh::Cli::Client::Uaa::Client.new(@target, @auth_info, @config)
           end
 
-          def client_access_info(config_access_token)
-            unless config_access_token
-              return uaa_client.access_info({})
-            end
-
-            access_info = ClientAccessInfo.from_config(config_access_token, nil, @token_decoder)
-            return nil unless access_info
-
-            if access_info.was_issued_for?(@auth_info.client_id)
-              return refresh_if_needed(access_info)
+          def client_access_info
+            if !@client_access_info.nil? && @client_access_info.was_issued_for?(@auth_info.client_id)
+              @client_access_info = refresh_if_needed(@client_access_info)
+            else
+              @client_access_info = uaa_client.access_info({})
             end
-            uaa_client.access_info({})
           end
 
-          def password_access_info(config_access_token)
+          def password_access_info
+            config_access_token = @config.access_token(@target)
             return nil unless config_access_token
 
-            access_info = PasswordAccessInfo.from_config(config_access_token, @config.refresh_token(@target), @token_decoder)
+            access_info = PasswordAccessInfo.create(config_access_token, @config.refresh_token(@target), @token_decoder)
             return nil unless access_info
 
             refresh_if_needed(access_info)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2981.0'
+    VERSION = '1.2982.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2981.0
+  version: 1.2982.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2981.0
+        version: 1.2982.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2981.0
+        version: 1.2982.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2981.0
+        version: 1.2982.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2981.0
+        version: 1.2982.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2981.0
+        version: 1.2982.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2981.0
+        version: 1.2982.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  4246cc
+  30e5c6
 email: support@cloudfoundry.com
 executables:
 - bosh