bosh_cli 1.3232.24.0 → 1.3262.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71f4dfaeff471cb81968a20e376da09e8609cfa
-  data.tar.gz: 4163600dbad95ff0513dfc74ce77552b71f35599
+  metadata.gz: 59759f7adc2372786190b96dd92b8db80cfeb884
+  data.tar.gz: ab19243126537de87c1f21492263431e46988c82
 SHA512:
-  metadata.gz: ddc0eebf3cea4efd3b284be7a92c48ce3153b71dd013a419addb8e290419121902ea41a128a4d1d37fd6053e08fdc8fcddc8d7d38d61eaa075a092c195d6ec39
-  data.tar.gz: 8d6a4f9c8121ffe0937c934dafc0ace23080749ad1dbd799fe9d45008d5534f771bcb9ecdab251ae24eaba0da13c9b454c1d3a0cb66b38753b26605cd0585610
+  metadata.gz: 55743026aee4ccdc7bb6ea7b2d1d3136c41c09c7501ca07b490619293ce4caffb4b211a076450a77ae8792d7b6836183d40c4ec3859492f28a56fb3f2c8acb15
+  data.tar.gz: c2eac49e1473c6efe3d7d0066b6c5b5ffef83cc35fb6174af430771d4b0b5648a1b1d75af164b66e2a9c53e725068f3f0b49cdbd625f55d563f3633792c7efb3

data/lib/cli/client/credentials.rb

@@ -13,11 +13,6 @@ module Bosh
         def authorization_header
           @token_provider.token
         end
-
-        def refresh
-          @token_provider.refresh
-          true
-        end
       end
 
       class BasicCredentials
@@ -33,10 +28,6 @@ module Bosh
         def authorization_header
           'Basic ' + Base64.encode64("#{@username}:#{@password}").strip
         end
-
-        def refresh
-          false
-        end
       end
     end
   end

data/lib/cli/client/director.rb

@@ -29,7 +29,7 @@ module Bosh
           end
 
           @director_uri        = URI.parse(director_uri)
-          @director_host       = @director_uri.host
+          @director_ip         = Resolv.getaddresses(@director_uri.host).last
           @scheme              = @director_uri.scheme
           @port                = @director_uri.port
           @credentials         = credentials
@@ -127,7 +127,9 @@ module Bosh
         def list_events(options={})
           query_string = "/events"
           delimeter = "?"
-          [:before_id, :deployment, :instance, :task].each do |param|
+          options[:before_time] = URI.encode(options.delete(:before)) if options[:before]
+          options[:after_time] = URI.encode(options.delete(:after)) if options[:after]
+          [:before_id, :deployment, :instance, :task, :before_time, :after_time].each do |param|
             if options[param]
               query_string += "#{delimeter}#{ param.to_s}=#{options[param]}"
               delimeter = "&"
@@ -268,6 +270,10 @@ module Bosh
           request_and_track(:delete, add_query_string(url, extras), options)
         end
 
+        def delete_vm_by_cid(vm_cid)
+          request_and_track(:delete, "/vms/#{vm_cid}")
+        end
+
         def deploy(manifest_yaml, options = {})
           options = options.dup
 
@@ -353,11 +359,15 @@ module Bosh
           options = options.dup
 
           skip_drain = !!options.delete(:skip_drain)
+          canaries = options.delete(:canaries)
+          max_in_flight = options.delete(:max_in_flight)
 
           url = "/deployments/#{deployment_name}/jobs/#{job}"
           url += "/#{index_or_id}" if index_or_id
           url += "?state=#{new_state}"
           url += "&skip_drain=true" if skip_drain
+          url += "&max_in_flight=#{max_in_flight}" if max_in_flight
+          url += "&canaries=#{canaries}" if canaries
 
           options[:payload]      = manifest_yaml
           options[:content_type] = 'text/yaml'
@@ -377,6 +387,12 @@ module Bosh
           put(url, 'application/json', payload)
         end
 
+        def change_instance_ignore_state(deployment_name, instance_group_name, id, ignore_state)
+          url     = "/deployments/#{deployment_name}/instance_groups/#{instance_group_name}/#{id}/ignore"
+          payload = JSON.generate('ignore' => ignore_state)
+          put(url, 'application/json', payload)
+        end
+
         def fetch_logs(deployment_name, job_name, index, log_type,
           filters = nil, options = {})
           options = options.dup
@@ -760,7 +776,7 @@ module Bosh
 
           response = try_to_perform_http_request(
             method,
-            "#{@scheme}://#{@director_host}:#{@port}#{uri}",
+            "#{@scheme}://#{@director_ip}:#{@port}#{uri}",
             payload,
             headers,
             num_retries,
@@ -865,32 +881,14 @@ module Bosh
           end
 
           if @credentials
-            @credentials.refresh unless payload.nil?
             headers['Authorization'] = @credentials.authorization_header
           end
 
-          response = http_client.request(method, uri, {
+          http_client.request(method, uri, {
             :body => payload,
             :header => headers,
           }, &block)
 
-          if !response.nil? && response.code == 401
-            if !payload.nil?
-              return response
-            end
-
-            if @credentials.nil? || !@credentials.refresh
-              raise AuthError
-            end
-
-            headers['Authorization'] = @credentials.authorization_header
-            response = http_client.request(method, uri, {
-                :body => payload,
-                :header => headers,
-            }, &block)
-          end
-
-          response
         rescue URI::Error,
                SocketError,
                Errno::ECONNREFUSED,

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

@@ -17,22 +17,17 @@ module Bosh
             access_info.auth_header if access_info
           end
 
-          def refresh
-            get_access_info(true)
-            nil
-          end
-
           def username
             get_access_info.username
           end
 
           private
 
-          def get_access_info(force_refresh = false)
+          def get_access_info
             if @auth_info.client_auth?
-              client_access_info(force_refresh)
+              client_access_info
             else
-              password_access_info(force_refresh)
+              password_access_info
             end
           end
 
@@ -40,28 +35,26 @@ module Bosh
             @uaa_client ||= Bosh::Cli::Client::Uaa::Client.new(@target, @auth_info, @config)
           end
 
-          def client_access_info(force_refresh = false)
-            if !@access_info.nil? && @access_info.was_issued_for?(@auth_info.client_id)
-              @access_info = refresh_if_needed(@access_info, force_refresh)
+          def client_access_info
+            if !@client_access_info.nil? && @client_access_info.was_issued_for?(@auth_info.client_id)
+              @client_access_info = refresh_if_needed(@client_access_info)
             else
-              @access_info = uaa_client.access_info({})
+              @client_access_info = uaa_client.access_info({})
             end
           end
 
-          def password_access_info(force_refresh = false)
-            if @access_info.nil?
-              config_access_token = @config.access_token(@target)
-              return nil unless config_access_token
+          def password_access_info
+            config_access_token = @config.access_token(@target)
+            return nil unless config_access_token
 
-              @access_info = PasswordAccessInfo.create(config_access_token, @config.refresh_token(@target), @token_decoder)
-              return nil unless @access_info
-            end
+            access_info = PasswordAccessInfo.create(config_access_token, @config.refresh_token(@target), @token_decoder)
+            return nil unless access_info
 
-            @access_info = refresh_if_needed(@access_info, force_refresh)
+            refresh_if_needed(access_info)
           end
 
-          def refresh_if_needed(access_info, force_refresh = false)
-            if access_info.expires_soon? || force_refresh
+          def refresh_if_needed(access_info)
+            if access_info.expires_soon?
               uaa_client.refresh(access_info)
             else
               access_info

data/lib/cli/commands/events.rb

@@ -3,10 +3,11 @@ module Bosh::Cli::Command
     usage 'events'
     desc 'Show all deployment events'
     option '--before-id id', Integer, 'Show all events with id less or equal to given id'
-    option '--deployment name', String, 'filter all events by the Deployment Name'
-    option '--task id', String, 'filter all events by the task id'
-    option '--instance job_name/id', String, 'filter all events by the instance job_name/id'
-
+    option '--before timestamp', String, 'Show all events by the given timestamp (ex: 2016-05-08 17:26:32)'
+    option '--after timestamp', String, 'Show all events after the given timestamp (ex: 2016-05-08 17:26:32)'
+    option '--deployment name', String, 'Filter all events by the Deployment Name'
+    option '--task id', String, 'Filter all events by the task id'
+    option '--instance job_name/id', String, 'Filter all events by the instance job_name/id'
 
     def list
       auth_required

data/lib/cli/commands/ignore.rb

@@ -0,0 +1,31 @@
+require 'cli/name_id_pair'
+
+module Bosh::Cli::Command
+  class Ignore < Base
+
+    usage "ignore instance"
+    desc "Ignore an instance. 'name_and_id' should be in the form of {name}/{id}"
+    def ignore(name_and_id)
+      change_ignore_state(name_and_id, true)
+    end
+
+    usage "unignore instance"
+    desc "Unignore an instance. 'name_and_id' should be in the form of {name}/{id}"
+    def unignore(name_and_id)
+      change_ignore_state(name_and_id, false)
+    end
+
+    private
+
+    def change_ignore_state(name_and_id, desired_state)
+      auth_required
+      deployment_required
+
+      instance_pair = Bosh::Cli::NameIdPair.parse(name_and_id)
+      manifest = prepare_deployment_manifest(show_state: true)
+
+      director.change_instance_ignore_state(manifest.name, instance_pair.name, instance_pair.id, desired_state)
+    end
+
+  end
+end

data/lib/cli/commands/instances.rb

@@ -79,7 +79,7 @@ module Bosh::Cli::Command
           if has_disk_cid
             headings += ['Disk CID']
           end
-          headings += ['Agent ID', 'Resurrection']
+          headings += ['Agent ID', 'Resurrection', 'Ignore']
         end
 
         if options[:dns]
@@ -155,11 +155,9 @@ module Bosh::Cli::Command
           display_table << :separator if row_count.between?(2, instance_count) && (options[:ps] || last_job != '' && instance['job_name'] != last_job)
 
           if options[:details]
-            if has_disk_cid
-              row += [instance['vm_cid'], instance['disk_cid'] || 'n/a', instance['agent_id'], instance['resurrection_paused'] ? 'paused' : 'active']
-            else
-              row += [instance['vm_cid'], instance['agent_id'], instance['resurrection_paused'] ? 'paused' : 'active']
-            end
+            row << instance['vm_cid']
+            row << (instance['disk_cid'] || 'n/a') if has_disk_cid
+            row += [instance['agent_id'], instance['resurrection_paused'] ? 'paused' : 'active', instance['ignore'].nil? ? 'n/a' : instance['ignore']]
           end
 
           if options[:dns]

data/lib/cli/commands/job_management.rb

@@ -6,11 +6,16 @@ module Bosh::Cli
     class JobManagement < Base
       FORCE = 'Proceed even when there are other manifest changes'
       SKIP_DRAIN = 'Skip running drain script'
+      MAX_IN_FLIGHT = 'Overwrites max_in_flight value in the manifest'
+      CANARIES = 'Overwrites canaries value in the manifest'
+
 
       # bosh start
       usage 'start'
       desc 'Start all jobs/job/instance'
       option '--force', FORCE
+      option '--max-in-flight MAX_IN_FLIGHT', MAX_IN_FLIGHT
+      option '--canaries CANARIES', CANARIES
       def start_job(job = '*', index_or_id = nil)
         change_job_state(:start, job, index_or_id)
       end
@@ -19,8 +24,10 @@ module Bosh::Cli
       usage 'stop'
       desc 'Stop all jobs/job/instance'
       option '--soft', 'Stop process only'
-      option '--hard', 'Power off VM'
+      option '--hard', 'Delete the VM'
       option '--force', FORCE
+      option '--max-in-flight MAX_IN_FLIGHT', MAX_IN_FLIGHT
+      option '--canaries CANARIES', CANARIES
       option '--skip-drain', SKIP_DRAIN
       def stop_job(job = '*', index_or_id = nil)
         if hard?
@@ -34,6 +41,8 @@ module Bosh::Cli
       usage 'restart'
       desc 'Restart all jobs/job/instance (soft stop + start)'
       option '--force', FORCE
+      option '--max-in-flight MAX_IN_FLIGHT', MAX_IN_FLIGHT
+      option '--canaries CANARIES', CANARIES
       option '--skip-drain', SKIP_DRAIN
       def restart_job(job = '*', index_or_id = nil)
         change_job_state(:restart, job, index_or_id)
@@ -43,6 +52,8 @@ module Bosh::Cli
       usage 'recreate'
       desc 'Recreate all jobs/job/instance (hard stop + start)'
       option '--force', FORCE
+      option '--max-in-flight MAX_IN_FLIGHT', MAX_IN_FLIGHT
+      option '--canaries CANARIES', CANARIES
       option '--skip-drain', SKIP_DRAIN
       def recreate_job(job = '*', index_or_id = nil)
         change_job_state(:recreate, job, index_or_id)
@@ -53,7 +64,11 @@ module Bosh::Cli
       def change_job_state(state, job, index_or_id = nil)
         auth_required
         manifest = parse_manifest(state)
-        job_state = JobState.new(self, manifest, skip_drain: skip_drain?)
+        options = {skip_drain: skip_drain?}
+        options[:canaries] = canaries if canaries
+        options[:max_in_flight] = max_in_flight if max_in_flight
+
+        job_state = JobState.new(self, manifest, options)
         status, task_id, completion_desc = job_state.change(state, job, index_or_id, force?)
         task_report(status, task_id, completion_desc)
       end
@@ -74,6 +89,14 @@ module Bosh::Cli
         !!options[:skip_drain]
       end
 
+      def canaries
+        options[:canaries]
+      end
+
+      def max_in_flight
+        options[:max_in_flight]
+      end
+
       def parse_manifest(operation)
         manifest = prepare_deployment_manifest(show_state: true)
 

data/lib/cli/commands/ssh.rb

@@ -6,7 +6,7 @@ module Bosh::Cli
     class Ssh < Base
 
       # bosh ssh
-      usage 'ssh'
+      usage 'ssh <job>/<index>'
       desc 'Execute command or start an interactive session'
       option '--gateway_host HOST', 'Gateway host'
       option '--gateway_user USER', 'Gateway user'
@@ -37,11 +37,11 @@ module Bosh::Cli
       end
 
       # bosh scp
-      usage 'scp'
-      desc 'upload/download the source file to the given job. ' +
-             'Note: for download /path/to/destination is a directory'
-      option '--download', 'Download file'
-      option '--upload', 'Upload file'
+      usage 'scp <job>/<index> <source> <destination>'
+      desc "Transfer files to (--upload) or from (--download) a job.\n" +
+             'Note: for --download, <destination> is treated as a directory'
+      option '--download', 'Download <source> file from the job'
+      option '--upload', 'Upload <source> file to the job'
       option '--gateway_host HOST', 'Gateway host'
       option '--gateway_user USER', 'Gateway user'
       option '--gateway_identity_file FILE', 'Gateway identity file'
@@ -153,14 +153,30 @@ module Bosh::Cli
             gateway = nil
           end
 
-          yield sessions, gateway, ssh_session
+          begin
+            yield sessions, gateway, ssh_session
+          rescue Exception => error
+            handle_closed_stream_error(error)
+          end
         ensure
           nl
           say('Cleaning up ssh artifacts')
           ssh_session.cleanup
           indices = sessions.map { |session| session['id'] || session['index'] }
+          begin
+            gateway.shutdown! if gateway
+          rescue Exception => error
+            handle_closed_stream_error(error)
+          end
           director.cleanup_ssh(deployment_name, job, "^#{ssh_session.user}$", indices)
-          gateway.shutdown! if gateway
+        end
+      end
+
+      def handle_closed_stream_error(error)
+        if error.message.include?('closed stream')
+          warn("#{error}")
+        else
+          raise error
         end
       end
 

data/lib/cli/commands/vm.rb

@@ -23,6 +23,20 @@ module Bosh::Cli
           director.change_vm_resurrection(manifest.name, job, index_or_id, resurrection.paused?)
         end
       end
+
+      usage 'delete vm'
+      desc 'Deletes a vm'
+      def delete(vm_cid)
+        auth_required
+
+        unless confirmed?("Are you sure you want to delete vm '#{vm_cid}'?")
+          say('Canceled deleting vm'.make_green)
+          return
+        end
+
+        status, task_id = director.delete_vm_by_cid(vm_cid)
+        task_report(status, task_id, "Deleted vm '#{vm_cid}'")
+      end
     end
   end
 end

data/lib/cli/commands/vms.rb

@@ -47,7 +47,7 @@ module Bosh::Cli::Command
         headings += ['VM Type', 'IPs']
 
         if options[:details]
-          headings += ['CID', 'Agent ID', 'Resurrection']
+          headings += ['CID', 'Agent ID', 'Resurrection', 'Ignore']
         end
         if options[:dns]
           headings += ['DNS A records']
@@ -83,7 +83,7 @@ module Bosh::Cli::Command
           row << ips
 
           if options[:details]
-            row += [vm['vm_cid'], vm['agent_id'], vm['resurrection_paused'] ? 'paused' : 'active']
+            row += [vm['vm_cid'], vm['agent_id'], vm['resurrection_paused'] ? 'paused' : 'active', vm['ignore'].nil? ? 'n/a' : vm['ignore']]
           end
 
           if options[:dns]

data/lib/cli/name_id_pair.rb

@@ -0,0 +1,22 @@
+module Bosh::Cli
+
+  class NameIdPair
+    def self.parse(str)
+      raise ArgumentError, 'str must not be nil' if str.nil?
+
+      name, _, id = str.rpartition('/')
+      if name.empty? || id.empty?
+        raise ArgumentError, "\"#{str}\" must be in the form name/id"
+      end
+
+      new(name, id)
+    end
+
+    attr_reader :name, :id
+
+    def initialize(name, id)
+      @name, @id = name, id
+    end
+  end
+
+end

data/lib/cli/task_tracking/event_log_renderer.rb

@@ -71,6 +71,8 @@ module Bosh::Cli::TaskTracking
 
       if event['type'] == 'deprecation'
         show_deprecation(event)
+      elsif event['type'] == 'warning'
+        show_warning(event)
       elsif event['error']
         show_error(event)
       else
@@ -78,6 +80,11 @@ module Bosh::Cli::TaskTracking
       end
     end
 
+    def show_warning(event)
+      msg = "  Warning: #{event['message']}"
+      @printer.print(:line_around, msg.make_yellow)
+    end
+
     def show_deprecation(event)
       msg = "Deprecation: #{event['message']}"
       @printer.print(:line_around, msg.make_red)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3232.24.0'
+    VERSION = '1.3262.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3232.24.0
+  version: 1.3262.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-06-23 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.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.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.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -364,6 +364,7 @@ files:
 - lib/cli/commands/errand.rb
 - lib/cli/commands/events.rb
 - lib/cli/commands/help.rb
+- lib/cli/commands/ignore.rb
 - lib/cli/commands/instances.rb
 - lib/cli/commands/job.rb
 - lib/cli/commands/job_management.rb
@@ -413,6 +414,7 @@ files:
 - lib/cli/logs_downloader.rb
 - lib/cli/manifest.rb
 - lib/cli/manifest_warnings.rb
+- lib/cli/name_id_pair.rb
 - lib/cli/name_version_pair.rb
 - lib/cli/non_interactive_progress_renderer.rb
 - lib/cli/public_stemcell.rb