[Feature] encrypted flag to knife data bag create

1 files changed, 13 insertions, 4 deletions

diff --git a/lib/chef/knife/data_bag_edit.rb b/lib/chef/knife/data_bag_edit.rb
index b3f53af919..2486edd5dd 100644
--- a/lib/chef/knife/data_bag_edit.rb
+++ b/lib/chef/knife/data_bag_edit.rb
@@ -42,6 +42,11 @@ class Chef
         :description => "A file containing the secret key to use to encrypt data bag item values",
         :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
+      option :encrypted,
+        :long => "--encrypted",
+        :description => "Only encrypt data bag when specified.",
+        :proc => Proc.new { |e| Chef::Config[:knife][:encrypted] = e }
+
       def read_secret
         if config[:secret]
           config[:secret]
@@ -51,11 +56,15 @@ class Chef
       end
 
       def use_encryption
-        if config[:secret] && config[:secret_file]
-          stdout.puts "please specify only one of --secret, --secret-file"
-          exit(1)
+        if config[:encrypted]
+          if config[:secret] && config[:secret_file]
+            ui.fatal("please specify only one of --secret, --secret-file")
+            exit(1)
+          end
+          config[:secret] || config[:secret_file]
+        else
+          false
         end
-        config[:secret] || config[:secret_file]
       end
 
       def load_item(bag, item_name)