(BOLT-994) Task helper for remote resources

Author: da-ar

tasks/panos_task.rb renamed to lib/puppet/util/task_helper.rb

@@ -1,8 +1,10 @@
 require 'puppet'
 require 'json'
 
-class PanosTask
-  def initialize
+class Puppet::Util::TaskHelper
+  def initialize(transport_name)
+    @transport_name = transport_name
+
     # work around the fact that bolt (for now, see BOLT-132) is not able to transport additional code from the module
     # this requires that the panos module is pluginsynced to the node executing the task
     Puppet.settings.initialize_app_defaults(
@@ -13,18 +15,21 @@ def initialize
     $LOAD_PATH.unshift(Puppet[:plugindest])
 
     unless target
-      puts "Panos task must be run on a proxy"
+      puts "Task must be run on a proxy"
       exit 1
     end
 
+    Puppet::Util::Log.newdestination(:console)
+    Puppet[:log_level] = 'debug'
+
     add_plugin_paths(params['_installdir'])
   end
 
   def transport
     require 'puppet/resource_api/transport'
-    require 'puppet/transport/panos'
+    require "puppet/transport/#{@transport_name}"
 
-    Puppet::ResourceApi::Transport.connect('panos', credentials)
+    Puppet::ResourceApi::Transport.connect(@transport_name, credentials)
   end
 
   def params
@@ -36,24 +41,7 @@ def target
   end
 
   def credentials
-    @credentials ||= if target.key? 'apikey'
-                        {
-                          host: target['host'],
-                          apikey: target['apikey']
-                        }
-                      else
-                        {
-                          host: target['host'],
-                          user: target['user'],
-                          password: target['password']
-                        }
-                      end
-
-    if target.key? 'port'
-      @credentials[:port] = target['port']
-    end
-
-    @credentials
+    @credentials ||= target.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
   end
 
   private

tasks/apikey.json

@@ -6,7 +6,7 @@
   "parameters": {
   },
   "files": [
-    "panos/tasks/panos_task.rb",
+    "panos/lib/puppet/util/task_helper.rb",
     "panos/lib/puppet/transport/panos.rb",
     "panos/lib/puppet/transport/schema/panos.rb"
   ]

tasks/apikey.rb

@@ -1,6 +1,6 @@
 #!/opt/puppetlabs/puppet/bin/ruby
 
-require_relative 'panos_task'
-task = PanosTask.new
+require_relative '../lib/puppet/util/task_helper'
+task = Puppet::Util::TaskHelper.new('panos')
 
 puts JSON.generate(apikey: task.transport.apikey)

tasks/commit.json

@@ -6,7 +6,7 @@
   "parameters": {
   },
   "files": [
-    "panos/tasks/panos_task.rb",
+    "panos/lib/puppet/util/task_helper.rb",
     "panos/lib/puppet/transport/panos.rb",
     "panos/lib/puppet/transport/schema/panos.rb"
   ]

tasks/commit.rb

@@ -1,7 +1,7 @@
 #!/opt/puppetlabs/puppet/bin/ruby
 
-require_relative 'panos_task'
-task = PanosTask.new
+require_relative '../lib/puppet/util/task_helper'
+task = Puppet::Util::TaskHelper.new('panos')
 
 if task.transport.outstanding_changes?
   task.transport.commit

tasks/set_config.json

@@ -14,7 +14,7 @@
     }
   },
   "files": [
-    "panos/tasks/panos_task.rb",
+    "panos/lib/puppet/util/task_helper.rb",
     "panos/lib/puppet/transport/panos.rb",
     "panos/lib/puppet/transport/schema/panos.rb"
   ]

tasks/set_config.rb

@@ -1,7 +1,7 @@
 #!/opt/puppetlabs/puppet/bin/ruby
 
-require_relative 'panos_task'
-task = PanosTask.new
+require_relative '../lib/puppet/util/task_helper'
+task = Puppet::Util::TaskHelper.new('panos')
 
 file = task.params['config_file']
 transport.import(file, 'configuration')