katello 4.15.0 → 4.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdca2a5e86da6b9dee888fb990127bb2e25604039907a5594fcfd24480908118
-  data.tar.gz: 6cac835a884d5ace60819762c04b6817e41dc17c0fa4923721cb79f0977d328b
+  metadata.gz: 197af1b9f99978a1178cbae74367c297adbf8ba6075164a8b392607396bd5fec
+  data.tar.gz: 4dc930d7beb511cff99bf9f18de2bbce228ac6cb30214ccf26498f5659d492e8
 SHA512:
-  metadata.gz: 18effa84dce5b6f9feca34e0966997e7b5d85fd834e848d1e7f16115712295ab8c820ac20c8d252e6f7d8b8e9bb07b9d791df0ad6c08aee3f6e76956a2468381
-  data.tar.gz: b5b004f2358caa23c8a9b27875d3eb378f0b3961bc4b071c1e12702c5eccf439b3eb654557ea948c200fd5b2f7f379d1cc23aef009ab389285a2d25c7ef7b264
+  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/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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.15.0
+  version: 4.15.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-02 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