foreman_leapp 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d735a5b1db5b5c8ce5d63754246d03c982ae52cefdbacca51eae46db7ecad55
-  data.tar.gz: c1c060d45f6ec673def9806c694f304702b4ebaed8508b14232004a6e1f0528c
+  metadata.gz: ee8943c7e2677970cc48b11a4d1f627c5c2ce86c9c7b02ce43823151ddbd607f
+  data.tar.gz: a46b06e6eea756d1ac3f63307ece144765aec4ad894eccccd61ad91171d75c98
 SHA512:
-  metadata.gz: 9b2d81b34d5b0db10c36e1f6d7e84d9ec7f2b84d5722468eac1dfcf77c1bffd5a4ed5f40f923a348ac6533c48bedf282a2165177c42ceffbaaa654c1cb62933b
-  data.tar.gz: c5b970584e21ee83003a2e7bbb1efd6e7fc7750b11677fcf1c8f31f799a346d2d9a55749106f05a17cd97cee8aabb895edb615467dc2caff2314992f88d63ec9
+  metadata.gz: 72bf0a4eba618fdb1ea19617d8affec8370fd4daa9e411135b46d6cf380c8b6eaa7449ee7b73f944b9842b9c8283b41690fa4e06ef42d7c64086b9dc19153910
+  data.tar.gz: fa82cfb2dd2e03e2e153b50d3edc069eb1d029111bac7e580de65dbe8bc0fe34a9c470a61e67eec5b892d7f269fc87fb38db811be68718c0f85bb93ccd23b3b3

data/config/routes.rb

@@ -4,7 +4,8 @@ Rails.application.routes.draw do
   resources :preupgrade_reports, :only => %i[index]
 
   namespace :api, defaults: { format: 'json' } do
-    scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/, constraints: ApiConstraints.new( version: 2, default: true) do
+    scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/,
+          constraints: ApiConstraints.new( version: 2, default: true) do
       resources :preupgrade_reports, only: %i[index show]
       get 'job_invocations/:id/preupgrade_reports', to: 'preupgrade_reports#job_invocation'
     end

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

@@ -4,6 +4,14 @@ organizations = Organization.unscoped.all
 locations = Location.unscoped.all
 User.as_anonymous_admin do
   RemoteExecutionFeature.without_auditing do
+    if Rails.env.test? || Foreman.in_rake?
+      # If this file tries to import a template with a REX feature in a SeedsTest,
+      # it will fail - the REX feature isn't registered on SeedsTest because
+      # DatabaseCleaner truncates the db before every test.
+      # During db:seed, we also want to know the feature is registered before
+      # seeding the template
+      ForemanLeapp::Engine.register_rex_features
+    end
     JobTemplate.without_auditing do
       Dir[File.join("#{ForemanLeapp::Engine.root}/app/views/foreman_leapp/"\
                     'job_templates/**/*.erb')].each do |template|

data/lib/foreman_leapp/engine.rb

@@ -36,6 +36,11 @@ module ForemanLeapp
                              ::Helpers::JobHelper.correct_feature?(subject, 'leapp_remediation_plan')
                          }
         end
+
+        security_block :foreman_leapp do
+          permission :view_job_invocations, { :preupgrade_reports => %i[index show job_invocation],
+                                              'api/v2/preupgrade_reports' => %i[index show job_invocation] }
+        end
       end
     end
 
@@ -48,26 +53,7 @@ module ForemanLeapp
         Rails.logger.warn "ForemanLeapp: skipping engine hook (#{e})"
       end
 
-      RemoteExecutionFeature.register(
-        :leapp_preupgrade,
-        N_('Preupgrade check with Leapp'),
-        description: N_('Upgradeability check for RHEL 7 host'),
-        host_action_button: false
-      )
-
-      RemoteExecutionFeature.register(
-        :leapp_upgrade,
-        N_('Upgrade with Leapp'),
-        description: N_('Run Leapp upgrade job for RHEL 7 host'),
-        host_action_button: false
-      )
-
-      RemoteExecutionFeature.register(
-        :leapp_remediation_plan,
-        N_('Remediation plan'),
-        description: N_('Run Remediation plan with Leapp'),
-        host_action_button: false
-      )
+      ForemanLeapp::Engine.register_rex_features
     end
 
     rake_tasks do
@@ -97,5 +83,28 @@ module ForemanLeapp
     initializer 'foreman_leapp.apipie' do
       Apipie.configuration.checksum_path += ['/api/']
     end
