foreman_leapp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a8b95728d37a13354b85aad5ab0c27dd6ec96ac248f30f7786ffeb769047c1
-  data.tar.gz: f87a224721de93faa6923cb9db3e4a92dae7bb6e4813c4b8f7c9b515bfb789b0
+  metadata.gz: de5248403683c119d2f8c4b7b331bbf5bc7125e408f8c5a0be2449191861926d
+  data.tar.gz: 4a08a8dc04d0e2d78fc76124b1cf5c2bc3c2cbb716f12bc376609d3d1e96ef9c
 SHA512:
-  metadata.gz: d3bc726e4aa2c21789ecb7d615e1de19df419501f04e141a4a8de60f951902fa6ce76f665428a5b2c564c32fa7e094260b99fa0528dd9dccc6dd55216e68becf
-  data.tar.gz: 2d76583bdc24a72b8faf91da3ecd9f04475135af429fab8e2505ac4d3dcc206bcd40b51a3ee6486b196581b011722e7c9f39e4f5eff17aa25793005aafa2ad3b
+  metadata.gz: 3a2781a3d87d9b0b2dc94e8deb61f0a5ae3ca62c10d3a3d2a36efdab31edbca9a959c45dfd85b1e050061fc5af552d95bf4b85dddf7dba18731f55c3e9040bb1
+  data.tar.gz: 78f6881ddbb87523c898375bb5ba7d61bb0e9912deb50739f94a07035c77585ea0be585374e298bd41719baf1026ebed4e9b2e3137ce9efd300ae69408582312

data/app/lib/helpers/job_helper.rb

@@ -4,10 +4,9 @@ module Helpers
   module JobHelper
     class << self
       def correct_feature?(job_invocation, feature)
-        job_invocation.job_category == ::ForemanLeapp::JOB_CATEGORY &&
-          RemoteExecutionFeature.find_by(job_template_id: job_invocation.pattern_template_invocations
-                                                                        .pluck(:template_id)
-                                                                        .first)&.label == feature
+        RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
+                                                                    .first
+                                                                    .template_id, label: feature).any?
       end
     end
   end

data/app/views/foreman_leapp/job_templates/{check.erb → leapp_check.erb}

@@ -5,6 +5,7 @@ kind: job_template
 job_category: Leapp
 provider_type: SSH
 snippet: true
+model: JobTemplate
 %>
 
 if ! command -v leapp > /dev/null

data/app/views/foreman_leapp/job_templates/{preupgrade.erb → leapp_preupgrade.erb}

@@ -1,16 +1,17 @@
 <%#
 kind: job_template
 name: Run preupgrade via Leapp
-job_category: Leapp
+job_category: Leapp - Preupgrade
 description_format: 'Upgradeability check for RHEL 7 host'
 provider_type: SSH
 feature: leapp_preupgrade
+model: JobTemplate
 %>
 
 <%= render_template 'Check Leapp' %>
 
+rm -f /var/log/leapp/leapp-report.json
 leapp preupgrade
 
 echo "===leap_upgrade_report_start==="
 cat /var/log/leapp/leapp-report.json
-rm -f /var/log/leapp/leapp-report.json

data/app/views/foreman_leapp/job_templates/{remediation.erb → leapp_remediation.erb}

@@ -1,10 +1,11 @@
 <%#
 kind: job_template
-name: Remediation plan
-job_category: Leapp
-description_format: 'Run Remediation plan with Leapp'
+name: Run remediation plan via Leapp
+job_category: Other
+description_format: 'Run remediation plan via Leapp'
 provider_type: SSH
 feature: leapp_remediation_plan
+model: JobTemplate
 template_inputs:
 - name: remediation_ids
   required: true

data/app/views/foreman_leapp/job_templates/{upgrade.erb → leapp_upgrade.erb}

@@ -1,10 +1,11 @@
 <%#
 kind: job_template
 name: Run upgrade via Leapp
-job_category: Ansible Playbook
+job_category: Leapp - Upgrade
 description_format: 'Upgrade RHEL 7 host'
 provider_type: Ansible
 feature: leapp_upgrade
+model: JobTemplate
 template_inputs:
 - name: Reboot
   description: Reboot the host automaticaly to continue with the upgrade
@@ -18,8 +19,8 @@ template_inputs:
   tasks:
     - name: Run Leapp Upgrade
       command: leapp upgrade
-<% if input('Reboot') == "true" %>
+<%- if input('Reboot') == "true" -%>
     - name: Reboot the machine
       reboot:
         reboot_timeout: 1800
-<% end %>
+<%- end -%>

data/db/seeds.d/10_leapp_preupgrade.rb

@@ -9,7 +9,7 @@ User.as_anonymous_admin do
                     'job_templates/**/*.erb')].each do |template|
         template = JobTemplate.import_raw!(File.read(template),
                                            :default => true,
-                                           :locked => true,
+                                           :lock => true,
                                            :update => true)
         template.organizations = organizations if template.present?
         template.locations = locations if template.present?

data/lib/foreman_leapp/engine.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  JOB_CATEGORY = 'Leapp'
-
   class Engine < ::Rails::Engine
     engine_name 'foreman_leapp'
 
@@ -44,8 +42,8 @@ module ForemanLeapp
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       begin
-        HostsHelper.prepend ForemanLeapp::HostsHelperExtensions
-        Host::JobInvocation.include ForemanLeapp::JobInvocationExtensions
+        ::HostsHelper.prepend ForemanLeapp::HostsHelperExtensions
+        ::JobInvocation.include ForemanLeapp::JobInvocationExtensions
       rescue StandardError => e
         Rails.logger.warn "ForemanLeapp: skipping engine hook (#{e})"
       end

data/lib/foreman_leapp/version.rb

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

data/test/unit/actions/preupgrade_job_test.rb

@@ -11,7 +11,7 @@ module ForemanLeapp
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
                                        provider_type: 'SSH', name: 'Leapp preupgrade')
     end
-    let(:job_invocation) { FactoryBot.create(:job_invocation, job_category: ::ForemanLeapp::JOB_CATEGORY) }
+    let(:job_invocation) { FactoryBot.create(:job_invocation) }
     let(:template_invocation) do
       FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
     end

data/test/unit/helpers/job_helper_test.rb

@@ -5,12 +5,12 @@ require 'test_plugin_helper'
 module Helpers
   class JobHelperTest < ActionView::TestCase
     let(:helper) { ::Helpers::JobHelper }
-    # let(:host) { FactoryBot.create(:host) }
+
     let(:job_template) do
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
                                        provider_type: 'SSH', name: 'Leapp preupgrade')
     end
-    let(:job_invocation) { FactoryBot.create(:job_invocation, job_category: ::ForemanLeapp::JOB_CATEGORY) }
+    let(:job_invocation) { FactoryBot.create(:job_invocation) }
 
     describe 'correct_feature?' do
       setup do
@@ -18,17 +18,10 @@ module Helpers
         FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
       end
 
-      it 'correct category & feature' do
+      it 'correct feature' do
         assert helper.correct_feature?(job_invocation, 'leapp_preupgrade')
       end
 
-      it 'wrong category' do
-        job_invocation = FactoryBot.create(:job_invocation, job_category: 'NOPE')
-        FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
-
-        assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade')
-      end
-
       it 'wrong feature' do
         assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade2')
       end

data/webpack/components/PreupgradeReports/components/EntriesFilter.js

