bosh_cli 1.3091.0 → 1.3093.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da859f230af3dcde0e0ce0a18b6c5419047a0e2
-  data.tar.gz: d5fc1e4eeb9ab84372545f94bba14c02656fd0fc
+  metadata.gz: a6f0f6a01a728568c829a7dd5eb560be35876086
+  data.tar.gz: 75191afff90c2644f931c5c587b292e1fd85ade6
 SHA512:
-  metadata.gz: 71d6c0c0d6b8a8fd4d7062a5c1b78e98aafec9bf6c74d5447868adb37b6a9968c341dc0dce9caf8e44f9645ddd77c21aed6b1991196e1d6922e9e8dcb7f02418
-  data.tar.gz: 59a163acbf7983284b2dbc2aa41d287e4d6b1090ec3cb476c80d27104d5aa9d1b57a780dd81c17679ec27f85b6e4209a9636b7c51d791c4dd19519577c660772
+  metadata.gz: 860039081d2a22918caf7098525a80dfd1a5242a672fff3cd6afb171e64b53b9c7f1eabc37c982b6fdcaa99fdaa0b463640af3d79cd820e22bb262d365d646a3
+  data.tar.gz: b45e66e483540247760aea8256016d0ed47f1a1e339741353ffb68e9d11046b88dbce565ecd28da1dffcac7cb0965d52834856e372cb15247a0b151999721224

data/lib/cli/client/director.rb

@@ -90,7 +90,7 @@ module Bosh
           options                = options.dup
           options[:content_type] = 'application/x-compressed'
 
-          upload_and_track(:post, '/stemcells', filename, options)
+          upload_and_track(:post, stemcells_path(options), filename, options)
         end
 
         def upload_remote_stemcell(stemcell_location, options = {})
@@ -99,7 +99,7 @@ module Bosh
           options[:payload]      = JSON.generate(payload)
           options[:content_type] = 'application/json'
 
-          request_and_track(:post, '/stemcells', options)
+          request_and_track(:post, stemcells_path(options), options)
         end
 
         def get_version
@@ -645,6 +645,12 @@ module Bosh
           path
         end
 
+        def stemcells_path(options = {})
+          path = '/stemcells'
+          path << "?fix=true" if options[:fix]
+          path
+        end
+
         def request(method, uri, content_type = nil, payload = nil, headers = {}, options = {})
           headers = headers.dup
           headers['Content-Type'] = content_type if content_type
@@ -723,12 +729,16 @@ module Bosh
           end
         end
 
-        def perform_http_request(method, uri, payload = nil, headers = {}, &block)
-          http_client = HTTPClient.new
+        def generate_http_client
+          @http_client ||= HTTPClient.new.tap do |http_client|
+            http_client.send_timeout    = API_TIMEOUT
+            http_client.receive_timeout = API_TIMEOUT
+            http_client.connect_timeout = CONNECT_TIMEOUT
+          end
+        end
 
-          http_client.send_timeout    = API_TIMEOUT
-          http_client.receive_timeout = API_TIMEOUT
-          http_client.connect_timeout = CONNECT_TIMEOUT
+        def perform_http_request(method, uri, payload = nil, headers = {}, &block)
+          http_client = generate_http_client
 
           if @ca_cert.nil?
             http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -753,8 +763,8 @@ module Bosh
             begin
               cert_store = OpenSSL::X509::Store.new
               cert_store.add_file(@ca_cert)
-            rescue OpenSSL::X509::StoreError
-              err('Invalid SSL Cert')
+            rescue OpenSSL::X509::StoreError => e
+              err("Invalid SSL Cert for '#{uri}': #{e.message}")
             end
             http_client.ssl_config.cert_store = cert_store
           end
@@ -780,7 +790,7 @@ module Bosh
                OpenSSL::X509::StoreError => e
 
           if e.is_a?(OpenSSL::SSL::SSLError) && e.message.include?('certificate verify failed')
-            err('Invalid SSL Cert')
+            err("Invalid SSL Cert for '#{uri}': #{e.message}")
           end
           raise DirectorInaccessible, "cannot access director (#{e.message})"
 

data/lib/cli/commands/instances.rb

@@ -7,6 +7,7 @@ module Bosh::Cli::Command
     option '--details', 'Return detailed instance information'
     option '--dns', 'Return instance DNS A records'
     option '--vitals', 'Return instance vitals information'
+    option '--ps', "Return instance process information"
     def list()
       auth_required
       deployment_required
@@ -65,6 +66,7 @@ module Bosh::Cli::Command
         end
         t.headings = headings
 
+        s = instances.size
         sorted.each do |instance|
           job = "#{instance['job_name'] || 'unknown'}/#{instance['index'] || 'unknown'}"
           ips = Array(instance['ips']).join("\n")