+
+    def self.register_rex_features
+      RemoteExecutionFeature.register(
+        :leapp_preupgrade,
+        N_('Preupgrade check with Leapp'),
+        description: N_('Upgradeability check for RHEL 7 host'),
+        host_action_button: false
+      )
+
+      RemoteExecutionFeature.register(
+        :leapp_upgrade,
+        N_('Upgrade with Leapp'),
+        description: N_('Run Leapp upgrade job for RHEL 7 host'),
+        host_action_button: false
+      )
+
+      RemoteExecutionFeature.register(
+        :leapp_remediation_plan,
+        N_('Remediation plan'),
+        description: N_('Run Remediation plan with Leapp'),
+        host_action_button: false
+      )
+    end
   end
 end

data/lib/foreman_leapp/version.rb

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

data/package.json

@@ -25,15 +25,15 @@
   },
   "homepage": "https://github.com/oamg/foreman_leapp",
   "peerDependencies": {
-    "@theforeman/vendor": ">= 4.2.1"
+    "@theforeman/vendor": ">= 8.3.3"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.2.1",
-    "@theforeman/eslint-plugin-foreman": "4.2.1",
-    "@theforeman/stories": "^4.2.1",
-    "@theforeman/test": "^4.2.1",
-    "@theforeman/vendor-dev": "^4.2.1",
+    "@theforeman/builder": "^8.3.3",
+    "@theforeman/eslint-plugin-foreman": "8.3.3",
+    "@theforeman/stories": "^8.3.3",
+    "@theforeman/test": "^8.3.3",
+    "@theforeman/vendor-dev": "^8.3.3",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
     "jest-svg-transformer": "^1.0.0",

data/webpack/components/PreupgradeReports/PreupgradeReports.js

@@ -110,8 +110,8 @@ const PreupgradeReports = ({
   );
 };
 
-const withLoadingState = Component => props => {
-  const { error, loading, preupgradeReports, reportsExpected } = props;
+const withLoadingState = Component => componentProps => {
+  const { error, loading, preupgradeReports, reportsExpected } = componentProps;
 
   if (!isEmpty(error)) {
     return (
@@ -126,7 +126,7 @@ const withLoadingState = Component => props => {
   return (
     <LoadingState loading={loading}>
       {preupgradeReports.length > 0 ? (
-        <Component {...props} />
+        <Component {...componentProps} />
       ) : (
         <NoReports reportsExpected={reportsExpected} />
       )}

data/webpack/components/PreupgradeReports/components/UpgradeAllButton.js

@@ -3,22 +3,21 @@ import PropTypes from 'prop-types';
 import { Button } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-import { idsForInvocationFromReports } from '../PreupgradeReportsHelpers';
-
-const UpgradeAllButton = ({ preupgradeReports, postUrl, csrfToken }) => {
-  const { hostIds } = idsForInvocationFromReports(preupgradeReports);
-
-  return (
-    <form action={postUrl} method="post">
-      <Button type="submit">{__('Run Upgrade')}</Button>
-      <input type="hidden" name="authenticity_token" value={csrfToken} />
-      <input type="hidden" name="feature" value="leapp_upgrade" />
-      {hostIds.map(hostId => (
-        <input type="hidden" name="host_ids[]" key={hostId} value={hostId} />
-      ))}
-    </form>
-  );
-};
+const UpgradeAllButton = ({ preupgradeReports, postUrl, csrfToken }) => (
+  <form action={postUrl} method="post">
+    <Button type="submit">{__('Run Upgrade')}</Button>
+    <input type="hidden" name="authenticity_token" value={csrfToken} />
+    <input type="hidden" name="feature" value="leapp_upgrade" />
+    {preupgradeReports.map(report => (
+      <input
+        type="hidden"
+        name="host_ids[]"
+        key={report.hostId}
+        value={report.hostId}
+      />
+    ))}
+  </form>
+);
 
 UpgradeAllButton.propTypes = {
   preupgradeReports: PropTypes.array.isRequired,

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

@@ -25,5 +25,17 @@ exports[`UpgradeAllButton should render 1`] = `
     type="hidden"
     value="leapp_upgrade"
   />
+  <input
+    key="5"
+    name="host_ids[]"
+    type="hidden"
+    value={5}
+  />
+  <input
+    key="6"
+    name="host_ids[]"
+    type="hidden"
+    value={6}
+  />
 </form>
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Foreman Leapp team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.80'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.80'
 description: A Foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp
   utility.
 email:
@@ -199,11 +179,11 @@ files:
 - webpack/index.js
 - webpack/reducer.js
 - webpack/testSetup.js
-homepage: https://github.com/oamg/foreman_leapp
+homepage: https://github.com/theforeman/foreman_leapp
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.
 test_files: