bosh_cli 1.2891.0 → 1.2902.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b313380c45d38aa82a3f8091a13dc1cdd69dfbe
-  data.tar.gz: 7f000f6fd769d7db14f82aee761352773f428f71
+  metadata.gz: 19c9cd4f833a3224f4d43207e1c66cfe52920a65
+  data.tar.gz: 59021c4b5c48314318d6b9607c80ed04ed62db01
 SHA512:
-  metadata.gz: feb792be9ea7cb30d37f601a76a43913d6f79b4c306ec974ec718d1e18db95e95552eb12fc536dc522873d5d6552657b36c0d03913c86f04aa6dfe4bb1504bc1
-  data.tar.gz: 51e41427c1c775537034fee707b641bc2d06ab8e0473d1dcaca2b58cfeadd6fca277e071376c5d392eb7e9e6baf9379077ad6c0063f9669679fb30baff1b4bd0
+  metadata.gz: 76e5c79e0300f5359af52aea8fa6b407c6245154888c9cb4eaf74fe056545240e940f3c07e48a4a0ed0a7abc58077732bbf5b3311b33cd94403969a79a2028fb
+  data.tar.gz: 3946323d25b1b5d95c7b5b10c9c8427a10c1f19d8f62c740c64cc011e02b403479f7e3995307998f6c302359eec1043339ef774ad3785a9fbe88783be4c006c4

data/lib/cli.rb

@@ -61,6 +61,7 @@ require 'cli/deployment_helper'
 require 'cli/validation'
 require 'cli/stemcell'
 require 'cli/client/director'
+require 'cli/client/credentials'
 require 'cli/director_task'
 
 require 'cli/line_wrap'
@@ -89,6 +90,7 @@ require 'cli/deployment_manifest_compiler'
 require 'cli/task_tracking'
 
 require 'cli/release'
+require 'cli/release_archiver'
 require 'cli/release_builder'
 require 'cli/release_compiler'
 require 'cli/release_tarball'

data/lib/cli/base_command.rb

@@ -42,7 +42,7 @@ module Bosh::Cli
 
       def director
         @director ||= Bosh::Cli::Client::Director.new(
-            target, username, password, @options.select { |k, _| k == :no_track })
+            target, credentials, @options.select { |k, _| k == :no_track })
       end
 
       def release
@@ -64,7 +64,7 @@ module Bosh::Cli
       end
 
       def logged_in?
-        !!(username && password)
+        !!(credentials)
       end
 
       def non_interactive?
@@ -101,14 +101,15 @@ module Bosh::Cli
         options[:deployment] || config.deployment
       end
 
-      # @return [String] Director username
-      def username
-        options[:username] || ENV['BOSH_USER'] || config.username(target)
-      end
+      def credentials
+        auth_token = config.token(target)
+        return Bosh::Cli::Client::UaaCredentials.new(auth_token) if auth_token
 
-      # @return [String] Director password
-      def password
-        options[:password] || ENV['BOSH_PASSWORD'] || config.password(target)
+        if username && password
+          return Bosh::Cli::Client::BasicCredentials.new(username, password)
+        end
+
+        nil
       end
 
       def target_name
@@ -121,6 +122,16 @@ module Bosh::Cli
 
       protected
 
+      # @return [String] Director username
+      def username
+        options[:username] || ENV['BOSH_USER'] || config.username(target)
+      end
+
+      # @return [String] Director password
+      def password
+        options[:password] || ENV['BOSH_PASSWORD'] || config.password(target)
+      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

data/lib/cli/{login_service.rb → basic_login_strategy.rb}

@@ -1,10 +1,9 @@
-require 'highline'
 require 'cli/core_ext'
 require 'cli/errors'
 
 module Bosh
   module Cli
-    class LoginService
+    class BasicLoginStrategy
       def initialize(terminal, director, config, interactive)
         @terminal = terminal
         @director = director
@@ -19,19 +18,22 @@ module Bosh
         end
 
         if username.blank? || password.blank?
