summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZane Geiger <zane.geiger@relativity.com>2018-01-12 11:35:48 -0600
committerTim Smith <tsmith@chef.io>2018-02-21 10:04:23 -0800
commit4d891da73538e60dda827e8d4ac6d07c4cf4cd99 (patch)
tree9a6a096068ea5a93574b2011639f398348cab833
parent3ae989a40029813df47e4c70b6e71e919e908a20 (diff)
downloadchef-4d891da73538e60dda827e8d4ac6d07c4cf4cd99.tar.gz
Prevent knife search --id-only from outputting IDs in the same format as an empty hash
Signed-off-by: Zane Geiger <zane.geiger@relativity.com>
-rw-r--r--lib/chef/knife/search.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/chef/knife/search.rb b/lib/chef/knife/search.rb
index 2a68ec5108..2ab1ad21cd 100644
--- a/lib/chef/knife/search.rb
+++ b/lib/chef/knife/search.rb
@@ -98,7 +98,9 @@ class Chef
begin
q.search(@type, @query, search_args) do |item|
formatted_item = Hash.new
- if item.is_a?(Hash)
+ if config[:id_only]
+ formatted_item = format_for_display({ 'id' => item["__display_name"] })
+ elsif item.is_a?(Hash)
# doing a little magic here to set the correct name
formatted_item[item["__display_name"]] = item.reject { |k| k == "__display_name" }
else