foreman_leapp 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e4e3132faad2aa5e0b38f734bdd8c86c57d494ad182e4c60eeae9f5cfbdec19
-  data.tar.gz: ca55a97be3f368735f991d932896774482c9f75836e495c2d82ebe0e71407c5b
+  metadata.gz: 745ee96b1f3f15a4318a625b4b28014d28078ea295319430b5711fe28083cb7d
+  data.tar.gz: cc04180b1d6ffab8b02e4e9c55989643eb9d1299bc39758c7d06be1164b4dc8a
 SHA512:
-  metadata.gz: 1b51745821e36f5a5bc1a4bbedb37bfbccbf5349549351757c5fbb53926460f90b720eae3b6bd4de44854fc6cbdf1be4e5f7af0a80b3d18b9f649d1edd5e2496
-  data.tar.gz: b8ce21033fa71eb558d62fa8b1cb8b77ad07320f171499dfee46067a0f723ee3b2e2cb01a4c349e44dad57d2c89026c447f30d5fb01b46fcba6c20040f24d9eb
+  metadata.gz: 1b4f56020c7a8eb952a83ec8c7a0e7e8933915b19b85bf51261f9c62f3f974c98e9db9dea4aea09113fb42814f9f14f107da43b488df5779fd4b4c43ea397766
+  data.tar.gz: 1883970a28fd7d929fb592419d2115d0a1fa433c63e8facd1b3df3f832d0daee6568f98f06d54a1450b4efc0385dfa28bf1ba9e5904e268abca9e4bf3a2e7e63

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

@@ -13,8 +13,8 @@ module ApiAuthorizer
     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' }
+      locals: { details: N_('Missing one of the required permissions: view_hosts'),
+                missing_permissions: 'view_hosts' }
   end
 
   def resource_scope(_options = {})

data/app/lib/actions/{preupgrade_job.rb → foreman_leapp/preupgrade_job.rb}

@@ -8,8 +8,8 @@ module Actions
       end
 
       def plan(job_invocation, host, *_args)
-        return unless ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_preupgrade') ||
-                      ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_remediation_plan')
+        return unless ::JobHelper.correct_feature?(job_invocation, 'leapp_preupgrade') ||
+                      ::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,13 +1,11 @@
 # frozen_string_literal: true
 
-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
+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

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

@@ -19,9 +19,6 @@ template_inputs:
   required: true
   options: "true\nfalse"
   default: "true"
-foreign_input_sets:
-- include_all: true
-  template: Run preupgrade via Leapp
 %>
 
 <%= render_template 'Check Leapp' %>

data/config/routes.rb

@@ -5,7 +5,7 @@ Rails.application.routes.draw do
 
   namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/,
-          constraints: ApiConstraints.new( version: 2, default: true) do
+      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

@@ -14,7 +14,7 @@ User.as_anonymous_admin do
     end
     JobTemplate.without_auditing do
       Dir[File.join("#{ForemanLeapp::Engine.root}/app/views/foreman_leapp/"\
-                    'job_templates/**/*.erb')].sort.each do |template|
+                    'job_templates/**/*.erb')].each do |template|
         template = JobTemplate.import_raw!(File.read(template),
                                            :default => true,
                                            :lock => true,

data/lib/foreman_leapp/engine.rb

@@ -7,6 +7,9 @@ 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"]
@@ -36,8 +39,8 @@ module ForemanLeapp
                          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')
+                           ::JobHelper.correct_feature?(subject, 'leapp_preupgrade') ||
+                             ::JobHelper.correct_feature?(subject, 'leapp_remediation_plan')
                          }
         end
 

data/lib/foreman_leapp/version.rb

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

data/test/helpers/template_helper_test.rb

@@ -16,8 +16,8 @@ module ForemanLeapp
 
       test 'without remediation commands' do
         empty_entry = FactoryBot.create(:preupgrade_report_entry, host: host, preupgrade_report: report,
-                                                                  detail: { remediations: [{ type: 'hint',
-                                                                                             context: 'meh.' }] })
+          detail: { remediations: [{ type: 'hint',
+                                     context: 'meh.' }] })
         template = build_remediation_plan([empty_entry.id], host)
         assert_equal template, ''
       end

data/test/unit/actions/preupgrade_job_test.rb

@@ -9,7 +9,7 @@ module ForemanLeapp
     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')
+        provider_type: 'SSH', name: 'Leapp preupgrade')
     end
     let(:job_invocation) { FactoryBot.create(:job_invocation) }
     let(:template_invocation) do

data/test/unit/helpers/job_helper_test.rb

@@ -4,11 +4,11 @@ require 'test_plugin_helper'
 
 module Helpers
   class JobHelperTest < ActionView::TestCase
-    let(:helper) { ::Helpers::JobHelper }
+    let(:helper) { ::JobHelper }
 
     let(:job_template) do
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
-                                       provider_type: 'SSH', name: 'Leapp preupgrade')
+        provider_type: 'SSH', name: 'Leapp preupgrade')
     end
     let(:job_invocation) { FactoryBot.create(:job_invocation) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Foreman Leapp team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -73,7 +73,7 @@ files:
 - app/controllers/preupgrade_reports_controller.rb
 - app/helpers/foreman_leapp/hosts_helper.rb
 - app/helpers/foreman_leapp/template_helper.rb
-- app/lib/actions/preupgrade_job.rb
+- app/lib/actions/foreman_leapp/preupgrade_job.rb
 - app/lib/helpers/job_helper.rb
 - app/models/concerns/foreman_leapp/job_invocation_extensions.rb
 - app/models/preupgrade_report.rb
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.