-          raise Bosh::Cli::CliError.new("Please provide username and password")
+          err("Please provide username and password")
         end
 
         if @director.login(username, password)
           @terminal.say_green("Logged in as `#{username}'")
-          @config.set_credentials(target, username, password)
+          @config.set_credentials(target, {
+              "username" => username,
+              "password" => password
+            })
           @config.save
         else
           if @interactive
             @terminal.say_red("Cannot log in as `#{username}', please try again")
             login(target, username, '')
           else
-            raise Bosh::Cli::CliError.new("Cannot log in as `#{username}'")
+            err("Cannot log in as `#{username}'")
           end
         end
       end

data/lib/cli/client/credentials.rb

@@ -0,0 +1,26 @@
+module Bosh
+  module Cli
+    module Client
+      class UaaCredentials
+        def initialize(token)
+          @token = token
+        end
+
+        def authorization_header
+          @token
+        end
+      end
+
+      class BasicCredentials
+        def initialize(username, password)
+          @username = username
+          @password = password
+        end
+
+        def authorization_header
+          'Basic ' + Base64.encode64("#{@username}:#{@password}").strip
+        end
+      end
+    end
+  end
+end

data/lib/cli/client/director.rb

@@ -19,16 +19,10 @@ module Bosh
 
         attr_reader :director_uri
 
-        # @return [String]
-        attr_accessor :user
-
-        # @return [String]
-        attr_accessor :password
-
         # Options can include:
         # * :no_track => true - do not use +TaskTracker+ for long-running
         #                       +request_and_track+ calls
-        def initialize(director_uri, user = nil, password = nil, options = {})
+        def initialize(director_uri, credentials = nil, options = {})
           if director_uri.nil? || director_uri =~ /^\s*$/
             raise DirectorMissing, 'no director URI given'
           end
@@ -37,8 +31,7 @@ module Bosh
           @director_ip         = Resolv.getaddresses(@director_uri.host).last
           @scheme              = @director_uri.scheme
           @port                = @director_uri.port
-          @user                = user
-          @password            = password
+          @credentials         = credentials
           @track_tasks         = !options.delete(:no_track)
           @num_retries         = options.fetch(:num_retries, 5)
           @retry_wait_interval = options.fetch(:retry_wait_interval, 5)
@@ -65,12 +58,13 @@ module Bosh
         end
 
         def login(username, password)
-          self.user = username
-          self.password = password
+          @credentials = BasicCredentials.new(username, password)
           authenticated?
         end
 
         def authenticated?
+          # getting status verifies credentials
+          # if credentials are wrong it will raise DirectorError
           status = get_status
           # Backward compatibility: older directors return 200
           # only for logged in users
@@ -684,11 +678,8 @@ module Bosh
           http_client.ssl_config.verify_mode     = OpenSSL::SSL::VERIFY_NONE
           http_client.ssl_config.verify_callback = Proc.new {}
 