@@ -17,7 +17,7 @@ const EntriesFilter = ({
 
   const filterTypes = [
     { value: 'title', label: __('Title') },
-    { value: 'severity', label: __('Severity') },
+    { value: 'severity', label: __('Risk Factor') },
     { value: 'hostname', label: __('Host') },
     { value: 'fix', label: __('Fix Type') },
     { value: 'inhibitor', label: __('Inhibitor') },

data/webpack/components/PreupgradeReports/components/__snapshots__/EntriesFilter.test.js.snap

@@ -41,7 +41,7 @@ exports[`EntriresFilter should render for host filter 1`] = `
             key="severity"
             onClick={[Function]}
           >
-            Severity
+            Risk Factor
           </MenuItem>
           <MenuItem
             active={true}
@@ -112,7 +112,7 @@ exports[`EntriresFilter should render for severity filter 1`] = `
         <DropdownButton
           componentClass={[Function]}
           id="entry-filter"
-          title="Severity"
+          title="Risk Factor"
         >
           <MenuItem
             active={false}
@@ -134,7 +134,7 @@ exports[`EntriresFilter should render for severity filter 1`] = `
             key="severity"
             onClick={[Function]}
           >
-            Severity
+            Risk Factor
           </MenuItem>
           <MenuItem
             active={false}
@@ -277,7 +277,7 @@ exports[`EntriresFilter should render for title filter 1`] = `
             key="severity"
             onClick={[Function]}
           >
-            Severity
+            Risk Factor
           </MenuItem>
           <MenuItem
             active={false}

data/webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js

@@ -10,7 +10,7 @@ import SortableHeaderItem from './SortableHeaderItem';
 const PreupgradeReportsListHeader = ({ sort, changeSort, toggleSelectAll }) => {
   const additionalInfoColumns = [
     { label: __('Host'), value: 'hostname' },
-    { label: __('Severity'), value: 'severity' },
+    { label: __('Risk Factor'), value: 'severity' },
     { label: __('Has Remediation?'), value: 'fix' },
     { label: __('Inhibitor?'), value: 'inhibitor' },
   ];

data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportEntry.test.js.snap

@@ -20,7 +20,7 @@ exports[`PreupgradeReportEntry should render 1`] = `
         stacked={false}
       >
         <img
-          alt="Low Severity"
+          alt="Low Risk Factor"
           className="severity-img"
           src={[Function]}
         />
@@ -116,7 +116,7 @@ exports[`PreupgradeReportEntry should render 1`] = `
         md={8}
       >
         <img
-          alt="Low Severity"
+          alt="Low Risk Factor"
           className="severity-img"
           key="5-7-sv5"
           src={[Function]}

data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportsListHeader.test.js.snap

@@ -36,7 +36,7 @@ exports[`PreupgradeReportsListHeader should render 1`] = `
                 "order": "asc",
               }
             }
-            title="Severity"
+            title="Risk Factor"
             value="severity"
           />
         </strong>

data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/helpers.test.js.snap

@@ -92,7 +92,7 @@ exports[`PreupgradeReportList/helpers should return severity 1`] = `
     md={8}
   >
     <img
-      alt="High Severity"
+      alt="High Risk Factor"
       className="severity-img"
       src={[Function]}
     />

data/webpack/components/PreupgradeReportsList/components/helpers.js

@@ -24,7 +24,7 @@ export const getSeverityImg = entry => {
         <img
           key={key}
           src={SeverityLow}
-          alt="Low Severity"
+          alt="Low Risk Factor"
           className="severity-img"
         />
       );
@@ -33,7 +33,7 @@ export const getSeverityImg = entry => {
         <img
           key={key}
           src={SeverityMedium}
-          alt="Medium Severity"
+          alt="Medium Risk Factor"
           className="severity-img"
         />
       );
@@ -42,7 +42,7 @@ export const getSeverityImg = entry => {
         <img
           key={key}
           src={SeverityHigh}
-          alt="High Severity"
+          alt="High Risk Factor"
           className="severity-img"
         />
       );
@@ -51,7 +51,7 @@ export const getSeverityImg = entry => {
         <img
           key={key}
           src={SeverityLow}
-          alt="Low Severity"
+          alt="Low Risk Factor"
           className="severity-img"
         />
       );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Foreman Leapp team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -93,10 +93,10 @@ files:
 - app/views/api/v2/preupgrade_reports/index.json.rabl
 - app/views/api/v2/preupgrade_reports/job_invocation.json.rabl
 - app/views/api/v2/preupgrade_reports/show.json.rabl
-- app/views/foreman_leapp/job_templates/check.erb
-- app/views/foreman_leapp/job_templates/preupgrade.erb
-- app/views/foreman_leapp/job_templates/remediation.erb
-- app/views/foreman_leapp/job_templates/upgrade.erb
+- app/views/foreman_leapp/job_templates/leapp_check.erb
+- app/views/foreman_leapp/job_templates/leapp_preupgrade.erb
+- app/views/foreman_leapp/job_templates/leapp_remediation.erb
+- app/views/foreman_leapp/job_templates/leapp_upgrade.erb
 - app/views/job_invocations/_leapp_preupgrade_report.html.erb
 - app/views/preupgrade_report_entries/base.json.rabl
 - app/views/preupgrade_reports/index.json.rabl