Simplify the deprecations system a bit, and introduce ways to silence deprecation warnings.

Signed-off-by: Noah Kantrowitz <noah@coderanger.net>

1 files changed, 7 insertions, 8 deletions

diff --git a/lib/chef/formatters/base.rb b/lib/chef/formatters/base.rb
index 0b27b55048..997577aa7b 100644
--- a/lib/chef/formatters/base.rb
+++ b/lib/chef/formatters/base.rb
@@ -212,14 +212,13 @@ class Chef
         file_load_failed(path, exception)
       end
 
-      def deprecation(message, location = caller(2..2)[0])
-        out = if is_structured_deprecation?(message)
-                message.inspect
-              else
-                "#{message} at #{location}"
-              end
-
-        Chef::Log.deprecation(out)
+      # Log a deprecation warning object.
+      #
+      # @param deprecation [Chef::Deprecated::Base] Deprecation object to log.
+      #   In previous versions, this could be a string. Don't do that anymore.
+      # @param location [Object] Unused, present only for compatbility.
+      def deprecation(deprecation, _location = nil)
+        Chef::Log.deprecation(deprecation.to_s) unless deprecation.silenced?
       end
 
       def is_structured_deprecation?(deprecation)