bosh_cli 1.2905.0 → 1.2915.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de2564930c27f2fd9d359408cf6db62f24b3fa4d
-  data.tar.gz: ee4c60205ad3c57171787bd1d596c34a499875ba
+  metadata.gz: f02ca6ddc4de5ea51002e19c5314b45f662f3e2e
+  data.tar.gz: f3530d1248685f5a1bfb405fb54f1e13bcf83d6b
 SHA512:
-  metadata.gz: 17e44063a1bf787858122d8631f2b3107e00b33cb6215adca4cb5fa1ef8db197c43e11ed6fecb9979867b8940c6580405e69474851ed885bc7bedb1dec1027d6
-  data.tar.gz: cbc4ec1c66b8ff81d5abb5a21c316c7283935075d2647e4b387fbcb4c06534502d5100558e0dba5a1c62e0dc527356e6db3c893644e95bc079aff4ace556e4e3
+  metadata.gz: 27e826747db64b638d5b1d1552ee50b03673de1d26caf411c628bc5d2b38b72f98538965e9e6003ac76215bfc721e995aa9de26a073124577a674a12d1dd2b14
+  data.tar.gz: 31c09e5037914052a47a58b472e4b4005c9d982c165f1122a413b4108e0ffc78d361ab61dbf718888b9a1dc20899e52fcf6df24226eff4cd1b50b62d752921f9

data/lib/cli/client/director.rb

@@ -1,6 +1,6 @@
-# Copyright (c) 2009-2012 VMware, Inc.
 require 'cli/core_ext'
 require 'cli/errors'
+require 'cli/cloud_config'
 
 require 'json'
 require 'httpclient'
@@ -529,11 +529,6 @@ module Bosh
           get_json('/locks')
         end
 
-        [:post, :put, :get, :delete].each do |method_name|
-          define_method method_name do |*args|
-            request(method_name, *args)
-          end
-        end
 
         # Perform director HTTP request and track director task (if request
         # started one).
@@ -578,6 +573,38 @@ module Bosh
           file.stop_progress_bar if file
         end
 
+        def get_cloud_config
+          _, cloud_configs = get_json_with_status('/cloud_configs?limit=1')
+          latest = cloud_configs.first
+
+          if !latest.nil?
+            Bosh::Cli::CloudConfig.new(
+              properties: latest["properties"],
+              created_at: latest["created_at"])
+          end
+        end
+
+        def update_cloud_config(cloud_config_yaml)
+          status, _ = post('/cloud_configs', 'text/yaml', cloud_config_yaml)
+          status == 201
+        end
+
+        def post(uri, content_type = nil, payload = nil, headers = {}, options = {})
+          request(:post, uri, content_type, payload, headers, options)
+        end
+
+        def put(uri, content_type = nil, payload = nil, headers = {}, options = {})
+          request(:put, uri, content_type, payload, headers, options)
+        end
+
+        def get(uri, content_type = nil, payload = nil, headers = {}, options = {})
+          request(:get, uri, content_type, payload, headers, options)
+        end
+
+        def delete(uri, content_type = nil, payload = nil, headers = {}, options = {})
+          request(:delete, uri, content_type, payload, headers, options)
+        end
+
         private
 
         def director_name

data/lib/cli/client/uaa.rb

@@ -1,99 +1,38 @@
 require 'uaa'
 require 'uri'
+require 'cli/client/uaa/client_token_issuer'
+require 'cli/client/uaa/password_token_issuer'
+require 'cli/client/uaa/token_decoder'
 
 module Bosh
   module Cli
     module Client
