summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZane Geiger <zane.geiger@relativity.com>2018-01-12 11:35:48 -0600
committerZane Geiger <zane.geiger@relativity.com>2018-01-15 10:26:02 -0600
commit18756f5ca30fcef03286dafe096e9c3135760683 (patch)
treedbd294a6bf66f3a798a677fc4de309ae5c4e7d89
parentadfaadb7e203e5b8f24b2d7db20c3deae7cfa9eb (diff)
downloadchef-18756f5ca30fcef03286dafe096e9c3135760683.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