Merge pull request #597 from DataDog/remeh/dd-handler

Removes the include_recipe chef_handler call from dd-handler
DataDog · Apr 26, 2019 · bb6af46 · bb6af46
2 parents df7fcc2 + d58221f
commit bb6af46
Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -54,6 +54,19 @@ The following Opscode cookbooks are dependencies:
 * `chef_handler`
 * `yum`
 
+### Chef support
+
+**Chef 13 users**
+
+- If you're using Chef 13 and chef_handler 1.x, you may have trouble using the
+dd-handler recipe. The known workaround is to update your dependency to `chef_handler >= 2.1`.
+
+**Chef 14 and 15 users**:
+
+- In order to support Chef 12 and 13, the `datadog` cookbook has a dependency to
+the `chef_handler` cookbook which is now shipped as a resource in Chef 14.
+Unfortunately, it will display a deprecation message to Chef 14 and 15 users.
+
 Recipes
 =======
 

diff --git a/recipes/dd-handler.rb b/recipes/dd-handler.rb
@@ -25,8 +25,6 @@
   return
 end
 
-include_recipe 'chef_handler'
-
 if node['datadog']['chef_handler_version'] &&
   Gem::Version.new(node['datadog']['chef_handler_version']) < Gem::Version.new('0.10.0')
   Chef::Log.error('We do not support chef_handler_version < v0.10.0 anymore, please use a more recent version.')

diff --git a/spec/dd-handler_spec.rb b/spec/dd-handler_spec.rb
@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 shared_examples 'a chef-handler-datadog installer' do |version|
-  it 'includes chef_handler recipe' do
-    expect(chef_run).to include_recipe('chef_handler')
-  end
-
   it 'installs the right version of chef-handler-datadog' do
     expect(chef_run).to install_chef_gem('chef-handler-datadog').with(version: version)
   end