Kernel version template output parsing fix (#56)

* Update job template description for patch viewing * Correct output parsing of kernel version job
theforeman · Oct 10, 2023 · 2429eae · 2429eae
1 parent b6eb067
commit 2429eae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -47,7 +47,7 @@ Metrics/PerceivedComplexity:
   Max: 10
 
 Metrics/MethodLength:
-  Max: 18
+  Max: 19
 
 Metrics/ModuleLength:
   Max: 120

diff --git a/app/controllers/concerns/foreman_kernel_care/foreman_tasks.rb b/app/controllers/concerns/foreman_kernel_care/foreman_tasks.rb
@@ -12,7 +12,9 @@ def callback
         complete_output = ''
         result = payload[:data].to_unsafe_h['result']
         result.each { |x| complete_output += x['output'] }
-        kcare, kernel = complete_output.split(/\n/).values_at(1, 3)
+        kernel, kcare = complete_output.split(/\n/)
+        kernel = kernel.gsub('Installed kernel version: ', '')
+        kcare = kcare.gsub('Patched kernel version: ', '')
         version, release = kcare.strip.split('-')
         next if version.empty? || release.empty?
         job_invocation = ::JobInvocation.where(:task_id => foreman_task.parent_task_id).first

diff --git a/app/views/foreman_kernel_care/job_templates/view_newest_patch.erb b/app/views/foreman_kernel_care/job_templates/view_newest_patch.erb
@@ -3,7 +3,7 @@ kind: job_template
 name: LivePatching - View newest Patch
 model: JobTemplate
 job_category: LivePatching - Script Default
-description_format: "Get patched kernel version"
+description_format: "View available patches"
 provider_type: script
 %>
 <%