foreman_remote_execution 15.0.2 → 16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518eef59c97e835fad82503079a71e1ade2d31873e467dda5260b763be13b939
-  data.tar.gz: 6bc0f53c1251752ea3f08dd407fff1be0b96b53902186c528fe92f02e85bc2ea
+  metadata.gz: 0aed9975e1debc81b9ffbb6979d64fc3630920cbb222eee4ab39e537c8af44b2
+  data.tar.gz: 00f1a3ea5b64b06c8ec65018b36b2fd34af5c908ae171a6b6284a11204f5ede6
 SHA512:
-  metadata.gz: 616d30c28685fd554f06d465c7b44a7aad4f2dc32978477f8880b6865a468c431aa2818ba201c5ff10682d4b6a3d6abc288c52ff178fa028ae9f1206582b177e
-  data.tar.gz: 69aa251274fbbefeb32b22f4a2dd167cc785baa073ffffd6666b8ffbcca15e9ff4db3f066c919aae0a80bb70bfa85a1b01f49f58d47d84ca591af1e2df5ca244
+  metadata.gz: 0d4cf8e11733df130bdd0e8a9d9b0849d59798dc15abe41bf876a2962ce6a08d50e261b9dd30a138b3bc00b9e1f75b3c371083f089ad2591f4aad01d010f62d8
+  data.tar.gz: bc2398fd0c4b2ed4cceff50f2be6ef37459bb298f875436e9f29a78b14964fb6a445c8c4588a06e3dbef504c461efb328f9947b8f868d48e499578a70bfe359b

data/app/controllers/api/v2/job_templates_controller.rb

@@ -23,10 +23,13 @@ module Api
       end
 
       api :POST, '/job_templates/import', N_('Import a job template from ERB')
+      param_group :template_import_options, ::Api::V2::BaseController
       param :template, String, :required => true, :desc => N_('Template ERB')
       param :overwrite, :bool, :required => false, :desc => N_('Overwrite template if it already exists')
       def import
         options = params[:overwrite] ? { :update => true } : { :build_new => true }
+        # the Template superclass expects hash indexed by symbols
+        options = options.merge(params.permit(:options => {}).try(:[], :options).try(:to_h) || {}).with_indifferent_access
 
         @job_template = JobTemplate.import_raw(params[:template], options)
         @job_template ||= JobTemplate.new

data/app/views/api/v2/job_invocations/main.json.rabl

@@ -31,7 +31,7 @@ child :targeting do
 end
 
 child :task do
-  attributes :id, :state
+  attributes :id, :state, :started_at
 end
 
 child @template_invocations do

data/lib/foreman_remote_execution/engine.rb

@@ -35,7 +35,7 @@ module ForemanRemoteExecution
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |app|
       app.reloader.to_prepare do
         Foreman::Plugin.register :foreman_remote_execution do
-          requires_foreman '>= 3.14'
+          requires_foreman '>= 3.15'
           register_global_js_file 'global'
           register_gettext
 

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '15.0.2'.freeze
+  VERSION = '16.0.0'.freeze
 end