bosh_cli 1.3215.4.0 → 1.3232.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b79ac5a8377c99cad46de0f2f788e3859310d4
-  data.tar.gz: b8f9b134f53385092d33cf8c2a5ae09ed786ea78
+  metadata.gz: f4e190149bfe9bd224bbe10c2be32ad11eeeef44
+  data.tar.gz: a43e138fbea15832c7233b3f41dbf7949478a2e2
 SHA512:
-  metadata.gz: 8dcc139f7050d386586bf31b9a768f30339deb6da2fd115b692a0477ef0ce1c9bbe2c7931e8fe8abbea010b46416bf7b7f750d633d71dad2f5fa9bef064bf11e
-  data.tar.gz: 3322806005d9b5560c50cb3d9fe1c5604016f061b5cbf9a3738e140ed36e44f9e9709374ac9560d8ab8fb87cd5c9b657de628821743da02619f94cc9bc461aa9
+  metadata.gz: b48f84f6cb4c4659978f95d039616b4bf21f8e04288e17fc9da4b4de4cdb6c506b0af956254698ee9e142c49bd6ec529c4fcc8983a6ed1447b86e18ce068ce4a
+  data.tar.gz: 7d53af233d4ecf0320865ca91b6217ebfb51d42e45c5870cfded371d81d5122aaf3833a3e3be6ae2ef28b9aea720f62e5103c321b231e9faec9e5616b1cd7c62

data/lib/cli.rb

@@ -43,6 +43,7 @@ end
 
 require 'common/common'
 require 'common/exec'
+require 'common/release/release_directory'
 require 'common/version/release_version'
 require 'common/version/release_version_list'
 require 'common/version/bosh_version'

data/lib/cli/base_command.rb

@@ -208,7 +208,7 @@ module Bosh::Cli
 
     def no_track_unsupported
       if @options.delete(:no_track)
-        say('Ignoring `' + '--no-track'.make_yellow + "' option")
+        say("Ignoring '" + '--no-track'.make_yellow + "' option")
       end
     end
 

data/lib/cli/basic_login_strategy.rb

@@ -22,7 +22,7 @@ module Bosh
         end
 
         if @director.login(username, password)
-          @terminal.say_green("Logged in as `#{username}'")
+          @terminal.say_green("Logged in as '#{username}'")
           @config.set_credentials(target, {
               "username" => username,
               "password" => password
@@ -30,10 +30,10 @@ module Bosh
           @config.save
         else
           if @interactive
-            @terminal.say_red("Cannot log in as `#{username}', please try again")
+            @terminal.say_red("Cannot log in as '#{username}', please try again")
             login(target, username, '')
           else
-            err("Cannot log in as `#{username}'")
+            err("Cannot log in as '#{username}'")
           end
         end
       end

data/lib/cli/blob_manager.rb

@@ -36,7 +36,7 @@ module Bosh::Cli
 
       @src_dir = File.join(@release.dir, "src")
       unless File.directory?(@src_dir)
-        err("`src' directory is missing")
+        err("'src' directory is missing")
       end
 
       @storage_dir = File.join(@release.dir, ".blobs")
@@ -96,7 +96,7 @@ module Bosh::Cli
       end
 
       nl
-      say("When ready please run `#{"bosh upload blobs".make_green}'")
+      say("When ready please run '#{"bosh upload blobs".make_green}'")
     end
 
     # Registers a file as BOSH blob
@@ -105,11 +105,11 @@ module Bosh::Cli
     # @return [void]
     def add_blob(local_path, blob_path)
       unless File.exists?(local_path)
-        err("File `#{local_path}' not found")
+        err("File '#{local_path}' not found")
       end
 
       if File.directory?(local_path)
-        err("`#{local_path}' is a directory")
+        err("'#{local_path}' is a directory")
       end
 
       if blob_path[0..0] == "/"
@@ -117,19 +117,19 @@ module Bosh::Cli
       end
 
       if blob_path[0..5] == "blobs/"
-        err("Blob path should not start with `blobs/'")
+        err("Blob path should not start with 'blobs/'")
       end
 
       blob_dst = File.join(@blobs_dir, blob_path)
 
       if File.directory?(blob_dst)
-        err("`#{blob_dst}' is a directory, please pick a different path")
+        err("'#{blob_dst}' is a directory, please pick a different path")
       end
 
       update = false
       if File.exists?(blob_dst)
         if file_checksum(blob_dst) == file_checksum(local_path)
-          err("Already tracking the same version of `#{blob_path}'")
+          err("Already tracking the same version of '#{blob_path}'")
         end
         update = true
         FileUtils.rm(blob_dst)
@@ -145,7 +145,7 @@ module Bosh::Cli
       end
 
       say("When you are done testing the new blob, please run\n" +
-          "`#{"bosh upload blobs".make_green}' and commit changes.")
+          "'#{"bosh upload blobs".make_green}' and commit changes.")
     end
 
     # Synchronizes the contents of blobs directory with blobs index.
@@ -173,7 +173,7 @@ module Bosh::Cli
         path = strip_blobs_dir(file)
 
         if File.exists?(File.join(@src_dir, path))
-          err("File `#{path}' is in both `blobs' and `src' directory.\n" +
+          err("File '#{path}' is in both 'blobs' and 'src' directory.\n" +
               "Please fix release repo before proceeding")
         end
 
@@ -213,7 +213,7 @@ module Bosh::Cli
       missing_blobs = []
       @index.each_pair do |path, entry|
         if File.exists?(File.join(@src_dir, path))
-          err("File `#{path}' is in both blob index and src directory.\n" +
+          err("File '#{path}' is in both blob index and src directory.\n" +
               "Please fix release repo before proceeding")
         end
 
@@ -256,11 +256,11 @@ module Bosh::Cli
       blob_path = File.join(@blobs_dir, path)
 
       unless File.exists?(blob_path)
-        err("Cannot upload blob, local file `#{blob_path}' doesn't exist")
+        err("Cannot upload blob, local file '#{blob_path}' doesn't exist")
       end
 
       if File.symlink?(blob_path)
-        err("`#{blob_path}' is a symlink")
+        err("'#{blob_path}' is a symlink")
       end
 
       checksum = file_checksum(blob_path)
@@ -288,7 +288,7 @@ module Bosh::Cli
       end
 
       unless @index.has_key?(path)
-        err("Unknown blob path `#{path}'")
+        err("Unknown blob path '#{path}'")
       end
 
       blob = @index[path]
@@ -355,7 +355,7 @@ module Bosh::Cli
       if blob_path[0..blobs_dir.size] == blobs_dir + "/"
         blob_path[blobs_dir.size+1..-1]
       else
-        err("File `#{blob_path}' is not under `blobs' directory")
+        err("File '#{blob_path}' is not under 'blobs' directory")
       end
     end
 

data/lib/cli/client/director.rb

@@ -124,6 +124,18 @@ module Bosh
           get_json('/deployments')
         end
 
+        def list_events(options={})
+          query_string = "/events"
+          delimeter = "?"
+          [:before_id, :deployment, :instance, :task].each do |param|
+            if options[param]
+              query_string += "#{delimeter}#{ param.to_s}=#{options[param]}"
+              delimeter = "&"
+            end
+          end
+          get_json(query_string)
+        end
+
         def list_errands(deployment_name)
           get_json("/deployments/#{deployment_name}/errands")
         end
@@ -275,15 +287,14 @@ module Bosh
           request_and_track(:post, add_query_string(url, extras), options)
         end
 
-        def diff_deployment(name, manifest_yaml, no_redact = false)
-          redact_param = no_redact ? '?redact=false' : ''
+        def diff_deployment(name, manifest_yaml, redact_diff = true)
+          redact_param = redact_diff ? '' : '?redact=false'
           uri = "/deployments/#{name}/diff#{redact_param}"
           status, body = post(uri, 'text/yaml', manifest_yaml)
-
           if status == 200
             JSON.parse(body)
           else
-            err(parse_error_message(status, body, uri))
+            err(parse_error_message(status, body))
           end
         end
 
@@ -411,7 +422,7 @@ module Bosh
             tmp_file
           else
             raise DirectorError,
-                  "Cannot download resource `#{id}': HTTP status #{status}"
+                  "Cannot download resource '#{id}': HTTP status #{status}"
           end
         end
 

data/lib/cli/commands/backup.rb

@@ -15,7 +15,7 @@ module Bosh::Cli::Command
       if status == :done
         tmp_path = director.fetch_backup
         FileUtils.mv(tmp_path, path)
-        say("Backup of BOSH director was put in `#{path.make_green}'.")
+        say("Backup of BOSH director was put in '#{path.make_green}'.")
       else
         [status, task_id]
       end
@@ -31,7 +31,7 @@ module Bosh::Cli::Command
       path = Bosh::Cli::BackupDestinationPath.new(director).create_from_path(dest_path)
 
       if File.exists?(path) && !force?
-        err("There is already an existing file at `#{path}'. " +
+        err("There is already an existing file at '#{path}'. " +
               'To overwrite it use the --force option.')
       end
 

data/lib/cli/commands/cloudcheck.rb

@@ -21,8 +21,8 @@ module Bosh::Cli::Command
 
       if non_interactive? && !(@report_mode || @auto_mode)
         err ("Cloudcheck cannot be run in non-interactive mode\n" +
-             "Please use `--auto' flag if you want automated resolutions " +
-             "or `--report' if you just want a report of the errors")
+             "Please use '--auto' flag if you want automated resolutions " +
+             "or '--report' if you just want a report of the errors")
       end
 
       if @auto_mode && @report_mode

data/lib/cli/commands/deployment.rb

@@ -13,7 +13,7 @@ module Bosh::Cli::Command
       manifest_filename = find_deployment(filename)
 
       unless File.exists?(manifest_filename)
-        err("Missing manifest for `#{filename}'")
+        err("Missing manifest for '#{filename}'")
       end
 
       manifest = load_yaml_file(manifest_filename)
@@ -60,10 +60,10 @@ module Bosh::Cli::Command
         config.target_version = status['version']
         config.target_uuid = status['uuid']
         say("#{'WARNING!'.make_red} Your target has been " +
-            "changed to `#{target.make_red}'!")
+            "changed to '#{target.make_red}'!")
       end
 
-      say("Deployment set to `#{manifest_filename.make_green}'")
+      say("Deployment set to '#{manifest_filename.make_green}'")
       config.set_deployment(manifest_filename)
       config.save
     end
@@ -81,21 +81,21 @@ module Bosh::Cli::Command
     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 '--no-redact', 'do not redact'
+    option '--no-redact', '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]
-      redact_diff = !!options[:redact_diff]
-      no_redact = !options[:no_redact].nil?
+      redact_diff = !!options[:no_redact].nil?
+
       manifest = build_manifest
 
       if manifest.hash['releases']
         manifest.hash['releases'].each do |release|
           if release['url'].blank?
             if release['version'] == 'create'
-              err("Expected URL when specifying release version `create'")
+              err("Expected URL when specifying release version 'create'")
             end
           else
             parsed_uri = URI.parse(release['url'])
@@ -110,11 +110,11 @@ module Bosh::Cli::Command
                 run_nested_command "upload", "release", parsed_uri.path, '--name', release['name'], '--version', release['version'].to_s
               end
             when 'http', 'https'
-              err('Path must be a local release directory when version is `create\'') if release['version'] == 'create'
-              err("Expected SHA1 when specifying remote URL for release `#{release["name"]}'") if release['sha1'].blank?
+              err("Path must be a local release directory when version is 'create'") if release['version'] == 'create'
+              err("Expected SHA1 when specifying remote URL for release '#{release["name"]}'") if release['sha1'].blank?
               run_nested_command "upload", "release", release['url'], "--sha1", release['sha1'], "--name", release['name'], "--version", release['version'].to_s
             else
-              err("Invalid URL format for release `#{release['name']}' with URL `#{release['url']}'. Supported schemes: file, http, https.")
+              err("Invalid URL format for release '#{release['name']}' with URL '#{release['url']}'. Supported schemes: file, http, https.")
             end
           end
         end
@@ -128,11 +128,11 @@ module Bosh::Cli::Command
             when 'file'
               run_nested_command "upload", "stemcell", parsed_uri.path, "--name", resource_pool['stemcell']['name'], "--version", resource_pool['stemcell']['version'].to_s, "--skip-if-exists"
             when 'http', 'https'
-              err("Expected SHA1 when specifying remote URL for stemcell `#{resource_pool['stemcell']['name']}'") if resource_pool['stemcell']['sha1'].blank?
+              err("Expected SHA1 when specifying remote URL for stemcell '#{resource_pool['stemcell']['name']}'") if resource_pool['stemcell']['sha1'].blank?
               run_nested_command "upload", "stemcell", resource_pool['stemcell']['url'], "--sha1", resource_pool['stemcell']['sha1'],
                 "--name", resource_pool['stemcell']['name'], "--version", resource_pool['stemcell']['version'].to_s, "--skip-if-exists"
             else
-              err("Invalid URL format for stemcell `#{resource_pool['stemcell']['name']}' with URL `#{resource_pool['stemcell']['url']}'. Supported schemes: file, http, https.")
+              err("Invalid URL format for stemcell '#{resource_pool['stemcell']['name']}' with URL '#{resource_pool['stemcell']['url']}'. Supported schemes: file, http, https.")
             end
           end
         end
@@ -140,7 +140,7 @@ module Bosh::Cli::Command
 
       manifest = prepare_deployment_manifest(resolve_properties: true, show_state: true)
 
-      context = DeploymentDiff.new(director, manifest).print({redact_diff: redact_diff, no_redact: no_redact})
+      context = DeploymentDiff.new(director, manifest).print({redact_diff: redact_diff})
       say('Please review all changes carefully'.make_yellow) if interactive?
 
       header('Deploying')
@@ -160,7 +160,7 @@ module Bosh::Cli::Command
 
       status, task_id = director.deploy(manifest.yaml, deploy_options)
 
-      task_report(status, task_id, "Deployed `#{manifest.name.make_green}' to `#{target_name.make_green}'")
+      task_report(status, task_id, "Deployed '#{manifest.name.make_green}' to '#{target_name.make_green}'")
     end
 
     # bosh delete deployment
@@ -173,7 +173,7 @@ module Bosh::Cli::Command
 
       force = !!options[:force]
 
-      say("\nYou are going to delete deployment `#{deployment_name}'.".make_red)
+      say("\nYou are going to delete deployment '#{deployment_name}'.".make_red)
       nl
       say("THIS IS A VERY DESTRUCTIVE OPERATION AND IT CANNOT BE UNDONE!\n".make_red)
 
@@ -184,9 +184,9 @@ module Bosh::Cli::Command
 
       begin
         status, result = director.delete_deployment(deployment_name, :force => force)
-        task_report(status, result, "Deleted deployment `#{deployment_name}'")
+        task_report(status, result, "Deleted deployment '#{deployment_name}'")
       rescue Bosh::Cli::ResourceNotFound
-        task_report(:done, nil, "Skipped delete of missing deployment `#{deployment_name}'")
+        task_report(:done, nil, "Skipped delete of missing deployment '#{deployment_name}'")
       end
     end
 
@@ -223,7 +223,7 @@ module Bosh::Cli::Command
       show_current_state(deployment_name)
 
       if save_as && File.exists?(save_as) &&
-         !confirmed?("Overwrite `#{save_as}'?")
+         !confirmed?("Overwrite '#{save_as}'?")
         err('Please choose another file to save the manifest to')
       end
 
@@ -233,7 +233,7 @@ module Bosh::Cli::Command
         File.open(save_as, 'w') do |f|
           f.write(deployment['manifest'])
         end
-        say("Deployment manifest saved to `#{save_as}'".make_green)
+        say("Deployment manifest saved to '#{save_as}'".make_green)
       else
         say(deployment['manifest'])
       end
@@ -244,7 +244,7 @@ module Bosh::Cli::Command
       config.target = target
       if config.deployment
         if interactive?
-          say("Current deployment is `#{config.deployment.make_green}'")
+          say("Current deployment is '#{config.deployment.make_green}'")
         else
           say(config.deployment)
         end
@@ -269,7 +269,7 @@ module Bosh::Cli::Command
     def path_is_reasonable!(path)
       #path is actually to a directory, not a file
       unless File.directory?(path)
-        err "Path must be a release directory when version is `create'"
+        err "Path must be a release directory when version is 'create'"
       end
     end
 

data/lib/cli/commands/deployment_diff.rb

@@ -6,10 +6,12 @@ module Bosh::Cli::Command
     end
 
     def print(options)
+      redact_diff = options[:redact_diff]
+
       begin
-        no_redact = options[:no_redact]
-        changes = @director.diff_deployment(@manifest.name, @manifest.yaml, no_redact)
+        changes = @director.diff_deployment(@manifest.name, @manifest.yaml, redact_diff)
         diff = changes['diff']
+        error = changes['error']
 
         header('Detecting deployment changes')
 
@@ -39,11 +41,13 @@ module Bosh::Cli::Command
           end
         end
 
+        say(error) if error
+
         changes['context']
       rescue Bosh::Cli::ResourceNotFound
         inspect_deployment_changes(
           @manifest,
-          redact_diff: options[:redact_diff]
+          redact_diff: redact_diff
         )
 
         nil

data/lib/cli/commands/disks.rb

@@ -6,7 +6,7 @@ module Bosh::Cli::Command
     def list
       auth_required
       unless options[:orphaned]
-        err('Only `bosh disks --orphaned` is supported')
+        err("Only 'bosh disks --orphaned' is supported")
       end
 
       disks = sort(director.list_orphan_disks)

data/lib/cli/commands/errand.rb

@@ -44,7 +44,7 @@ module Bosh::Cli::Command
       status, task_id, errand_result = errands_client.run_errand(deployment_name, errand_name, options[:keep_alive] || FALSE)
 
       unless errand_result
-        task_report(status, task_id, nil, "Errand `#{errand_name}' did not complete")
+        task_report(status, task_id, nil, "Errand '#{errand_name}' did not complete")
         return
       end
 
@@ -69,7 +69,7 @@ module Bosh::Cli::Command
         end
       end
 
-      title_prefix = "Errand `#{errand_name}'"
+      title_prefix = "Errand '#{errand_name}'"
       exit_code_suffix = "(exit code #{errand_result.exit_code})"
 
       if errand_result.exit_code == 0