Change hard errors to warnings for deprecated methods

1 files changed, 17 insertions, 16 deletions

diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb
index 4e3e8069a6..1f55ff8b72 100644
--- a/lib/chef/cookbook_version.rb
+++ b/lib/chef/cookbook_version.rb
@@ -63,47 +63,48 @@ class Chef
       cookbook_manifest.update_from(new_manifest)
     end
 
+    private def deprecated!(message)
+      if Chef::Config[:treat_deprecation_warnings_as_errors]
+        raise Exceptions::DeprecatedFeatureError, message
+      else
+        Chef::Log.warn(message)
+      end
+    end
+
     def save_url
       # TODO: double check this code suggestion
-      msg = <<-WARNING
+      deprecated!(<<-DEPRECATED)
 Cookbooks now have multiple save URLs based on the capabilities of the Chef Server.
 To get the default save URL, use code like `Chef::CookbookManifest.new(cookbook_version).save_url`
-WARNING
-      raise msg
-      # TODO: change to warning
+DEPRECATED
+
       cookbook_manifest.save_url
     end
 
     def force_save_url
       # TODO: double check this code suggestion
-      msg = <<-WARNING
+      deprecated!(<<-DEPRECATED)
 Cookbooks now have multiple save URLs based on the capabilities of the Chef Server.
 To get the default save URL, use code like `Chef::CookbookManifest.new(cookbook_version).force_save_url`
-WARNING
-      raise msg
-      # TODO: change to warning
+DEPRECATED
       cookbook_manifest.force_save_url
     end
 
     def to_hash
       # TODO: double check this code suggestion
-      msg = <<-WARNING
+      deprecated!(<<-DEPRECATED)
 Cookbooks now have multiple JSON representations based on the capabilities of the Chef Server.
 To get the Hash representation, use code like `Chef::CookbookManifest.new(cookbook_version).to_hash`
-WARNING
-      raise msg
-      # TODO: change to warning
+DEPRECATED
       cookbook_manifest.to_hash
     end
 
     def to_json(*a)
       # TODO: double check this code suggestion
-      msg = <<-WARNING
+      deprecated!(<<-DEPRECATED)
 Cookbooks now have multiple JSON representations based on the capabilities of the Chef Server.
 To get the JSON representation, use code like `Chef::CookbookManifest.new(cookbook_version).to_json`
-WARNING
-      raise msg
-      # TODO: change to warning
+DEPRECATED
       cookbook_manifest.to_json
     end