foreman_leapp 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1891f98edb810793eaf892578ca6a2fdafe87be017e1e3ee370ebbd008baaeb
-  data.tar.gz: 3a618bb3303b275113dc3ddaae440971f6f17939d274e4d0263c66424d5511b8
+  metadata.gz: f66eb2aaee146f245f45c3806525803d9bf0834035ea62fcde33e666d9df94d7
+  data.tar.gz: 20d3e32fc5ab353b5bb0e804bb54a2f937a757cb220a37cb3d1067915f4f7129
 SHA512:
-  metadata.gz: 652a75504d5ccfb8b20580043c02335547d0ab1d763f936329558499d9e4bdfe1958c6fc091c76fc8c55a77babeb8b2beb89c655afc8c5ae33f48cf4494a0372
-  data.tar.gz: 05b6c03d647d507262bb8f7847c87da4cb97facc0ea20d139fd90e788e37bc51664de0bd56d5bba0f89c0731e40eff8f02daadf0beba2dc890a6a2fced63e44e
+  metadata.gz: 529c587c622d1d3a131f16d62670c6bb341ae9a762dea74b092d62b8e56b3a7b3b2874be83bc96b83e521f9474123a745d868390162df2836e1a83d73ed10b62
+  data.tar.gz: 6efbb688ff2ce91a8181f2698fb4beb9e64b5bb01d95e3ddbb6e91bedac4fbd326e651d3bbe74650ed3c20226c59a56bc19c673762f29f148aa1223b52bdc1f5

data/README.md

@@ -1,6 +1,6 @@
 # ForemanLeapp
 
-This plugin allows to run inplace upgrades for RHEL 7 hosts in Foreman using Leapp tool.
+This plugin allows to run inplace upgrades for RHEL hosts in Foreman using Leapp tool.
 For more information about Leapp tool check [github](https://github.com/oamg/leapp) or [developer docs](https://leapp.readthedocs.io/en/latest/).
 
 ## Installation

data/app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb

@@ -2,14 +2,11 @@
 
 module ForemanLeapp
   module RemoteExecutionHelperExtension
-    def job_invocation_task_buttons(task)
-      return super unless ::Helpers::JobHelper.correct_feature?(@job_invocation, 'leapp_remediation_plan')
-
-      super.insert(2, link_to(_('Rerun preupgrade check'),
-                              new_job_invocation_path(host_ids: @resource_base.map(&:id), feature: 'leapp_preupgrade'),
-                              class: 'btn btn-default',
-                              title: _('Run Leapp Preupgrade check again'),
-                              method: :get))
+    def rex_host_features(*args)
+      super + [link_to(_('Preupgrade check with Leapp'),
+                       new_job_invocation_path(host_ids: [args.first.id], feature: 'leapp_preupgrade')),
+               link_to(_('Upgrade with Leapp'),
+                       new_job_invocation_path(host_ids: [args.first.id], feature: 'leapp_upgrade'))]
     end
   end
 end

data/app/helpers/foreman_leapp/hosts_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ForemanLeapp
+  module HostsHelper
+    def leapp_hosts_multiple_actions
+      [{ action: [_('Preupgrade check with Leapp'), new_job_invocation_path(feature: 'leapp_preupgrade'), false],
+         priority: 1000 },
+       { action: [_('Upgrade with Leapp'), new_job_invocation_path(feature: 'leapp_upgrade'), false], priority: 1000 }]
+    end
+  end
+end

data/app/views/foreman_leapp/job_templates/leapp_preupgrade.erb

@@ -2,7 +2,7 @@
 kind: job_template
 name: Run preupgrade via Leapp
 job_category: Leapp - Preupgrade
-description_format: 'Upgradeability check for RHEL 7 host'
+description_format: 'Upgradeability check for RHEL host'
 provider_type: SSH
 feature: leapp_preupgrade
 model: JobTemplate

data/app/views/foreman_leapp/job_templates/leapp_upgrade.erb

@@ -2,7 +2,7 @@
 kind: job_template
 name: Run upgrade via Leapp
 job_category: Leapp - Upgrade
-description_format: 'Upgrade RHEL 7 host'
+description_format: 'Upgrade RHEL host'
 provider_type: Ansible
 feature: leapp_upgrade
 model: JobTemplate

data/lib/foreman_leapp/engine.rb

@@ -41,13 +41,16 @@ module ForemanLeapp
           permission :view_job_invocations, { :preupgrade_reports => %i[index show job_invocation],
                                               'api/v2/preupgrade_reports' => %i[index show job_invocation] }
         end
+
+        describe_host do
+          multiple_actions_provider :leapp_hosts_multiple_actions
+        end
       end
     end
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       begin
-        ::HostsHelper.prepend ForemanLeapp::HostsHelperExtensions
         ::JobInvocation.include ForemanLeapp::JobInvocationExtensions
       rescue StandardError => e
         Rails.logger.warn "ForemanLeapp: skipping engine hook (#{e})"
@@ -88,14 +91,14 @@ module ForemanLeapp
       RemoteExecutionFeature.register(
         :leapp_preupgrade,
         N_('Preupgrade check with Leapp'),
-        description: N_('Upgradeability check for RHEL 7 host'),
+        description: N_('Upgradeability check for RHEL host'),
         host_action_button: false
       )
 
       RemoteExecutionFeature.register(
         :leapp_upgrade,
         N_('Upgrade with Leapp'),
-        description: N_('Run Leapp upgrade job for RHEL 7 host'),
+        description: N_('Run Leapp upgrade job for RHEL host'),
         host_action_button: false
       )
 

data/lib/foreman_leapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/locale/action_names.rb

@@ -1,6 +1,6 @@
 # Autogenerated!
-_("Preupgrade job")
 _("Remote action:")
 _("Import Puppet classes")
 _("Import facts")
-_("Action with sub plans")
+_("Action with sub plans")
+_("Preupgrade job")

data/locale/en/foreman_leapp.edit.po

@@ -0,0 +1,172 @@
+# foreman_leapp
+#
+# This file is distributed under the same license as foreman_leapp.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2014-08-20 08:54+0100\n"
+"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
+"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../app/controllers/api/v2/concerns/api_authorizer.rb:16
+msgid "Missing one of the required permissions: view_hosts"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:10
+msgid "List Preupgrade reports"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:16
+msgid "Show Preupgrade report"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:22
+msgid "List Preupgrade reports for Job invocation"
+msgstr ""
+
+#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:6 ../app/helpers/foreman_leapp/hosts_helper.rb:6 ../lib/foreman_leapp/engine.rb:93
+msgid "Preupgrade check with Leapp"
+msgstr ""
+
+#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:8 ../app/helpers/foreman_leapp/hosts_helper.rb:8 ../lib/foreman_leapp/engine.rb:100
+msgid "Upgrade with Leapp"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:32
+msgid "Leapp preupgrade report"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:94
+msgid "Upgradeability check for RHEL host"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:101
+msgid "Run Leapp upgrade job for RHEL host"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:107
+msgid "Remediation plan"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:108
+msgid "Run Remediation plan with Leapp"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:19 ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:38
+msgid "Title"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:20 ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:13
+msgid "Risk Factor"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:21 ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:12
+msgid "Host"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:22
+msgid "Fix Type"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:23 ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:21
+msgid "Inhibitor"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:27 ../webpack/components/PreupgradeReports/components/EntriesFilter.js:35 ../webpack/components/PreupgradeReports/components/EntriesFilter.js:41
+msgid "All"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:28
+msgid "Low"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:29
+msgid "Medium"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:30
+msgid "High"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:31
+msgid "Info"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:36
+msgid "Hint"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:37
+msgid "Command"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:42
+msgid "Yes"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:43
+msgid "No"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/FixSelectedButton.js:12
+msgid "Fix Selected"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/NoReports.js:12
+msgid "The preupgrade report could not be generated, check the job details for the reason"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/NoReports.js:17
+msgid "The preupgrade report will be available after the job finishes"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/NoReports.js:25
+msgid "No Preupgrade Report Available"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/UpgradeAllButton.js:8
+msgid "Run Upgrade"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:17
+msgid "This issue inhibits the upgrade."
+msgstr ""
+
+#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:14
+msgid "Has Remediation?"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:15
+msgid "Inhibitor?"
+msgstr ""
+
+#: action_names.rb:2
+msgid "Remote action:"
+msgstr ""
+
+#: action_names.rb:3
+msgid "Import Puppet classes"
+msgstr ""
+
+#: action_names.rb:4
+msgid "Import facts"
+msgstr ""
+
+#: action_names.rb:5
+msgid "Action with sub plans"
+msgstr ""
+
+#: action_names.rb:6
+msgid "Preupgrade job"
+msgstr ""
+
+#: gemspec.rb:4
+msgid "A Foreman plugin to support inplace RHEL upgrades with Leapp utility."
+msgstr ""

data/locale/en/foreman_leapp.po

@@ -15,7 +15,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utility."
+msgid "A Foreman plugin to support inplace RHEL upgrades with Leapp utility."
+msgstr ""
+
+msgid "Action with sub plans"
 msgstr ""
 
 msgid "All"
@@ -42,6 +45,12 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
 msgid "Info"
 msgstr ""
 
@@ -78,19 +87,19 @@ msgstr ""
 msgid "Preupgrade check with Leapp"
 msgstr ""
 
-msgid "Remediation plan"
+msgid "Preupgrade job"
 msgstr ""
 
-msgid "Rerun preupgrade check"
+msgid "Remediation plan"
 msgstr ""
 
-msgid "Risk Factor"
+msgid "Remote action:"
 msgstr ""
 
-msgid "Run Leapp Preupgrade check again"
+msgid "Risk Factor"
 msgstr ""
 
-msgid "Run Leapp upgrade job for RHEL 7 host"
+msgid "Run Leapp upgrade job for RHEL host"
 msgstr ""
 
 msgid "Run Remediation plan with Leapp"
@@ -102,6 +111,9 @@ msgstr ""
 msgid "Show Preupgrade report"
 msgstr ""
 
+msgid "The preupgrade report could not be generated, check the job details for the reason"
+msgstr ""
+
 msgid "The preupgrade report will be available after the job finishes"
 msgstr ""
 
@@ -114,7 +126,7 @@ msgstr ""
 msgid "Upgrade with Leapp"
 msgstr ""
 
-msgid "Upgradeability check for RHEL 7 host"
+msgid "Upgradeability check for RHEL host"
 msgstr ""
 
 msgid "Yes"

data/locale/foreman_leapp.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_leapp 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-20 08:46+0200\n"
-"PO-Revision-Date: 2020-07-20 08:46+0200\n"
+"POT-Creation-Date: 2022-10-10 10:24+0200\n"
+"PO-Revision-Date: 2022-10-10 10:24+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -34,44 +34,35 @@ msgstr ""
 msgid "List Preupgrade reports for Job invocation"
 msgstr ""
 
-#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:6
-#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:11
-#: ../lib/foreman_leapp/engine.rb:53
+#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:6
+#: ../app/helpers/foreman_leapp/hosts_helper.rb:6
+#: ../lib/foreman_leapp/engine.rb:93
 msgid "Preupgrade check with Leapp"
 msgstr ""
 
-#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:7
-#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:13
-#: ../lib/foreman_leapp/engine.rb:60
-msgid "Upgrade with Leapp"
-msgstr ""
-
 #: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:8
-msgid "Rerun preupgrade check"
-msgstr ""
-
-#:
-#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:11
-msgid "Run Leapp Preupgrade check again"
+#: ../app/helpers/foreman_leapp/hosts_helper.rb:8
+#: ../lib/foreman_leapp/engine.rb:100
+msgid "Upgrade with Leapp"
 msgstr ""
 
 #: ../lib/foreman_leapp/engine.rb:32
 msgid "Leapp preupgrade report"
 msgstr ""
 
-#: ../lib/foreman_leapp/engine.rb:54
-msgid "Upgradeability check for RHEL 7 host"
+#: ../lib/foreman_leapp/engine.rb:94
+msgid "Upgradeability check for RHEL host"
 msgstr ""
 
-#: ../lib/foreman_leapp/engine.rb:61
-msgid "Run Leapp upgrade job for RHEL 7 host"
+#: ../lib/foreman_leapp/engine.rb:101
+msgid "Run Leapp upgrade job for RHEL host"
 msgstr ""
 
-#: ../lib/foreman_leapp/engine.rb:67
+#: ../lib/foreman_leapp/engine.rb:107
 msgid "Remediation plan"
 msgstr ""
 
-#: ../lib/foreman_leapp/engine.rb:68
+#: ../lib/foreman_leapp/engine.rb:108
 msgid "Run Remediation plan with Leapp"
 msgstr ""
 
@@ -141,6 +132,12 @@ msgstr ""
 msgid "Fix Selected"
 msgstr ""
 
+#: ../webpack/components/PreupgradeReports/components/NoReports.js:12
+msgid ""
+"The preupgrade report could not be generated, check the job details for the re"
+"ason"
+msgstr ""
+
 #: ../webpack/components/PreupgradeReports/components/NoReports.js:17
 msgid "The preupgrade report will be available after the job finishes"
 msgstr ""
@@ -149,7 +146,7 @@ msgstr ""
 msgid "No Preupgrade Report Available"
 msgstr ""
 
-#: ../webpack/components/PreupgradeReports/components/UpgradeAllButton.js:13
+#: ../webpack/components/PreupgradeReports/components/UpgradeAllButton.js:8
 msgid "Run Upgrade"
 msgstr ""
 
@@ -168,8 +165,26 @@ msgstr ""
 msgid "Inhibitor?"
 msgstr ""
 
+#: action_names.rb:2
+msgid "Remote action:"
+msgstr ""
+
+#: action_names.rb:3
+msgid "Import Puppet classes"
+msgstr ""
+
+#: action_names.rb:4
+msgid "Import facts"
+msgstr ""
+
+#: action_names.rb:5
+msgid "Action with sub plans"
+msgstr ""
+
+#: action_names.rb:6
+msgid "Preupgrade job"
+msgstr ""
+
 #: gemspec.rb:4
-msgid ""
-"A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utili"
-"ty."
+msgid "A Foreman plugin to support inplace RHEL upgrades with Leapp utility."
 msgstr ""

data/locale/gemspec.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 # Matches foreman_leapp.gemspec
-_('A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utility.')
+_('A Foreman plugin to support inplace RHEL upgrades with Leapp utility.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Foreman Leapp team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -52,8 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.2'
-description: A Foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp
-  utility.
+description: A Foreman plugin to support inplace RHEL upgrades with Leapp utility.
 email:
 - foreman-dev@googlegroups.com
 executables: []
@@ -66,8 +65,8 @@ files:
 - app/controllers/api/v2/concerns/api_authorizer.rb
 - app/controllers/api/v2/preupgrade_reports_controller.rb
 - app/controllers/preupgrade_reports_controller.rb
-- app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb
+- app/helpers/foreman_leapp/hosts_helper.rb
 - app/helpers/foreman_leapp/template_helper.rb
 - app/lib/actions/preupgrade_job.rb
 - app/lib/helpers/job_helper.rb
@@ -99,7 +98,9 @@ files:
 - lib/tasks/foreman_leapp_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/en/foreman_leapp.edit.po
 - locale/en/foreman_leapp.po
+- locale/en/foreman_leapp.po.time_stamp
 - locale/foreman_leapp.pot
 - locale/gemspec.rb
 - package.json
@@ -198,17 +199,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.
 test_files:
+- test/factories/foreman_leapp_factories.rb
 - test/functional/api/v2/preupgrade_reports_controller_test.rb
 - test/functional/preupgrade_reports_controller_test.rb
-- test/models/preupgrade_report_test.rb
+- test/helpers/template_helper_test.rb
 - test/models/preupgrade_report_entry_test.rb
-- test/unit/helpers/job_helper_test.rb
+- test/models/preupgrade_report_test.rb
 - test/unit/actions/preupgrade_job_test.rb
+- test/unit/helpers/job_helper_test.rb
 - test/test_plugin_helper.rb
-- test/helpers/template_helper_test.rb
-- test/factories/foreman_leapp_factories.rb

data/app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanLeapp
-  module HostsHelperExtensions
-    def multiple_actions
-      super + [[_('Preupgrade check with Leapp'), new_job_invocation_path(feature: 'leapp_preupgrade'), false],
-               [_('Upgrade with Leapp'), new_job_invocation_path(feature: 'leapp_upgrade'), false]]
-    end
-
-    def rex_host_features(*args)
-      super + [link_to(_('Preupgrade check with Leapp'),
-                       new_job_invocation_path(host_ids: [args.first.id], feature: 'leapp_preupgrade')),
-               link_to(_('Upgrade with Leapp'),
-                       new_job_invocation_path(host_ids: [args.first.id], feature: 'leapp_upgrade'))]
-    end
-  end
-end