knife-uploader 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc52a66d8a055b73673f4c6e6f78625cb98dcb6c
-  data.tar.gz: 900b14fa63e8f61f8ccfa9a90c284af0d47a6da8
+  metadata.gz: fcc9484804ca9f66f58700ac210996a74772566d
+  data.tar.gz: b569f9fd687aebe8b0a391d831a6515b4fc2b790
 SHA512:
-  metadata.gz: 320b161c6c84e1069bce5eaf7f3a2c6e6b279b19dfe0610cdaa20d8f31d84eec5e97de4f873d6a7a19cb39d74a7f9bf2a7549140c85f7c00d5bf640231cf2afe
-  data.tar.gz: 068faafc3c9cff565defd5b0ea7153597d025677543cc61d949125c44a674a0cf1b22def248da32fc46f3b16839158bd24d990e7fb2c8f58382db9a646a267d4
+  metadata.gz: 0758984dea2bd60386c10be3fd3eb20c80e39bc65ed77556edd745df895a72367bb0613d57e39845bb1e88c2ae0fac60b0fc00aac66f9b5d62d87973b1886ad2
+  data.tar.gz: 130d96553f42d95a4760e79b90b9c4f3c63f84fd0002d3e8edec19b72f4c8d761fc95ffc29bb5a0ed2e6eba7a859f5b1116d095d0fdfa98b81475b692b3b0e04

data/lib/chef/knife/uploader_base.rb

@@ -103,16 +103,21 @@ module KnifeUploader
         end
 
         option :pattern,
-          :short => '-p PATTERN',
-          :long => '--pattern PATTERN',
-          :description => 'A regular expression pattern to restrict the set of objects to ' +
+          short: '-p PATTERN',
+          long: '--pattern PATTERN',
+          description: 'A regular expression pattern to restrict the set of objects to ' +
                           'manipulate',
-          :proc => Proc.new { |value| Chef::Config[:knife][:pattern] = value }
+          proc: Proc.new { |value| Chef::Config[:knife][:pattern] = value }
 
         option :debug,
-          :long => '--debug',
-          :description => 'Turn on debug messages',
-          :proc => Proc.new { |value| Chef::Config[:knife][:debug] = value }
+          long: '--debug',
+          description: 'Turn on debug messages',
+          proc: Proc.new { |value| Chef::Config[:knife][:debug] = value }
+
+        option :show_encrypted,
+          long: '--show_encrypted',
+          description: 'Show the decrypted data bag contets when different.',
+          prod: Proc.new { |value| Chef::Config[:knife][:show_encrypted] = value }
       end
     end
   end

data/lib/chef/knife/uploader_data_bag.rb

@@ -82,6 +82,8 @@ module KnifeUploader
       old_decrypted_formatted = Utils.json_with_sorted_keys(old_decrypted)
       new_decrypted_formatted = Utils.json_with_sorted_keys(new_decrypted)
 
+      show_encrypted = locate_config_value(:show_encrypted) || false
+
       # Encrypted data could differ but decrypted data could still be the same.
       if old_decrypted_formatted == new_decrypted_formatted
         ui.info("#{item_id} has differences before decryption " +
@@ -89,10 +91,16 @@ module KnifeUploader
         return false
       end
 
-      ui.info("#{diff_comment_prefix} data bag item #{item_id} " +
-              "(#{old_could_decrypt ? 'decrypted' : 'raw'} #{desc1} vs." +
-              " #{new_could_decrypt ? 'decrypted' : 'raw'} #{desc2}):\n" +
-              diff_color(old_decrypted_formatted, new_decrypted_formatted) + "\n")
+      if !show_encrypted && (old_could_decrypt || new_could_decrypt)
+        ui.info("#{diff_comment_prefix} data bag item #{item_id}. \n" +
+                "\tNot showing the diff since they are encrypted.\n" +
+                "\tUse --show_encrypted to display the diff.\n\n")
+      else
+        ui.info("#{diff_comment_prefix} data bag item #{item_id} " +
+                "(#{old_could_decrypt ? 'decrypted' : 'raw'} #{desc1} vs." +
+                " #{new_could_decrypt ? 'decrypted' : 'raw'} #{desc2}):\n" +
+                diff_color(old_decrypted_formatted, new_decrypted_formatted) + "\n")
+      end
       true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-uploader
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mikhail Bautin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef