Make location verification more idiomatic

Signed-off-by: Jon Cowie <jonlives@gmail.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/lib/chef/data_collector.rb b/lib/chef/data_collector.rb
index 1daf3b2456..65614e88ae 100644
--- a/lib/chef/data_collector.rb
+++ b/lib/chef/data_collector.rb
@@ -543,6 +543,10 @@ class Chef
         end
       end
 
+      def handle_type(type, loc)
+        type == :urls ? validate_and_return_uri(loc) : validate_and_create_file(loc)
+      end
+
       def validate_data_collector_output_locations!
         if data_collector_output_locations.empty?
           raise Chef::Exceptions::ConfigurationError,
@@ -550,15 +554,8 @@ class Chef
         end
 
         data_collector_output_locations.each do |type, locations|
-
-          method = if type == :urls
-                     method(:validate_and_return_uri)
-                   elsif type == :files
-                     method(:validate_and_create_file)
-                   end
-
           locations.each do |l|
-            unless method.call(l)
+            unless handle_type(type,l)
               raise Chef::Exceptions::ConfigurationError,
                       "Chef::Config[:data_collector][:output_locations] contains the location #{l} which is not valid."
             end