bosh_cli 1.3160.0 → 1.3163.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf12c78c9d77c3d537b7adb8ecb7af2b32212fbf
-  data.tar.gz: 85d06b153cec7e1ca6fcd6062e64d234ff691edf
+  metadata.gz: 9bcf51bb65be3f043bb997bca2e36565fc389ef1
+  data.tar.gz: 5f9c4117351b0bc8776a37afe92609ed3af980c4
 SHA512:
-  metadata.gz: a244138c9f3b4402a2cdca38dbddfaca37d21ebdff16794c50aa30db065d43670f0edf178cd045d1567ee3abde1b4622fb51f9ec3d836d60d7fa0c1f9e86e3d8
-  data.tar.gz: e6b7794000d93b7f510db0440e00fedc044cb2e8401381e55b9c57d6639dba4d67b3b044a1b63ab680dbbbd1a7c29e74c77293701e796d44d8b69952ccd948df
+  metadata.gz: 20f34ebd95c481e8f9721da66a745fa199fd4465c68e66db9a5b80b756c1d93941191fbdf8f3395ea7bf4e3ac9323a4b3ef417fd6a9fd11600a424a8b0894347
+  data.tar.gz: ffc3ab67f387aa7f7a752d821f18e3c4f468ffd7c2123d11ac8d021e6929700bd65b8d9dd81b0282c7aa866d1b3cdc3d935b3b2043d72483ed43a0d23070bf60

data/lib/cli/base_command.rb

@@ -277,7 +277,7 @@ module Bosh::Cli
         uri.port = DEFAULT_DIRECTOR_PORT
         uri.to_s
       end
+      end
     end
   end
 end
-end

data/lib/cli/client/director.rb

@@ -180,6 +180,15 @@ module Bosh
           body
         end
 
+        def delete_orphan_disk_by_disk_cid(orphan_disk_cid)
+          request_and_track(:delete, "/disks/#{orphan_disk_cid}")
+        end
+
+        def list_orphan_disks
+          _, body = get_json_with_status('/disks')
+          body
+        end
+
         def upload_release(filename, options = {})
           options                = options.dup
           options[:content_type] = 'application/x-compressed'
@@ -251,7 +260,7 @@ module Bosh
           request_and_track(:post, add_query_string(url, extras), options)
         end
 
-        def setup_ssh(deployment_name, job, index, user,
+        def setup_ssh(deployment_name, job, id, user,
           public_key, password, options = {})
           options = options.dup
 
@@ -262,7 +271,8 @@ module Bosh
             'deployment_name' => deployment_name,
             'target'          => {
               'job'     => job,
-              'indexes' => [index].compact
+              'indexes' => [id].compact, # for backwards compatibility with old director
+              'ids' => [id].compact,
             },
             'params'          => {
               'user'       => user,
@@ -277,7 +287,7 @@ module Bosh
           request_and_track(:post, url, options)
         end
 
-        def cleanup_ssh(deployment_name, job, user_regex, indexes, options = {})
+        def cleanup_ssh(deployment_name, job, user_regex, id, options = {})
           options = options.dup
 
           url = "/deployments/#{deployment_name}/ssh"
@@ -287,7 +297,8 @@ module Bosh
             'deployment_name' => deployment_name,
             'target'          => {
               'job'     => job,
-              'indexes' => (indexes || []).compact
+              'indexes' => (id || []).compact,
+              'ids' => (id || []).compact,
             },
             'params'          => { 'user_regex' => user_regex }
           }
@@ -300,13 +311,13 @@ module Bosh
         end
 
         def change_job_state(deployment_name, manifest_yaml,
-          job, index, new_state, options = {})
+          job, index_or_id, new_state, options = {})
           options = options.dup
 
           skip_drain = !!options.delete(:skip_drain)
 
           url = "/deployments/#{deployment_name}/jobs/#{job}"
-          url += "/#{index}" if index
+          url += "/#{index_or_id}" if index_or_id
           url += "?state=#{new_state}"
           url += "&skip_drain=true" if skip_drain
 
@@ -357,22 +368,28 @@ module Bosh
           get_task_result(task_id)
         end
 
