Rework packages_names_for_job_templates

Katello · Jan 9, 2024 · 6acdc28 · 6acdc28
1 parent 57b957a
commit 6acdc28
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 29 deletions.
diff --git a/app/models/katello/concerns/host_managed_extensions.rb b/app/models/katello/concerns/host_managed_extensions.rb
@@ -534,6 +534,15 @@ def rhel_eos_schedule_index
       end
 
       def package_names_for_job_template(action:, search:, versions: nil)
+        if self.operatingsystem.family == 'Debian'
+          deb_names_for_job_template(action, search)
+        else
+          yum_names_for_job_template(action, search, versions)
+        end
+      end
+
+
+      def yum_names_for_job_template(action:, search:, versions: nil)
         actions = %w(install remove update).freeze
         case action
         when 'install'
@@ -608,7 +617,7 @@ class ::Host::Managed::Jail < Safemode::Jail
         :installed_packages, :traces_helpers, :advisory_ids, :package_names_for_job_template,
         :filtered_entitlement_quantity_consumed, :bound_repositories,
         :single_content_view, :single_lifecycle_environment, :purpose_role, :purpose_usage, :release_version,
-        :purpose_role_status_label, :purpose_usage_status_label, :deb_names_for_job_template
+        :purpose_role_status_label, :purpose_usage_status_label
 end
 
 class ActiveRecord::Associations::CollectionProxy::Jail < Safemode::Jail

diff --git a/app/views/foreman/job_templates/install_packages_by_search_query.erb b/app/views/foreman/job_templates/install_packages_by_search_query.erb
@@ -11,16 +11,9 @@ template_inputs:
   input_type: user
   required: false
 %>
-<% if @host.operatingsystem.family == 'Debian'
-  package_names = @host.deb_names_for_job_template(
+<% package_names = @host.package_names_for_job_template(
   action: 'install',
   search: input('Package search query')
-)
-else
-  package_names = @host.package_names_for_job_template(
-  action: 'install',
-  search: input('Package search query')
-)
-end -%>
+) -%>
 
-<%= render_template('Package Action - Script Default', :action => 'install', :package => package_names.join(' ')) %>
+<%= render_template('Package Action - Script Default', :action => 'install', :package => package_names.join(' ')) %>
diff --git a/app/views/foreman/job_templates/remove_packages_by_search_query.erb b/app/views/foreman/job_templates/remove_packages_by_search_query.erb
@@ -11,16 +11,9 @@ template_inputs:
   input_type: user
   required: true
 %>
-<% if @host.operatingsystem.family == 'Debian'
-  package_names = @host.deb_names_for_job_template(
+<% package_names = @host.package_names_for_job_template(
   action: 'remove',
   search: input('Packages search query')
-)
-else
-  package_names = @host.package_names_for_job_template(
-  action: 'remove',
-  search: input('Packages search query')
-)
-end -%>
+) -%>
 
 <%= render_template('Package Action - Script Default', :action => 'remove', :package => package_names.join(' ')) %>
diff --git a/app/views/foreman/job_templates/update_packages_by_search_query.erb b/app/views/foreman/job_templates/update_packages_by_search_query.erb
@@ -16,17 +16,10 @@ template_inputs:
   required: false
   value_type: plain
 %>
-<% if @host.operatingsystem.family == 'Debian'
-  package_names = @host.deb_names_for_job_template(
-  action: 'update',
-  search: input('Packages search query')
-)
-else
-  package_names = @host.package_names_for_job_template(
+<% package_names = @host.package_names_for_job_template(
   action: 'update',
   search: input('Packages search query'),
   versions: input('Selected update versions')
-)
-end -%>
+) -%>
 
 <%= render_template('Package Action - Script Default', :action => 'update', :package => package_names.join(' ')) %>