Merge pull request #86 from jeremymv2/add_more_output_info

adding clarifications
chef-boneyard · Aug 29, 2016 · d5f5d2a · d5f5d2a
2 parents 69625e5 + bb57ccd
commit d5f5d2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -19,9 +19,10 @@
 # collector possible values: chef-server, chef-compliance, chef-visibility
 # chef-visibility requires inspec version 0.27.1 or above
 default['audit']['collector'] = 'chef-server'
-# server needed for the 'chef-compliance' and 'chef-server' collectors
+# server and token are only needed for the 'chef-compliance' collector
 default['audit']['server'] = nil
-# token needed for the 'chef-compliance' collector
+# choose between token and refresh_token
+# the token, needed for the 'chef-compliance' collector
 default['audit']['token'] = nil
 # refresh_token needed for the 'chef-compliance' collector
 default['audit']['refresh_token'] = nil

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -33,6 +33,8 @@
     if report_collector == 'chef-compliance' && !refresh_token.nil?
       token = retrieve_access_token(server, refresh_token, node['audit']['insecure'])
       node.override['audit']['token'] = token
+    else
+      Chef::Log.info("Token Exchange not necessary, using #{report_collector} audit.collector instead.")
     end
   end
   action :run