-        def fetch_vm_state(deployment_name, options = {})
+        def fetch_vm_state(deployment_name, options = {}, full = true)
           options = options.dup
 
-          url = "/deployments/#{deployment_name}/vms?format=full"
+          url = "/deployments/#{deployment_name}/vms"
 
-          status, task_id = request_and_track(:get, url, options)
+          if full
+            status, task_id = request_and_track(:get, "#{url}?format=full", options)
 
-          if status != :done
-            raise DirectorError, 'Failed to fetch VMs information from director'
-          end
+            raise DirectorError, 'Failed to fetch VMs information from director' if status != :done
 
-          output = get_task_result_log(task_id)
+            output = get_task_result_log(task_id)
+          else
+            status, output, _ = get(url, nil, nil, {}, options)
+
+            raise DirectorError, 'Failed to fetch VMs information from director' if status != 200
+          end
 
-          output.to_s.split("\n").map do |vm_state|
+          output = output.to_s.split("\n").map do |vm_state|
             JSON.parse(vm_state)
           end
+
+          output.flatten
         end
 
         def download_resource(id)
@@ -617,6 +634,13 @@ module Bosh
           status == 201
         end
 
+        def cleanup(config = {})
+          options = {}
+          options[:payload] = JSON.generate('config' => config)
+          options[:content_type] = 'application/json'
+          request_and_track(:post, '/cleanup', options)
+        end
+
         def post(uri, content_type = nil, payload = nil, headers = {}, options = {})
           request(:post, uri, content_type, payload, headers, options)
         end

data/lib/cli/commands/deployment.rb

@@ -2,8 +2,8 @@
 module Bosh::Cli::Command
   class Deployment < Base
     # bosh deployment
-    usage "deployment"
-    desc "Get/set current deployment"
+    usage 'deployment'
+    desc 'Get/set current deployment'
     def set_current(filename = nil)
       if filename.nil?
         show_current
@@ -19,34 +19,34 @@ module Bosh::Cli::Command
       manifest = load_yaml_file(manifest_filename)
 
       unless manifest.is_a?(Hash)
-        err("Invalid manifest format")
+        err('Invalid manifest format')
       end
 
-      unless manifest["target"].blank?
+      unless manifest['target'].blank?
         err(Bosh::Cli::Manifest::MANIFEST_TARGET_UPGRADE_NOTICE)
       end
 
-      if manifest["director_uuid"].blank?
-        err("Director UUID is not defined in deployment manifest")
+      if manifest['director_uuid'].blank?
+        err('Director UUID is not defined in deployment manifest')
       end
 
       if target
         old_director = Bosh::Cli::Client::Director.new(target, credentials, ca_cert: config.ca_cert)
-        old_director_uuid = old_director.get_status["uuid"] rescue nil
+        old_director_uuid = old_director.get_status['uuid'] rescue nil
       else
         old_director_uuid = nil
       end
 
-      new_director_uuid = manifest["director_uuid"]
+      new_director_uuid = manifest['director_uuid']
 
       if old_director_uuid != new_director_uuid
         new_target_url = config.resolve_alias(:target, new_director_uuid)
 
         if new_target_url.blank?
-          err("This manifest references director with UUID " +
+          err('This manifest references director with UUID ' +
               "#{new_director_uuid}.\n" +
               "You've never targeted it before.\n" +
-              "Please find your director IP or hostname and target it first.")
+              'Please find your director IP or hostname and target it first.')
         end
 
         target_ca_cert = config.ca_cert(new_target_url)
@@ -56,10 +56,10 @@ module Bosh::Cli::Command
         status = new_director.get_status
 
         config.target = new_target_url
