bosh_cli 1.3033.0 → 1.3039.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72475f73ad031da70342f0bb1212875b8564c673
-  data.tar.gz: 8d5c7f7e0180ad6de866b90310dcfbab33ede00f
+  metadata.gz: 39b0415133fae5b37514f70649163d3f856a9818
+  data.tar.gz: b21f0d0f0326a90915458b758c89316fbd069ade
 SHA512:
-  metadata.gz: 98683233f763ab298a59fe043e8de16611b7143ba76c61ef61181bbbfbad2d2aad089a9ab2dc591242e671aa6975d401b998e557e1618d326a6553cc91f105db
-  data.tar.gz: 060fe37ba625f7b1bac8c529fcb2217ed301e6a82b0087f359bccf16eefe1ed8db34dbdbc70c7df309ed208809f58186d5552871cb05a96187836d8f5c125916
+  metadata.gz: 0ea19816f2b52adbc1fdf1492488d3197910e0949e9ec67c896baa7edcb00dea59c111737c5eaa213b5478029c7f42413088996e5439b6a49e5b0d9b8031698e
+  data.tar.gz: 689a7cd6b64bd18ad5e2effba90d6357f2339f9ad54bf84c7406cf7768f5be5b263647d0fc0bc1fb0a91630722373c9ad563871c553d7419915a89c9daaa61c5

data/bin/bosh

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+require_relative '../bin/optionally_run_with_bundler'
+OptionallyRunWithBundler.run(ENV)
+
 require 'benchmark'
 require_cli_time = Benchmark.realtime { require "cli" }
 

data/bin/optionally_run_with_bundler.rb

@@ -0,0 +1,36 @@
+# #!/usr/bin/env ruby
+
+class OptionallyRunWithBundler
+  def self.run(env)
+    if env['BOSH_USE_BUNDLER']
+      gemfile_path = File.join(File.dirname(__FILE__), 'run_bosh_with_bundler.Gemfile')
+
+      if File.exists?(gemfile_path)
+        rubyopt = [env['RUBYOPT']].compact
+
+        if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
+          rubyopt.unshift('-rbundler/setup')
+
+          env['BUNDLE_GEMFILE'] = gemfile_path
+          env['RUBYOPT'] = rubyopt.join(' ')
+
+          kernel_exec_current_command
+        end
+      else
+        require "fileutils"
+        FileUtils.mkdir_p(File.dirname(gemfile_path))
+        File.write(gemfile_path, "gem 'bosh_cli'")
+
+        print "\nOptimizing gem configuration...\n\n"
+
+        env['BUNDLE_GEMFILE'] = gemfile_path
+
+        require 'bundler/setup'
+      end
+    end
+  end
+
+  def self.kernel_exec_current_command
+    Kernel.exec($0, *ARGV)
+  end
+end

data/lib/cli/client/director.rb

@@ -137,6 +137,15 @@ module Bosh
           get_json("/releases/#{name}")
         end
 
+        def inspect_release(name, version)
+          url = "/releases/#{name}"
+
+          extras = []
+          extras << ['version', version]
+
+          get_json(add_query_string(url, extras))
+        end
+
         def match_packages(manifest_yaml)
           url          = '/packages/matches'
           status, body = post(url, 'text/yaml', manifest_yaml)
@@ -216,13 +225,15 @@ module Bosh
           options = options.dup
 
           recreate               = options.delete(:recreate)
+          skip_drain             = options.delete(:skip_drain)
           options[:content_type] = 'text/yaml'
           options[:payload]      = manifest_yaml
 
           url = '/deployments'
 
           extras = []
-          extras << ['recreate', 'true'] if recreate
+          extras << ['recreate', 'true']   if recreate
+          extras << ['skip_drain', skip_drain] if skip_drain
 
           request_and_track(:post, add_query_string(url, extras), options)
         end
@@ -278,9 +289,12 @@ module Bosh
           job_name, index, new_state, options = {})
           options = options.dup
 
+          skip_drain = !!options.delete(:skip_drain)
+
           url = "/deployments/#{deployment_name}/jobs/#{job_name}"
           url += "/#{index}" if index
           url += "?state=#{new_state}"
+          url += "&skip_drain=true" if skip_drain
 
           options[:payload]      = manifest_yaml
           options[:content_type] = 'text/yaml'

data/lib/cli/commands/deployment.rb

@@ -79,8 +79,9 @@ module Bosh::Cli::Command
     # bosh deploy
     usage "deploy"
     desc "Deploy according to the currently selected deployment manifest"
-    option "--recreate", "recreate all VMs in deployment"
-    option "--redact-diff", "redact manifest value changes in deployment"
+    option "--recreate", "Recreate all VMs in deployment"
+    option "--redact-diff", "Redact manifest value changes in deployment"
+    option "--skip-drain [job1,job2]", String, "Skip drain script for either specific or all jobs"
     def perform
       auth_required
       recreate = !!options[:recreate]
@@ -101,7 +102,16 @@ module Bosh::Cli::Command
         cancel_deployment
       end
 
-      status, task_id = director.deploy(manifest.yaml, :recreate => recreate)
+      deploy_options = { recreate: recreate }
+
+      if options.has_key?(:skip_drain)
+        # when key is present but no jobs specified OptionParser
+        # adds a key with nil value, in that case we want to
+        # skip drain for all jobs
+        deploy_options[:skip_drain] = options[:skip_drain].nil? ? '*' : options[:skip_drain]
+      end
+
+      status, task_id = director.deploy(manifest.yaml, deploy_options)
 
       task_report(status, task_id, "Deployed `#{manifest.name.make_green}' to `#{target_name.make_green}'")
     end

data/lib/cli/commands/instances.rb

@@ -0,0 +1,119 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+module Bosh::Cli::Command
+  class Instances < Base
+    usage 'instances'
+    desc 'List all instances in a deployment'
+    option '--details', 'Return detailed instance information'
+    option '--dns', 'Return instance DNS A records'
+    option '--vitals', 'Return instance vitals information'
+    def list()
+      auth_required
+      deployment_required
+      manifest = Bosh::Cli::Manifest.new(deployment, director)
+      manifest.load
+      deployment_name = manifest.name
+
+      deps = director.list_deployments
+      selected = deps.select { |dep| dep['name'] == deployment_name }
+      err("The deployment '#{deployment_name}' doesn't exist") if selected.size == 0
+
+      show_current_state(deployment_name)
+      no_track_unsupported
+
+      if deployment_name.nil?
+      else
+        show_deployment deployment_name, options
+      end
+    end
+
+    def show_deployment(name, options={})
+      instances = director.fetch_vm_state(name)
+
+      if instances.empty?
+        nl
+        say('No instances')
+        nl
+        return
+      end
+
+      sorted = instances.sort do |a, b|
+        s = a['job_name'].to_s <=> b['job_name'].to_s
+        s = a['index'].to_i <=> b['index'].to_i if s == 0
+        s = a['resource_pool'].to_s <=> b['resource_pool'].to_s if s == 0
+        s
+      end
+
+      instances_table = table do |t|
+        headings = ['Instance', 'State', 'Resource Pool', 'IPs']
+        if options[:details]
+          headings += ['CID', 'Agent ID', 'Resurrection']
+        end
+        if options[:dns]
+          headings += ['DNS A records']
+        end
+        if options[:vitals]
+          headings += [{:value => "Load\n(avg01, avg05, avg15)", :alignment => :center}]
+          headings += ["CPU\nUser", "CPU\nSys", "CPU\nWait"]
+          headings += ['Memory Usage', 'Swap Usage']
+          headings += ["System\nDisk Usage", "Ephemeral\nDisk Usage", "Persistent\nDisk Usage"]
+        end
+        t.headings = headings
+
+        sorted.each do |instance|
+          job = "#{instance['job_name'] || 'unknown'}/#{instance['index'] || 'unknown'}"
+          ips = Array(instance['ips']).join("\n")
+          dns_records = Array(instance['dns']).join("\n")
+          vitals = instance['vitals']
+
+          row = [job, instance['job_state'], instance['resource_pool'], ips]
+
+          if options[:details]
+            row += [instance['vm_cid'], instance['agent_id'], instance['resurrection_paused'] ? 'paused' : 'active']
+          end
+
+          if options[:dns]
+            row += [dns_records.empty? ? 'n/a' : dns_records]
+          end
+
+          if options[:vitals]
+            if vitals
+              cpu =  vitals['cpu']
+              mem =  vitals['mem']
+              swap = vitals['swap']
+              disk = vitals['disk']
+
+              row << vitals['load'].join(', ')
+              row << "#{cpu['user']}%"
+              row << "#{cpu['sys']}%"
+              row << "#{cpu['wait']}%"
+              row << "#{mem['percent']}% (#{pretty_size(mem['kb'].to_i * 1024)})"
+              row << "#{swap['percent']}% (#{pretty_size(swap['kb'].to_i * 1024)})"
+              row << "#{disk['system']['percent']}%"
+              if disk['ephemeral'].nil?
+                row << 'n/a'
+              else
+                row << "#{disk['ephemeral']['percent']}%"
+              end
+              if disk['persistent'].nil?
+                row << 'n/a'
+              else
+                row << "#{disk['persistent']['percent']}%"
+              end
+            else
+              9.times { row << 'n/a' }
+            end
+          end
+
+          t << row
+        end
+      end
+
+      nl
+      say(instances_table)
+      nl
+      say('Instances total: %d' % instances.size)
+    end
+
+  end
+end

data/lib/cli/commands/job_management.rb

@@ -6,6 +6,7 @@ module Bosh::Cli
   module Command
     class JobManagement < Base
       FORCE = 'Proceed even when there are other manifest changes'
+      SKIP_DRAIN = 'Skip running drain script'
 
       # bosh start
       usage 'start'
@@ -21,6 +22,7 @@ module Bosh::Cli
       option '--soft', 'Stop process only'
       option '--hard', 'Power off VM'
       option '--force', FORCE
+      option '--skip-drain', SKIP_DRAIN
       def stop_job(job, index = nil)
         if hard?
           change_job_state(:detach, job, index)
@@ -33,6 +35,7 @@ module Bosh::Cli
       usage 'restart'
       desc 'Restart job/instance (soft stop + start)'
       option '--force', FORCE
+      option '--skip-drain', SKIP_DRAIN
       def restart_job(job, index = nil)
         change_job_state(:restart, job, index)
       end
@@ -41,6 +44,7 @@ module Bosh::Cli
       usage 'recreate'
       desc 'Recreate job/instance (hard stop + start)'
       option '--force', FORCE
+      option '--skip-drain', SKIP_DRAIN
       def recreate_job(job, index = nil)
         change_job_state(:recreate, job, index)
       end
@@ -53,21 +57,25 @@ module Bosh::Cli
 
         index = valid_index_for(manifest.hash, job, index)
         vm_state = VmState.new(self, manifest, force?)
-        job_state = JobState.new(self, vm_state)
+        job_state = JobState.new(self, vm_state, skip_drain: skip_drain?)
         status, task_id, completion_desc = job_state.change(state, job, index)
         task_report(status, task_id, completion_desc)
       end
 
       def hard?
-        options[:hard]
+        !!options[:hard]
       end
 
       def soft?
-        options[:soft]
+        !!options[:soft]
       end
 
       def force?
-        options[:force]
+        !!options[:force]
+      end
+
+      def skip_drain?
+        !!options[:skip_drain]
       end
 
       def parse_manifest(operation, job)

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

@@ -0,0 +1,73 @@
+module Bosh::Cli::Command
+  module Release
+    class InspectRelease < Base
+
+      usage 'inspect release'
+      desc 'List all jobs, packages, and compiled packages associated with a release. Release must be in the form {name}/{version}'
+      def inspect(release)
+        auth_required
+        show_current_state
+
+        release = Bosh::Cli::NameVersionPair.parse(release)
+
+        response = director.inspect_release(release.name, release.version)
+        if !reasonable_response?(response)
+          raise Bosh::Cli::DirectorError,
+                'Response from director does not include expected information. Is your director version 1.3034.0 or newer?'
+        end
+
+        templates_table = build_jobs_table(response)
+        say(templates_table.render)
+        nl
+
+        packages_table = build_packages_table(response)
+        say(packages_table.render)
+      end
+
+      def build_jobs_table(release)
+        table do |t|
+          t.headings = 'Job', 'Fingerprint', 'Blobstore ID', 'SHA1'
+          release['jobs'].each do |job|
+            row = [
+                job['name'].make_yellow,
+                job['fingerprint'].make_yellow,
+                job['blobstore_id'].make_yellow,
+                job['sha1'].make_yellow]
+            t << row
+          end
+        end
+      end
+
+      def build_packages_table(release)
+        table do |t|
+          t.headings = 'Package', 'Fingerprint', 'Compiled For', 'Blobstore ID', 'SHA1'
+          release['packages'].each do |package|
+            src_pkg_row = [
+                package['name'].make_yellow,
+                package['fingerprint'].make_yellow,
+                package['blobstore_id'].nil? ? '(no source)'.make_red : '(source)'.make_yellow,
+                package['blobstore_id'].nil? ? "" : package['blobstore_id'].make_yellow,
+                package['sha1'].nil? ? "" : package['sha1'].make_yellow]
+            t << src_pkg_row
+
+            package['compiled_packages'].each do |compiled|
+              comp_pkg_row = [
+                  '',
+                  '',
+                  compiled['stemcell'].make_green,
+                  compiled['blobstore_id'].make_green,
+                  compiled['sha1'].make_green]
+              t << comp_pkg_row
+            end
+          end
+        end
+      end
+
+      # older directors return an incorrect response for the request we make (they ignore the version parameter).
+      # this method checks for that condition so we can give a helpful error message.
+      def reasonable_response?(response)
+        !response.has_key?('versions')
+      end
+    end
+  end
+end

data/lib/cli/job_state.rb

@@ -24,9 +24,10 @@ module Bosh::Cli
         recreate: '%s has been recreated'
     }
 
-    def initialize(command, vm_state)
+    def initialize(command, vm_state, options)
       @command = command
       @vm_state = vm_state
+      @options = options
     end
 
     def change(state, job, index)
@@ -48,7 +49,7 @@ module Bosh::Cli
     end
 
     def perform_vm_state_change(job, index, new_state, operation_desc)
-      vm_state.change(job, index, new_state, operation_desc)
+      vm_state.change(job, index, new_state, operation_desc, @options)
     end
   end
 end

data/lib/cli/task_tracking/stage_collection.rb

@@ -30,7 +30,7 @@ module Bosh::Cli::TaskTracking
     end
 
     def update_with_event(event)
-      new_task = Task.new(self, event['task'], event['progress'], @callbacks)
+      new_task = Task.new(self, event['task'], event['index'], event['progress'], @callbacks)
       unless found_task = @tasks.find { |s| s == new_task }
         found_task = new_task
         @tasks << new_task
@@ -112,14 +112,15 @@ module Bosh::Cli::TaskTracking
   end
 
   class Task
-    attr_reader :stage, :name, :state, :progress, :error
+    attr_reader :stage, :name, :index, :state, :progress, :error
 
     extend Forwardable
     def_delegators :@total_duration, :duration, :started_at, :finished_at
 
-    def initialize(stage, name, progress, callbacks)
+    def initialize(stage, name, index, progress, callbacks)
       @stage = stage
       @name = name
+      @index = index
       @progress = progress
       @callbacks = callbacks
       @total_duration = TotalDuration.new
@@ -138,7 +139,7 @@ module Bosh::Cli::TaskTracking
 
     def ==(other)
       return false unless other.is_a?(Task)
-      [stage, name] == [other.stage, other.name]
+      [stage, index, name] == [other.stage, other.index, other.name]
     end
 
     def done?

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3033.0'
+    VERSION = '1.3039.0'
   end
 end

data/lib/cli/vm_state.rb

@@ -6,7 +6,7 @@ module Bosh::Cli
       @force = force
     end
 
-    def change(job, index, new_state, operation_desc)
+    def change(job, index, new_state, operation_desc, options = {})
       command.say("You are about to #{operation_desc.make_green}")
 
       check_if_manifest_changed(@manifest.hash)
@@ -17,7 +17,14 @@ module Bosh::Cli
 
       command.nl
       command.say("Performing `#{operation_desc}'...")
-      command.director.change_job_state(@manifest.name, @manifest.yaml, job, index, new_state)
+      command.director.change_job_state(
+        @manifest.name,
+        @manifest.yaml,
+        job,
+        index,
+        new_state,
+        options
+      )
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3033.0
+  version: 1.3039.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-13 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.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.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.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  2c1c13
+  e8cf4e
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -314,6 +314,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/bosh
+- bin/optionally_run_with_bundler.rb
 - lib/cli.rb
 - lib/cli/archive_builder.rb
 - lib/cli/archive_repository.rb
@@ -351,6 +352,7 @@ files:
 - lib/cli/commands/export_compiled_packages.rb
 - lib/cli/commands/help.rb
 - lib/cli/commands/import_compiled_packages.rb
+- lib/cli/commands/instances.rb
 - lib/cli/commands/job.rb
 - lib/cli/commands/job_management.rb
 - lib/cli/commands/job_rename.rb
@@ -366,6 +368,7 @@ files:
 - lib/cli/commands/release/export_release.rb
 - lib/cli/commands/release/finalize_release.rb
 - lib/cli/commands/release/init_release.rb
+- lib/cli/commands/release/inspect_release.rb
 - lib/cli/commands/release/list_releases.rb
 - lib/cli/commands/release/reset_release.rb
 - lib/cli/commands/release/upload_release.rb