katello 4.15.0.rc1 → 4.15.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e186226a2565c97bcbb32824cb73529b41587d5835331f92d7703873422c54
-  data.tar.gz: 3a447ab555fd7af2c11d6fa9314e62aa3c8bdd6a7592932eebd5f2dfcb9a5f55
+  metadata.gz: 42fc16f97e3c3ec773c97e554fc14f11ae7bc3e92ceae35d05a25acb3086965d
+  data.tar.gz: c197411d237e7a82c9a9caa1ecf7bfdbc958354d01fe373e95207d81b410854b
 SHA512:
-  metadata.gz: b114285e86a4a17948bf0636e4f0f4cad6eb8c8a53b75ff7e0986ff54758dbe4911a3beafe2ab5fc1d8aa9c73929cedc30abf638c2087a6e8108d3b0903975b6
-  data.tar.gz: b5998fa315eb371df74500e1e8868caff62da9c30dfd6473361981ae94e23ac1a8b38a6c91f90f0c8e9078358cc3c21f31d7cd41a738d7cd46f9943ee205acad
+  metadata.gz: 1ed1e2c8ec5408e98341e8608f17b3500b0d57b21f780d97582a6f21e953cd93209f3d6cb67e412f62a98648bef14a5adee0310fd23665c25a53ece294ff6d67
+  data.tar.gz: f1ebce7de2995fa8fd1cdb571887d787b20070e6b8a31300d0fb557ffe0813b37cd52711251d54a91cddf176d76878156d6fa0d622a0ddd57c3b024ee2b1dbfa

data/app/controllers/katello/api/v2/generic_content_units_controller.rb

@@ -2,7 +2,8 @@ module Katello
   class Api::V2::GenericContentUnitsController < Api::V2::ApiController
     resource_description do
       name 'Content Units'
-      param :content_type, String, desc: N_("Possible values: #{Katello::RepositoryTypeManager.generic_content_types.join(", ")}"), required: true
+      param :content_type, lambda { |val| Katello::RepositoryTypeManager.generic_content_types.include?(val) },
+            desc: N_("Possible values: %s") % Katello::RepositoryTypeManager.generic_content_types.join(", "), required: true
     end
     apipie_concern_subst(:a_resource => N_("a content unit"), :resource_id => "content_units")
 

data/app/models/katello/concerns/content_facet_host_extensions.rb

@@ -101,22 +101,14 @@ module Katello
 
         def find_by_applicable_errata(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Erratum.table_name}.errata_id #{operator} ?", value_to_sql(operator, value)])
-          hosts = ::Host::Managed.joins(:applicable_errata).where(conditions)
-          if hosts.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})" }
-          end
+          hosts = ::Host::Managed.joins(:applicable_errata).select(:id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.to_sql})" }
         end
 
         def find_by_installable_errata(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Erratum.table_name}.errata_id #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_installable_errata.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_installable_errata.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_applicable_debs(_key, operator, value)
@@ -139,42 +131,26 @@ module Katello
 
         def find_by_applicable_rpms(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Rpm.table_name}.nvra #{operator} ?", value_to_sql(operator, value)])
-          hosts = ::Host::Managed.joins(:applicable_rpms).where(conditions)
-          if hosts.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})" }
-          end
+          hosts = ::Host::Managed.joins(:applicable_rpms).select(:id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.to_sql})" }
         end
 
         def find_by_installable_rpms(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Rpm.table_name}.nvra #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_installable_rpms.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_installable_rpms.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_repository_content_label(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Content.table_name}.label #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_repositories.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_repository_name(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::RootRepository.table_name}.name #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_repositories.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def in_content_view_environments(content_views: nil, lifecycle_environments: nil)

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

@@ -534,10 +534,16 @@ module Katello
           versions_by_name_arch = {}
           if versions.present?
             JSON.parse(versions).each do |nvra|
-              nvra =~ /([^.]*)-[-.\w]*\.(\w+)/
-              versions_by_name_arch[[Regexp.last_match(1), Regexp.last_match(2)]] = nvra
+              package_info = ::Katello::Util::Package.parse_nvrea(nvra)
+              versions_by_name_arch[[package_info[:name], package_info[:arch]]] = nvra
             end
           end
+
+          # > versions_by_name_arch
+          # =>
+          # {["glibc-langpack-en", "x86_64"]=>"glibc-langpack-en-2.34-100.el9_4.2.x86_64",
+          #  ["crypto-policies", "noarch"]=>"crypto-policies-20221215-1.git9a18988.el9_2.1.noarch"}
+
           pkg_name_archs = installed_packages.search_for(search).distinct.pluck(:name, :arch)
           if pkg_name_archs.empty?
             fail _("Cannot upgrade packages: No installed packages found for search term '%s'.") % search

data/app/views/foreman/job_templates/resolve_traces.erb

@@ -19,10 +19,17 @@ reboot = commands.delete('reboot')
 <% if reboot -%>
 shutdown -r +1
 <% else -%>
-<%= commands.join("\n") %>
+RETVAL=0
+<% commands.each do |command| -%>
+<%= command %>
+if [ $? -ne 0 ]; then
+  RETVAL=1
+fi
+<% end -%>
 RUN_TRACER_CMD='katello-tracer-upload'
 if [ "$(id -u)" -ne 0 ]; then
   RUN_TRACER_CMD='sudo katello-tracer-upload'
 fi
 $RUN_TRACER_CMD
+exit $RETVAL
 <% end %>

data/app/views/foreman/job_templates/resolve_traces_-_katello_ansible_default.erb

@@ -17,10 +17,11 @@ kind: job_template
 commands = @host.traces_helpers(search: input('Traces search query'))
 reboot = commands.delete('reboot')
 -%>
+<% if reboot -%>
+    - reboot:
+<% else -%>
 <%= render_template(
     'Run Command - Ansible Default',
     :command => (commands.push('katello-tracer-upload')).join("\n")
 ) %>
-<% if reboot %>
-    - reboot:
-<% end %>
+<% end -%>

data/app/views/foreman/job_templates/restart_services.erb

@@ -16,8 +16,16 @@ template_inputs:
 commands = input(:helper).split(',').map { |split| split.strip }
 reboot = commands.delete('reboot')
 -%>
-<%= commands.join("\n") %>
-katello-tracer-upload
 <% if reboot -%>
 <%= render_template('Power Action - Script Default', action: 'restart') %>
-<% end %>
+<% else -%>
+RETVAL=0
+<% commands.each do |command| -%>
+<%= command %>
+if [ $? -ne 0 ]; then
+  RETVAL=1
+fi
+<% end -%>
+katello-tracer-upload
+<% end -%>
+exit $RETVAL

data/app/views/foreman/job_templates/restart_services_-_katello_ansible_default.erb

@@ -18,10 +18,11 @@ kind: job_template
 commands = input(:helper).split(',').map { |split| split.strip }
 reboot = commands.delete('reboot')
 -%>
+<% if reboot -%>
+    - reboot:
+<% else -%>
 <%= render_template(
     'Run Command - Ansible Default',
     :command => (commands.push('katello-tracer-upload')).join("\n")
 ) %>
-<% if reboot %>
-    - reboot:
-<% end %>
+<% end -%>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -160,6 +160,8 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                     $scope.genericRemoteOptions.forEach(function(option) {
                         if (option.type === "Array" && option.value !== "") {
                             repository[option.name] = option.value.split(option.delimiter);
+                        } else if (option.type === "number" && option.value === "") {
+                            repository[option.name] = option.default;
                         } else {
                             repository[option.name] = option.value;
                         }

data/lib/katello/repository_types/ostree.rb

@@ -24,7 +24,7 @@ Katello::RepositoryTypeManager.register('ostree') do
   generic_remote_option :exclude_refs, title: N_("Exclude Refs"), type: Array, input_type: "text", delimiter: ",", default: [],
                          description: N_("A comma-separated list of tags to exclude during an ostree sync. The wildcards *, ? are recognized. 'exclude_refs' is evaluated after 'include_refs'.")
 
-  generic_remote_option :depth, title: N_("Depth"), type: :number, input_type: "number", delimiter: "", default: 0, description: N_("An option to specify how many ostree commits to traverse.")
+  generic_remote_option :depth, title: N_("Depth"), type: :number, input_type: "number", default: 0, description: N_("An option to specify how many ostree commits to traverse.")
 
   url_description N_("URL of an OSTree repository.")
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.15.0.rc1".freeze
+  VERSION = "4.15.0.rc2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.15.0.rc1
+  version: 4.15.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails