foreman_kernel_care 1.0.0.pre.alfa → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b69d029637d5bee05bb0c109c33c6c132f78eea786ffe869f65ca71b46b1094
-  data.tar.gz: e42b57600e3633a14238ac046a9782128f50d37002fbf2a806904c91f34a820c
+  metadata.gz: c0348921f3d8a92fad7474e5e6256d1f766b016f827f4e16b75afe825230f511
+  data.tar.gz: b5811ad734c679a9341b8691f21e29ead36cfc8fac6b2f568c536732a1987ee9
 SHA512:
-  metadata.gz: 2033bc0576354e02c2b56bfd8dea0b966702c538ae3fbb967284b9a3a07afb659957c20baa0e619d82c29355dfbb505989188ef00fdf3dad8d0e75a8ab424e0b
-  data.tar.gz: 0b0a1f5475398e2340b22d6953cd785a5f911499ad8ba8b59d621d4469cfbb642b029e9ce401c6a060db115a535da43288c783b75c8198fb3acd305b969f709b
+  metadata.gz: 89fb27d78851ea1e38eb8add5398ecc04e9e970bcd69f5e501193ccb4f6ac6f86395e64c531b3cc92a794a0819c4aecd25f975de2d51f3f592ab99efac3462fa
+  data.tar.gz: 522e387d5dac01c5f49302eb5837132c89fe9daea5e53d8a8fd335d8a2aecfae066c9091febfde3e3eefc5f0a8e830a0d3afc6495bcbba33333d208bd1ca2283

data/README.md

@@ -1,10 +1,10 @@
 # ForemanKernelCare
 
-This plugin removes kernel [trace](https://theforeman.org/plugins/katello/3.18/user_guide/tracer/index.html) if [KernelCare](https://www.kernelcare.com/product/) package is installed on host
+This plugin removes kernel [trace](https://theforeman.org/plugins/katello/nightly/user_guide/tracer/index.html) and update the kernel package version if [KernelCare](https://www.kernelcare.com/product/) package is installed on host
 
 ## Installation
 
-See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
+See [How_to_Install_a_Plugin](https://www.theforeman.org/plugins/#2.Installation)
 for how to install Foreman plugins
 
 ## Usage
@@ -17,7 +17,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2021 maccelf
+Copyright (c) 2022 maccelf
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/app/controllers/concerns/foreman_kernel_care/foreman_tasks.rb

@@ -0,0 +1,22 @@
+module ForemanKernelCare
+  module ForemanTasks
+    def callback
+      callbacks = params.key?(:callback) ? Array(params) : params[:callbacks]
+      ids = callbacks.map { |payload| payload[:callback][:task_id] }
+      foreman_tasks = ::ForemanTasks::Task.where(:id => ids)
+      external_map = Hash[*foreman_tasks.pluck(:id, :external_id).flatten]
+      callbacks.each do |payload|
+        # We need to call .to_unsafe_h to unwrap the hash from ActionController::Parameters
+        callback = payload[:callback]
+        foreman_task = foreman_tasks.find { |task| task.id == callback[:task_id] }
+        if foreman_task.action.include?('Get patched kernel version')
+          version, release = payload[:data].to_unsafe_h['result'].first['output'].strip.split('-')
+          job_invocation = ::JobInvocation.where(:task_id => foreman_task.parent_task_id).first
+          job_invocation.targeting.hosts.each { |host| host.update_kernel_version(version, release) }
+        end
+        process_callback(external_map[callback[:task_id]], callback[:step_id].to_i, payload[:data].to_unsafe_h, :request_id => ::Logging.mdc['request'])
+      end
+      render :json => { :message => 'processing' }.to_json
+    end
+  end
+end

data/app/models/concerns/foreman_kernel_care/host_managed_extensions.rb

@@ -1,5 +1,16 @@
 module ForemanKernelCare
   module HostManagedExtensions
+    def import_package_profile(simple_packages)
+      if kernelcare?
+        composer = ::JobInvocationComposer.for_feature(:kernel_version, self)
+        composer.triggering.mode = :future
+        composer.trigger!
+      end
+
+      found = import_package_profile_in_bulk(simple_packages)
+      sync_package_associations(found.map(&:id).uniq)
+    end
+
     def import_tracer_profile(tracer_profile)
       traces = []
       tracer_profile.each do |trace, attributes|
@@ -20,6 +31,44 @@ module ForemanKernelCare
       update_trace_status
     end
 
+    def update_kernel_version(version, release)
+      packages = ::Katello::InstalledPackage.where('name LIKE ?', '%kernel%').where.not(name: 'kernelcare').to_a
+      delete_ids = []
+      simple_packages = packages.map do |p|
+        delete_ids << p.id
+        ::Katello::Pulp::SimplePackage.new({
+                                             arch: p.arch,
+                                             epoch: p.epoch,
+                                             version: version,
+                                             release: release,
+                                             name: p.name
+                                           })
+      end
+      found = import_package_profile_in_bulk(simple_packages)
+      sync_kernel_associations(found.map(&:id).uniq, delete_ids)
+    end
+
+    def sync_kernel_associations(new_patched_kernel_ids, delete_ids)
+      ::Katello::Util::Support.active_record_retry do
+        table_name = host_installed_packages.table_name
+
+        queries = []
+
+        if delete_ids.any?
+          queries << "DELETE FROM #{table_name} WHERE host_id=#{id} AND installed_package_id IN (#{delete_ids.join(', ')})"
+        end
+
+        unless new_patched_kernel_ids.empty?
+          inserts = new_patched_kernel_ids.map { |unit_id| "(#{unit_id.to_i}, #{id.to_i})" }
+          queries << "INSERT INTO #{table_name} (installed_package_id, host_id) VALUES #{inserts.join(', ')}"
+        end
+
+        queries.each do |query|
+          ::ActiveRecord::Base.connection.execute(query)
+        end
+      end
+    end
+
     protected
 
     def kernelcare?

data/app/views/foreman_kernel_care/job_templates/kernel_version.erb

@@ -0,0 +1,15 @@
+<%#
+kind: job_template
+name: Kernel version
+model: JobTemplate
+job_category: Commands
+description_format: "Get patched kernel version"
+provider_type: SSH
+feature: kernel_version
+%>
+<%
+  unless @host.installed_packages.select { |package| package.name == 'kernelcare' }.empty?
+    render_error(N_('Unsupported host.'))
+  end
+%>
+/usr/bin/kcarectl --uname

data/db/seeds.d/100_assign_features_with_templates.rb

@@ -16,6 +16,13 @@ User.as_anonymous_admin do
         module_template.organizations << Organization.unscoped.all if module_template.organizations.empty?
         module_template.locations << Location.unscoped.all if module_template.locations.empty?
       end
+
+      module_template = JobTemplate.find_by(name: 'Kernel version')
+      if module_template && !Rails.env.test? && Setting[:remote_execution_sync_templates]
+        module_template.sync_feature('kernel_version')
+        module_template.organizations << Organization.unscoped.all if module_template.organizations.empty?
+        module_template.locations << Location.unscoped.all if module_template.locations.empty?
+      end
     end
   end
 end

data/lib/foreman_kernel_care/engine.rb

@@ -19,6 +19,7 @@ module ForemanKernelCare
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       Katello::Concerns::HostManagedExtensions.prepend ForemanKernelCare::HostManagedExtensions
+      ForemanTasks::Api::TasksController.prepend ForemanKernelCare::ForemanTasks
     rescue StandardError => e
       Rails.logger.warn "ForemanKernelCare: skipping engine hook (#{e})"
     end

data/lib/foreman_kernel_care/remote_execution.rb

@@ -11,6 +11,12 @@ module ForemanKernelCare
         N_('Run Update kernel'),
         :description => N_('Runs Update kernel')
       )
+
+      RemoteExecutionFeature.register(
+        :kernel_version,
+        N_('Get patched kernel version'),
+        :description => N_('Get patched kernel version')
+      )
     end
   end
 end

data/lib/foreman_kernel_care/version.rb

@@ -1,3 +1,3 @@
 module ForemanKernelCare
-  VERSION = '1.0.0-alfa'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/test/unit/host_managed_extensions_test.rb

@@ -2,15 +2,40 @@ require 'test_plugin_helper'
 
 module ForemanKernelCare
   class HostManagedExtensionsTestBase < ActiveSupport::TestCase
+  end
+
+  class HostInstalledPackagesTest < HostManagedExtensionsTestBase
     def setup
-      template = FactoryBot.create(:job_template, name: 'Update kernel')
-      template.sync_feature('update_kernel')
+      feature = RemoteExecutionFeature.register('kernel_version', 'Kernel version')
+      template = FactoryBot.create(:job_template, name: 'Kernel versionl')
+      template.sync_feature(feature.label)
+
+      @host = FactoryBot.create(:host, :with_kernelcare)
+      package_json = {:name => "kernel", :version => "1", :release => "1.el7", :arch => "x86_64", :epoch => "1",
+                      :nvra => "kernel-1-1.el7.x86_64"}
+      @host.import_package_profile([::Katello::Pulp::SimplePackage.new(package_json)])
+      @nvra = 'kernel-1-1.el7.x86_64'
+      @host.reload
+    end
+
+    def test_update_kernel_version
+      version = '2'
+      release = '2.el7'
+      @host.update_kernel_version(version, release)
+      kernel_package = @host.installed_packages.where(name: 'kernel').first
+
+      assert_not_equal kernel_package.nvra, @nvra
+      assert_equal kernel_package.version, version
+      assert_equal kernel_package.release, release
     end
   end
 
   class HostTracerTest < HostManagedExtensionsTestBase
     def setup
-      super
+      feature = RemoteExecutionFeature.register('update_kernel', 'Update Kernel')
+      template = FactoryBot.create(:job_template, name: 'Update kernel')
+      template.sync_feature(feature.label)
+
       @tracer_json = {
         "kernel": {
           "type": 'static',

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kernel_care
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alfa
+  version: 1.1.1
 platform: ruby
 authors:
 - Maxim Petukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: katello
+  name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
-  name: foreman_remote_execution
+  name: katello
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This plugin removes kernel trace if KernelCare package is installed on
-  host
+description: This plugin removes kernel trace and update the kernel package version
+  if KernelCare package is installed on host
 email:
 - maxmol27@gmail.com
 executables: []
@@ -77,7 +77,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/foreman_kernel_care/foreman_tasks.rb
 - app/models/concerns/foreman_kernel_care/host_managed_extensions.rb
+- app/views/foreman_kernel_care/job_templates/kernel_version.erb
 - app/views/foreman_kernel_care/job_templates/update_kernel.erb
 - db/seeds.d/100_assign_features_with_templates.rb
 - db/seeds.d/70_job_templates.rb
@@ -104,11 +106,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Plugin for KernelCare