Merge pull request #119 from DataDog/kserrania/pin-dogapi-major

Update dogapi version constraint and fix tests
DataDog · Jan 9, 2020 · 91c15a9 · 91c15a9
2 parents 219240b + e4bc343
commit 91c15a9
Show file tree

Hide file tree

Showing 39 changed files with 3,654 additions and 4,940 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     chef-handler-datadog (0.12.3)
-      dogapi (= 1.36.0)
+      dogapi (~> 1.38.0)
 
 GEM
   remote: http://rubygems.org/
@@ -67,7 +67,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.3.2)
-    dogapi (1.36.0)
+    dogapi (1.38.0)
       multi_json
     dotenv (2.7.5)
     ed25519 (1.2.4)
@@ -276,7 +276,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 2.0.1)
   bundler
-  chef (>= 12.7)
+  chef (~> 15.0)
   chef-handler-datadog!
   dotenv
   guard

diff --git a/chef-handler-datadog.gemspec b/chef-handler-datadog.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.extra_rdoc_files = ['README.md', 'LICENSE.txt']
 
-  gem.add_dependency 'dogapi', '= 1.36.0'
+  gem.add_dependency 'dogapi', '~> 1.38.0'
 
   gem.add_development_dependency 'appraisal', '~> 2.0.1'
   gem.add_development_dependency 'bundler'

diff --git a/lib/chef/handler/datadog_chef_events.rb b/lib/chef/handler/datadog_chef_events.rb
@@ -10,6 +10,9 @@
 class DatadogChefEvents
   include DatadogUtil
 
+  attr_reader :event_title
+  attr_reader :event_body
+
   def initialize
     @hostname = nil
     @run_status = nil

diff --git a/lib/chef/handler/datadog_chef_tags.rb b/lib/chef/handler/datadog_chef_tags.rb
@@ -92,6 +92,7 @@ def with_policy_tags_enabled(enabled)
   def send_update_to_datadog(dog)
     tags = combined_host_tags
     retries = @retries
+    rc = []
     begin
       loop do
         should_retry = false
@@ -114,7 +115,7 @@ def send_update_to_datadog(dog)
         break unless should_retry
       end
     rescue StandardError => e
-      Chef::Log.warn("Could not determine whether #{@hostname}'s tags were successfully submitted to Datadog: #{rc}. Error:\n#{e}")
+      Chef::Log.warn("Could not determine whether #{@hostname}'s tags were successfully submitted to Datadog: #{rc.inspect}. Error:\n#{e}")
     end
   end