-      class Uaa
-        class AccessInfo < Struct.new(:username, :token); end
-
-        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_decoder = TokenDecoder.new
-          if ENV['BOSH_CLIENT'] && ENV['BOSH_CLIENT_SECRET']
-            @token_issuer = ClientTokenIssuer.new(url, ssl_ca_file, token_decoder)
-          else
-            @token_issuer = PasswordTokenIssuer.new(url, ssl_ca_file, token_decoder)
-          end
-        end
-
-        def prompts
-          @token_issuer.prompts
-        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_issuer.access_info(credentials)
-        rescue CF::UAA::TargetError => e
-          err("Failed to log in: #{e.info['error_description']}")
-        rescue CF::UAA::BadResponse
-          nil
-        end
-
-        private
-
-        class ClientTokenIssuer
-          def initialize(url, ssl_ca_file, token_decoder)
-            @token_issuer = CF::UAA::TokenIssuer.new(url, ENV['BOSH_CLIENT'], ENV['BOSH_CLIENT_SECRET'], {ssl_ca_file: ssl_ca_file})
-            @token_decoder = token_decoder
-          end
-
-          def prompts
-            {}
-          end
-
-          def access_info(_)
-            token = @token_issuer.client_credentials_grant
-            decoded = @token_decoder.decode(token)
-
-            username = decoded['client_id'] if decoded
-            AccessInfo.new(username, nil)
-          end
-        end
-
-        class PasswordTokenIssuer
-          def initialize(url, ssl_ca_file, token_decoder)
-            @token_issuer = CF::UAA::TokenIssuer.new(url, 'bosh_cli', nil, {ssl_ca_file: ssl_ca_file})
-            @token_decoder = token_decoder
-          end
-
-          def prompts
-            @token_issuer.prompts.map do |field, (type, display_text)|
-              Prompt.new(field, type, display_text)
+      module Uaa
+        class Client
+          def initialize(options)
+            token_decoder = TokenDecoder.new
+            if options.client_auth?
+              token_issuer = ClientTokenIssuer.new(options, token_decoder)
+            else
+              token_issuer = PasswordTokenIssuer.new(options, token_decoder)
             end
+            @ssl_ca_file = options.ssl_ca_file
+            @token_issuer = token_issuer
           end
 
-          def access_info(credentials)
-            credentials = credentials.select { |_, c| !c.empty? }
-            token = @token_issuer.owner_password_credentials_grant(credentials)
-            decoded = @token_decoder.decode(token)
-
-            username = decoded['user_name'] if decoded
-            access_token = "#{token.info['token_type']} #{token.info['access_token']}"
-
-            AccessInfo.new(username, access_token)
-          end
-        end
-
-        class Prompt < Struct.new(:field, :type, :display_text)
-          def password?
-            type == 'password'
-          end
-        end
-
-        class TokenDecoder
-          def decode(token)
-            CF::UAA::TokenCoder.decode(
-              token.info['access_token'],
-              {verify: false}, # token signature not verified because CLI doesn't have the secret key
-              nil, nil)
+          def prompts
+            @token_issuer.prompts
+          rescue CF::UAA::SSLException => e
+            raise e unless @ssl_ca_file.nil?
+            err('Invalid SSL Cert. Use --ca-cert to specify SSL certificate') #FIXME: the uaa client shouldn't know about 'err'
+          end
+
+          def login(credentials)
+            @token_issuer.access_info(credentials)
+          rescue CF::UAA::TargetError => e
+            err("Failed to log in: #{e.info['error_description']}") #FIXME: the uaa client shouldn't know about 'err'
+          rescue CF::UAA::BadResponse
+            nil
           end
         end
       end

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

@@ -0,0 +1,9 @@
+module Bosh
+  module Cli
+    module Client
+      module Uaa
+        class AccessInfo < Struct.new(:username, :token); end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Bosh
+  module Cli
+    module Client
+      module Uaa
+        class ClientTokenIssuer
+          def initialize(options, token_decoder)
+            @token_issuer = CF::UAA::TokenIssuer.new(options.url, options.client_id, options.client_secret, {ssl_ca_file: options.ssl_ca_file})
+            @token_decoder = token_decoder
+          end
+
+          def prompts
+            {}
+          end
+
+          def access_info(_)
+            token = @token_issuer.client_credentials_grant
+            decoded = @token_decoder.decode(token)
+
+            username = decoded['client_id'] if decoded
+            AccessInfo.new(username, nil)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+require 'cli/errors'
+
+module Bosh
+  module Cli
+    module Client
+      module Uaa
+        class Options < Struct.new(:url, :ssl_ca_file, :client_id, :client_secret)
+          class ValidationError < Bosh::Cli::CliError; end
+
+          def self.parse(cli_options, auth_options, env)
+            url = auth_options.fetch('url')
+            ssl_ca_file = cli_options[:ca_cert]
+            client_id, client_secret = env['BOSH_CLIENT'], env['BOSH_CLIENT_SECRET']
+
+            options = new(url, ssl_ca_file, client_id, client_secret)
+            options.validate!
+            options
+          end
+
+          def client_auth?
+            !client_id.nil? && !client_secret.nil?
+          end
+
+          def validate!
+            unless URI.parse(url).instance_of?(URI::HTTPS)
+              raise ValidationError.new('HTTPS protocol is required')
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,35 @@
+require 'uaa'
+require 'cli/client/uaa/prompt'
+require 'cli/client/uaa/access_info'
+
+module Bosh
+  module Cli
+    module Client
+      module Uaa
+        class PasswordTokenIssuer
+          def initialize(options, token_decoder)
+            @token_issuer = CF::UAA::TokenIssuer.new(options.url, 'bosh_cli', nil, {ssl_ca_file: options.ssl_ca_file})
+            @token_decoder = token_decoder
+          end
+
+          def prompts
+            @token_issuer.prompts.map do |field, (type, display_text)|
+              Prompt.new(field, type, display_text)
+            end
+          end
+
+          def access_info(credentials)
+            credentials = credentials.select { |_, c| !c.empty? }
+            token = @token_issuer.owner_password_credentials_grant(credentials)
+            decoded = @token_decoder.decode(token)
+
+            username = decoded['user_name'] if decoded
+            access_token = "#{token.info['token_type']} #{token.info['access_token']}"
+
+            AccessInfo.new(username, access_token)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Bosh
+  module Cli
+    module Client
+      module Uaa
+        class Prompt < Struct.new(:field, :type, :display_text)
+          def password?
+            type == 'password'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Bosh
+  module Cli
+    module Client
+      module Uaa
+        class TokenDecoder
+          def decode(token)
+            CF::UAA::TokenCoder.decode(
+              token.info['access_token'],
+              {verify: false}, # token signature not verified because CLI doesn't have the secret key
+              nil, nil)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cli/cloud_config.rb

@@ -0,0 +1,10 @@
+module Bosh
+  module Cli
+    class CloudConfig < Struct.new(:properties, :created_at)
+      def initialize(attrs)
+        self.properties = attrs.fetch(:properties)
+        self.created_at = attrs.fetch(:created_at)
+      end
+    end
+  end
+end

data/lib/cli/commands/cloud_config.rb

@@ -0,0 +1,32 @@
+require 'cli/core_ext'
+
+module Bosh::Cli::Command
+  class CloudConfig < Base
+    usage 'cloud-config'
+    desc 'Download the current cloud config for the director'
+
+    def show
+      auth_required
+
+      config = director.get_cloud_config
+      if !config.nil?
+        say(config.properties)
+      end
+    end
+
+    usage 'update cloud-config'
+    desc 'Update the current cloud config for the director'
+
+    def update(cloud_config_path)
+      auth_required
+
+      cloud_config_yaml = read_yaml_file(cloud_config_path)
+
+      if director.update_cloud_config(cloud_config_yaml)
+        say("Successfully updated cloud config")
+      else
+        err("Failed to update cloud config")
+      end
+    end
+  end
+end

data/lib/cli/commands/login.rb

@@ -1,6 +1,7 @@
 require 'cli/basic_login_strategy'
 require 'cli/uaa_login_strategy'
 require 'cli/client/uaa'
+require 'cli/client/uaa/options'
 require 'cli/terminal'
 
 module Bosh::Cli::Command
@@ -41,11 +42,15 @@ module Bosh::Cli::Command
       auth_info = director_info.fetch('user_authentication', {})
 
       if auth_info['type'] == 'uaa'
-        uaa = Bosh::Cli::Client::Uaa.new(auth_info['options'], options[:ca_cert])
+        client_options = Bosh::Cli::Client::Uaa::Options.parse(options, auth_info['options'], ENV)
+        uaa = Bosh::Cli::Client::Uaa::Client.new(client_options)
         Bosh::Cli::UaaLoginStrategy.new(terminal, uaa, config, interactive?)
       else
         Bosh::Cli::BasicLoginStrategy.new(terminal, director, config, interactive?)
       end
+
+      rescue Bosh::Cli::Client::Uaa::Options::ValidationError => e
+        err("Failed to connect to UAA: #{e.message}")
     end
   end
 end

data/lib/cli/commands/maintenance.rb

@@ -9,12 +9,15 @@ module Bosh::Cli::Command
     # bosh cleanup
     usage 'cleanup'
     desc 'Cleanup releases and stemcells'
+    option '--all', 'Remove all unused releases and stemcells'
     def cleanup
       target_required
       auth_required
 
-      releases_to_keep = RELEASES_TO_KEEP
-      stemcells_to_keep = STEMCELLS_TO_KEEP
+      remove_all = !!options[:all]
+
+      releases_to_keep = remove_all ? 0 : RELEASES_TO_KEEP
+      stemcells_to_keep = remove_all ? 0 : STEMCELLS_TO_KEEP
 
       release_wording = pluralize(releases_to_keep, 'latest version')
       stemcell_wording = pluralize(stemcells_to_keep, 'latest version')
@@ -62,20 +65,18 @@ module Bosh::Cli::Command
           Bosh::Common::Version::StemcellVersion.parse(sc1['version']) <=> Bosh::Common::Version::StemcellVersion.parse(sc2['version'])
         end
 
-        delete_list += sorted_stemcells[0...(-n_to_keep)]
+        delete_list = trim_array(sorted_stemcells, n_to_keep)
       end
 
-      if delete_list.size > 0
-        delete_list.each do |stemcell|
-          name, version = stemcell['name'], stemcell['version']
-          desc = "#{name}/#{version}"
-          perform(desc) do
-            director.delete_stemcell(name, version, :quiet => true)
-          end
+      delete_list.each do |stemcell|
+        name, version = stemcell['name'], stemcell['version']
+        desc = "#{name}/#{version}"
+        perform(desc) do
+          director.delete_stemcell(name, version, :quiet => true)
         end
-      else
-        say('  none found'.make_yellow)
       end
+
+       say('  none found'.make_yellow) if delete_list.size == 0
     end
 
     def cleanup_releases(n_to_keep)
@@ -103,22 +104,24 @@ module Bosh::Cli::Command
         end
         versions = version_tuples.sort_by { |v| v[:parsed] }.map { |v| v[:provided] }
 
-        versions[0...(-n_to_keep)].each do |version|
+        trim_array(versions, n_to_keep).each do |version|
           delete_list << [name, version] unless currently_deployed.include?(version)
         end
       end
 
-      if delete_list.size > 0
-        delete_list.each do |name, version|
-          desc = "#{name}/#{version}"
-          perform(desc) do
-            director.delete_release(name, :force => false,
-                                    :version => version, :quiet => true)
-          end
+      delete_list.each do |name, version|
+        desc = "#{name}/#{version}"
+        perform(desc) do
+          director.delete_release(name, :force => false,
+                                  :version => version, :quiet => true)
         end
-      else
-        say('  none found'.make_yellow)
       end
+
+      say('  none found'.make_yellow) if delete_list.size == 0
+    end
+
+    def trim_array(array, n_to_keep)
+      n_to_keep > 0 ? array[0...(-n_to_keep)] : array
     end
 
     def refresh(message)
@@ -148,6 +151,5 @@ module Bosh::Cli::Command
 
       status == :done
     end
-
   end
 end

data/lib/cli/config.rb

@@ -25,7 +25,7 @@ module Bosh::Cli
     end
 
     @commands = {}
-    @colorize = true
+    @colorize = nil
     @output = nil
     @interactive = false
 

data/lib/cli/core_ext.rb