-          # HTTPClient#set_auth doesn't seem to work properly,
-          # injecting header manually instead.
-          if @user && @password
-            headers['Authorization'] = 'Basic ' +
-              Base64.encode64("#{@user}:#{@password}").strip
+          if @credentials
+            headers['Authorization'] = @credentials.authorization_header
           end
 
           http_client.request(method, uri, {
@@ -712,7 +703,7 @@ module Bosh
 
         # HTTPClient doesn't have a root exception but instead subclasses RuntimeError
         rescue RuntimeError => e
-          puts "Perform request #{method}, #{uri}, #{headers.inspect}, #{payload.inspect}"
+          say("Perform request #{method}, #{uri}, #{headers.inspect}, #{payload.inspect}")
           err("REST API call exception: #{e}")
         end
 

data/lib/cli/client/uaa.rb

@@ -0,0 +1,48 @@
+require 'uaa'
+require 'uri'
+
+module Bosh
+  module Cli
+    module Client
+      class Uaa
+        def initialize(options, ssl_ca_file)
+          url = options.fetch('url')
+          unless URI.parse(url).instance_of?(URI::HTTPS)
+            err('Failed to connect to UAA, HTTPS protocol is required')
+          end
+          @ssl_ca_file = ssl_ca_file
+          @token_issuer = CF::UAA::TokenIssuer.new(url, 'bosh_cli', nil, { ssl_ca_file: ssl_ca_file })
+        end
+
+        def prompts
+          @token_issuer.prompts.map do |field, (type, display_text)|
+            Prompt.new(field, type, display_text)
+          end
+        rescue CF::UAA::SSLException => e
+          raise e unless @ssl_ca_file.nil?
+          err('Invalid SSL Cert. Use --ca-cert to specify SSL certificate')
+        end
+
+        def login(credentials)
+          token = @token_issuer.implicit_grant_with_creds(credentials)
+          if token
+            decoded = CF::UAA::TokenCoder.decode(
+              token.info['access_token'],
+              { verify: false }, # token signature not verified because CLI doesn't have the secret key
+              nil, nil)
+            full_token = "#{token.info['token_type']} #{token.info['access_token']}"
+            { username: decoded['user_name'], token: full_token }
+          end
+        rescue CF::UAA::BadResponse
+          nil
+        end
+
+        class Prompt < Struct.new(:field, :type, :display_text)
+          def password?
+            type == 'password'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cli/commands/deployment.rb

@@ -32,7 +32,7 @@ module Bosh::Cli::Command
       end
 
       if target
-        old_director = Bosh::Cli::Client::Director.new(target, username, password)
+        old_director = Bosh::Cli::Client::Director.new(target, credentials)
         old_director_uuid = old_director.get_status["uuid"] rescue nil
       else
         old_director_uuid = nil
@@ -51,7 +51,7 @@ module Bosh::Cli::Command
         end
 
         new_director = Bosh::Cli::Client::Director.new(
-          new_target_url, username, password)
+          new_target_url, credentials)
 
         status = new_director.get_status
 

data/lib/cli/commands/login.rb

@@ -1,35 +1,51 @@
+require 'cli/basic_login_strategy'
+require 'cli/uaa_login_strategy'
+require 'cli/client/uaa'
 require 'cli/terminal'
-require 'cli/login_service'
 
 module Bosh::Cli::Command
   class Login < Base
     # bosh login
-    usage "login"
-    desc  "Log in to currently targeted director. " +
-          "The username and password can also be " +
-          "set in the BOSH_USER and BOSH_PASSWORD " +
-          "environment variables."
+    usage 'login'
+    desc  'Log in to currently targeted director. ' +
+        'The username and password can also be ' +
+        'set in the BOSH_USER and BOSH_PASSWORD ' +
+        'environment variables.'
+    option '--ca-cert FILE', String, 'Path to client certificate provided to UAA server'
     def login(username = nil, password = nil)
       target_required
 
-      terminal = Bosh::Cli::Terminal.new(HighLine.new)
-      Bosh::Cli::LoginService.new(terminal, director, config, interactive?).login(target, username.to_s, password.to_s)
+      login_strategy(director_info).login(target, username.to_s, password.to_s)
     end
 
     # bosh logout
-    usage "logout"
-    desc  "Forget saved credentials for targeted director"
+    usage 'logout'
+    desc 'Forget saved credentials for targeted director'
     def logout
       target_required
-      config.set_credentials(target, nil, nil)
+      config.set_credentials(target, nil)
       config.save
       say("You are no longer logged in to `#{target}'".make_yellow)
     end
 
     private
 
-    def get_director_status
-      Bosh::Cli::Client::Director.new(target).get_status
+    def director_info
+      director.get_status
+    rescue Bosh::Cli::AuthError
+      {}
+    end
+
+    def login_strategy(director_info)
+      terminal = Bosh::Cli::Terminal.new(HighLine.new, BoshExtensions)
+      auth_info = director_info.fetch('user_authentication', {})
+
+      if auth_info['type'] == 'uaa'
+        uaa = Bosh::Cli::Client::Uaa.new(auth_info['options'], options[:ca_cert])
+        Bosh::Cli::UaaLoginStrategy.new(terminal, uaa, config, interactive?)
+      else
+        Bosh::Cli::BasicLoginStrategy.new(terminal, director, config, interactive?)
+      end
     end
   end
 end

data/lib/cli/commands/misc.rb

@@ -33,7 +33,7 @@ module Bosh::Cli::Command
             print_value("Name", status["name"])
             print_value("URL", target_url)
             print_value("Version", status["version"])
-            print_value("User", username, "not logged in")
+            print_value("User", status["user"], "not logged in")
             print_value("UUID", status["uuid"])
             print_value("CPI", status["cpi"], "n/a")
             print_feature_list(status["features"]) if status["features"]
@@ -66,6 +66,7 @@ module Bosh::Cli::Command
     usage "target"
     desc  "Choose director to talk to (optionally creating an alias). " +
           "If no arguments given, show currently targeted director"
+    option '--ca-cert FILE', String, 'Path to client certificate provided to UAA server'
     def set_target(director_url = nil, name = nil)
       if director_url.nil?
         show_target
@@ -234,7 +235,7 @@ module Bosh::Cli::Command
     end
 
     def get_director_status
-      Bosh::Cli::Client::Director.new(target).get_status
+      Bosh::Cli::Client::Director.new(target, credentials).get_status
     end
   end
 end

data/lib/cli/commands/release/create_release.rb

@@ -251,10 +251,10 @@ module Bosh::Cli::Command
           end
         end
 
-        if builder.license_artifact
+        if builder.license
           license_table = table do |t|
             t.headings = %w(Name Version Notes)
-            t << artifact_summary(builder.license_artifact)
+            t << artifact_summary(builder.license)
           end
 
           say('License')

data/lib/cli/config.rb

@@ -70,12 +70,9 @@ module Bosh::Cli
       end
     end
 
-    def set_credentials(target, username, password)
+    def set_credentials(target, credentials)
       @config_file["auth"] ||= {}
-      @config_file["auth"][target] = {
-        "username" => username,
-        "password" => password
-      }
+      @config_file["auth"][target] = credentials
     end
 
     def set_alias(category, alias_name, value)
@@ -118,6 +115,12 @@ module Bosh::Cli
       credentials_for(target)["password"]
     end
 
+    # @param [String] target Target director url
+    # @return [String] Token associated with target
+    def token(target)
+      credentials_for(target)["token"]
+    end
+
     # Deployment used to be a string that was only stored for your
     # current target. As soon as you switched targets, the deployment
     # was erased. If the user has the old config we convert it to the

data/lib/cli/release_archiver.rb

@@ -0,0 +1,63 @@
+module Bosh::Cli
+  class ReleaseArchiver
+    attr_reader :filepath
+
+    def initialize(filepath, manifest, packages, jobs, license = nil)
+      @filepath = filepath
+      @manifest = manifest
+      @packages = packages
+      @jobs = jobs
+      @license = license
+
+      @build_dir = Dir.mktmpdir
+    end
+
+    def build
+      FileUtils.copy(manifest, File.join(build_dir, 'release.MF'), :preserve => true)
+
+      packages_dir = FileUtils.mkdir_p(File.join(build_dir, 'packages'))
+      header("Copying packages")
+      packages.each do |package|
+        say(package.name.make_green)
+        FileUtils.copy(package.tarball_path, File.join(packages_dir, "#{package.name}.tgz"), :preserve => true)
+      end
+      nl
+
+      jobs_dir = FileUtils.mkdir_p(File.join(build_dir, 'jobs'))
+      header("Copying jobs")
+      jobs.each do |job|
+        say(job.name.make_green)
+        FileUtils.copy(job.tarball_path, File.join(jobs_dir, "#{job.name}.tgz"), :preserve => true)
+      end
+      nl
+
+      if license
+        header("Copying license")
+        say("license".make_green)
+        nl
+        `tar -xzf #{license.tarball_path} -C #{build_dir} 2>&1`
+        unless $?.exitstatus == 0
+          raise InvalidRelease, "Cannot extract license tarball"
+        end
+      end
+
+      in_build_dir do
+        `tar -czf #{filepath} . 2>&1`
+        unless $?.exitstatus == 0
+          raise InvalidRelease, "Cannot create release tarball"
+        end
+        say("Generated #{filepath.make_green}")
+        say("Release size: #{pretty_size(filepath).make_green}")
+      end
+    end
+
+    private
+
+    attr_reader :manifest, :packages, :jobs, :license, :build_dir
+
+    def in_build_dir(&block)
+      Dir.chdir(build_dir) { yield }
+    end
+
+  end
+end

data/lib/cli/release_builder.rb

@@ -4,7 +4,7 @@ module Bosh::Cli
 
     attr_reader(
       :release,
-      :license_artifact,
+      :license,
       :packages,
       :jobs,
       :name,
@@ -25,7 +25,7 @@ module Bosh::Cli
       @uncommitted_changes = options.fetch(:uncommitted_changes, true)
       @packages = package_artifacts # todo
       @jobs = job_artifacts # todo
-      @license_artifact = license_artifact
+      @license = license_artifact
       @name = name
       raise 'Release name is blank' if name.blank?
 
@@ -87,10 +87,9 @@ module Bosh::Cli
       options = { :generate_tarball => true }.merge(options)
 
       header("Generating manifest...")
-      generate_manifest
+      manifest_path = generate_manifest
       if options[:generate_tarball]
-        header("Generating tarball...")
-        generate_tarball
+        generate_tarball(manifest_path)
       end
       @build_complete = true
     end
@@ -117,11 +116,11 @@ module Bosh::Cli
         }
       end
 
-      unless @license_artifact.nil?
+      unless @license.nil?
         manifest['license'] = {
-          'version' => @license_artifact.version,
-          'fingerprint' => @license_artifact.fingerprint,
-          'sha1' => @license_artifact.sha1,
+          'version' => @license.version,
+          'fingerprint' => @license.fingerprint,
+          'sha1' => @license.sha1,
         }
       end
 
@@ -150,25 +149,15 @@ module Bosh::Cli
       end
 
       @manifest_generated = true
+      manifest_path
     end
 
-    def generate_tarball
-      generate_manifest unless @manifest_generated
+    def generate_tarball(manifest_path = nil)
+      manifest_path ||= generate_manifest
       return if @release_storage.has_file?(release_filename)
 
-      copy_jobs
-      copy_packages
-      copy_license
-
-      FileUtils.mkdir_p(File.dirname(tarball_path))
-
-      in_build_dir do
-        `tar -czf #{tarball_path} . 2>&1`
-        unless $?.exitstatus == 0
-          raise InvalidRelease, "Cannot create release tarball"
-        end
-        say("Generated #{tarball_path}")
-      end
+      archiver = ReleaseArchiver.new(tarball_path, manifest_path, packages, jobs, license)
+      archiver.build
     end
 
     def releases_dir
@@ -202,44 +191,6 @@ module Bosh::Cli
       nl
     end
 
-    # Copies jobs into release todo DRY vs copy_packages
-    def copy_jobs
-      header("Copying jobs...")
-      jobs.each do |job_artifact|
-        copy_artifact(job_artifact, 'jobs')
-      end
-      nl
-    end
-
-    def copy_license
-      return if @license_artifact.nil?
-
-      header("Copying license...")
-      copied = copy_artifact(@license_artifact)
-      extract_license(copied)
-      nl
-    end
-
-    def copy_artifact(artifact, dest = nil)
-      name = artifact.name
-      source_path = artifact.tarball_path
-      output_path = File.join([build_dir, dest, "#{name}.tgz"].compact)
-
-      say("%-40s %s" % [name.make_green, pretty_size(tarball_path)])
-      FileUtils.cp(source_path, output_path, :preserve => true)
-
-      output_path
-    end
-
-    def extract_license(tarball_path)
-      return if @license_artifact.nil?
-
-      in_build_dir do
-        `tar -xzf #{tarball_path} 2>&1`
-        `rm #{tarball_path} 2>&1`
-      end
-    end
-
     def assign_version
       latest_final_version = Versions::ReleaseVersionsIndex.new(@final_index).latest_version
       latest_final_version ||= Bosh::Common::Version::ReleaseVersion.parse('0')

data/lib/cli/release_compiler.rb

@@ -20,7 +20,7 @@ module Bosh::Cli
 
       @blobstore = blobstore
       @release_source = release_source || Dir.pwd
-      @manifest_file = File.expand_path(manifest_file, @release_source)
+      @manifest_path = File.expand_path(manifest_file, @release_source)
       @tarball_path = nil
 
       @artifacts_dir = artifacts_dir
@@ -42,58 +42,26 @@ module Bosh::Cli
       @license = @manifest["license"] ? OpenStruct.new(@manifest["license"]) : nil
     end
 
+    def artifact_from(resource, type)
+      return nil unless resource
+      BuildArtifact.new(resource.name, resource.fingerprint, send(:"find_#{type}", resource), resource.sha1, [], nil, nil)
+    end
+
     def compile
       if exists?
         quit("You already have this version in `#{tarball_path.make_green}'")
       end
 
-      FileUtils.cp(@manifest_file, File.join(@build_dir, "release.MF"), :preserve => true)
-
-      header("Copying packages")
-      @packages.each do |package|
-        say("#{package.name} (#{package.version})".ljust(30), " ")
-        if remote_package_exists?(package)
-          say("SKIP".make_yellow)
-          next
-        end
-        nl
-        package_file_path = find_package(package)
-        FileUtils.cp(package_file_path,
-                     File.join(@packages_dir, "#{package.name}.tgz"),
-                     :preserve => true)
-      end
-
-      header("Copying jobs")
-      @jobs.each do |job|
-        say("#{job.name} (#{job.version})".ljust(30), " ")
-        if remote_job_exists?(job)
-          say("SKIP".make_yellow)
-          next
-        end
-        nl
-        job_file_path = find_job(job)
-        FileUtils.cp(job_file_path,
-                     File.join(@jobs_dir, "#{job.name}.tgz"),
-                     :preserve => true)
-      end
-
-      header("Copying license")
-      if @license
-        say("license (#{@license.version})".ljust(30), " ")
-        nl
-        license_file_path = find_license(@license)
-        FileUtils.cp(license_file_path, File.join(@build_dir, 'license.tgz'), preserve: true)
-      end
+      packages = @packages
+        .reject { |package| remote_package_exists?(package) }
+        .map { |package| artifact_from(package, :package) }
+      jobs = @jobs
+        .reject { |job| remote_job_exists?(job) }
+        .map { |job| artifact_from(job, :job) }
+      license = artifact_from(@license, :license)
 
-      header("Building tarball")
-      Dir.chdir(@build_dir) do
-        tar_out = `tar -czf #{tarball_path} . 2>&1`
-        unless $?.exitstatus == 0
-          raise InvalidRelease, "Cannot create release tarball: #{tar_out}"
-        end
-        say("Generated #{tarball_path.make_green}")
-        say("Release size: #{pretty_size(tarball_path).make_green}")
-      end
+      archiver = ReleaseArchiver.new(tarball_path, @manifest_path, packages, jobs, license)
+      archiver.build
     end
 
     def exists?
@@ -101,7 +69,7 @@ module Bosh::Cli
     end
 
     def tarball_path
-      @tarball_path || File.join(File.dirname(@manifest_file),
+      @tarball_path || File.join(File.dirname(@manifest_path),
                                  "#{@name}-#{@version}.tgz")
     end
 

data/lib/cli/terminal.rb

@@ -3,8 +3,9 @@ module Bosh
     class Terminal
       extend Forwardable
 
-      def initialize(highline)
+      def initialize(highline, sayer)
         @highline = highline
+        @sayer = sayer
       end
 
       def ask(prompt)
@@ -16,15 +17,15 @@ module Bosh
       end
 
       def say_green(message)
-        highline.say(message.make_green)
+        sayer.say(message.make_green)
       end
 
       def say_red(message)
-        highline.say(message.make_red)
+        sayer.say(message.make_red)
       end
 
       private
-      attr_reader :highline
+      attr_reader :highline, :sayer
     end
   end
 end

data/lib/cli/uaa_login_strategy.rb

@@ -0,0 +1,38 @@
+require 'cli/core_ext'
+require 'cli/errors'
+
+module Bosh
+  module Cli
+    class UaaLoginStrategy
+      def initialize(terminal, uaa, config, interactive)
+        @terminal = terminal
+        @uaa = uaa
+        @config = config
+        @interactive = interactive
+      end
+
+      def login(target, username = nil, password = nil)
+        if @interactive
+          credentials = {}
+          @uaa.prompts.map do |prompt|
+            if prompt.password?
+              credentials[prompt.field] = @terminal.ask_password("#{prompt.display_text}: ")
+            else
+              credentials[prompt.field] = @terminal.ask("#{prompt.display_text}: ")
+            end
+          end
+
+          if results = @uaa.login(credentials)
+            @terminal.say_green("Logged in as `#{results[:username]}'")
+            @config.set_credentials(target, { 'token' => results[:token] })
+            @config.save
+          else
+            err('Failed to log in')
+          end
+        else
+          err('Non-interactive UAA login is not supported.')
+        end
+      end
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2891.0'
+    VERSION = '1.2902.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2891.0
+  version: 1.2902.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
+- !ruby/object:Gem::Dependency
+  name: cf-uaa-lib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  1d294c
+  ac0a41
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -306,12 +320,15 @@ files:
 - lib/cli/archive_repository_provider.rb
 - lib/cli/backup_destination_path.rb
 - lib/cli/base_command.rb
+- lib/cli/basic_login_strategy.rb
 - lib/cli/blob_manager.rb
 - lib/cli/build_artifact.rb
 - lib/cli/changeset_helper.rb
 - lib/cli/client/compiled_packages_client.rb
+- lib/cli/client/credentials.rb
 - lib/cli/client/director.rb
 - lib/cli/client/errands_client.rb
+- lib/cli/client/uaa.rb
 - lib/cli/command_discovery.rb
 - lib/cli/command_handler.rb
 - lib/cli/commands/backup.rb
@@ -365,7 +382,6 @@ files:
 - lib/cli/job_property_validator.rb
 - lib/cli/job_state.rb
 - lib/cli/line_wrap.rb
-- lib/cli/login_service.rb
 - lib/cli/logs_downloader.rb
 - lib/cli/manifest_warnings.rb
 - lib/cli/name_version_pair.rb
@@ -374,6 +390,7 @@ files:
 - lib/cli/public_stemcell_presenter.rb
 - lib/cli/public_stemcells.rb
 - lib/cli/release.rb
+- lib/cli/release_archiver.rb
 - lib/cli/release_builder.rb
 - lib/cli/release_compiler.rb
 - lib/cli/release_tarball.rb
@@ -394,6 +411,7 @@ files:
 - lib/cli/task_tracking/task_tracker.rb
 - lib/cli/task_tracking/total_duration.rb
 - lib/cli/terminal.rb
+- lib/cli/uaa_login_strategy.rb
 - lib/cli/validation.rb
 - lib/cli/version.rb
 - lib/cli/versions/local_artifact_storage.rb