foreman_remote_execution 12.0.0 → 12.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/ui_job_wizard_controller.rb +4 -1
- data/app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb +1 -1
- data/app/helpers/remote_execution_helper.rb +4 -5
- data/app/models/job_invocation_composer.rb +1 -0
- data/app/views/job_invocations/new.html.erb +2 -2
- data/app/views/job_invocations/welcome.html.erb +1 -1
- data/app/views/templates/script/convert2rhel_analyze.erb +3 -0
- data/lib/foreman_remote_execution/engine.rb +6 -2
- data/lib/foreman_remote_execution/version.rb +1 -1
- data/locale/action_names.rb +5 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 230bf89e8ad5ca9add72085b2d338562ca756f08fb9ce3837b588a4f295a5336
|
4
|
+
data.tar.gz: 6e55dc4a21cc35f4402d3f0056c073d28b7e911dafdaf2c9410642fcd397ad86
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ea882c01f9c360df7d5b4def426a4d3a43c7401a805642bf934fdab828c936463e2373f2c7bfd10e68a7e4d46d217f092275f2a07e434335fd2afb641b136678
|
7
|
+
data.tar.gz: e11419f9dbad58f603d49999ac9e22c6c9416176e728b6ec611228d5744990e8d4d0b51f5f0f48aa56705011276419501484b4215a06ad696d6cf5e2c12519fe
|
@@ -64,7 +64,10 @@ class UiJobWizardController < ApplicationController
|
|
64
64
|
job = JobInvocation.authorized.find(params[:id])
|
65
65
|
composer = JobInvocationComposer.from_job_invocation(job, params).params
|
66
66
|
job_template_inputs = JobTemplate.authorized.find(composer[:template_invocations][0][:template_id]).template_inputs_with_foreign
|
67
|
-
|
67
|
+
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)}] }]
|
68
|
+
provider_inputs = composer[:template_invocations][0][:provider_input_values]
|
69
|
+
provider_inputs_hash = Hash[provider_inputs.map { |input| ["inputs[#{input[:name]}]", {:advanced => true, :value => input[:value]}] }]
|
70
|
+
inputs = job_template_inputs_hash.merge(provider_inputs_hash)
|
68
71
|
job_organization = Taxonomy.find_by(id: job.task.input[:current_organization_id])
|
69
72
|
job_location = Taxonomy.find_by(id: job.task.input[:current_location_id])
|
70
73
|
render :json => {
|
@@ -4,7 +4,7 @@ module ForemanRemoteExecution
|
|
4
4
|
original = super(template)
|
5
5
|
|
6
6
|
if template.is_a?(JobTemplate)
|
7
|
-
original.unshift(
|
7
|
+
original.unshift(authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Run'), hash_for_new_job_invocation_path(:template_id => template.id).merge(:authorizer => authorizer)) : nil) unless template.snippet
|
8
8
|
end
|
9
9
|
|
10
10
|
original
|
@@ -33,8 +33,7 @@ module RemoteExecutionHelper
|
|
33
33
|
links << { title: _('Host detail'),
|
34
34
|
action: { href: current_host_details_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
|
35
35
|
end
|
36
|
-
|
37
|
-
if authorized_for(hash_for_rerun_job_invocation_path(id: job_invocation, host_ids: [ host.id ], authorizer: job_hosts_authorizer))
|
36
|
+
if authorized_for(controller: :job_invocations, action: :create) && (!host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts))
|
38
37
|
links << { title: (_('Rerun on %s') % host.name),
|
39
38
|
action: { href: rerun_job_invocation_path(job_invocation, host_ids: [ host.id ]),
|
40
39
|
'data-method': 'get', id: "#{host.name}-actions-rerun" } }
|
@@ -56,7 +55,7 @@ module RemoteExecutionHelper
|
|
56
55
|
def job_invocations_buttons
|
57
56
|
[
|
58
57
|
documentation_button_rex('3.2ExecutingaJob'),
|
59
|
-
|
58
|
+
authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Run Job'), hash_for_new_job_invocation_path, {:class => "btn btn-primary"}) : '',
|
60
59
|
]
|
61
60
|
end
|
62
61
|
|
@@ -70,12 +69,12 @@ module RemoteExecutionHelper
|
|
70
69
|
title: _('Create report for this job'),
|
71
70
|
disabled: task.pending?)
|
72
71
|
end
|
73
|
-
if authorized_for(
|
72
|
+
if authorized_for(controller: :job_invocations, action: :create)
|
74
73
|
buttons << link_to(_('Rerun'), rerun_job_invocation_path(:id => job_invocation.id),
|
75
74
|
:class => 'btn btn-default',
|
76
75
|
:title => _('Rerun the job'))
|
77
76
|
end
|
78
|
-
if authorized_for(
|
77
|
+
if authorized_for(controller: :job_invocations, action: :create)
|
79
78
|
buttons << link_to(_('Rerun failed'), rerun_job_invocation_path(:id => job_invocation.id, :failed_only => 1),
|
80
79
|
:class => 'btn btn-default',
|
81
80
|
:disabled => job_invocation.failed_hosts.none?,
|
@@ -271,6 +271,7 @@ class JobInvocationComposer
|
|
271
271
|
job_invocation.pattern_template_invocations.map do |template_invocation|
|
272
272
|
params = template_invocation.attributes.slice('template_id', 'effective_user')
|
273
273
|
params['input_values'] = template_invocation.input_values.map { |v| v.attributes.slice('template_input_id', 'value') }
|
274
|
+
params['provider_input_values'] = template_invocation.provider_input_values.map { |v| v.attributes.slice('name', 'value') }
|
274
275
|
params
|
275
276
|
end
|
276
277
|
end
|
@@ -2,8 +2,8 @@
|
|
2
2
|
<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
|
3
3
|
<% title _('Job invocation') %>
|
4
4
|
<% if(request.path_parameters[:action] == "rerun") %>
|
5
|
-
<%=
|
5
|
+
<%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Use new job wizard'), hash_for_rerun_job_invocation_path({:id => request.path_parameters[:id]}).merge(request.query_parameters)) : nil %>
|
6
6
|
<% else %>
|
7
|
-
<%=
|
7
|
+
<%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Use new job wizard'), hash_for_new_job_invocation_path().merge(request.query_parameters)) : nil %>
|
8
8
|
<%end%>
|
9
9
|
<%= render :partial => 'form' %>
|
@@ -9,6 +9,6 @@
|
|
9
9
|
<p><%= link_to _('Learn more about this in the documentation.'),
|
10
10
|
documentation_url('1.ForemanRemoteExecution1.3Manual', :root_url => 'https://www.theforeman.org/plugins/foreman_remote_execution/1.3/index.html#'), :rel => 'external' %></p>
|
11
11
|
<div class="blank-slate-pf-main-action">
|
12
|
-
<%=
|
12
|
+
<%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_("Run Job"), { :action => :create }, { :class => "btn btn-primary btn-lg" }) : nil %>
|
13
13
|
</div>
|
14
14
|
</div>
|
@@ -31,6 +31,9 @@ export CONVERT2RHEL_DISABLE_TELEMETRY=1
|
|
31
31
|
|
32
32
|
/usr/bin/convert2rhel analyze -y
|
33
33
|
|
34
|
+
# Workaround for https://issues.redhat.com/browse/RHELC-1280
|
35
|
+
subscription-manager facts --update
|
36
|
+
|
34
37
|
if grep -q ERROR /var/log/convert2rhel/convert2rhel-pre-conversion.json; then
|
35
38
|
echo "Error: Some error(s) have been found."
|
36
39
|
echo "Exiting ..."
|
@@ -177,8 +177,11 @@ module ForemanRemoteExecution
|
|
177
177
|
:'api/v2/job_templates' => [:update],
|
178
178
|
:'api/v2/template_inputs' => [:create, :update, :destroy],
|
179
179
|
:'api/v2/foreign_input_sets' => [:create, :update, :destroy]}, :resource_type => 'JobTemplate'
|
180
|
-
permission :
|
181
|
-
:'api/v2/remote_execution_features' => [:index, :show, :
|
180
|
+
permission :view_remote_execution_features, { :remote_execution_features => [:index, :show],
|
181
|
+
:'api/v2/remote_execution_features' => [:index, :show, :available_remote_execution_features]},
|
182
|
+
:resource_type => 'RemoteExecutionFeature'
|
183
|
+
permission :edit_remote_execution_features, { :remote_execution_features => [:update],
|
184
|
+
:'api/v2/remote_execution_features' => [:update ]}, :resource_type => 'RemoteExecutionFeature'
|
182
185
|
permission :destroy_job_templates, { :job_templates => [:destroy],
|
183
186
|
:'api/v2/job_templates' => [:destroy] }, :resource_type => 'JobTemplate'
|
184
187
|
permission :lock_job_templates, { :job_templates => [:lock, :unlock] }, :resource_type => 'JobTemplate'
|
@@ -204,6 +207,7 @@ module ForemanRemoteExecution
|
|
204
207
|
:create_template_invocations,
|
205
208
|
:view_hosts,
|
206
209
|
:view_smart_proxies,
|
210
|
+
:view_remote_execution_features,
|
207
211
|
].freeze
|
208
212
|
MANAGER_PERMISSIONS = USER_PERMISSIONS + [
|
209
213
|
:cancel_job_invocations,
|
data/locale/action_names.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_remote_execution
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 12.0.
|
4
|
+
version: 12.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Foreman Remote Execution team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-01-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: deface
|