@@ -66,6 +66,17 @@ module BoshExtensions
   end
 
   def load_yaml_file(path, expected_type = Hash)
+    yaml_str = read_yaml_file(path)
+
+    yaml = Psych::load(yaml_str)
+    if expected_type && !yaml.is_a?(expected_type)
+      err("Incorrect YAML structure in `#{path}': expected #{expected_type} at the root".make_red)
+    end
+
+    yaml
+  end
+
+  def read_yaml_file(path)
     err("Cannot find file `#{path}'".make_red) unless File.exist?(path)
 
     begin
@@ -76,16 +87,10 @@ module BoshExtensions
 
     begin
       Bosh::Cli::YamlHelper.check_duplicate_keys(yaml_str)
-    rescue => e
+    rescue Exception => e # on ruby 1.9.3 Psych::SyntaxError isn't a StandardError
       err("Incorrect YAML structure in `#{path}': #{e}".make_red)
     end
-
-    yaml = Psych::load(yaml_str)
-    if expected_type && !yaml.is_a?(expected_type)
-      err("Incorrect YAML structure in `#{path}': expected #{expected_type} at the root".make_red)
-    end
-
-    yaml
+    yaml_str
   end
 
   def write_yaml(manifest, path)
@@ -125,11 +130,17 @@ module BoshStringExtensions
   end
 
   def make_color(color_code)
-    if Bosh::Cli::Config.output &&
-       Bosh::Cli::Config.output.tty? &&
-       Bosh::Cli::Config.colorize &&
-       COLOR_CODES[color_code]
+    # invalid color
+    return self if !COLOR_CODES[color_code]
+
+    # output disabled
+    return self if !Bosh::Cli::Config.output
+
+    # colorization explicitly disabled
+    return self if Bosh::Cli::Config.colorize == false
 
+    # colorization explicitly enabled, or output is tty
+    if Bosh::Cli::Config.colorize || Bosh::Cli::Config.output.tty?
       "#{COLOR_CODES[color_code]}#{self}\e[0m"
     else
       self

data/lib/cli/release_builder.rb

@@ -31,8 +31,6 @@ module Bosh::Cli
 
       @version = options.fetch(:version, nil)
 
-      raise ReleaseVersionError.new('Version numbers cannot be specified for dev releases') if (@version && !@final)
-
       @final_index = Versions::VersionsIndex.new(final_releases_dir)
       @dev_index = Versions::VersionsIndex.new(dev_releases_dir)
       @index = @final ? @final_index : @dev_index

data/lib/cli/runner.rb

@@ -24,7 +24,7 @@ module Bosh::Cli
       banner = "Usage: bosh [<options>] <command> [<args>]"
       @option_parser = OptionParser.new(banner)
 
-      Config.colorize = true
+      Config.colorize = nil
       Config.output ||= STDOUT
 
       parse_global_options

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2905.0'
+    VERSION = '1.2915.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2905.0
+  version: 1.2915.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-07 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.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.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.2905.0
+        version: 1.2915.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2905.0
+        version: 1.2915.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  327a58
+  5653ce
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -329,11 +329,19 @@ files:
 - lib/cli/client/director.rb
 - lib/cli/client/errands_client.rb
 - lib/cli/client/uaa.rb
+- lib/cli/client/uaa/access_info.rb
+- lib/cli/client/uaa/client_token_issuer.rb
+- lib/cli/client/uaa/options.rb
+- lib/cli/client/uaa/password_token_issuer.rb
+- lib/cli/client/uaa/prompt.rb
+- lib/cli/client/uaa/token_decoder.rb
+- lib/cli/cloud_config.rb
 - lib/cli/command_discovery.rb
 - lib/cli/command_handler.rb
 - lib/cli/commands/backup.rb
 - lib/cli/commands/biff.rb
 - lib/cli/commands/blob_management.rb
+- lib/cli/commands/cloud_config.rb
 - lib/cli/commands/cloudcheck.rb
 - lib/cli/commands/complete.rb
 - lib/cli/commands/deployment.rb