-        config.target_name = status["name"]
-        config.target_version = status["version"]
-        config.target_uuid = status["uuid"]
-        say("#{"WARNING!".make_red} Your target has been " +
+        config.target_name = status['name']
+        config.target_version = status['version']
+        config.target_uuid = status['uuid']
+        say("#{'WARNING!'.make_red} Your target has been " +
             "changed to `#{target.make_red}'!")
       end
 
@@ -69,20 +69,20 @@ module Bosh::Cli::Command
     end
 
     # bosh edit deployment
-    usage "edit deployment"
-    desc "Edit current deployment manifest"
+    usage 'edit deployment'
+    desc 'Edit current deployment manifest'
     def edit
       deployment_required
-      editor = ENV['EDITOR'] || "vi"
+      editor = ENV['EDITOR'] || 'vi'
       system("#{editor} #{deployment}")
     end
 
     # 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 "--skip-drain [job1,job2]", String, "Skip drain script for either specific or all jobs"
+    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 '--skip-drain [job1,job2]', String, 'Skip drain script for either specific or all jobs'
     def perform
       auth_required
       recreate = !!options[:recreate]
@@ -166,9 +166,9 @@ module Bosh::Cli::Command
     end
 
     # bosh delete deployment
-    usage "delete deployment"
-    desc "Delete deployment"
-    option "--force", "ignore errors while deleting"
+    usage 'delete deployment'
+    desc 'Delete deployment'
+    option '--force', 'ignore errors while deleting'
     def delete(deployment_name)
       auth_required
       show_current_state(deployment_name)
@@ -180,7 +180,7 @@ module Bosh::Cli::Command
       say("THIS IS A VERY DESTRUCTIVE OPERATION AND IT CANNOT BE UNDONE!\n".make_red)
 
       unless confirmed?
-        say("Canceled deleting deployment".make_green)
+        say('Canceled deleting deployment'.make_green)
         return
       end
 
@@ -193,44 +193,44 @@ module Bosh::Cli::Command
     end
 
     # bosh validate jobs
-    usage "validate jobs"
-    desc "Validates all jobs in the current release using current " +
-         "deployment manifest as the source of properties"
+    usage 'validate jobs'
+    desc 'Validates all jobs in the current release using current ' +
+        'deployment manifest as the source of properties'
     def validate_jobs
       check_if_release_dir
       manifest = prepare_deployment_manifest(:resolve_properties => true, show_state: true)
 
-      if manifest.hash["release"]
-        release_name = manifest.hash["release"]["name"]
-      elsif manifest.hash["releases"].count > 1
-        err("Cannot validate a deployment manifest with more than 1 release")
+      if manifest.hash['release']
+        release_name = manifest.hash['release']['name']
+      elsif manifest.hash['releases'].count > 1
+        err('Cannot validate a deployment manifest with more than 1 release')
       else
-        release_name = manifest.hash["releases"].first["name"]
+        release_name = manifest.hash['releases'].first['name']
       end
       if release_name == release.dev_name || release_name == release.final_name
         nl
-        say("Analyzing release directory...".make_yellow)
+        say('Analyzing release directory...'.make_yellow)
       else
-        err("This release was not found in deployment manifest")
+        err('This release was not found in deployment manifest')
       end
 
-      say(" - discovering packages")
+      say(' - discovering packages')
       packages = Bosh::Cli::Resources::Package.discover(work_dir)
 
-      say(" - discovering jobs")
+      say(' - discovering jobs')
       jobs = Bosh::Cli::Resources::Job.discover(
         work_dir,
         # TODO: be sure this is covered in integration
         packages.map {|package| package['name']}
       )
 
-      say(" - validating properties")
+      say(' - validating properties')
       validator = Bosh::Cli::JobPropertyValidator.new(jobs, manifest.hash)
       validator.validate
 
       unless validator.jobs_without_properties.empty?
         nl
-        say("Legacy jobs (no properties defined): ".make_yellow)
+        say('Legacy jobs (no properties defined): '.make_yellow)
         validator.jobs_without_properties.sort { |a, b|
           a.name <=> b.name
         }.each do |job|
@@ -240,10 +240,10 @@ module Bosh::Cli::Command
 
       if validator.template_errors.empty?
         nl
-        say("No template errors found".make_green)
+        say('No template errors found'.make_green)
       else
         nl
-        say("Template errors: ".make_yellow)
+        say('Template errors: '.make_yellow)
         validator.template_errors.each do |error|
           nl
           path = Pathname.new(error.template_path)
@@ -256,15 +256,15 @@ module Bosh::Cli::Command
     end
 
     # bosh deployments
-    usage "deployments"
-    desc "Show the list of available deployments"
+    usage 'deployments'
+    desc 'Show the list of available deployments'
     def list
       auth_required
       show_current_state
 
       deployments = director.list_deployments
 
-      err("No deployments") if deployments.empty?
+      err('No deployments') if deployments.empty?
 
       deployments_table = table do |t|
         t.headings = ['Name', 'Release(s)', 'Stemcell(s)', 'Cloud Config']
@@ -277,30 +277,30 @@ module Bosh::Cli::Command
       nl
       say(deployments_table)
       nl
-      say("Deployments total: %d" % deployments.size)
+      say('Deployments total: %d' % deployments.size)
     end
 
     # bosh download manifest
-    usage "download manifest"
-    desc "Download deployment manifest locally"
+    usage 'download manifest'
+    desc 'Download deployment manifest locally'
     def download_manifest(deployment_name, save_as = nil)
       auth_required
       show_current_state(deployment_name)
 
       if save_as && File.exists?(save_as) &&
          !confirmed?("Overwrite `#{save_as}'?")
-        err("Please choose another file to save the manifest to")
+        err('Please choose another file to save the manifest to')
       end
 
       deployment = director.get_deployment(deployment_name)
 
       if save_as
-        File.open(save_as, "w") do |f|
-          f.write(deployment["manifest"])
+        File.open(save_as, 'w') do |f|
+          f.write(deployment['manifest'])
         end
         say("Deployment manifest saved to `#{save_as}'".make_green)
       else
-        say(deployment["manifest"])
+        say(deployment['manifest'])
       end
     end
 
@@ -314,20 +314,20 @@ module Bosh::Cli::Command
           say(config.deployment)
         end
       else
-        err("Deployment not set")
+        err('Deployment not set')
       end
     end
 
     def row_for_deployments_table(deployment)
-      stemcells = names_and_versions_from(deployment["stemcells"])
-      releases  = names_and_versions_from(deployment["releases"])
+      stemcells = names_and_versions_from(deployment['stemcells'])
+      releases  = names_and_versions_from(deployment['releases'])
 
-      [deployment["name"], releases.join("\n"), stemcells.join("\n"), deployment.fetch("cloud_config", "none")]
+      [deployment['name'], releases.join("\n"), stemcells.join("\n"), deployment.fetch('cloud_config', 'none')]
     end
 
     def names_and_versions_from(arr)
       arr.map { |hash|
-        hash.values_at("name", "version").join("/")
+        hash.values_at('name', 'version').join('/')
       }.sort
     end
 

data/lib/cli/commands/disks.rb

@@ -0,0 +1,63 @@
+module Bosh::Cli::Command
+  class Disks < Base
+    usage 'disks'
+    desc 'List all orphaned disks in a deployment (requires --orphaned option)'
+    option '--orphaned', 'Return orphaned disks'
+
+    def list
+      auth_required
+      unless options[:orphaned]
+        err('Only `bosh disks --orphaned` is supported')
+      end
+
+      disks = sort(director.list_orphan_disks)
+      if disks.empty?
+        nl
+        say('No orphaned disks')
+        nl
+        return
+      end
+
+      disks_table = table do |table|
+        table.headings = 'Disk CID',
+          'Size (MiB)',
+          'Deployment Name',
+          'Instance Name',
+          'AZ',
+          'Orphaned At'
+
+        disks.each do |disk|
+          table << [
+            disk['disk_cid'],
+            disk['size'] || 'n/a',
+            disk['deployment_name'],
+            disk['instance_name'],
+            disk['az'] || 'n/a',
+            disk['orphaned_at']
+          ]
+        end
+      end
+
+      nl
+      say(disks_table)
+    end
+
+    usage 'delete disk'
+    desc 'Deletes an orphaned disk'
+    def delete(orphan_disk_cid)
+      auth_required
+
+      status, result = director.delete_orphan_disk_by_disk_cid(orphan_disk_cid)
+
+      task_report(status, result, "Deleted orphaned disk #{orphan_disk_cid}")
+    end
+
+    private
+
+    def sort(disks)
+      disks.sort do |a, b|
+        Time.parse(b['orphaned_at']).to_i <=> Time.parse(a['orphaned_at']).to_i
+      end
+    end
+  end
+end