@@ -115,6 +117,17 @@ module Bosh::Cli::Command
           end
 
           t << row
+          s -= 1
+          if options[:ps] && instance['processes']
+            instance['processes'].each do |process|
+              name = process['name']
+              state = process['state']
+              process_row = ["  #{name}", "#{state}"]
+              (headings.size - 2).times { process_row << '' }
+              t << process_row
+            end
+            t << :separator if s > 0
+          end
         end
       end
 

data/lib/cli/commands/stemcell.rb

@@ -27,13 +27,20 @@ module Bosh::Cli
     end
 
     usage 'upload stemcell'
-    desc 'Upload stemcell (stemcell_location can be a local file or a remote URI)'
+    desc "Upload stemcell (stemcell_location can be a local file or a remote URI). \
+Note that --skip-if-exists and --fix can not be used together."
     option '--skip-if-exists', 'skips upload if stemcell already exists'
+    option '--fix', 'replaces the stemcell if already exists'
     def upload(stemcell_location)
       auth_required
       show_current_state
 
+      if options[:skip_if_exists] && options[:fix]
+        err("Option '--skip-if-exists' and option '--fix' should not be used together")
+      end
+
       stemcell_type = stemcell_location =~ /^#{URI::regexp}$/ ? 'remote' : 'local'
+
       if stemcell_type == 'local'
         stemcell = Bosh::Cli::Stemcell.new(stemcell_location)
 
@@ -46,19 +53,16 @@ module Bosh::Cli
           err('Stemcell is invalid, please fix, verify and upload again')
         end
 
-        say('Checking if stemcell already exists...')
         name = stemcell.manifest['name']
         version = stemcell.manifest['version']
 
-        if exists?(name, version)
+        if !options[:fix] && exists?(name, version)
           if options[:skip_if_exists]
             say("Stemcell `#{name}/#{version}' already exists. Skipping upload.")
             return
           else
             err("Stemcell `#{name}/#{version}' already exists. Increment the version if it has changed.")
           end
-        else
-          say('No')
         end
 
         stemcell_location = stemcell.stemcell_file
@@ -71,7 +75,7 @@ module Bosh::Cli
         say("Using remote stemcell `#{stemcell_location}'")
       end
 
-      status, task_id = apply_upload_stemcell_strategy(stemcell_type, stemcell_location)
+      status, task_id = apply_upload_stemcell_strategy(stemcell_type, stemcell_location, options[:fix]?{fix: true}:{})
       success_message = 'Stemcell uploaded and created.'
 
       if status == :error && options[:skip_if_exists] && last_event(task_id)['error']['code'] == STEMCELL_EXISTS_ERROR_CODE
@@ -140,11 +144,7 @@ module Bosh::Cli
 
       force = !!options[:force]
 
-      say('Checking if stemcell exists...')
-
-      unless exists?(name, version)
-        err("Stemcell `#{name}/#{version}' does not exist")
-      end
+      err("Stemcell `#{name}/#{version}' does not exist") unless exists?(name, version)
 
       say("You are going to delete stemcell `#{name}/#{version}'".make_red)
 
@@ -168,11 +168,11 @@ module Bosh::Cli
       end
     end
 
-    def apply_upload_stemcell_strategy(stemcell_type, stemcell_location)
+    def apply_upload_stemcell_strategy(stemcell_type, stemcell_location, options={})
       if stemcell_type == 'local'
-        director.upload_stemcell(stemcell_location)
+        director.upload_stemcell(stemcell_location, options)
       else
-        director.upload_remote_stemcell(stemcell_location)
+        director.upload_remote_stemcell(stemcell_location, options)
       end
     end
 
@@ -182,10 +182,11 @@ module Bosh::Cli
     end
 
     def exists?(name, version)
+      say('Checking if stemcell already exists...')
       existing = director.list_stemcells.select do |sc|
         sc['name'] == name && sc['version'] == version
       end
-
+      existing.empty? ? say('No'):say('Yes')
       !existing.empty?
     end
 

data/lib/cli/task_tracking/task_tracker.rb

@@ -13,7 +13,10 @@ module Bosh::Cli::TaskTracking
     def initialize(director, task_id, options = {})
       @director = director
       @task_id = task_id
-      @task_success_state = options[:task_success_state] || :done
+      @task_finished_states = 'done error cancelled'
+      if(options[:task_success_state])
+        @task_finished_states << options[:task_success_state].to_s
+      end
       @options = options
 
       @quiet = !!options[:quiet]
@@ -140,7 +143,7 @@ module Bosh::Cli::TaskTracking
     end
 
     def finished?(state)
-      "#{@task_success_state} error cancelled".include?(state)
+      @task_finished_states.include?(state)
     end
 
     def interactive?

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3091.0'
+    VERSION = '1.3093.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3091.0
+  version: 1.3093.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-02 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.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.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.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement