file_upload.rb in bolt-0.15.0

- old
+ new

@@ -3,24 +3,28 @@
 # * This function does nothing if the list of targets is empty.
 # * It is possible to run on the target 'localhost'
 # * A target is a String with a targets's hostname or a Target.
 # * The returned value contains information about the result per target.
 #
+require 'bolt/error'
+
 Puppet::Functions.create_function(:file_upload, Puppet::Functions::InternalFunction) do
   local_types do
     type 'TargetOrTargets = Variant[String[1], Target, Array[TargetOrTargets]]'
   end
 
   dispatch :file_upload do
     scope_param
     param 'String[1]', :source
     param 'String[1]', :destination
-    repeated_param 'TargetOrTargets', :targets
-    return_type 'ExecutionResult'
+    param 'TargetOrTargets', :targets
+    optional_param 'Hash[String[1], Any]', :options
+    return_type 'ResultSet'
   end
 
-  def file_upload(scope, source, destination, *targets)
+  def file_upload(scope, source, destination, targets, options = nil)
+    options ||= {}
     unless Puppet[:tasks]
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
         Puppet::Pops::Issues::TASK_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, operation: 'file_upload'
       )
     end
@@ -38,19 +42,20 @@
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: source
       )
     end
 
     # Ensure that that given targets are all Target instances
-    targets = targets.flatten.map { |t| t.is_a?(String) ? Bolt::Target.new(t) : t }
+    targets = [targets] unless targets.is_a?(Array)
+    targets = targets.flatten.map { |t| t.is_a?(String) ? Bolt::Target.from_uri(t) : t }
     if targets.empty?
       call_function('debug', "Simulating file upload of '#{found}' - no targets given - no action taken")
-      Bolt::ExecutionResult::EMPTY_RESULT
+      r = Bolt::ResultSet.new([])
     else
-      # Awaits change in the executor, enabling it receive Target instances
-      hosts = targets.map(&:host)
+      r = executor.file_upload(targets, found, destination)
+    end
 
-      Bolt::ExecutionResult.from_bolt(
-        executor.file_upload(executor.from_uris(hosts), found, destination)
-      )
+    if !r.ok && !options['_catch_errors']
+      raise Bolt::RunFailure.new(r, 'upload_file', source)
     end
+    r
   end
 end