From 6a0da68d18e67d65b4650c46790704b0e2ba3cda Mon Sep 17 00:00:00 2001 From: Evan Jones Date: Sun, 1 Mar 2015 16:00:58 -0800 Subject: [PATCH 1/2] don't pass api_timeout to helper methods that can't handle it --- libraries/sumo_source_provider.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/sumo_source_provider.rb b/libraries/sumo_source_provider.rb index c2b8a68..baebc04 100644 --- a/libraries/sumo_source_provider.rb +++ b/libraries/sumo_source_provider.rb @@ -54,7 +54,7 @@ def action_create if @@collector.source_exist?(new_resource.name) if sumo_source_different? converge_by("replace #{new_resource.name} via api\n" + convergence_description) do - @@collector.update_source!(@@collector.source(new_resource.name)['id'], new_resource.to_sumo_hash, node['sumologic']['api_timeout']) + @@collector.update_source!(@@collector.source(new_resource.name)['id'], new_resource.to_sumo_hash) @@collector.refresh! end @new_resource.updated_by_last_action(true) @@ -62,7 +62,7 @@ def action_create end else converge_by("add #{new_resource.name} via sumologic api\n" + new_resource.to_sumo_hash.to_s) do - @@collector.add_source!(new_resource.to_sumo_hash, node['sumologic']['api_timeout']) + @@collector.add_source!(new_resource.to_sumo_hash) @@collector.refresh! end @new_resource.updated_by_last_action(true) From 4609627b5d0d79dc58a06d4ab378d81dd32dba20 Mon Sep 17 00:00:00 2001 From: Grant Ridder Date: Tue, 17 Nov 2015 15:48:24 -0800 Subject: [PATCH 2/2] Update syntax for rubocop --- libraries/sumo_source_provider.rb | 2 +- spec/helper_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/sumo_source_provider.rb b/libraries/sumo_source_provider.rb index baebc04..030c26c 100644 --- a/libraries/sumo_source_provider.rb +++ b/libraries/sumo_source_provider.rb @@ -61,7 +61,7 @@ def action_create Chef::Log.info("#{@new_resource} replaced sumo_source entry") end else - converge_by("add #{new_resource.name} via sumologic api\n" + new_resource.to_sumo_hash.to_s) do + converge_by("add #{new_resource.name} via sumologic api\n" + new_resource.to_sumo_hash.to_s) do @@collector.add_source!(new_resource.to_sumo_hash) @@collector.refresh! end diff --git a/spec/helper_spec.rb b/spec/helper_spec.rb index 4f85746..eabc166 100644 --- a/spec/helper_spec.rb +++ b/spec/helper_spec.rb @@ -40,7 +40,7 @@ end let(:source_data) do - { sources: [{ name: :pd, name: :doit }] } + { sources: [{ name: :doit, id: 1 }] } end let(:timeout_secs) do