bosh_cli 1.3215.4.0 → 1.3232.0

data/lib/cli/commands/events.rb

@@ -0,0 +1,55 @@
+module Bosh::Cli::Command
+  class Events < Base
+    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'
+
+
+    def list
+      auth_required
+      show_events
+    end
+
+    private
+    def show_events
+      events = director.list_events(options)
+      if events.empty?
+        nl
+        say('No events')
+        nl
+        return
+      end
+
+      events_table = table do |t|
+        headings   = ['ID', 'Time', 'User', 'Action', 'Object type', 'Object ID', 'Task', 'Dep', 'Inst', 'Context']
+        t.headings = headings
+
+        events.each do |event|
+          row = []
+          id  = event['id']
+          id  = "#{id} <- #{event['parent_id']}" if event['parent_id']
+          row << id
+          row << Time.at(event['timestamp']).utc.strftime('%a %b %d %H:%M:%S %Z %Y')
+          row << event['user']
+          row << event['action']
+          row << event['object_type']
+          row << event.fetch('object_name', '-')
+          row << event.fetch('task', '-')
+          row << event.fetch('deployment', '-')
+          row << event.fetch('instance', '-')
+          context = event['error'] ? {'error' => event['error'].to_s.truncate(80)}.merge(event['context']) : event['context']
+          context = context.empty? ? '-' : context.map { |k, v| "#{k}: #{v}" }.join(",\n")
+          row << context
+          t << row
+        end
+      end
+
+      nl
+      say(events_table)
+      nl
+    end
+  end
+end

data/lib/cli/commands/help.rb

@@ -54,7 +54,7 @@ module Bosh::Cli::Command
         end
       end
 
-      err("No help found for command `#{keywords.join(' ')}'. Run 'bosh help --all' to see all available BOSH commands.") if good_matches.empty?
+      err("No help found for command '#{keywords.join(' ')}'. Run `bosh help --all` to see all available BOSH commands.") if good_matches.empty?
 
       self.class.list_commands(good_matches)
     end

data/lib/cli/commands/job.rb

@@ -10,13 +10,13 @@ module Bosh::Cli::Command
       check_if_release_dir
 
       unless name.bosh_valid_id?
-        err("`#{name}' is not a valid BOSH id")
+        err("'#{name}' is not a valid BOSH id")
       end
 
       job_dir = File.join("jobs", name)
 
       if File.exists?(job_dir)
-        err("Job `#{name}' already exists, please pick another name")
+        err("Job '#{name}' already exists, please pick another name")
       end
 
       say("create\t#{job_dir}")
@@ -38,7 +38,7 @@ module Bosh::Cli::Command
         f.write("---\nname: #{name}\ntemplates:\n\npackages:\n")
       end
 
-      say("\nGenerated skeleton for `#{name}' job in `#{job_dir}'")
+      say("\nGenerated skeleton for '#{name}' job in '#{job_dir}'")
     end
 
   end

data/lib/cli/commands/job_management.rb

@@ -82,7 +82,7 @@ module Bosh::Cli
         end
 
         if !hard_and_soft_options_allowed?(operation) && (hard? || soft?)
-          err("--hard and --soft options only make sense for `stop' operation")
+          err("--hard and --soft options only make sense for 'stop' operation")
         end
 
         manifest

data/lib/cli/commands/locks.rb

@@ -1,6 +1,3 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2013 GoPivotal, Inc.
-
 module Bosh::Cli::Command
   class Locks < Base
 
@@ -11,7 +8,12 @@ module Bosh::Cli::Command
       show_current_state
 
       locks = director.list_locks
-      err('No locks') if locks.empty?
+      if locks.empty?
+        nl
+        say('No locks')
+        nl
+        return
+      end
 
       show_locks_table(locks)
       say("Locks total: %d" % locks.size)

data/lib/cli/commands/login.rb

@@ -24,7 +24,7 @@ module Bosh::Cli::Command
       target_required
       config.set_credentials(target, nil)
       config.save
-      say("You are no longer logged in to `#{target}'".make_yellow)
+      say("You are no longer logged in to '#{target}'".make_yellow)
     end
 
     private

data/lib/cli/commands/misc.rb

@@ -89,7 +89,7 @@ module Bosh::Cli::Command
       rescue Bosh::Cli::AuthError
         status = {}
       rescue Bosh::Cli::DirectorError
-        err("Cannot talk to director at `#{director_url}', " +
+        err("Cannot talk to director at '#{director_url}', " +
             "please set correct target")
       end
 
@@ -101,7 +101,7 @@ module Bosh::Cli::Command
       old_ca_cert_path = config.ca_cert
       expanded_ca_cert_path = config.save_ca_cert_path(options[:ca_cert])
       if old_ca_cert_path != expanded_ca_cert_path
-        say("Updating certificate file path to `#{expanded_ca_cert_path.to_s.make_green}'")
+        say("Updating certificate file path to '#{expanded_ca_cert_path.to_s.make_green}'")
         nl
       end
 
@@ -114,7 +114,7 @@ module Bosh::Cli::Command
       end
 
       config.save
-      say("Target set to `#{target_name.make_green}'")
+      say("Target set to '#{target_name.make_green}'")
 
       if interactive? && !logged_in?
         redirect("login")
@@ -146,7 +146,7 @@ module Bosh::Cli::Command
     def set_alias(name, command)
       config.set_alias(:cli, name, command.to_s.strip)
       config.save
-      say("Alias `#{name.make_green}' created for command `#{command.make_green}'")
+      say("Alias '#{name.make_green}' created for command '#{command.make_green}'")
     end
 
     # bosh aliases

data/lib/cli/commands/package.rb

@@ -9,13 +9,13 @@ module Bosh::Cli::Command
       check_if_release_dir
 
       unless name.bosh_valid_id?
-        err("`#{name}' is not a vaild BOSH id")
+        err("'#{name}' is not a vaild BOSH id")
       end
 
       package_dir = File.join("packages", name)
 
       if File.exists?(package_dir)
-        err("Package `#{name}' already exists, please pick another name")
+        err("Package '#{name}' already exists, please pick another name")
       end
 
       say("create\t#{package_dir}")
@@ -35,7 +35,7 @@ module Bosh::Cli::Command
         "---\nname: #{name}\n\ndependencies:\n\nfiles:\n"
       end
 
-      say("\nGenerated skeleton for `#{name}' package in `#{package_dir}'")
+      say("\nGenerated skeleton for '#{name}' package in '#{package_dir}'")
     end
 
     private

data/lib/cli/commands/property_management.rb

@@ -17,14 +17,14 @@ module Bosh::Cli::Command
       end
 
       if existing_property
-        say("Current `#{name.make_green}' value is " +
-            "`#{format_property(body["value"]).make_green}'")
+        say("Current '#{name.make_green}' value is " +
+            "'#{format_property(body["value"]).make_green}'")
       else
         say("This will be a new property")
       end
 
       prompt = "Are you sure you want to set property" +
-        " `#{name.make_green}' to `#{format_property(value).make_green}'?"
+        " '#{name.make_green}' to '#{format_property(value).make_green}'?"
 
       unless confirmed?(prompt)
         err("Canceled")
@@ -37,7 +37,7 @@ module Bosh::Cli::Command
       end
 
       if status == 204
-        say("Property `#{name.make_green}' set to `#{value.make_green}'")
+        say("Property '#{name.make_green}' set to '#{value.make_green}'")
       else
         err(director.parse_error_message(status, body))
       end
@@ -51,7 +51,7 @@ module Bosh::Cli::Command
       show_header
 
       prompt = "Are you sure you want to unset property " +
-        "`#{name.make_green}'?"
+        "'#{name.make_green}'?"
 
       unless confirmed?(prompt)
         err("Canceled")
@@ -60,7 +60,7 @@ module Bosh::Cli::Command
       status, body = director.delete_property(@deployment_name, name)
 
       if status == 204
-        say("Property `#{name.make_green}' has been unset")
+        say("Property '#{name.make_green}' has been unset")
       else
         err(director.parse_error_message(status, body))
       end
@@ -75,8 +75,8 @@ module Bosh::Cli::Command
 
       status, body = director.get_property(@deployment_name, name)
       if status == 200
-        say("Property `#{name.make_green}' value is " +
-            "`#{format_property(body["value"]).make_green}'")
+        say("Property '#{name.make_green}' value is " +
+            "'#{format_property(body["value"]).make_green}'")
       else
         err(director.parse_error_message(status, body))
       end

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

@@ -14,14 +14,14 @@ module Bosh::Cli::Command
         desc << "/#{version}" if version
 
         if force
-          say("Deleting `#{desc}' (FORCED DELETE, WILL IGNORE ERRORS)".make_red)
+          say("Deleting '#{desc}' (FORCED DELETE, WILL IGNORE ERRORS)".make_red)
         else
-          say("Deleting `#{desc}'".make_red)
+          say("Deleting '#{desc}'".make_red)
         end
 
         if confirmed?
           status, task_id = director.delete_release(name, force: force, version: version)
-          task_report(status, task_id, "Deleted `#{desc}'")
+          task_report(status, task_id, "Deleted '#{desc}'")
         else
           say('Canceled deleting release'.make_green)
         end

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

@@ -43,10 +43,10 @@ module Bosh::Cli::Command
         progress_renderer.finish(tarball_file_name, "downloaded")
 
         if file_checksum(tarball_file_path) != tarball_sha1
-          err("Checksum mismatch for downloaded blob `#{tarball_file_path}'")
+          err("Checksum mismatch for downloaded blob '#{tarball_file_path}'")
         end
 
-        task_report(status, task_id, "Exported release `#{release.name.make_green}/#{release.version.make_green}` for `#{stemcell_os.make_green}/#{stemcell.version.make_green}`")
+        task_report(status, task_id, "Exported release '#{release.name.make_green}/#{release.version.make_green}' for '#{stemcell_os.make_green}/#{stemcell.version.make_green}'")
       end
 
       # Returns file SHA1 checksum

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

@@ -42,7 +42,9 @@ module Bosh::Cli::Command
           manifest["version"] = final_release_ver
           manifest["name"] = final_release_name
 
-          tarball.replace_manifest(manifest)
+          updated_manifest = upload_package_and_job_blobs(manifest, tarball)
+
+          tarball.replace_manifest(updated_manifest)
 
           FileUtils.mkdir_p(final_release_dir)
           final_release_manifest_path = File.absolute_path(File.join(final_release_dir, "#{final_release_name}-#{final_release_ver}.yml"))
@@ -55,8 +57,6 @@ module Bosh::Cli::Command
           final_release_tarball_path = File.absolute_path(File.join(final_release_dir, "#{final_release_name}-#{final_release_ver}.tgz"))
           tarball.create_from_unpacked(final_release_tarball_path)
 
-          upload_package_and_job_blobs(manifest, tarball)
-
           nl
           say("Creating final release #{final_release_name}/#{final_release_ver} from dev release #{dev_release_name}/#{dev_release_ver}")
 
@@ -77,19 +77,25 @@ module Bosh::Cli::Command
       private
 
       def upload_package_and_job_blobs(manifest, tarball)
-        manifest['packages'].each do |package|
-          upload_to_blobstore(package, 'packages', tarball.package_tarball_path(package['name']))
+        manifest['packages'].map! do |package|
+          upload_to_blobstore(package.dup, 'packages', tarball.package_tarball_path(package['name']))
         end
 
-        manifest['jobs'].each do |job|
-          upload_to_blobstore(job, 'jobs', tarball.job_tarball_path(job['name']))
+        manifest['jobs'].map! do |job|
+          upload_to_blobstore(job.dup, 'jobs', tarball.job_tarball_path(job['name']))
         end
 
         if manifest['license']
           # the licence is different from packages and jobs: it has to be rebuilt from the
           # raw LICENSE and/or NOTICE files in the dev release tarball
-          archive_builder.build(tarball.license_resource)
+          updated_artifact = archive_builder.build(tarball.license_resource)
+          manifest['license'] = {
+            'version' => updated_artifact.version,
+            'fingerprint' => updated_artifact.fingerprint,
+            'sha1' => updated_artifact.sha1,
+          }
         end
+        manifest
       end
 
       def extract_and_validate_tarball(tarball_path)
@@ -108,11 +114,12 @@ module Bosh::Cli::Command
       def upload_to_blobstore(artifact, plural_type, artifact_path)
         err("Cannot find artifact complete information, please upgrade tarball to newer version") if !artifact['fingerprint']
 
-        final_builds_dir = File.join('.final_builds', plural_type, artifact['name']).to_s
-        FileUtils.mkdir_p(final_builds_dir)
-        final_builds_index = Bosh::Cli::Versions::VersionsIndex.new(final_builds_dir)
+        final_builds_index = final_builds_for_artifact(plural_type, artifact)
 
-        return artifact if final_builds_index[artifact['fingerprint']]
+        if final_builds_index[artifact['fingerprint']]
+          artifact['sha1'] = final_builds_index[artifact['fingerprint']]['sha1']
+          return artifact
+        end
 
         @progress_renderer.start(artifact['name'], "uploading...")
         blobstore_id = nil
@@ -126,6 +133,7 @@ module Bosh::Cli::Command
             'blobstore_id' => blobstore_id
           })
         @progress_renderer.finish(artifact['name'], "uploaded")
+        artifact
       end
 
       def archive_builder
@@ -136,6 +144,12 @@ module Bosh::Cli::Command
       def archive_repository_provider
         @archive_repository_provider ||= Bosh::Cli::ArchiveRepositoryProvider.new(work_dir, cache_dir, release.blobstore)
       end
+
+      def final_builds_for_artifact(plural_type, artifact)
+        final_builds_dir = File.join('.final_builds', plural_type, artifact['name']).to_s
+        FileUtils.mkdir_p(final_builds_dir)
+        Bosh::Cli::Versions::VersionsIndex.new(final_builds_dir)
+      end
     end
   end
 end

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

@@ -170,10 +170,10 @@ If --name & --version are provided, they will be used for checking if release ex
 
       def upload_remote_release(release_location, upload_options = {})
         if upload_options[:rebase]
-          say("Using remote release `#{release_location}' (#{'will be rebased'.make_yellow})")
+          say("Using remote release '#{release_location}' (#{'will be rebased'.make_yellow})")
           report = 'Release rebased'
         else
-          say("Using remote release `#{release_location}'")
+          say("Using remote release '#{release_location}'")
           report = 'Release uploaded'
         end
 

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

@@ -14,13 +14,13 @@ module Bosh::Cli::Command
         nl
 
         if tarball.valid?
-          say("`#{tarball_path}' is a valid release".make_green)
+          say("'#{tarball_path}' is a valid release".make_green)
         else
           say('Validation errors:'.make_red)
           tarball.errors.each do |error|
             say("- #{error}")
           end
-          err("`#{tarball_path}' is not a valid release".make_red)
+          err("'#{tarball_path}' is not a valid release".make_red)
         end
       end
     end

data/lib/cli/commands/restore.rb

@@ -19,12 +19,12 @@ class Restore < Base
         return
       end
 
-      err("The file `#{path}' does not exist.".make_red) unless File.exists?(path)
-      err("The file `#{path}' is not readable.".make_red) unless File.readable?(path)
+      err("The file '#{path}' does not exist.".make_red) unless File.exists?(path)
+      err("The file '#{path}' is not readable.".make_red) unless File.readable?(path)
 
       nl
       status = director.restore_db(path)
-      err("Failed to restore the database, the status is `#{status}'") unless status == 202
+      err("Failed to restore the database, the status is '#{status}'") unless status == 202
       nl
       say('Starting restore of BOSH director.')
 

data/lib/cli/commands/snapshot.rb

@@ -50,7 +50,7 @@ module Bosh::Cli::Command
       deployment_name = prepare_deployment_manifest(show_state: true).name
 
       unless job && index
-        unless confirmed?("Are you sure you want to take a snapshot of all deployment `#{deployment_name}'?")
+        unless confirmed?("Are you sure you want to take a snapshot of all deployment '#{deployment_name}'?")
           say('Canceled taking snapshot'.make_green)
           return
         end
@@ -68,14 +68,14 @@ module Bosh::Cli::Command
 
       deployment_name = prepare_deployment_manifest(show_state: true).name
 
-      unless confirmed?("Are you sure you want to delete snapshot `#{snapshot_cid}'?")
+      unless confirmed?("Are you sure you want to delete snapshot '#{snapshot_cid}'?")
         say('Canceled deleting snapshot'.make_green)
         return
       end
 
       status, task_id = director.delete_snapshot(deployment_name, snapshot_cid)
 
-      task_report(status, task_id, "Deleted Snapshot `#{snapshot_cid}'")
+      task_report(status, task_id, "Deleted Snapshot '#{snapshot_cid}'")
     end
 
     usage 'delete snapshots'
@@ -85,14 +85,14 @@ module Bosh::Cli::Command
 
       deployment_name = prepare_deployment_manifest(show_state: true).name
 
-      unless confirmed?("Are you sure you want to delete all snapshots of deployment `#{deployment_name}'?")
+      unless confirmed?("Are you sure you want to delete all snapshots of deployment '#{deployment_name}'?")
         say('Canceled deleting snapshots'.make_green)
         return
       end
 
       status, task_id = director.delete_all_snapshots(deployment_name)
 
-      task_report(status, task_id, "Deleted all snapshots of deployment `#{deployment_name}'")
+      task_report(status, task_id, "Deleted all snapshots of deployment '#{deployment_name}'")
     end
   end
 end