bosh_cli 1.2788.0 → 1.2789.0

data/lib/cli/commands/deployment.rb

@@ -81,14 +81,17 @@ 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"
     def perform
       auth_required
       recreate = !!options[:recreate]
+      redact_diff = !!options[:redact_diff]
 
       manifest_yaml = prepare_deployment_manifest(
         :yaml => true, :resolve_properties => true)
 
-      inspect_deployment_changes(Psych.load(manifest_yaml), interactive: interactive?)
+      inspect_deployment_changes(Psych.load(manifest_yaml),
+        interactive: interactive?, redact_diff: redact_diff)
       say('Please review all changes carefully'.make_yellow) if interactive?
 
       deployment_name = File.basename(deployment)

data/lib/cli/deployment_helper.rb

@@ -76,7 +76,7 @@ module Bosh::Cli
         @_diff_key_visited = {}
         diff.keys.each do |key|
           unless @_diff_key_visited[key]
-            print_summary(diff, key)
+            print_summary(diff, key, false)
             nl
           end
         end
@@ -93,6 +93,7 @@ module Bosh::Cli
     def inspect_deployment_changes(manifest, options = {})
       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'])
@@ -120,13 +121,13 @@ module Bosh::Cli
       end
 
       if diff[:release]
-        print_summary(diff, :release)
+        print_summary(diff, :release, redact_diff)
         warn_about_release_changes(diff[:release]) if interactive
         nl
       end
 
       if diff[:releases]
-        print_summary(diff, :releases)
+        print_summary(diff, :releases, redact_diff)
         if interactive
           diff[:releases].each do |release_diff|
             warn_about_release_changes(release_diff)
@@ -135,31 +136,31 @@ module Bosh::Cli
         nl
       end
 
-      print_summary(diff, :compilation)
+      print_summary(diff, :compilation, redact_diff)
       nl
 
-      print_summary(diff, :update)
+      print_summary(diff, :update, redact_diff)
       nl
 
-      print_summary(diff, :resource_pools)
+      print_summary(diff, :resource_pools, redact_diff)
       warn_about_stemcell_changes(diff) if interactive
       nl
 
-      print_summary(diff, :disk_pools)
+      print_summary(diff, :disk_pools, redact_diff)
       nl
 
-      print_summary(diff, :networks)
+      print_summary(diff, :networks, redact_diff)
       nl
 
-      print_summary(diff, :jobs)
+      print_summary(diff, :jobs, redact_diff)
       nl
 
-      print_summary(diff, :properties)
+      print_summary(diff, :properties, redact_diff)
       nl
 
       diff.keys.each do |key|
         unless @_diff_key_visited[key]
-          print_summary(diff, key)
+          print_summary(diff, key, redact_diff)
           nl
         end
       end
@@ -323,7 +324,7 @@ module Bosh::Cli
       EOS
     end
 
-    def print_summary(diff, key, title = nil)
+    def print_summary(diff, key, redact, title = nil)
       title ||= key.to_s.gsub(/[-_]/, ' ').capitalize
 
       say(title.make_green)
@@ -332,7 +333,11 @@ module Bosh::Cli
       if !summary || summary.empty?
         say('No changes')
       else
-        say(summary.join("\n"))
+        if redact
+          say("Changes found - Redacted")
+        else
+          say(summary.join("\n"))
+        end
       end
 
       @_diff_key_visited[key.to_s] = 1

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2788.0'
+    VERSION = '1.2789.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2788.0
+  version: 1.2789.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2788.0
+        version: 1.2789.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2788.0
+        version: 1.2789.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2788.0
+        version: 1.2789.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2788.0
+        version: 1.2789.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2788.0
+        version: 1.2789.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2788.0
+        version: 1.2789.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
         version: 0.5.4
 description: ! 'BOSH CLI
 
-  e5697a'
+  177517'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3829858657906541199
+      hash: 271561866118815358
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23