foreman_leapp 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c59a1ab80e574f5c262115fcb2a438c73be6a7d78f087143b17d0722326fde
-  data.tar.gz: 13683be8ba8d390aa8b284cf24a0b33908881338a33ce794e43cc4adfd734ecf
+  metadata.gz: 815c2de3def891d8d23547a78937d3a85cd9998a2e4e6d46f97ac3f77a7fcd2e
+  data.tar.gz: c276ec42e54ed4d6dd98acc249b2de961372698a1bdf045ca462662cfb50c6bc
 SHA512:
-  metadata.gz: ee1bb633e4ad8d3d5311f527fbc57e3d669cb91fbf8359cf500b8ae848aa7b143d7186637add46a1deec39c1367385441d8fb1927af425c4e5c266d6c9ac63d0
-  data.tar.gz: 2814bfb36de2d66fcee36c3e5d31edf9ce5d3b97c679afcda34418b8eedd1140c4ea581fae5e31dac068da34297f87553ac80e164bf484a88c9d9a377e1188d6
+  metadata.gz: b5aadf3851821b208b593ce42a05b66a3c5a13af879cf6f79fa79b15dc49f7aee6aabdd7109ff552ea6eaf6b88691ce8b39292b14680d89843b0e1f6df7be919
+  data.tar.gz: 05f9a5f005ee281ad6f635bb211bc12728b9847315f19cbc0ba54202f04ff91c541355f070a4ec77f1eacc1585ffab4c70cb67c671fef7b51794090feb097160

data/app/controllers/concerns/api/v2/api_authorizer.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Api
+  module V2
+    module ApiAuthorizer
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :hosts_permission
+      end
+
+      private
+
+      def hosts_permission
+        return if User.current.can?('view_hosts')
+
+        render_error 'access_denied', status: :forbidden,
+          locals: { details: N_('Missing one of the required permissions: view_hosts'),
+                    missing_permissions: 'view_hosts' }
+      end
+
+      def resource_scope(_options = {})
+        @resource_scope ||= begin
+          scope = PreupgradeReport.joins(:host).merge(Host.authorized(:view_hosts, Host))
+          scope = scope.where(job_invocation_id: params[:id]) if action_name == 'job_invocation'
+          scope
+        end
+      end
+    end
+  end
+end

data/app/controllers/preupgrade_reports_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PreupgradeReportsController < ::Api::V2::BaseController
-  include ApiAuthorizer
+  include Api::V2::ApiAuthorizer
 
   def index
     @preupgrade_reports = resource_scope.includes(:preupgrade_report_entries).search_for(*search_options)

data/app/lib/actions/foreman_leapp/preupgrade_job.rb

@@ -8,8 +8,8 @@ module Actions
       end
 
       def plan(job_invocation, host, *_args)
-        return unless ::JobHelper.correct_feature?(job_invocation, 'leapp_preupgrade') ||
-                      ::JobHelper.correct_feature?(job_invocation, 'leapp_remediation_plan')
+        return unless ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_preupgrade') ||
+                      ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_remediation_plan')
 
         plan_self(host_id: host.id, job_invocation_id: job_invocation.id)
       end

data/app/lib/helpers/job_helper.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-module JobHelper
-  class << self
-    def correct_feature?(job_invocation, feature)
-      RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
-                                                                  .first
-                                                                  .template_id, label: feature).any?
+module Helpers
+  module JobHelper
+    class << self
+      def correct_feature?(job_invocation, feature)
+        RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
+                                                                    .first
+                                                                    .template_id, label: feature).any?
+      end
     end
   end
 end

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

@@ -23,7 +23,7 @@ template_inputs:
 ---
 - hosts: all
   vars:
-    - channel_opts: <% input('Channel') == 'ga' ? '' : "--channel #{input('Channel')}" %>
+    - channel_opts: <%= input('Channel') == 'ga' ? '' : "--channel #{input('Channel')}" %>
   tasks:
     - name: Run Leapp Upgrade
       command: leapp upgrade {{ channel_opts }}

data/lib/foreman_leapp/engine.rb

@@ -7,17 +7,6 @@ module ForemanLeapp
   class Engine < ::Rails::Engine
     engine_name 'foreman_leapp'
 
-    config.eager_load_paths += Dir["#{config.root}/app/controllers/api/v2/concerns"]
-    config.eager_load_paths += Dir["#{config.root}/app/lib/helpers"]
-
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/controllers/api/v2/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/lib/helpers"]
-    config.autoload_paths += Dir["#{config.root}/test/"]
-
     # Add any db migrations
     initializer 'foreman_leapp.load_app_instance_data' do |app|
       ForemanLeapp::Engine.paths['db/migrate'].existent.each do |path|
@@ -25,32 +14,35 @@ module ForemanLeapp
       end
     end
 
-    initializer 'foreman_leapp.register_plugin', before: :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_leapp do
-        requires_foreman '>= 3.7'
-        register_gettext
-
-        apipie_documented_controllers ["#{ForemanLeapp::Engine.root}/app/controllers/api/v2/*.rb"]
-        extend_template_helpers ForemanLeapp::TemplateHelper
-
-        extend_page 'job_invocations/show' do |cx|
-          cx.add_pagelet :main_tabs,
-                         partial: 'job_invocations/leapp_preupgrade_report',
-                         name: _('Leapp preupgrade report'),
-                         id: 'leapp_preupgrade_report',
-                         onlyif: proc { |subject|
-                           ::JobHelper.correct_feature?(subject, 'leapp_preupgrade') ||
-                             ::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
-
-        describe_host do
-          multiple_actions_provider :leapp_hosts_multiple_actions
+    initializer 'foreman_leapp.register_plugin', before: :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_leapp do
+          requires_foreman '>= 3.13'
+          register_gettext
+
+          apipie_documented_controllers ["#{ForemanLeapp::Engine.root}/app/controllers/api/v2/*.rb"]
+          extend_template_helpers ForemanLeapp::TemplateHelper
+
+          extend_page 'job_invocations/show' do |cx|
+            cx.add_pagelet :main_tabs,
+                          partial: 'job_invocations/leapp_preupgrade_report',
+                          name: _('Leapp preupgrade report'),
+                          id: 'leapp_preupgrade_report',
+                          onlyif: proc { |subject|
+                            ::Helpers::JobHelper.correct_feature?(subject, 'leapp_preupgrade') ||
+                              ::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] },
+                                              :resource_type => 'JobInvocation'
+          end
+
+          describe_host do
+            multiple_actions_provider :leapp_hosts_multiple_actions
+          end
         end
       end
     end

data/lib/foreman_leapp/version.rb

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

data/test/unit/helpers/job_helper_test.rb

@@ -4,7 +4,7 @@ require 'test_plugin_helper'
 
 module Helpers
   class JobHelperTest < ActionView::TestCase
-    let(:helper) { ::JobHelper }
+    let(:helper) { ::Helpers::JobHelper }
 
     let(:job_template) do
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Foreman Leapp team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -68,8 +68,8 @@ files:
 - app/assets/javascripts/foreman_leapp/locale/ja/foreman_leapp.js
 - app/assets/javascripts/foreman_leapp/locale/ka/foreman_leapp.js
 - app/assets/javascripts/foreman_leapp/locale/zh_CN/foreman_leapp.js
-- app/controllers/api/v2/concerns/api_authorizer.rb
 - app/controllers/api/v2/preupgrade_reports_controller.rb
+- app/controllers/concerns/api/v2/api_authorizer.rb
 - app/controllers/preupgrade_reports_controller.rb
 - app/helpers/foreman_leapp/hosts_helper.rb
 - app/helpers/foreman_leapp/template_helper.rb
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.

data/app/controllers/api/v2/concerns/api_authorizer.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module ApiAuthorizer
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :hosts_permission
-  end
-
-  private
-
-  def hosts_permission
-    return if User.current.can?('view_hosts')
-
-    render_error 'access_denied', status: :forbidden,
-      locals: { details: N_('Missing one of the required permissions: view_hosts'),
-                missing_permissions: 'view_hosts' }
-  end
-
-  def resource_scope(_options = {})
-    @resource_scope ||= begin
-      scope = PreupgradeReport.joins(:host).merge(Host.authorized(:view_hosts, Host))
-      scope = scope.where(job_invocation_id: params[:id]) if action_name == 'job_invocation'
-      scope
-    end
-  end
-end