katello 4.15.0.rc2 → 4.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42fc16f97e3c3ec773c97e554fc14f11ae7bc3e92ceae35d05a25acb3086965d
-  data.tar.gz: c197411d237e7a82c9a9caa1ecf7bfdbc958354d01fe373e95207d81b410854b
+  metadata.gz: 197af1b9f99978a1178cbae74367c297adbf8ba6075164a8b392607396bd5fec
+  data.tar.gz: 4dc930d7beb511cff99bf9f18de2bbce228ac6cb30214ccf26498f5659d492e8
 SHA512:
-  metadata.gz: 1ed1e2c8ec5408e98341e8608f17b3500b0d57b21f780d97582a6f21e953cd93209f3d6cb67e412f62a98648bef14a5adee0310fd23665c25a53ece294ff6d67
-  data.tar.gz: f1ebce7de2995fa8fd1cdb571887d787b20070e6b8a31300d0fb557ffe0813b37cd52711251d54a91cddf176d76878156d6fa0d622a0ddd57c3b024ee2b1dbfa
+  metadata.gz: f82b441dd7dce81a9e570b14c4bdeab6aca2a98a97681000603b9d198515d7f3c5479f6e19f9a583c2a0baf9c02e38e6cd51e54a35b192f23014d5fa95d665e1
+  data.tar.gz: 724ff457e264705c0b78057c703f359385bad2db8ac01e93af7a54b35fb34f6c3266eb01cecabb96ba7bfce9f05566940ac439a2137b500481604c75a4910387

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

@@ -12,9 +12,10 @@ module Katello
     param :repository_id, :number, :required => true, :desc => N_("repository id")
     param :size, :number, :required => true, :desc => N_("Size of file to upload")
     param :checksum, String, :required => false, :desc => N_("Checksum of file to upload")
-    param :content_type, RepositoryTypeManager.uploadable_content_types(false).map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree_ref', 'rpm', 'srpm')")
+    param :content_type, RepositoryTypeManager.uploadable_content_types(false).map(&:label), :required => false, :desc => N_("content type ('deb', 'file', 'ostree_ref', 'rpm', 'srpm')")
     def create
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Ansible collections.") if @repository.ansible_collection?
+      fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload container content via Hammer/API. Use podman push instead.") if @repository.docker?
       content_type = params[:content_type] || ::Katello::RepositoryTypeManager.find(@repository.content_type)&.default_managed_content_type&.label
       RepositoryTypeManager.check_content_matches_repo_type!(@repository, content_type)
       if ::Katello::RepositoryTypeManager.generic_content_type?(content_type)

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

@@ -186,7 +186,7 @@ module Katello
         validate_content_overrides_enabled(override_params)
       end
       sync_task(::Actions::Katello::Host::UpdateContentOverrides, @host, content_override_values, false)
-      fetch_product_content
+      fetch_product_content(!params.dig(:content_overrides_search, :search).nil? && Foreman::Cast.to_bool(params.dig(:content_overrides_search, :limit_to_env)))
     end
 
     api :GET, "/hosts/:host_id/subscriptions/available_release_versions", N_("Show releases available for the content host")
@@ -205,8 +205,8 @@ module Katello
 
     private
 
-    def fetch_product_content
-      content_finder = ProductContentFinder.new(:consumable => @host.subscription_facet)
+    def fetch_product_content(limit_to_env = false)
+      content_finder = ProductContentFinder.new(:match_environment => limit_to_env, :consumable => @host.subscription_facet)
       content = content_finder.presenter_with_overrides(@host.subscription_facet.candlepin_consumer.content_overrides)
       respond_with_template_collection("index", 'repository_sets', :collection => full_result_response(content))
     end

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

@@ -403,6 +403,13 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. On the
         end
       end
 
+      additive_policy = ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE
+      is_repo_param_additive = repo_params[:mirroring_policy] == additive_policy
+      is_root_additive = @repository.root.mirroring_policy == additive_policy
+
+      if @repository.yum? && !(is_repo_param_additive || is_root_additive)
+        repo_params[:retain_package_versions_count] = nil
+      end
       sync_task(::Actions::Katello::Repository::Update, @repository.root, repo_params)
       respond_for_show(:resource => @repository)
     end

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

@@ -82,11 +82,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/lib/katello/concerns/base_template_scope_extensions.rb

@@ -257,17 +257,16 @@ module Katello
         search_since = since.present? ? "ended_at > \"#{since}\"" : nil
         search_result = status.present? && status != 'all' ? "result = #{status}" : nil
         labels = 'label ^ (Actions::Katello::Host::Erratum::Install, Actions::Katello::Host::Erratum::ApplicableErrataInstall)'
-        select = 'foreman_tasks_tasks.*'
 
         new_labels = 'label = Actions::RemoteExecution::RunHostJob AND remote_execution_feature.label ^ (katello_errata_install, katello_errata_install_by_search)'
         labels = [labels, new_labels].map { |label| "(#{label})" }.join(' OR ')
-        select += ',template_invocations.id AS template_invocation_id'
 
         search = [search_up_to, search_since, search_result, "state = stopped", labels].compact.join(' and ')
 
         tasks = load_resource(klass: ForemanTasks::Task,
                               permission: 'view_foreman_tasks',
-                              select: select,
+                              joins: [:template_invocation],
+                              preload: [:template_invocation],
                               search: search)
         only_host_ids = ::Host.search_for(host_filter).pluck(:id) if host_filter
 
@@ -383,7 +382,7 @@ module Katello
           found = script.lines.find { |line| line.start_with? '# RESOLVED_ERRATA_IDS=' } || ''
           (found.chomp.split('=', 2).last || '').split(',')
         else
-          TemplateInvocationInputValue.joins(:template_input).where("template_invocation_id = ? AND template_inputs.name = ?", task.template_invocation_id, 'errata')
+          TemplateInvocationInputValue.joins(:template_input).where("template_invocation_id = ? AND template_inputs.name = ?", task.template_invocation.id, 'errata')
             .first&.value&.split(',') || []
         end
       end

data/app/lib/katello/resources/candlepin/product.rb

@@ -4,7 +4,8 @@ module Katello
       class Product < CandlepinResource
         class << self
           def all(owner_label, included = [])
-            products = JSON.parse(Candlepin::CandlepinResource.get(path(owner_label) + "?#{included_list(included)}", self.default_headers).body)
+            url = path(owner_label) + "?active=include" + "&#{included_list(included)}"
+            products = JSON.parse(Candlepin::CandlepinResource.get(url, self.default_headers).body)
             ::Katello::Util::Data.array_with_indifferent_access products
           end
 

data/app/lib/katello/util/cveak_migrator.rb

@@ -27,8 +27,9 @@ module Katello
           Rails.logger.info "You may want to change the content view / lifecycle environment for these activation keys manually."
         end
         (aks_with_no_cve + aks_with_missing_cve).each do |ak|
-          default_content_view = ak.organization.default_content_view
-          library = ak.organization.library
+          ak_organization = ::Organization.find_by(id: ak.organization_id)
+          default_content_view = ak_organization.default_content_view
+          library = ak_organization.library
           Rails.logger.info "Updating activation key #{ak.name} with default content_view_id and lifecycle_environment_id"
           ak&.update_columns(content_view_id: default_content_view&.id, environment_id: library&.id)
         end

data/app/models/katello/content_view.rb

@@ -112,7 +112,7 @@ module Katello
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :label, :complete_value => true
-    scoped_search :on => :composite, :complete_value => true
+    scoped_search :on => :composite, :complete_value => { :true => true, :false => false }
     scoped_search :on => :generated_for, :complete_value => true
     scoped_search :on => :default # just for ordering
     scoped_search :on => :name, :complete_value => true,

data/app/models/katello/root_repository.rb

@@ -343,6 +343,9 @@ module Katello
       unless yum?
         errors.add(:retain_package_versions_count, N_("is only allowed for Yum repositories."))
       end
+      if yum? && self.mirroring_policy != MIRRORING_POLICY_ADDITIVE
+        errors.add(:retain_package_versions_count, N_("cannot be set for repositories without 'Additive' mirroring policy."))
+      end
       if self.retain_package_versions_count.to_i < 0
         errors.add(:retain_package_versions_count, N_("must not be a negative value."))
       end

data/app/models/katello/upstream_pool.rb

@@ -33,6 +33,7 @@ module Katello
         params[:consumer] = upstream_consumer_id if attachable
         params[:sort_by] = 'Product.name'
         params[:order] = 'asc'
+        params[:add_future] = true
         params
       end
 

data/app/services/katello/pulp3/content_view_version/importable_repositories.rb

@@ -29,7 +29,7 @@ module Katello
 
             root = product.root_repositories.find do |r|
               if repo.content&.id && repo.redhat
-                repo_exists = r.content.cp_content_id == repo.content.id &&
+                repo_exists = r.library_instance.content.cp_content_id == repo.content.id &&
                   r.arch == repo.arch &&
                   r.major == repo.major &&
                   r.minor == repo.minor

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

@@ -261,7 +261,11 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                             optionIndex = $scope.genericRemoteOptions.map(function(option) {
                                 return option.name;
                             }).indexOf(key);
-                            $scope.genericRemoteOptions[optionIndex].value = remOptions[key].join($scope.genericRemoteOptions[optionIndex].delimiter);
+                            if ($scope.genericRemoteOptions[optionIndex].delimiter) {
+                                $scope.genericRemoteOptions[optionIndex].value = remOptions[key].join($scope.genericRemoteOptions[optionIndex].delimiter);
+                            } else {
+                                $scope.genericRemoteOptions[optionIndex].value = remOptions[key];
+                            }
                         }
                     });
                 }

data/lib/katello/repository_types/docker.rb

@@ -27,7 +27,6 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
                :priority => 1,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifest,
                :removable => true,
-               :uploadable => true,
                :primary_content => true
   content_type Katello::DockerManifestList,
                :priority => 2,

data/lib/katello/repository_types/python.rb

@@ -28,6 +28,9 @@ Katello::RepositoryTypeManager.register('python') do
   generic_remote_option :package_types, title: N_("Package Types"), type: Array, input_type: "text", delimiter: ",", default: [],
                         description: N_("Package types to sync for Python content, separated by comma. Leave empty to get every package type. Package types are: bdist_dmg, bdist_dumb, bdist_egg, bdist_msi, bdist_rpm, bdist_wheel, bdist_wininst, sdist.")
 
+  generic_remote_option :keep_latest_packages, title: N_("Keep latest packages"), type: :number, input_type: "number", default: 0,
+                        description: N_("The amount of latest versions of a package to keep on sync, includes pre-releases if synced. Default 0 keeps all versions.")
+
   url_description N_("URL of a PyPI content source such as https://pypi.org.")
 
   generic_content_type 'python_package',

data/lib/katello/version.rb

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

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

@@ -30,15 +30,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.15.0.rc2
+  version: 4.15.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,6 +101,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +111,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15'
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -4397,102 +4403,150 @@ files:
 - locale/action_names.rb
 - locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
+- locale/bn/katello.po.time_stamp
 - locale/bn_IN/LC_MESSAGES/katello.mo
 - locale/bn_IN/katello.po
+- locale/bn_IN/katello.po.time_stamp
 - locale/ca/LC_MESSAGES/katello.mo
 - locale/ca/katello.po
+- locale/ca/katello.po.time_stamp
 - locale/cs/LC_MESSAGES/katello.mo
 - locale/cs/katello.po
+- locale/cs/katello.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/katello.mo
 - locale/cs_CZ/katello.po
+- locale/cs_CZ/katello.po.time_stamp
 - locale/de/LC_MESSAGES/katello.mo
 - locale/de/katello.po
+- locale/de/katello.po.time_stamp
 - locale/de_AT/LC_MESSAGES/katello.mo
 - locale/de_AT/katello.po
+- locale/de_AT/katello.po.time_stamp
 - locale/de_DE/LC_MESSAGES/katello.mo
 - locale/de_DE/katello.po
+- locale/de_DE/katello.po.time_stamp
 - locale/el/LC_MESSAGES/katello.mo
 - locale/el/katello.po
+- locale/el/katello.po.time_stamp
 - locale/en/LC_MESSAGES/katello.mo
 - locale/en/katello.po
+- locale/en/katello.po.time_stamp
 - locale/en_GB/LC_MESSAGES/katello.mo
 - locale/en_GB/katello.po
+- locale/en_GB/katello.po.time_stamp
 - locale/en_US/LC_MESSAGES/katello.mo
 - locale/en_US/katello.po
+- locale/en_US/katello.po.time_stamp
 - locale/es/LC_MESSAGES/katello.mo
 - locale/es/katello.po
+- locale/es/katello.po.time_stamp
 - locale/et_EE/LC_MESSAGES/katello.mo
 - locale/et_EE/katello.po
+- locale/et_EE/katello.po.time_stamp
 - locale/fr/LC_MESSAGES/katello.mo
 - locale/fr/katello.po
+- locale/fr/katello.po.time_stamp
 - locale/gl/LC_MESSAGES/katello.mo
 - locale/gl/katello.po
+- locale/gl/katello.po.time_stamp
 - locale/gu/LC_MESSAGES/katello.mo
 - locale/gu/katello.po
+- locale/gu/katello.po.time_stamp
 - locale/he_IL/LC_MESSAGES/katello.mo
 - locale/he_IL/katello.po
+- locale/he_IL/katello.po.time_stamp
 - locale/hi/LC_MESSAGES/katello.mo
 - locale/hi/katello.po
+- locale/hi/katello.po.time_stamp
 - locale/id/LC_MESSAGES/katello.mo
 - locale/id/katello.po
+- locale/id/katello.po.time_stamp
 - locale/it/LC_MESSAGES/katello.mo
 - locale/it/katello.po
+- locale/it/katello.po.time_stamp
 - locale/ja/LC_MESSAGES/katello.mo
 - locale/ja/katello.po
+- locale/ja/katello.po.time_stamp
 - locale/ka/LC_MESSAGES/katello.mo
 - locale/ka/katello.po
+- locale/ka/katello.po.time_stamp
 - locale/katello.pot
 - locale/kn/LC_MESSAGES/katello.mo
 - locale/kn/katello.po
+- locale/kn/katello.po.time_stamp
 - locale/ko/LC_MESSAGES/katello.mo
 - locale/ko/katello.po
+- locale/ko/katello.po.time_stamp
 - locale/ml_IN/LC_MESSAGES/katello.mo
 - locale/ml_IN/katello.po
+- locale/ml_IN/katello.po.time_stamp
 - locale/mr/LC_MESSAGES/katello.mo
 - locale/mr/katello.po
+- locale/mr/katello.po.time_stamp
 - locale/nl_NL/LC_MESSAGES/katello.mo
 - locale/nl_NL/katello.po
+- locale/nl_NL/katello.po.time_stamp
 - locale/or/LC_MESSAGES/katello.mo
 - locale/or/katello.po
+- locale/or/katello.po.time_stamp
 - locale/pa/LC_MESSAGES/katello.mo
 - locale/pa/katello.po
+- locale/pa/katello.po.time_stamp
 - locale/pl/LC_MESSAGES/katello.mo
 - locale/pl/katello.po
+- locale/pl/katello.po.time_stamp
 - locale/pl_PL/LC_MESSAGES/katello.mo
 - locale/pl_PL/katello.po
+- locale/pl_PL/katello.po.time_stamp
 - locale/pt/LC_MESSAGES/katello.mo
 - locale/pt/katello.po
+- locale/pt/katello.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/katello.mo
 - locale/pt_BR/katello.po
+- locale/pt_BR/katello.po.time_stamp
 - locale/ro/LC_MESSAGES/katello.mo
 - locale/ro/katello.po
+- locale/ro/katello.po.time_stamp
 - locale/ro_RO/LC_MESSAGES/katello.mo
 - locale/ro_RO/katello.po
+- locale/ro_RO/katello.po.time_stamp
 - locale/ru/LC_MESSAGES/katello.mo
 - locale/ru/katello.po
+- locale/ru/katello.po.time_stamp
 - locale/sl/LC_MESSAGES/katello.mo
 - locale/sl/katello.po
+- locale/sl/katello.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/katello.mo
 - locale/sv_SE/katello.po
+- locale/sv_SE/katello.po.time_stamp
 - locale/ta/LC_MESSAGES/katello.mo
 - locale/ta/katello.po
+- locale/ta/katello.po.time_stamp
 - locale/ta_IN/LC_MESSAGES/katello.mo
 - locale/ta_IN/katello.po
+- locale/ta_IN/katello.po.time_stamp
 - locale/te/LC_MESSAGES/katello.mo
 - locale/te/katello.po
+- locale/te/katello.po.time_stamp
 - locale/tr/LC_MESSAGES/katello.mo
 - locale/tr/katello.po
+- locale/tr/katello.po.time_stamp
 - locale/update-i18n
 - locale/vi/LC_MESSAGES/katello.mo
 - locale/vi/katello.po
+- locale/vi/katello.po.time_stamp
 - locale/vi_VN/LC_MESSAGES/katello.mo
 - locale/vi_VN/katello.po
+- locale/vi_VN/katello.po.time_stamp
 - locale/zh/LC_MESSAGES/katello.mo
 - locale/zh/katello.po
+- locale/zh/katello.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/katello.mo
 - locale/zh_CN/katello.po
+- locale/zh_CN/katello.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/katello.mo
 - locale/zh_TW/katello.po
+- locale/zh_TW/katello.po.time_stamp
 - package.json
 - vendor/assets/images/katello/add2.png
 - vendor/assets/images/katello/addhost.png
@@ -5461,9 +5515,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.33
 signing_key: