bosh_cli 1.3178.0 → 1.3181.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c301e84146873f8d658e9777dfd45bb680f47e5
-  data.tar.gz: 967d60eab9b45d2f4243b41e3c96179766a7ab51
+  metadata.gz: f3752794136b632c019fbc30d74f20d9b2af6dd9
+  data.tar.gz: 0c09ce0323b35eedae508812a396f79c6f5da9e6
 SHA512:
-  metadata.gz: 96e70e4b956deb8502ee5145ef39cf1eb1a9d8d71391d3c8eb7a79a3d8d5421ca9f0153e6895c58e3dc476f83fb444212f66d3c5161a8c5e002541294f985617
-  data.tar.gz: 43368c13fe63e26c61124ea4484f9a5db177d2b43c8d51c691bc40966e5e5663a07708a6dbad8b1784ab0d47f6654d35940dd5c0e1c2cf13b64364da8d6b13be
+  metadata.gz: 1b2a7a5b96cb7d59a1581e0b4a736729ddedc03bc0e379d7c601cf29478a5fbbae51c6595ba7cc5df918a68c5f210796236439704f534709c885198ea05200da
+  data.tar.gz: 452bad4c0109afb3953bce13352ef59f43fcca822a7b71609f7d8d2249f825babcd23fca16fe9cf023c51b5e5921bec0e7cf4a8d19de9fc89c7fcbeacd796d1a

data/lib/cli/client/director.rb

@@ -248,18 +248,29 @@ module Bosh
 
           recreate               = options.delete(:recreate)
           skip_drain             = options.delete(:skip_drain)
+          context                = options.delete(:context)
           options[:content_type] = 'text/yaml'
           options[:payload]      = manifest_yaml
 
           url = '/deployments'
 
           extras = []
-          extras << ['recreate', 'true']   if recreate
+          extras << ['recreate', 'true'] if recreate
+          extras << ['context', JSON.dump(context)] if context
           extras << ['skip_drain', skip_drain] if skip_drain
 
           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)
+          if status == 200
+            JSON.parse(body)
+          else
+            err(parse_error_message(status, body))
+          end
+        end
+
         def setup_ssh(deployment_name, job, id, user,
           public_key, password, options = {})
           options = options.dup

data/lib/cli/commands/deployment.rb

@@ -138,11 +138,7 @@ module Bosh::Cli::Command
 
       manifest = prepare_deployment_manifest(resolve_properties: true, show_state: true)
 
-      inspect_deployment_changes(
-        manifest.hash,
-        interactive: interactive?,
-        redact_diff: redact_diff
-      )
+      context = DeploymentDiff.new(director, manifest).print({redact_diff: redact_diff})
       say('Please review all changes carefully'.make_yellow) if interactive?
 
       header('Deploying')
@@ -151,7 +147,7 @@ module Bosh::Cli::Command
         cancel_deployment
       end
 
-      deploy_options = { recreate: recreate }
+      deploy_options = { recreate: recreate, context: context }
 
       if options.has_key?(:skip_drain)
         # when key is present but no jobs specified OptionParser

data/lib/cli/commands/deployment_diff.rb

@@ -0,0 +1,52 @@
+module Bosh::Cli::Command
+  class DeploymentDiff < Base
+    def initialize(director, manifest)
+      @director = director
+      @manifest = manifest
+    end
+
+    def print(options)
+      begin
+        changes = @director.diff_deployment(@manifest.name, @manifest.yaml)
+        diff = changes['diff']
+
+        header('Detecting deployment changes')
+
+        diff.each do |line_diff|
+          formatted_line_diff, state = line_diff
+
+          # colorization explicitly disabled
+          if Bosh::Cli::Config.use_color?
+            case state
+              when 'added'
+                say(formatted_line_diff.make_green)
+              when 'removed'
+                say(formatted_line_diff.make_red)
+              else
+                say(formatted_line_diff)
+            end
+
+          else
+            case state
+              when 'added'
+                say('+ ' + formatted_line_diff)
+              when 'removed'
+                say('- ' + formatted_line_diff)
+              else
+                say('  ' + formatted_line_diff)
+            end
+          end
+        end
+
+        changes['context']
+      rescue Bosh::Cli::ResourceNotFound
+        inspect_deployment_changes(
+          @manifest,
+          redact_diff: options[:redact_diff]
+        )
+
+        nil
+      end
+    end
+  end
+end

data/lib/cli/config.rb

@@ -39,6 +39,14 @@ module Bosh::Cli
       @commands[command.usage] = command
     end
 
+    def self.use_color?
+      # colorization explicitly enabled, or output is tty
+      return false if Bosh::Cli::Config.colorize == false
+
+      # colorization explicitly enabled, or output is tty
+      Bosh::Cli::Config.colorize || Bosh::Cli::Config.output.tty?
+    end
+
     def initialize(filename, work_dir = Dir.pwd)
       @filename = File.expand_path(filename || Bosh::Cli::DEFAULT_CONFIG_PATH)
       @work_dir = work_dir

data/lib/cli/core_ext.rb

@@ -140,11 +140,7 @@ module BoshStringExtensions
     # output disabled
     return self if !Bosh::Cli::Config.output
 
-    # colorization explicitly disabled
-    return self if Bosh::Cli::Config.colorize == false
-
-    # colorization explicitly enabled, or output is tty
-    if Bosh::Cli::Config.colorize || Bosh::Cli::Config.output.tty?
+    if Bosh::Cli::Config.use_color?
       "#{COLOR_CODES[color_code]}#{self}\e[0m"
     else
       self

data/lib/cli/deployment_helper.rb

@@ -46,12 +46,14 @@ module Bosh::Cli
     # a meaningful return value.
     # @return Boolean Were there any changes in deployment manifest?
     def inspect_deployment_changes(manifest, options = {})
+      manifest.resolve_release_aliases
+      manifest.resolve_stemcell_aliases
+
       show_empty_changeset = options.fetch(:show_empty_changeset, true)
-      interactive = options.fetch(:interactive, false)
       redact_diff = options.fetch(:redact_diff, false)
 
-      manifest = manifest.dup
-      current_deployment = director.get_deployment(manifest['name'])
+      manifest_hash = manifest.hash.dup
+      current_deployment = director.get_deployment(manifest_hash['name'])
 
       # We cannot retrieve current manifest until there was at least one
       # successful deployment. There used to be a warning about that
@@ -65,7 +67,7 @@ module Bosh::Cli
       end
 
       diff = Bosh::Cli::HashChangeset.new
-      diff.add_hash(normalize_deployment_manifest(manifest), :new)
+      diff.add_hash(normalize_deployment_manifest(manifest_hash), :new)
       diff.add_hash(normalize_deployment_manifest(current_manifest), :old)
       @_diff_key_visited = { 'name' => 1, 'director_uuid' => 1 }
 

data/lib/cli/deployment_manifest.rb

@@ -9,6 +9,19 @@ module Bosh::Cli
     def normalize
       normalized = Bosh::Common::DeepCopy.copy(manifest_hash)
 
+      # for backwards compatibility, new directors always convert stemcell and release versions to string
+      if normalized['resource_pools']
+        normalized['resource_pools'].each do |rp|
+          rp['stemcell']['version'] = rp['stemcell']['version'].to_s
+        end
+      end
+
+      if normalized['releases']
+        normalized['releases'].each do |release|
+          release['version'] = release['version'].to_s
+        end
+      end
+
       %w(releases networks jobs resource_pools disk_pools).each do |section|
         normalized[section] ||= []
 

data/lib/cli/job_state.rb

@@ -46,7 +46,7 @@ module Bosh::Cli
     def change_job_state(new_state, job, index_or_id, operation_desc, force)
       @command.say("You are about to #{operation_desc.make_green}")
 
-      check_if_manifest_changed(@manifest.hash, force)
+      check_if_manifest_changed(force)
       unless @command.confirmed?("#{operation_desc.capitalize}?")
         @command.cancel_deployment
       end
@@ -57,8 +57,8 @@ module Bosh::Cli
     end
 
 
-    def check_if_manifest_changed(manifest_hash, force)
-      other_changes_present = @command.inspect_deployment_changes(manifest_hash, show_empty_changeset: false)
+    def check_if_manifest_changed(force)
+      other_changes_present = @command.inspect_deployment_changes(@manifest, show_empty_changeset: false)
 
       if other_changes_present && !force
         @command.err("Cannot perform job management when other deployment changes are present. Please use `--force' to override.")

data/lib/cli/manifest.rb

@@ -62,16 +62,13 @@ module Bosh::Cli
             "please add 'release' or 'releases' section")
       end
 
-      resolve_release_aliases
-      resolve_stemcell_aliases
-
       report_manifest_warnings
 
       @hash
     end
 
     def yaml
-      @yaml ||= Psych.dump(@hash)
+      Psych.dump(@hash)
     end
 
     # @param [Hash] manifest Deployment manifest (will be modified)
@@ -89,12 +86,6 @@ module Bosh::Cli
           if latest_version.nil?
             err("Latest version for stemcell `#{stemcell['name']}' is unknown")
           end
-          # Avoiding {Float,Fixnum} -> String noise in diff
-          if latest_version.to_s == latest_version.to_f.to_s
-            latest_version = latest_version.to_f
-          elsif latest_version.to_s == latest_version.to_i.to_s
-            latest_version = latest_version.to_i
-          end
           stemcell['version'] = latest_version
         end
       end
@@ -132,10 +123,6 @@ module Bosh::Cli
           end
           release['version'] = latest_release_version
         end
-
-        if release['version'].to_i.to_s == release['version']
-          release['version'] = release['version'].to_i
-        end
       end
     end
 

data/lib/cli/release_archiver.rb

@@ -41,23 +41,14 @@ module Bosh::Cli
         end
       end
 
-      in_build_dir do
-        `tar -czf #{filepath} . 2>&1`
-        unless $?.exitstatus == 0
-          raise InvalidRelease, "Cannot create release tarball"
-        end
-        say("Generated #{filepath.make_green}")
-        say("Release size: #{pretty_size(filepath).make_green}")
-      end
+      SortedReleaseArchiver.new(build_dir).archive(filepath)
+
+      say("Generated #{filepath.make_green}")
+      say("Release size: #{pretty_size(filepath).make_green}")
     end
 
     private
 
     attr_reader :manifest, :packages, :jobs, :license, :build_dir
-
-    def in_build_dir(&block)
-      Dir.chdir(build_dir) { yield }
-    end
-
   end
 end

data/lib/cli/release_tarball.rb

@@ -28,6 +28,9 @@ module Bosh::Cli
     def unpack_jobs
       return @unpacked_jobs unless @unpacked_jobs.nil?
       exit_success = safe_fast_unpack('./jobs/')
+      unless all_release_jobs_unpacked?
+        exit_success = safe_unpack('./jobs/')
+      end
       @unpacked_jobs = !!exit_success
     end
 
@@ -48,6 +51,15 @@ module Bosh::Cli
       exit_status
     end
 
+    def safe_unpack(target)
+      exit_status = raw_unpack(target)
+      if !exit_status
+        processed_target = handle_dot_slash_prefix(target)
+        exit_status = raw_unpack(processed_target)
+      end
+      exit_status
+    end
+
     # This will [add or remove] the './' when trying to extract a specific file from archive
     def handle_dot_slash_prefix(target)
       if target =~ /^\.\/.*/
@@ -64,16 +76,29 @@ module Bosh::Cli
         when /.*gnu.*/i
             Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "--occurrence", "#{target}", out: "/dev/null", err: "/dev/null")
         when /.*bsd.*/i
-            if target[-1, 1] == "/"
-              Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
-            else
-              Kernel.system("tar", "-C", @unpack_dir, "--fast-read", "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
-            end
+          if target[-1, 1] == "/"
+            raw_unpack(target)
+          else
+            Kernel.system("tar", "-C", @unpack_dir, "--fast-read", "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
+          end
         else
-          Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
+          raw_unpack(target)
       end
     end
 
+    def raw_unpack(target)
+      Kernel.system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, "#{target}", out: "/dev/null", err: "/dev/null")
+    end
+
+    # verifies that all jobs in release manifest were unpacked
+    def all_release_jobs_unpacked?
+      return false if manifest_yaml['jobs'].nil?
+
+      manifest_job_names = manifest_yaml['jobs'].map { |j| j['name'] }.sort
+      unpacked_job_file_names = Dir.glob(File.join(@unpack_dir, 'jobs', '*')).map { |f| File.basename(f, '.*') }.sort
+      unpacked_job_file_names == manifest_job_names
+    end
+
     # Unpacks tarball to @unpack_dir, returns true if succeeded, false if failed
     def unpack
       return @unpacked unless @unpacked.nil?
@@ -84,7 +109,7 @@ module Bosh::Cli
     # Creates a new tarball from the current contents of @unpack_dir
     def create_from_unpacked(target_path)
       raise "Not unpacked yet!" unless @unpacked
-      !!system("tar", "-C", @unpack_dir, "-pczf", File.expand_path(target_path), ".", out: "/dev/null", err: "/dev/null")
+      SortedReleaseArchiver.new(@unpack_dir).archive(File.expand_path(target_path))
     end
 
     def exists?

data/lib/cli/sorted_release_archiver.rb

@@ -0,0 +1,28 @@
+module Bosh::Cli
+  class SortedReleaseArchiver
+    def initialize(dir)
+      @dir = dir
+    end
+
+    def archive(destination_file)
+      Dir.chdir(@dir) do
+        success = Kernel.system('tar', '-C', @dir, '-pczf', destination_file, *ordered_release_files, out: '/dev/null', err: '/dev/null')
+        if !success
+          raise InvalidRelease, 'Cannot create release tarball'
+        end
+      end
+    end
+
+    private
+
+    def ordered_release_files
+      ordered_release_files = ['./release.MF']
+      license_files = (Dir.entries('.') & ['LICENSE', 'NOTICE']).sort
+      unless license_files.empty?
+        ordered_release_files += license_files.map { |filename| "./#{filename}" }
+      end
+      ordered_release_files += ['./jobs', './packages']
+      ordered_release_files
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3178.0'
+    VERSION = '1.3181.0'
   end
 end

data/lib/cli.rb

@@ -96,6 +96,7 @@ require 'cli/release_archiver'
 require 'cli/release_builder'
 require 'cli/release_compiler'
 require 'cli/release_tarball'
+require 'cli/sorted_release_archiver'
 
 require 'cli/blob_manager'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3178.0
+  version: 1.3181.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-19 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.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.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.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +359,7 @@ files:
 - lib/cli/commands/cloudcheck.rb
 - lib/cli/commands/complete.rb
 - lib/cli/commands/deployment.rb
+- lib/cli/commands/deployment_diff.rb
 - lib/cli/commands/disks.rb
 - lib/cli/commands/errand.rb
 - lib/cli/commands/help.rb
@@ -426,6 +427,7 @@ files:
 - lib/cli/resources/package.rb
 - lib/cli/resurrection.rb
 - lib/cli/runner.rb
+- lib/cli/sorted_release_archiver.rb
 - lib/cli/source_control/git_ignore.rb
 - lib/cli/ssh_session.rb
 - lib/cli/stemcell.rb