bosh_cli 1.3202.0 → 1.3213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57bf0c54be21cb26fe042e6cb2a3153187a4a9a9
-  data.tar.gz: b2639e85670849be3a505b9f4d99ca2784a2814d
+  metadata.gz: 4d71ef21dc5730f51080af4a6a321428c098779d
+  data.tar.gz: 6358116553ae88c116dccf01e748a50c41f20b53
 SHA512:
-  metadata.gz: 6593b135fbd3099be5a2f6e68df6fc50ab46ead9583e4d1b13ea216efea37ffa6497f1bf1bdb0f608f7227b302ec41cde2ebe21dbb13280dc4dcb6c91823b07a
-  data.tar.gz: 33af5651442751fca69b45a64c530ec561085b72cab80a66abe1217e6fb69491b23e5f01ead8a1bc8bebc85b2c8ff2e40f80d3e01b73e49fa1ac7b90b4f97c20
+  metadata.gz: d1166bcbe2ef187d5d72836935a281b4220e831187e8e1d5ee816fad44e6857b3faf82c667b61732d5eb6e66677173a0704b8b5ab8de5d9ecd24a8bae4922e9c
+  data.tar.gz: e1326d025425c8a866cfbe9b9612e919d8bfe19466be13a9f986b2746b0b2cca6fccf0bf52be0fe3fc2089ee3f684376467bb2d54fc02a82b4e14759f725f8ff

data/lib/cli/client/director.rb

@@ -1,6 +1,7 @@
 require 'cli/core_ext'
 require 'cli/errors'
 require 'cli/cloud_config'
+require 'cli/runtime_config'
 
 require 'json'
 require 'httpclient'
@@ -127,12 +128,20 @@ module Bosh
           get_json("/deployments/#{deployment_name}/errands")
         end
 
-        def list_running_tasks(verbose = 1)
-          get_json("/tasks?state=processing,cancelling,queued&verbose=#{verbose}")
+        def list_running_tasks(verbose = 1, deployment_name = nil)
+          if deployment_name
+            get_json("/tasks?state=processing,cancelling,queued&verbose=#{verbose}&deployment=#{deployment_name}")
+          else
+            get_json("/tasks?state=processing,cancelling,queued&verbose=#{verbose}")
+          end
         end
 
-        def list_recent_tasks(count = 30, verbose = 1)
-          get_json("/tasks?limit=#{count}&verbose=#{verbose}")
+        def list_recent_tasks(count = 30, verbose = 1, deployment_name = nil)
+          if deployment_name
+            get_json("/tasks?limit=#{count}&verbose=#{verbose}&deployment=#{deployment_name}")
+          else
+            get_json("/tasks?limit=#{count}&verbose=#{verbose}")
+          end
         end
 
         def get_release(name)
@@ -266,12 +275,15 @@ module Bosh
           request_and_track(:post, add_query_string(url, extras), options)
         end
 
-        def diff_deployment(name, manifest_yaml)
-          status, body = post("/deployments/#{name}/diff", 'text/yaml', manifest_yaml)
+        def diff_deployment(name, manifest_yaml, no_redact = false)
+          redact_param = no_redact ? '?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))
+            err(parse_error_message(status, body, uri))
           end
         end
 
@@ -545,12 +557,7 @@ module Bosh
             body = nil if response_code == 416
           end
 
-          # backward compatible with renaming soap log to cpi log
-          if response_code == 204 && log_type == 'cpi'
-            get_task_output(task_id, offset, 'soap')
-          else
-            [body, new_offset]
-          end
+          [body, new_offset]
         end
 
         def cancel_task(task_id)
@@ -669,6 +676,22 @@ module Bosh
           status == 201
         end
 
+        def get_runtime_config
+          _, runtime_configs = get_json_with_status('/runtime_configs?limit=1')
+          latest = runtime_configs.first
+
+          if !latest.nil?
+            Bosh::Cli::RuntimeConfig.new(
+                properties: latest["properties"],
+                created_at: latest["created_at"])
+          end
+        end
+
+        def update_runtime_config(runtime_config_yaml)
+          status, _ = post('/runtime_configs', 'text/yaml', runtime_config_yaml)
+          status == 201
+        end
+
         def cleanup(config = {})
           options = {}
           options[:payload] = JSON.generate('config' => config)

data/lib/cli/commands/deployment.rb

@@ -82,13 +82,15 @@ module Bosh::Cli::Command
     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 '--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?
       manifest = build_manifest
+
       if manifest.hash['releases']
         manifest.hash['releases'].each do |release|
           if release['url'].blank?
@@ -138,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})
+      context = DeploymentDiff.new(director, manifest).print({redact_diff: redact_diff, no_redact: no_redact})
       say('Please review all changes carefully'.make_yellow) if interactive?
 
       header('Deploying')
@@ -188,69 +190,6 @@ module Bosh::Cli::Command
       end
     end
 
-    # bosh validate jobs
-    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')
-      else
-        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)
-      else
-        err('This release was not found in deployment manifest')
-      end
-
-      say(' - discovering packages')
-      packages = Bosh::Cli::Resources::Package.discover(work_dir)
-
-      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')
-      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)
-        validator.jobs_without_properties.sort { |a, b|
-          a.name <=> b.name
-        }.each do |job|
-          say(" - #{job.name}")
-        end
-      end
-
-      if validator.template_errors.empty?
-        nl
-        say('No template errors found'.make_green)
-      else
-        nl
-        say('Template errors: '.make_yellow)
-        validator.template_errors.each do |error|
-          nl
-          path = Pathname.new(error.template_path)
-          rel_path = path.relative_path_from(Pathname.new(release.dir))
-
-          say(" - #{rel_path}:")
-          say("     line #{error.line}:".make_yellow + " #{error.exception.to_s}")
-        end
-      end
-    end
-
     # bosh deployments
     usage 'deployments'
     desc 'Show the list of available deployments'

data/lib/cli/commands/deployment_diff.rb

@@ -7,7 +7,8 @@ module Bosh::Cli::Command
 
     def print(options)
       begin
-        changes = @director.diff_deployment(@manifest.name, @manifest.yaml)
+        no_redact = options[:no_redact]
+        changes = @director.diff_deployment(@manifest.name, @manifest.yaml, no_redact)
         diff = changes['diff']
 
         header('Detecting deployment changes')

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

@@ -24,17 +24,29 @@ module Bosh::Cli::Command
         say(packages_table.render)
       end
 
+      private
+
       def build_jobs_table(release)
         table do |t|
-          t.headings = 'Job', 'Fingerprint', 'Blobstore ID', 'SHA1'
-          release['jobs'].each do |job|
+          t.headings = 'Job', 'Fingerprint', 'Blobstore ID', 'SHA1', 'Links Consumed', 'Links Provided'
+
+          release['jobs'].each_with_index do |job, index|
+
+            consumed_links = (job['consumes'].nil? ? '' : YAML.dump(job['consumes']).sub("---\n", ''))
+            provided_links = (job['provides'].nil? ? '' : YAML.dump(job['provides']).sub("---\n", ''))
+
+            color = (index.even? ? :yellow : :green)
+
             row = [
-                job['name'].make_yellow,
-                job['fingerprint'].make_yellow,
-                job['blobstore_id'].make_yellow,
-                job['sha1'].make_yellow]
+                job['name'].make_color(color),
+                job['fingerprint'].make_color(color),
+                job['blobstore_id'].make_color(color),
+                job['sha1'].make_color(color),
+                consumed_links.make_color(color),
+                provided_links.make_color(color)]
             t << row
           end
+
         end
       end
 

data/lib/cli/commands/runtime_config.rb

@@ -0,0 +1,34 @@
+require 'cli/core_ext'
+
+module Bosh::Cli::Command
+  class RuntimeConfig < Base
+    usage 'runtime-config'
+    desc 'Download the current runtime config for the director'
+
+    def show
+      auth_required
+      show_current_state
+
+      config = director.get_runtime_config
+      if !config.nil?
+        say(config.properties)
+      end
+    end
+
+    usage 'update runtime-config'
+    desc 'Update the current runtime config for the director'
+
+    def update(runtime_config_path)
+      auth_required
+      show_current_state
+
+      runtime_config_yaml = read_yaml_file(runtime_config_path)
+
+      if director.update_runtime_config(runtime_config_yaml)
+        say("Successfully updated runtime config")
+      else
+        err("Failed to update runtime config")
+      end
+    end
+  end
+end

data/lib/cli/commands/task.rb

@@ -66,11 +66,12 @@ module Bosh::Cli::Command
     usage "tasks"
     desc "Show running tasks"
     option "--no-filter", INCLUDE_ALL
+    option "--deployment DEPLOYMENT_NAME", "Show tasks for given deployment"
     def list_running
       auth_required
       show_current_state
       use_filter = !options.key?(:no_filter)
-      tasks = director.list_running_tasks(get_verbose_level(use_filter))
+      tasks = director.list_running_tasks(get_verbose_level(use_filter), options[:deployment])
       err("No running tasks") if tasks.empty?
       show_tasks_table(tasks.sort_by { |t| t["id"].to_i * -1 })
       say("Total tasks running now: %d" % [tasks.size])
@@ -80,11 +81,12 @@ module Bosh::Cli::Command
     usage "tasks recent"
     desc "Show <number> recent tasks"
     option "--no-filter", INCLUDE_ALL
+    option "--deployment DEPLOYMENT_NAME", "Show tasks for given deployment"
     def list_recent(count = 30)
       auth_required
       show_current_state
       use_filter = !options.key?(:no_filter)
-      tasks = director.list_recent_tasks(count, get_verbose_level(use_filter))
+      tasks = director.list_recent_tasks(count, get_verbose_level(use_filter), options[:deployment])
       err("No recent tasks") if tasks.empty?
       show_tasks_table(tasks)
       say("Showing #{tasks.size} recent #{tasks.size == 1 ? "task" : "tasks"}")
@@ -117,9 +119,9 @@ module Bosh::Cli::Command
     def show_tasks_table(tasks)
       return if tasks.empty?
       tasks_table = table do |t|
-        t.headings = "#", "State", "Timestamp", "User", "Description", "Result"
+        t.headings = "#", "State", "Timestamp", "User", "Deployment", "Description", "Result"
         tasks.map do |task|
-          t << [task["id"], task["state"], Time.at(task["timestamp"]).utc, task["user"],
+          t << [task["id"], task["state"], Time.at(task["timestamp"]).utc, task["user"], task["deployment"],
                 task["description"].to_s, task["result"].to_s.truncate(80)]
         end
       end

data/lib/cli/errors.rb

@@ -49,6 +49,7 @@ module Bosh
     class InvalidManifest        < CliError; error_code(514); end
     class PropertyMismatch       < CliError; error_code(515); end
     class InvalidPropertyMapping < CliError; error_code(516); end
+    class InvalidLinks           < CliError; error_code(517); end
 
     class ReleaseVersionError    < CliError; error_code(600); end
   end

data/lib/cli/job_property_validator.rb

@@ -28,23 +28,23 @@ module Bosh::Cli
       end
 
       unless @manifest["jobs"].is_a?(Array)
-        bad_manifest("Invalid jobs format in deployment " +
+        bad_manifest("Invalid instance groups format in deployment " +
           "manifest, Array expected, #{@manifest["jobs"].class} given")
       end
 
       @manifest["jobs"].each do |job|
         unless job.is_a?(Hash)
-          bad_manifest("Invalid job spec in the manifest " +
+          bad_manifest("Invalid instance group spec in the manifest " +
                        "Hash expected, #{job.class} given")
         end
 
         job_name = job["name"]
         if job_name.nil?
-          bad_manifest("Manifest contains at least one job without name")
+          bad_manifest("Manifest contains at least one instance group without name")
         end
 
         if job["template"].nil?
-          bad_manifest("Job '#{job_name}' doesn't have a template")
+          bad_manifest("Instance group '#{job_name}' doesn't have a job")
         end
       end
 
@@ -68,7 +68,7 @@ module Bosh::Cli
       built_job = @built_jobs[job_spec["template"]]
 
       if built_job.nil?
-        raise CliError, "Job '#{job_spec["template"]}' has not been built"
+        raise CliError, "Instance group '#{job_spec["template"]}' has not been built"
       end
 
       collection = JobPropertyCollection.new(

data/lib/cli/runtime_config.rb

@@ -0,0 +1,10 @@
+module Bosh
+  module Cli
+    class RuntimeConfig < Struct.new(:properties, :created_at)
+      def initialize(attrs)
+        self.properties = attrs.fetch(:properties)
+        self.created_at = attrs.fetch(:created_at)
+      end
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3202.0'
+    VERSION = '1.3213.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3202.0
+  version: 1.3213.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-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.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.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.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -384,6 +384,7 @@ files:
 - lib/cli/commands/release/upload_release.rb
 - lib/cli/commands/release/verify_release.rb
 - lib/cli/commands/restore.rb
+- lib/cli/commands/runtime_config.rb
 - lib/cli/commands/snapshot.rb
 - lib/cli/commands/ssh.rb
 - lib/cli/commands/stemcell.rb
@@ -427,6 +428,7 @@ files:
 - lib/cli/resources/package.rb
 - lib/cli/resurrection.rb
 - lib/cli/runner.rb
+- lib/cli/runtime_config.rb
 - lib/cli/sorted_release_archiver.rb
 - lib/cli/source_control/git_ignore.rb
 - lib/cli/ssh_session.rb