foreman_leapp 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f53abbd1654c96303f55576990e18b12ebf75b4f90721fc07e33ecee98ec391
-  data.tar.gz: 4057361799540b43773a321c20cb964d33dc6afe88af4e735c01a78dee971405
+  metadata.gz: 0dfdafe8cfd66270ad9e3fa8b26b14318eeb3c335c63aaad854c5fb3514c7fdf
+  data.tar.gz: 8c2066dbfeeb373aa8989ba401fb2b39c25e0896373c2d6b4ddcba17ddf6fe7e
 SHA512:
-  metadata.gz: f2bda54c06b4c2b313023721d447ef06a61c0351cc0c38a3d98c31900b70213ee4b414fd7ac61f5386ace70ca9ac1d9253d9f431a44e4fdcdd482d2684186d21
-  data.tar.gz: 3e3a8acc3c78e88aa282989c3c66a7ee80feabaec1c21ee85ebab5b1364066ef44a731ea54350637102b2b1a2ff28a04f28318bc23a58090da48741f7105681f
+  metadata.gz: 77551a97d10c13a751b4f3d03954e6f359e53e980f933c402c5045bd173c35514b8dbd0555425fb3cef85dd6c6c542879167d4e4be789c6c342dfc92fba1bf25
+  data.tar.gz: 944be997316144646e4c1f993679467779a65fda006f07606acae2650e87dadc2cbf9c9fa1c68aa625a5f0451dbe26b72b949ec3cdae04436f000690b445f2cb

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.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Foreman Leapp team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 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:
@@ -203,7 +183,7 @@ homepage: https://github.com/oamg/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.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.
 test_files: