katello 4.14.1 → 4.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb838f1316844984ac6a811415ee7ffd5b91c7e4b968b96de55b0bf3adf1f0b7
-  data.tar.gz: b8158bfab87d2e3cbe687af69e65962a8627bc78516f6f20b190864854eee4e3
+  metadata.gz: b12dcdfe79518fca3a4ea75673805a2c0bf59f7610c8dc4b847e9ccd5a75c601
+  data.tar.gz: 96e0cbbac6e2cdc80e2522b648c48961785b1107683feaa743e8b4d4dc413729
 SHA512:
-  metadata.gz: e2e57134ff21bfaffb6bd31b2954adad011b6cb63991e66a2ca54d08f596b63c061177049402aa9831e8407ef2d7006f0b2d536892757c69e5cc5f716cdff687
-  data.tar.gz: f2badc68f6c7b3638fb076e2cabeca5a60c073fffee6d6a7c6e2f886a906085adc5d54fc5babc44280f00a1a1e5e7a188b25b7de64a359ead41950b9ec289367
+  metadata.gz: 8e0dce2f09fc537dd70401b230e462b17b8348bfe5579f7d623faf3c635da9d1d22eae7d3d0483961f9f3e448fff393b366c26733cb7ac45cc2af988ca73b5ce
+  data.tar.gz: 5cb76f04bb7a0d7044508979c935c48f7ea6d23533f11c6e7263234216971147380d7282039fde039209fe42d31190f7d587b3e8ce52a6520c826e2fdcb538db

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

@@ -19,8 +19,8 @@ module Katello
     api :GET, "/environments/:environment_id/activation_keys"
     api :GET, "/organizations/:organization_id/activation_keys"
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
-    param :environment_id, :number, :desc => N_("environment identifier")
-    param :content_view_id, :number, :desc => N_("content view identifier")
+    param :environment_id, :number, :desc => N_("environment identifier"), :allow_nil => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :allow_nil => true
     param :name, String, :desc => N_("activation key name to filter by")
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ActivationKey)

data/app/lib/actions/katello/repository/destroy.rb

@@ -70,11 +70,7 @@ module Actions
           # Remove products from ACS's that contain no repositories which both
           # match the ACS content type and have a non-nil URL
           product = repository.product
-          repo_content_types = Set.new
-          product.repositories.each do |test_repo|
-            # we need to check id because test_repo will still contain the old, non-nil url
-            repo_content_types.add(test_repo.content_type) if (repository.id != test_repo.id) && test_repo.url.present?
-          end
+          repo_content_types = ::Katello::RootRepository.where(:id => product.repositories.where.not(:id => repository.id).select(:root_id)).where.not(:url => [nil, '']).distinct.pluck(:content_type)
           ::Katello::AlternateContentSource.with_products(product).each do |acs|
             unless repo_content_types.include?(acs.content_type)
               acs.products = acs.products - [product]

data/app/lib/actions/katello/repository/update.rb

@@ -91,11 +91,7 @@ module Actions
           # Remove products from ACS's that contain no repositories which both
           # match the ACS content type and have a non-nil URL
           product = repository.product
-          repo_content_types = Set.new
-          product.acs_compatible_repositories.each do |test_repo|
-            # we need to check id because test_repo will still contain the old, non-nil url
-            repo_content_types.add(test_repo.content_type) if (repository.id != test_repo.id) && test_repo.url.present?
-          end
+          repo_content_types = ::Katello::RootRepository.where(:id => product.repositories.where.not(:id => repository.id).select(:root_id)).where.not(:url => [nil, '']).distinct.pluck(:content_type)
           ::Katello::AlternateContentSource.with_products(product).each do |acs|
             unless repo_content_types.include?(acs.content_type)
               acs.products = acs.products - [product]

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

@@ -79,22 +79,14 @@ module Katello
       module ClassMethods
         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)
@@ -117,42 +109,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/services/katello/registration_manager.rb

@@ -154,13 +154,18 @@ module Katello
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def register_host(host, consumer_params, content_view_environments, activation_keys = [])
         new_host = host.new_record?
         unless new_host
           host.save!
           # Keep the kickstart repository ID so the host's Medium isn't unset
           # Important for registering a host during provisioning
-          unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+          begin
+            unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+          rescue RestClient::Gone
+            Rails.logger.debug("Host %s has been removed in preparation for reregistration" % host&.name)
+          end
           host.reload
         end
 
@@ -194,6 +199,7 @@ module Katello
           finalize_registration(host)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def check_registration_services
         ping_results = {}

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.14.1".freeze
+  VERSION = "4.14.3".freeze
 end

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -28,15 +28,15 @@ const recommendedRepositoriesSatTools = [
   'satellite-client-6-for-rhel-9-x86_64-rpms',
   'satellite-client-6-for-rhel-8-x86_64-rpms',
   'rhel-7-server-els-satellite-client-6-rpms',
-  'rhel-7-server-els-satellite-6-client-2-rpms',
-  'satellite-6-client-2-for-rhel-8-x86_64-rpms',
-  'satellite-6-client-2-for-rhel-9-x86_64-rpms',
 ];
 
 const recommendedRepositoriesMisc = [
-  'satellite-capsule-6.15-for-rhel-8-x86_64-rpms',
-  'satellite-maintenance-6.15-for-rhel-8-x86_64-rpms',
-  'satellite-utils-6.15-for-rhel-8-x86_64-rpms',
+  'satellite-capsule-6.16-for-rhel-8-x86_64-rpms',
+  'satellite-maintenance-6.16-for-rhel-8-x86_64-rpms',
+  'satellite-utils-6.16-for-rhel-8-x86_64-rpms',
+  'satellite-utils-6.16-for-rhel-9-x86_64-rpms',
+  'satellite-maintenance-6.16-for-rhel-9-x86_64-rpms',
+  'satellite-capsule-6.16-for-rhel-9-x86_64-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.14.1
+  version: 4.14.3
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails