bosh_cli 1.2982.0 → 1.2983.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9901f35b38a8d19557f025c539b6429ad6d1cb
-  data.tar.gz: c0b59a2d9ddfa2d1c5827d3cb899eb97cf278b27
+  metadata.gz: ebcf2ddd1601fd0a009078c3b52f043df2c81969
+  data.tar.gz: 3e9306e4515ddd0dd38cc8da3a31028b6d6e42ab
 SHA512:
-  metadata.gz: f80da0368d9d91d331e37d0c225e250a287e9881a7ea5f587158487149a0e1bc1c16c34f4ecfdb9f401d5ee7eb8b2f48fe475d2289e5742865446de18ff75336
-  data.tar.gz: 08a5c19f09873e03bf20b6208330ca167549d248387df76d813746c92d672ef3c1f070c337cc91f543e4c42af5a4298f2e8c17932bbfdf1fbf0a98fbe30168bb
+  metadata.gz: 5634530f84e9f3e1c06f28d3d3b3f6b223077a81e4cbb4b55f0daae9ed5b256379d149031365070db740b1d013c9bd3c43e3f945c0ce507d553b71158ac1ce98
+  data.tar.gz: 93545f71bc76fc460cad14e07122075340840220adc2f7433f466d2e2362dfc8369d2c29432f4b07edbf6dcdd5248cea51e3ca0f120ec4217733df3bea69abbd

data/lib/cli/base_command.rb

@@ -40,7 +40,7 @@ module Bosh::Cli
 
       def director
         @director ||= Bosh::Cli::Client::Director.new(
-            target, credentials, @options.select { |k, _| k == :no_track })
+          target, credentials, @options.select { |k, _| k == :no_track })
       end
 
       def release
@@ -62,7 +62,7 @@ module Bosh::Cli
       end
 
       def logged_in?
-        !!(credentials)
+        !!(credentials && credentials.authorization_header)
       end
 
       def non_interactive?
@@ -92,6 +92,7 @@ module Bosh::Cli
         url = config.resolve_alias(:target, raw_url) || raw_url
         url ? normalize_url(url) : nil
       end
+
       alias_method :target_url, :target
 
       # @return [String] Deployment manifest path
@@ -100,153 +101,154 @@ module Bosh::Cli
       end
 
       def credentials
-        auth_token = uaa_token_provider.token
-        return Client::UaaCredentials.new(auth_token) if auth_token
-
-        if username && password
-          return Client::BasicCredentials.new(username, password)
-        end
-
-        nil
-      end
+        return @credentials if @credentials
 
-      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))
+        if auth_info.uaa?
           token_decoder = Client::Uaa::TokenDecoder.new
-          Client::Uaa::TokenProvider.new(auth_info, config, token_decoder, target)
+          uaa_token_provider = Client::Uaa::TokenProvider.new(auth_info, config, token_decoder, target)
+          @credentials = Client::UaaCredentials.new(uaa_token_provider)
+        elsif username && password
+          @credentials = Client::BasicCredentials.new(username, password)
         end
-      end
 
-      def target_name
-        options[:target] || config.target_name || target_url
+        @credentials
       end
 
-      def cache_dir
-        File.join(Dir.home, '.bosh', 'cache')
-      end
+    def target_name
+      options[:target] || config.target_name || target_url
+    end
 
-      protected
+    def cache_dir
+      File.join(Dir.home, '.bosh', 'cache')
+    end
 
-      # @return [String] Director username
-      def username
-        options[:username] || ENV['BOSH_USER'] || config.username(target)
-      end
+    protected
 
-      # @return [String] Director password
-      def password
-        options[:password] || ENV['BOSH_PASSWORD'] || config.password(target)
+    def auth_info
+      @auth_info ||= begin
+        director_client = Client::Director.new(target)
+        Client::Uaa::AuthInfo.new(director_client, ENV, config.ca_cert(target))
       end
+    end
 
-      # Prints director task completion report. Note that event log usually
-      # contains pretty detailed error report and other UI niceties, so most
-      # of the time this could just do nothing
-      # @param [Symbol] status Task status
-      # @param [#to_s] task_id Task ID
-      def task_report(status, task_id, success_msg = nil, error_msg = nil)
-        case status
-          when :non_trackable
-            report = "Can't track director task".make_red
-          when :track_timeout
-            report = 'Task tracking timeout'.make_red
-          when :running
-            report = "Task #{task_id.make_yellow} running"
-          when :error
-            report = error_msg
-          when :done
-            report = success_msg
-          else
-            report = "Task exited with status #{status}"
-        end
+    # @return [String] Director username
+    def username
+      options[:username] || ENV['BOSH_USER'] || config.username(target)
+    end
 
-        unless [:running, :done].include?(status)
-          @exit_code = 1
-        end
+    # @return [String] Director password
+    def password
+      options[:password] || ENV['BOSH_PASSWORD'] || config.password(target)
+    end
 
-        say("\n#{report}") if report
-        say("\nFor a more detailed error report, run: bosh task #{task_id} --debug") if status == :error
+    # Prints director task completion report. Note that event log usually
+    # contains pretty detailed error report and other UI niceties, so most
+    # of the time this could just do nothing
+    # @param [Symbol] status Task status
+    # @param [#to_s] task_id Task ID
+    def task_report(status, task_id, success_msg = nil, error_msg = nil)
+      case status
+        when :non_trackable
+          report = "Can't track director task".make_red
+        when :track_timeout
+          report = 'Task tracking timeout'.make_red
+        when :running
+          report = "Task #{task_id.make_yellow} running"
+        when :error
+          report = error_msg
+        when :done
+          report = success_msg
+        else
+          report = "Task exited with status #{status}"
       end
 
-      def auth_required
-        target_required
-        err('Please log in first') unless logged_in?
+      unless [:running, :done].include?(status)
+        @exit_code = 1
       end
 
-      def target_required
-        err('Please choose target first') if target.nil?
-      end
+      say("\n#{report}") if report
+      say("\nFor a more detailed error report, run: bosh task #{task_id} --debug") if status == :error
+    end
 
-      def deployment_required
-        err('Please choose deployment first') if deployment.nil?
-      end
+    def auth_required
+      target_required
+      err('Please log in first') unless logged_in?
+    end
 
-      def show_deployment
-        say("Current deployment is #{deployment.make_green}")
-      end
+    def target_required
+      err('Please choose target first') if target.nil?
+    end
 
-      def no_track_unsupported
-        if @options.delete(:no_track)
-          say('Ignoring `' + '--no-track'.make_yellow + "' option")
-        end
-      end
+    def deployment_required
+      err('Please choose deployment first') if deployment.nil?
+    end
 
-      def check_if_release_dir
-        unless in_release_dir?
-          err("Sorry, your current directory doesn't look like release directory")
-        end
-      end
+    def show_deployment
+      say("Current deployment is #{deployment.make_green}")
+    end
 
-      def raise_dirty_state_error
-        say("\n%s\n" % [`git status`])
-        err('Your current directory has some local modifications, ' +
-                "please discard or commit them first.\n\n" +
-                'Use the --force option to skip this check.')
+    def no_track_unsupported
+      if @options.delete(:no_track)
+        say('Ignoring `' + '--no-track'.make_yellow + "' option")
       end
+    end
 
-      def in_release_dir?
-        File.directory?('packages') &&
-            File.directory?('jobs') &&
-            File.directory?('src')
+    def check_if_release_dir
+      unless in_release_dir?
+        err("Sorry, your current directory doesn't look like release directory")
       end
+    end
 
-      def dirty_state?
-        git_status = `git status 2>&1`
-        case $?.exitstatus
-          when 128 # Not in a git repo
-            false
-          when 127 # git command not found
-            false
-          else
-            !git_status.lines.to_a.last.include?('nothing to commit')
-        end
-      end
+    def raise_dirty_state_error
+      say("\n%s\n" % [`git status`])
+      err('Your current directory has some local modifications, ' +
+          "please discard or commit them first.\n\n" +
+          'Use the --force option to skip this check.')
+    end
+
+    def in_release_dir?
+      File.directory?('packages') &&
+        File.directory?('jobs') &&
+        File.directory?('src')
+    end
 
-      def valid_index_for(job, index, options = {})
-        index = '0' if job_unique_in_deployment?(job)
-        err('You should specify the job index. There is more than one instance of this job type.') if index.nil?
-        index = index.to_i if options[:integer_index]
-        index
+    def dirty_state?
+      git_status = `git status 2>&1`
+      case $?.exitstatus
+        when 128 # Not in a git repo
+          false
+        when 127 # git command not found
+          false
+        else
+          !git_status.lines.to_a.last.include?('nothing to commit')
       end
+    end
 
-      def normalize_url(url)
-        url = url.gsub(/\/$/, '')
-        url = "https://#{url}" unless url.match(/^http:?/)
-        uri = URI.parse(url)
+    def valid_index_for(job, index, options = {})
+      index = '0' if job_unique_in_deployment?(job)
+      err('You should specify the job index. There is more than one instance of this job type.') if index.nil?
+      index = index.to_i if options[:integer_index]
+      index
+    end
 
-        if port = url.match(/:(\d+)$/)
-          port_number = port.captures[0].to_i
-          if port_number == URI::HTTPS::DEFAULT_PORT
-            uri.to_s + ":#{URI::HTTPS::DEFAULT_PORT}"
-          else
-            uri.port = port_number
-            uri.to_s
-          end
+    def normalize_url(url)
+      url = url.gsub(/\/$/, '')
+      url = "https://#{url}" unless url.match(/^http:?/)
+      uri = URI.parse(url)
+
+      if port = url.match(/:(\d+)$/)
+        port_number = port.captures[0].to_i
+        if port_number == URI::HTTPS::DEFAULT_PORT
+          uri.to_s + ":#{URI::HTTPS::DEFAULT_PORT}"
         else
-          uri.port = DEFAULT_DIRECTOR_PORT
+          uri.port = port_number
           uri.to_s
         end
+      else
+        uri.port = DEFAULT_DIRECTOR_PORT
+        uri.to_s
       end
     end
   end
 end
+end

data/lib/cli/client/credentials.rb

@@ -2,12 +2,12 @@ module Bosh
   module Cli
     module Client
       class UaaCredentials
-        def initialize(token)
-          @token = token
+        def initialize(token_provider)
+          @token_provider = token_provider
         end
 
         def authorization_header
-          @token
+          @token_provider.token
         end
       end
 

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

@@ -16,6 +16,13 @@ module Bosh
           end
 
           def client_auth?
+            if @client_id.nil? && !@client_secret.nil?
+              raise ValidationError.new('BOSH_CLIENT is missing')
+            end
+            if @client_secret.nil? && !@client_id.nil?
+              raise ValidationError.new('BOSH_CLIENT_SECRET is missing')
+            end
+
             !@client_id.nil? && !@client_secret.nil?
           end
 
@@ -24,15 +31,15 @@ module Bosh
           end
 
           def url
-            auth_info.fetch('options', {}).fetch('url', nil)
-          end
-
-          def validate!
-            return unless uaa?
+            url = auth_info.fetch('options', {}).fetch('url', nil)
 
-            unless URI.parse(url).instance_of?(URI::HTTPS)
-              raise ValidationError.new('HTTPS protocol is required')
+            if url
+              unless URI.parse(url).instance_of?(URI::HTTPS)
+                raise ValidationError.new('HTTPS protocol is required')
+              end
             end
+
+            url
           end
 
           private

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

@@ -15,8 +15,6 @@ module Bosh
           end
 
           def access_info(_)
-            @auth_info.validate!
-
             token = token_issuer.client_credentials_grant
             ClientAccessInfo.new(token, @token_decoder)
           end

data/lib/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2982.0
+  version: 1.2983.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 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.2982.0
+        version: 1.2983.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2982.0
+        version: 1.2983.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2982.0
+        version: 1.2983.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2982.0
+        version: 1.2983.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.2982.0
+        version: 1.2983.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2982.0
+        version: 1.2983.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  30e5c6
+  71d152
 email: support@cloudfoundry.com
 executables:
 - bosh