summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-09-10 18:18:41 -0700
committertyler-ball <tyleraball@gmail.com>2014-09-29 08:31:08 -0700
commitce03bb01bff58fac8d65b402e4f1fd424f85ca6e (patch)
tree8aa08c82d1c3fd94b2849562bb8504edabaafb8d /lib
parentefcaafeaae481a7b49e5e9b44b79218cee20385d (diff)
downloadchef-ce03bb01bff58fac8d65b402e4f1fd424f85ca6e.tar.gz
Fixing broken tests and updating all tests to (attempt) to use describe/context blocks for readability
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/knife/data_bag_show.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife/data_bag_show.rb b/lib/chef/knife/data_bag_show.rb
index 72f76734e7..2a759d1b43 100644
--- a/lib/chef/knife/data_bag_show.rb
+++ b/lib/chef/knife/data_bag_show.rb
@@ -35,7 +35,7 @@ class Chef
def run
display = case @name_args.length
when 2 # Bag and Item names provided
- secret = read_secret
+ secret = encryption_secret_provided? ? read_secret : nil
raw_data = Chef::DataBagItem.load(@name_args[0], @name_args[1]).raw_data
encrypted = encrypted?(raw_data)