foreman_remote_execution 11.1.1 → 11.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d56ae409f173cfae7b2ff5f9e5db8a86bbb12574efcd2ab1e9acd9b80ce07f
-  data.tar.gz: d2897bd622c9d79613ee1f07102a07799f70aff7d0f031345394adb4f4badfb6
+  metadata.gz: '099d9d7140c506a3f504b68de05eec293d4dd391bdd402b085019aaaa26c82a7'
+  data.tar.gz: 2811f1aefc0cf16d65a7bf999927ccda7e31bf70705c2f1ff223d46c41de9d67
 SHA512:
-  metadata.gz: 87591392d5a1cb138e271820de90d0c2d661489fa02a3943f6a8baa5ed27fcaf81b6bf1b9a12749ad77c3a8c1ed95bfad4cdba24c4e653015d0922ef57c4f8cd
-  data.tar.gz: b1e00a53b261dedd92b23c2c7ddf8b22112a5197a71e778401a7e9d67e08dfc5f2bbaabacbc8302146365a74cff9e1ce864227967b4040eed36b688969e8183f
+  metadata.gz: d793830b576a7b8fb698fa4ef940b182ba8fae1f0bc3e30cef5f485330f6d04e4a1e47fba9878a63854dca208fd9b51a3954f5ed93379918690706f44c3ffa4b
+  data.tar.gz: 119ff10ea101c237b96bc6b6a9d013505804a578150c99b30323c8da37fa6ee15399d56b599ae078c259bc88d8048ec1717ef1f59ec46122b8db25e92a885066

data/app/controllers/ui_job_wizard_controller.rb

@@ -64,7 +64,10 @@ class UiJobWizardController < ApplicationController
     job = JobInvocation.authorized.find(params[:id])
     composer = JobInvocationComposer.from_job_invocation(job, params).params
     job_template_inputs = JobTemplate.authorized.find(composer[:template_invocations][0][:template_id]).template_inputs_with_foreign
-    inputs = Hash[job_template_inputs.map { |input| ["inputs[#{input[:name]}]", {:advanced => input[:advanced], :value => (composer[:template_invocations][0][:input_values].find { |value| value[:template_input_id] == input[:id] }).try(:[], :value)}] }]
+    job_template_inputs_hash = Hash[job_template_inputs.map { |input| ["inputs[#{input[:name]}]", {:advanced => input[:advanced], :value => (composer[:template_invocations][0][:input_values].find { |value| value[:template_input_id] == input[:id] }).try(:[], :value)}] }]
+    provider_inputs = composer[:template_invocations][0][:provider_input_values]
+    provider_inputs_hash = Hash[provider_inputs.map { |input| ["inputs[#{input[:name]}]", {:advanced => true, :value => input[:value]}] }]
+    inputs = job_template_inputs_hash.merge(provider_inputs_hash)
     job_organization = Taxonomy.find_by(id: job.task.input[:current_organization_id])
     job_location = Taxonomy.find_by(id: job.task.input[:current_location_id])
     render :json => {

data/app/helpers/remote_execution_helper.rb

@@ -33,8 +33,7 @@ module RemoteExecutionHelper
       links << { title: _('Host detail'),
         action: { href: current_host_details_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
     end
-
-    if authorized_for(hash_for_rerun_job_invocation_path(id: job_invocation, host_ids: [ host.id ], authorizer: job_hosts_authorizer))
+    if authorized_for(controller: :job_invocations, action: :create) && (!host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts))
       links << { title: (_('Rerun on %s') % host.name),
         action: { href: rerun_job_invocation_path(job_invocation, host_ids: [ host.id ]),
                   'data-method': 'get', id: "#{host.name}-actions-rerun" } }
@@ -56,7 +55,7 @@ module RemoteExecutionHelper
   def job_invocations_buttons
     [
       documentation_button_rex('3.2ExecutingaJob'),
-      display_link_if_authorized(_('Run Job'), hash_for_new_job_invocation_path, {:class => "btn btn-primary"}),
+      authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Run Job'), hash_for_new_job_invocation_path, {:class => "btn btn-primary"}) : '',
     ]
   end
 
@@ -70,12 +69,12 @@ module RemoteExecutionHelper
         title: _('Create report for this job'),
         disabled: task.pending?)
     end
-    if authorized_for(hash_for_new_job_invocation_path)
+    if authorized_for(controller: :job_invocations, action: :create)
       buttons << link_to(_('Rerun'), rerun_job_invocation_path(:id => job_invocation.id),
         :class => 'btn btn-default',
         :title => _('Rerun the job'))
     end
-    if authorized_for(hash_for_new_job_invocation_path)
+    if authorized_for(controller: :job_invocations, action: :create)
       buttons << link_to(_('Rerun failed'), rerun_job_invocation_path(:id => job_invocation.id, :failed_only => 1),
         :class => 'btn btn-default',
         :disabled => job_invocation.failed_hosts.none?,

data/app/models/job_invocation_composer.rb

@@ -271,6 +271,7 @@ class JobInvocationComposer
       job_invocation.pattern_template_invocations.map do |template_invocation|
         params = template_invocation.attributes.slice('template_id', 'effective_user')
         params['input_values'] = template_invocation.input_values.map { |v| v.attributes.slice('template_input_id', 'value') }
+        params['provider_input_values'] = template_invocation.provider_input_values.map { |v| v.attributes.slice('name', 'value') }
         params
       end
     end

data/app/views/templates/script/convert2rhel_analyze.erb

@@ -31,6 +31,9 @@ export CONVERT2RHEL_DISABLE_TELEMETRY=1
 
 /usr/bin/convert2rhel analyze -y
 
+# Workaround for https://issues.redhat.com/browse/RHELC-1280
+subscription-manager facts --update
+
 if grep -q ERROR /var/log/convert2rhel/convert2rhel-pre-conversion.json; then
     echo "Error: Some error(s) have been found."
     echo "Exiting ..."

data/lib/foreman_remote_execution/engine.rb

@@ -177,8 +177,11 @@ module ForemanRemoteExecution
                                             :'api/v2/job_templates' => [:update],
                                             :'api/v2/template_inputs' => [:create, :update, :destroy],
                                             :'api/v2/foreign_input_sets' => [:create, :update, :destroy]}, :resource_type => 'JobTemplate'
-          permission :edit_remote_execution_features, { :remote_execution_features => [:index, :show, :update],
-                                                        :'api/v2/remote_execution_features' => [:index, :show, :update, :available_remote_execution_features]}, :resource_type => 'RemoteExecutionFeature'
+          permission :view_remote_execution_features, { :remote_execution_features => [:index, :show],
+                                                        :'api/v2/remote_execution_features' => [:index, :show, :available_remote_execution_features]},
+            :resource_type => 'RemoteExecutionFeature'
+          permission :edit_remote_execution_features, { :remote_execution_features => [:update],
+                                                        :'api/v2/remote_execution_features' => [:update ]}, :resource_type => 'RemoteExecutionFeature'
           permission :destroy_job_templates, { :job_templates => [:destroy],
                                                :'api/v2/job_templates' => [:destroy] }, :resource_type => 'JobTemplate'
           permission :lock_job_templates, { :job_templates => [:lock, :unlock] }, :resource_type => 'JobTemplate'
@@ -204,6 +207,7 @@ module ForemanRemoteExecution
           :create_template_invocations,
           :view_hosts,
           :view_smart_proxies,
+          :view_remote_execution_features,
         ].freeze
         MANAGER_PERMISSIONS = USER_PERMISSIONS + [
           :cancel_job_invocations,

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '11.1.1'.freeze
+  VERSION = '11.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 11.1.1
+  version: 11.1.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface