katello 4.15.0 → 4.16.0.rc1

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

@@ -33,6 +33,7 @@ module Katello
         before_create :associate_default_locations
         before_create :associate_lifecycle_environments
         before_validation :set_default_download_policy
+        after_update :refresh_smart_proxy_sync_histories
 
         lazy_accessor :pulp_repositories, :initializer => lambda { |_s| pulp_node.extensions.repository.retrieve_all }
 
@@ -131,9 +132,13 @@ module Katello
         SmartProxy.joins(:smart_proxy_alternate_content_sources).where('katello_smart_proxy_alternate_content_sources.smart_proxy_id' => self.id)
       end
 
-      def registration_host
+      def registration_url
         url = self.setting('Registration', 'registration_url').presence || self.url
-        URI.parse(url).host
+        URI(url)
+      end
+
+      def registration_host
+        registration_url.host
       end
 
       def load_balanced?
@@ -171,10 +176,10 @@ module Katello
       end
 
       def initialize_content_counts(reset: false)
-        if reset
+        if reset || content_counts.empty?
           { content_view_versions: {} }.with_indifferent_access
         else
-          (content_counts&.deep_dup || { content_view_versions: {} }).with_indifferent_access
+          content_counts.deep_dup.with_indifferent_access
         end
       end
 
@@ -182,7 +187,9 @@ module Katello
         repo_mirror_service = repo.backend_service(self).with_mirror_adapter
         repo_content_counts = repo_mirror_service.latest_content_counts
         translated_counts = translate_counts(repo, repo_mirror_service, repo_content_counts)
-        content_counts[:content_view_versions][repo.content_view_version_id.to_s] ||= { repositories: {}}
+        if content_counts[:content_view_versions][repo.content_view_version_id.to_s].empty?
+          content_counts[:content_view_versions][repo.content_view_version_id.to_s] = { repositories: {}}.with_indifferent_access
+        end
         content_counts[:content_view_versions][repo.content_view_version_id.to_s][:repositories][repo.id.to_s] = translated_counts
       end
 
@@ -465,6 +472,9 @@ module Katello
       end
 
       def remove_lifecycle_environment(environment)
+        smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
+        repos = smart_proxy_helper.repositories_available_to_capsule(environment)
+        smart_proxy_helper.clear_smart_proxy_sync_histories(repos) unless repos.empty?
         self.lifecycle_environments.find(environment.id)
         unless self.lifecycle_environments.destroy(environment)
           fail _("Could not remove the lifecycle environment from the smart proxy")
@@ -473,6 +483,16 @@ module Katello
         raise _("Lifecycle environment was not attached to the smart proxy; therefore, no changes were made.")
       end
 
+      def refresh_smart_proxy_sync_histories
+        smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
+        repos = smart_proxy_helper.repositories_available_to_capsule.select(:id)
+        if repos.size == 0
+          self.smart_proxy_sync_histories.delete_all
+        else
+          self.smart_proxy_sync_histories.where.not(repository_id: repos).delete_all
+        end
+      end
+
       def available_lifecycle_environments(organization_id = nil)
         scope = Katello::KTEnvironment.not_in_capsule(self)
         scope = scope.where(organization_id: organization_id) if organization_id
@@ -598,12 +618,16 @@ module Katello
         URI(setting(SmartProxy::PULP3_FEATURE, 'content_app_url'))
       end
 
+      def load_balancer_pulp_content_url
+        URI::HTTPS.build(host: registration_url.host, path: pulp_content_url.path)
+      end
+
       def audit_capsule_sync
         write_audit(action: "sync capsule", comment: _('Successfully synced capsule.'), audited_changes: {})
       end
 
       class ::SmartProxy::Jail < ::Safemode::Jail
-        allow :rhsm_url, :pulp_content_url
+        allow :rhsm_url, :pulp_content_url, :load_balancer_pulp_content_url, :registration_url
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Katello
 
         has_many :activation_keys, :through => :subscription_facet
         has_many :pools, :through => :subscription_facet
-        has_many :purpose_addons, :through => :subscription_facet
         has_many :subscriptions, :through => :pools
         has_one :rhel_lifecycle_status_object, :class_name => 'Katello::RhelLifecycleStatus', :foreign_key => 'host_id', :dependent => :destroy
         has_one :hypervisor_host, :through => :subscription_facet
@@ -38,7 +37,6 @@ module Katello
         scoped_search :on => :id, :relation => :pools, :rename => :subscription_id, :complete_value => true, :ext_method => :find_by_subscription_id, :only_explicit => true
         scoped_search :on => :purpose_role, :rename => :role, :relation => :subscription_facet, :complete_value => true
         scoped_search :on => :purpose_usage, :rename => :usage, :relation => :subscription_facet, :complete_value => true
-        scoped_search :on => :name, :rename => :addon, :relation => :purpose_addons, :complete_value => true, :ext_method => :find_by_purpose_addon
         before_update :update_candlepin_associations, if: -> { subscription_facet.try(:backend_update_needed?) }
       end
 
@@ -81,12 +79,6 @@ module Katello
           ::Katello::RhelLifecycleStatus.status_map
         end
 
-        def find_by_purpose_addon(_key, operator, value)
-          conditions = sanitize_sql_for_conditions(["#{Katello::PurposeAddon.table_name}.name #{operator} ?", value_to_sql(operator, value)])
-          hosts = ::Host::Managed.joins(:purpose_addons).where(conditions)
-          return_hosts(hosts)
-        end
-
         def find_by_activation_key(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::ActivationKey.table_name}.name #{operator} ?", value_to_sql(operator, value)])
           hosts = ::Host::Managed.joins(:activation_keys).where(conditions)

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,
@@ -342,7 +342,9 @@ module Katello
     end
 
     def latest_version_env
-      latest_version_object.try(:environments) || []
+      environments = organization.readable_promotion_paths.flatten
+      environments.insert(0, organization.library)
+      environments.intersection(latest_version_object.try(:environments) || [])
     end
 
     def last_task

data/app/models/katello/content_view_erratum_filter.rb

@@ -92,9 +92,21 @@ module Katello
     end
 
     def types_clause
+      # Create an array to store output clauses for quick type filtering later
+      conditions = []
+
+      # Add clauses for types in the filter
       types = erratum_rules.first.types
-      return if types.blank?
-      errata_types_in(types)
+      conditions << errata_types_in(types) unless types.blank?
+
+      # Add clauses for 'other' types
+      conditions << errata_types_not_in(Erratum::TYPES) if erratum_rules.first.allow_other_types?
+
+      # Reduce the array of clauses to a single clause and return
+      return if conditions.empty?
+      conditions.reduce(nil) do |combined_clause, condition|
+        combined_clause ? combined_clause.or(condition) : condition
+      end
     end
 
     def filter_by_id?
@@ -105,6 +117,10 @@ module Katello
       erratum_arel[:errata_type].in(types)
     end
 
+    def errata_types_not_in(types)
+      erratum_arel[:errata_type].not_in(types)
+    end
+
     def errata_in(ids)
       erratum_arel[:errata_id].in(ids)
     end

data/app/models/katello/content_view_version.rb

@@ -108,6 +108,12 @@ module Katello
       name
     end
 
+    def sorted_organization_readable_environments
+      organization_readable_environments = organization.readable_promotion_paths.flatten
+      organization_readable_environments.insert(0, organization.library)
+      organization_readable_environments.intersection(environments)
+    end
+
     def self.contains_file(file_unit_id)
       where(id: Katello::Repository.where(id: Katello::RepositoryFileUnit.where(file_unit_id: file_unit_id).select(:repository_id)).select(:content_view_version_id))
     end

data/app/models/katello/docker_manifest.rb

@@ -5,13 +5,21 @@ module Katello
     has_many :docker_manifest_list_manifests, :class_name => "Katello::DockerManifestListManifest",
              :dependent => :delete_all, :inverse_of => :docker_manifest
     has_many :docker_manifest_lists, :through => :docker_manifest_list_manifests, :inverse_of => :docker_manifests
+    has_many :content_facets, :class_name => "::Katello::Host::ContentFacet", :as => :manifest_entity, :dependent => :nullify
+    has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets, :inverse_of => :docker_manifest
 
     CONTENT_TYPE = "docker_manifest".freeze
 
+    scope :bootable, -> { where(:is_bootable => true) }
+    scope :flatpak, -> { where(:is_flatpak => true) }
+
     scoped_search :relation => :docker_tags, :on => :name, :rename => :tag, :complete_value => true
     scoped_search :on => :digest, :rename => :digest, :complete_value => true, :only_explicit => true
     scoped_search :on => :schema_version, :rename => :schema_version, :complete_value => true, :only_explicit => true
     scoped_search :relation => :docker_manifest_lists, :on => :digest, :rename => :manifest_list_digest, :complete_value => true, :only_explicit => true
+    scoped_search :on => :is_bootable, :rename => :bootable, :complete_value => true, :only_explicit => true
+    scoped_search :on => :is_flatpak, :rename => :flatpak, :complete_value => true, :only_explicit => true
+    scoped_search :on => :content_type, :complete_value => true, :only_explicit => true
 
     def self.default_sort
       order(:schema_version)

data/app/models/katello/docker_manifest_list.rb

@@ -6,12 +6,20 @@ module Katello
     has_many :docker_manifest_list_manifests, :class_name => "Katello::DockerManifestListManifest",
              :dependent => :delete_all, :inverse_of => :docker_manifest_list
     has_many :docker_manifests, :through => :docker_manifest_list_manifests, :inverse_of => :docker_manifest_lists
+    has_many :content_facets, :class_name => "::Katello::Host::ContentFacet", :as => :manifest_entity, :dependent => :nullify
+    has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets, :inverse_of => :docker_manifest_list
 
     CONTENT_TYPE = "docker_manifest_list".freeze
 
+    scope :bootable, -> { where(:is_bootable => true) }
+    scope :flatpak, -> { where(:is_flatpak => true) }
+
     scoped_search :relation => :docker_tags, :on => :name, :rename => :tag, :complete_value => true
     scoped_search :on => :digest, :rename => :digest, :complete_value => true, :only_explicit => true
     scoped_search :on => :schema_version, :rename => :schema_version, :complete_value => true, :only_explicit => true
+    scoped_search :on => :is_bootable, :rename => :bootable, :complete_value => true, :only_explicit => true
+    scoped_search :on => :is_flatpak, :rename => :flatpak, :complete_value => true, :only_explicit => true
+    scoped_search :on => :content_type, :complete_value => true, :only_explicit => true
 
     def self.default_sort
       order(:schema_version)

data/app/models/katello/erratum.rb

@@ -48,8 +48,14 @@ module Katello
                   :validator => ->(value) { ['true', 'false'].include?(value.downcase) },
                   :operators => ["="]
 
-    def self.of_type(type)
-      where(:errata_type => type)
+    def self.of_type(type, include_other = false)
+      if include_other
+        where.not(
+          :errata_type => [Erratum::SECURITY, Erratum::BUGZILLA, Erratum::ENHANCEMENT].flatten
+          ).or(where(:errata_type => type))
+      else
+        where(:errata_type => type)
+      end
     end
 
     scope :security, -> { of_type(Erratum::SECURITY) }

data/app/models/katello/flatpak_remote.rb

@@ -1,5 +1,8 @@
 module Katello
   class FlatpakRemote < Katello::Model
+    include Authorization::FlatpakRemote
+    include ForemanTasks::Concerns::ActionSubject
+
     has_many :remote_repositories, dependent: :destroy, class_name: 'Katello::FlatpakRemoteRepository'
     has_many :remote_repository_manifests, through: :remote_repositories, source: :remote_repository_manifests
     belongs_to :organization, inverse_of: :flatpak_remotes
@@ -7,5 +10,18 @@ module Katello
     validates :name, presence: true
     validates :url, presence: true
     validates :organization_id, presence: true
+    validates :name, :uniqueness => {:scope => :organization_id}
+
+    scope :seeded, -> { where(:seeded => true) }
+
+    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 => :url, :complete_value => true
+    scoped_search :on => :seeded, :complete_value => true
+    scoped_search :on => :registry_url, :complete_value => true
+
+    def self.humanize_class_name(_name = nil)
+      _("Flatpak Remotes")
+    end
   end
 end

data/app/models/katello/flatpak_remote_repository.rb

@@ -1,5 +1,7 @@
 module Katello
   class FlatpakRemoteRepository < Katello::Model
+    include Ext::LabelFromName
+
     belongs_to :flatpak_remote, inverse_of: :remote_repositories
     has_many :remote_repository_manifests, dependent: :destroy, class_name: 'Katello::FlatpakRemoteRepositoryManifest'
 
@@ -7,6 +9,22 @@ module Katello
     validates :name, presence: true
     validates :label, presence: true
 
+    scoped_search :on => :name, :complete_value => true
+    scoped_search :on => :label, :complete_value => true
+    scoped_search :on => :flatpak_remote_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+
     alias_attribute :manifests, :remote_repository_manifests
+
+    def self.readable
+      where(flatpak_remote_id: FlatpakRemote.readable)
+    end
+
+    def manifest_dependencies
+      FlatpakRemoteRepositoryManifest.where(flatpak_ref: self.manifests&.select(:runtime))
+    end
+
+    def repository_dependencies
+      manifest_dependencies&.map(&:remote_repository)
+    end
   end
 end

data/app/models/katello/flatpak_remote_repository_manifest.rb

@@ -6,5 +6,9 @@ module Katello
                inverse_of: :remote_repository_manifests
     validates :flatpak_remote_repository_id, presence: true
     validates :name, presence: true
+
+    def runtime_dependency
+      FlatpakRemoteRepositoryManifest.where(flatpak_ref: self.runtime)
+    end
   end
 end

data/app/models/katello/glue/candlepin/pool.rb

@@ -10,7 +10,7 @@ module Katello
         lazy_accessor :subscription_facts, :initializer => lambda { |_s| self.subscription ? self.subscription.attributes : {} }
 
         lazy_accessor :pool_derived, :owner, :source_pool_id, :virt_limit, :arch, :description, :product_family,
-          :variant, :suggested_quantity, :support_type, :product_id, :type, :upstream_entitlement_id, :roles, :usage, :addons,
+          :variant, :suggested_quantity, :support_type, :product_id, :type, :upstream_entitlement_id, :roles, :usage,
           :initializer => :pool_facts
 
         lazy_accessor :name, :support_level, :org, :sockets, :cores, :instance_multiplier,

data/app/models/katello/glue/pulp/repos.rb

@@ -50,7 +50,18 @@ module Katello
       end
 
       def last_sync_audit
-        Audited::Audit.where(:auditable_id => self.repositories, :auditable_type => Katello::Repository.name, :action => "sync").order(:created_at).last
+        repository_ids = self.repositories.pluck(:id)
+        return nil if repository_ids.blank?
+
+        Audited::Audit
+         .where(
+          auditable_id: repository_ids,
+          auditable_type: Katello::Repository.name,
+          action: "sync"
+         )
+         .order(created_at: :desc)
+         .limit(1)
+         .first
       end
 
       def last_sync

data/app/models/katello/host/content_facet.rb

@@ -15,9 +15,20 @@ module Katello
       ALL_TRACER_PACKAGE_NAMES = [ "python-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
                                    "python3-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
                                    HOST_TOOLS_TRACER_PACKAGE_NAME ].freeze
+      BOOTC_FIELD_FACT_NAMES = [
+        "bootc.booted.image",
+        "bootc.booted.digest",
+        "bootc.staged.image",
+        "bootc.staged.digest",
+        "bootc.rollback.image",
+        "bootc.rollback.digest",
+        "bootc.available.image",
+        "bootc.available.digest",
+      ].freeze
 
       belongs_to :kickstart_repository, :class_name => "::Katello::Repository", :inverse_of => :kickstart_content_facets
       belongs_to :content_source, :class_name => "::SmartProxy", :inverse_of => :content_facets
+      belongs_to :manifest_entity, :polymorphic => true, :optional => true, :inverse_of => :content_facets
 
       has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet", :dependent => :destroy, :inverse_of => :content_facet
       has_many :content_view_environments, :through => :content_view_environment_content_facets,
@@ -48,7 +59,7 @@ module Katello
       validates_associated :content_view_environment_content_facets, :message => _("invalid: The content source must sync the lifecycle environment assigned to the host. See the logs for more information.")
       validates :host, :presence => true, :allow_blank => false
       validates :bootc_booted_digest, :bootc_available_digest, :bootc_staged_digest, :bootc_rollback_digest,
-                format: { with: /\Asha256:[A-Fa-f0-9]{64}\z/, message: "must be a valid sha256 digest", allow_nil: true }
+                format: { with: /\Asha256:[A-Fa-f0-9]{64}\z/, message: "must be a valid sha256 digest", allow_blank: true }
 
       scope :with_environments, ->(lifecycle_environments) do
         joins(:content_view_environment_content_facets => :content_view_environment).
@@ -125,7 +136,7 @@ module Katello
       def content_view_environments=(new_cves)
         if new_cves.length > 1 && !Setting['allow_multiple_content_views']
           fail ::Katello::Errors::MultiEnvironmentNotSupportedError,
-          _("Assigning a host to multiple content view environments is not enabled.")
+          _("Assigning a host to multiple content view environments is not enabled. To enable, set the allow_multiple_content_views setting.")
         end
         super(new_cves)
         Katello::ContentViewEnvironmentContentFacet.reprioritize_for_content_facet(self, new_cves)
@@ -308,6 +319,34 @@ module Katello
         Katello::Host::ContentFacet.where(id: non_installable_errata)
       end
 
+      def self.populate_fields_from_facts(host, parser, _type, _source_proxy)
+        return if host.content_facet.blank?
+        facet = host.content_facet || host.build_content_facet
+        attrs_to_add = {}
+        BOOTC_FIELD_FACT_NAMES.each do |fact_name|
+          fact_value = parser.facts[fact_name]
+          field_name = fact_name.tr(".", "_")
+          attrs_to_add[field_name] = fact_value # overwrite with nil if fact is not present
+        end
+        if attrs_to_add['bootc_booted_digest'].present?
+          manifest_entity = find_manifest_entity(digest: attrs_to_add['bootc_booted_digest'])
+          if manifest_entity.present?
+            attrs_to_add['manifest_entity_type'] = manifest_entity.model_name.name
+            attrs_to_add['manifest_entity_id'] = manifest_entity.id
+          else
+            # remove the association if the manifest entity is not found
+            attrs_to_add['manifest_entity_type'] = nil
+            attrs_to_add['manifest_entity_id'] = nil
+          end
+        end
+        facet.assign_attributes(attrs_to_add)
+        facet.save unless facet.new_record?
+      end
+
+      def self.find_manifest_entity(digest:)
+        ::Katello::DockerManifestList.find_by(digest: digest) || ::Katello::DockerManifest.find_by(digest: digest)
+      end
+
       def self.with_applicable_errata(errata)
         self.joins(:applicable_errata).where("#{Katello::Erratum.table_name}.id" => errata)
       end
@@ -414,7 +453,7 @@ module Katello
               :errata_counts, :id, :kickstart_repository, :kickstart_repository_id, :kickstart_repository_name,
               :upgradable_deb_count, :upgradable_module_stream_count, :upgradable_rpm_count, :uuid,
               :installable_security_errata_count, :installable_bugfix_errata_count, :installable_enhancement_errata_count,
-              :single_content_view, :single_lifecycle_environment
+              :single_content_view, :single_lifecycle_environment, :content_view_environment_labels
       end
     end
   end

data/app/models/katello/host/subscription_facet.rb

@@ -12,9 +12,6 @@ module Katello
       has_many :subscription_facet_activation_keys, :class_name => "Katello::SubscriptionFacetActivationKey", :dependent => :destroy, :inverse_of => :subscription_facet
       has_many :activation_keys, :through => :subscription_facet_activation_keys, :class_name => "Katello::ActivationKey"
 
-      has_many :subscription_facet_purpose_addons, :class_name => "Katello::SubscriptionFacetPurposeAddon", :dependent => :destroy, :inverse_of => :subscription_facet
-      has_many :purpose_addons, :class_name => "Katello::PurposeAddon", :through => :subscription_facet_purpose_addons
-
       has_many :subscription_facet_pools, :class_name => "Katello::SubscriptionFacetPool", :dependent => :delete_all, :inverse_of => :subscription_facet
       has_many :pools, :through => :subscription_facet_pools, :class_name => "Katello::Pool"
 
@@ -27,9 +24,7 @@ module Katello
 
       DEFAULT_TYPE = 'system'.freeze
 
-      accepts_nested_attributes_for :installed_products, :purpose_addons
-
-      dirty_has_many_associations :purpose_addons
+      accepts_nested_attributes_for :installed_products
 
       attr_accessor :facts
 
@@ -63,9 +58,6 @@ module Katello
         self.update_installed_products(consumer_params['installedProducts']) if consumer_params.key?('installedProducts')
         self.purpose_role = consumer_params['role'] unless consumer_params['role'].nil?
         self.purpose_usage = consumer_params['usage'] unless consumer_params['usage'].nil?
-        unless consumer_params['addOns'].nil?
-          self.purpose_addon_ids = consumer_params['addOns'].map { |addon_name| ::Katello::PurposeAddon.find_or_create_by(name: addon_name).id }
-        end
 
         unless consumer_params['releaseVer'].nil?
           release = consumer_params['releaseVer']
@@ -141,7 +133,6 @@ module Katello
           :autoheal => autoheal,
           :usage => purpose_usage,
           :role => purpose_role,
-          :addOns => purpose_addons.pluck(:name),
           :serviceLevel => service_level,
           :releaseVer => release_version,
           :environments => self.candlepin_environments,
@@ -283,7 +274,7 @@ module Katello
       end
 
       def backend_update_needed?
-        %w(release_version service_level autoheal purpose_role purpose_usage purpose_addon_ids).each do |method|
+        %w(release_version service_level autoheal purpose_role purpose_usage).each do |method|
           if self.send("#{method}_changed?")
             Rails.logger.debug("backend_update_needed: subscription facet #{method} changed")
             return true
@@ -302,10 +293,11 @@ module Katello
         return unless host.subscription_facet || has_convert2rhel
         # Add in custom convert2rhel fact if system was converted using convert2rhel through Katello
         # We want the value nil unless the custom fact is present otherwise we get a 0 in the database which if debugging
-        # might make you think it was converted2rhel but not with satellite, that is why I have the tenary below.
+        # might make you think it was converted2rhel but not with satellite, that is why I have the ternary below.
         facet = host.subscription_facet || host.build_subscription_facet
         facet.attributes = {
           convert2rhel_through_foreman: has_convert2rhel ? ::Foreman::Cast.to_bool(parser.facts['conversions.env.CONVERT2RHEL_THROUGH_FOREMAN']) : nil,
+
         }.compact
         facet.save unless facet.new_record?
       end

data/app/models/katello/repository.rb

@@ -357,6 +357,13 @@ module Katello
       end
     end
 
+    def full_gpg_key_path(smart_proxy = nil, force_http = false)
+      return if self.root.gpg_key.try(:content).blank?
+      pulp_uri = URI.parse(smart_proxy ? smart_proxy.url : ::SmartProxy.pulp_primary.url)
+      scheme = force_http ? 'http' : 'https'
+      "#{scheme}://#{pulp_uri.host.downcase}#{gpg_key_content_api_repository_url(self, :only_path => true)}"
+    end
+
     def product_type
       redhat? ? "redhat" : "custom"
     end
@@ -556,9 +563,9 @@ module Katello
         view = self.content_view.label
         product = self.product.label
         env = cve.label.split('/').first
-        "#{org}-#{env.downcase}-#{view}-#{product}-#{self.root.label}"
+        "#{org}/#{env.downcase}/#{view}/#{product}/#{self.root.label}"
       else
-        "#{org}-#{self.content_view.label}-#{self.content_view_version.version}-#{self.root.product.label}-#{self.root.label}"
+        "#{org}/#{self.content_view.label}/#{self.content_view_version.version}/#{self.root.product.label}/#{self.root.label}"
       end
     end
 
@@ -697,7 +704,7 @@ module Katello
                           .uniq
                           .map { |task| "- #{Setting['foreman_url']}/foreman_tasks/tasks/#{task&.id}" }
                           .join("\n")
-        fail _("This repository has pending tasks in associated content views. Please wait for the tasks: " + errored_tasks +
+        fail _("Repository #{self.label} has pending tasks in associated content views. Please wait for the tasks: " + errored_tasks +
                " to complete before proceeding.")
       end
     end
@@ -936,9 +943,9 @@ module Katello
       # the container provided. Branches numbered as ordered below.
       #
       # 1 - Render promotion pattern (or env pattern if no promo pattern)
-      # 2 - <org label>-<product label>-<repo label>
-      # 3 - <org label>-<env label>-<cv label>-<product label>-<repo label>
-      # 4 - <org label>-<cv label>-<cvv label>-<product label>-<repo label>
+      # 2 - <org label>/<product label>/<repo label>
+      # 3 - <org label>/<env label>/<cv label>/<product label>/<repo label>
+      # 4 - <org label>/<cv label>/<cvv label>/<product label>/<repo label>
       is_pattern_provided = pattern.present?
       env_exists = repository.environment.present?
       is_env_pattern_provided = env_exists && repository.environment.registry_name_pattern.present?
@@ -967,7 +974,7 @@ module Katello
       else
         items = [repository.organization.label, repository.content_view.label, repository.content_view_version.version, repository.product.label, repository.label]
       end
-      Repository.clean_container_name(items.compact.join("-"))
+      Repository.clean_container_name(items.compact.join("/"))
     end
 
     def self.clean_container_name(name)
@@ -1052,10 +1059,16 @@ module Katello
       pulp_api.list({:repository_version => version_href}).results.map { |x| x.component }.uniq
     end
 
+    def deb_sanitize_pulp_distribution(distribution)
+      return "flat-repo" if distribution == "/"
+      return distribution.chomp("/") if distribution&.end_with?("/")
+      distribution
+    end
+
     def deb_pulp_distributions(version_href = self.version_href)
       return [] if version_href.blank?
       pulp_api = Katello::Pulp3::Repository.instance_for_type(self, SmartProxy.pulp_primary).api.content_release_components_api
-      pulp_api.list({:repository_version => version_href}).results.map { |x| x.distribution }.uniq
+      pulp_api.list({:repository_version => version_href}).results.map { |x| deb_sanitize_pulp_distribution(x.distribution) }.uniq
     end
 
     def sync_status

data/app/models/katello/rhel_lifecycle_status.rb

@@ -13,6 +13,9 @@ module Katello
     end
 
     RHEL_EOS_SCHEDULE = { # dates that each support category ends
+      'RHEL10' => {
+        'full_support' => nil,
+      },
       'RHEL9' => {
         'full_support' => end_of_day('2027-05-31'),
         'maintenance_support' => end_of_day('2032-05-31'),
@@ -74,6 +77,7 @@ module Katello
 
     def self.lifecycles_expire_soon
       expiring = RHEL_EOS_SCHEDULE.collect do |index, schedules|
+        next if schedules['full_support'].blank?
         expire_soon = schedules.except("full_support").select { |_k, v| (Time.now.utc..Time.now.utc + EOS_WARNING_THRESHOLD).cover?(v) }
         {index => expire_soon} if expire_soon.present?
       end
@@ -98,6 +102,8 @@ module Katello
       extended_support_end_date = RHEL_EOS_SCHEDULE[release]['extended_support']
 
       case
+      when full_support_end_date.blank?
+        return FULL_SUPPORT
       when Date.today <= full_support_end_date
         return FULL_SUPPORT
       when Date.today <= maintenance_support_end_date

data/app/models/katello/root_repository.rb

@@ -23,7 +23,7 @@ module Katello
     SKIPABLE_METADATA_TYPES = [Repository::YUM_TYPE, Repository::DEB_TYPE].freeze
 
     CONTENT_ATTRIBUTE_RESTRICTIONS = {
-      :download_policy => [Repository::YUM_TYPE, Repository::DEB_TYPE, Repository::DOCKER_TYPE],
+      :download_policy => [Repository::YUM_TYPE, Repository::DEB_TYPE, Repository::DOCKER_TYPE, Repository::FILE_TYPE],
     }.freeze
 
     MAX_EXPIRE_TIME = 7 * 24 * 60 * 60
@@ -39,7 +39,8 @@ module Katello
     RHEL7 = 'rhel-7'.freeze
     RHEL8 = 'rhel-8'.freeze
     RHEL9 = 'rhel-9'.freeze
-    ALLOWED_OS_VERSIONS = [RHEL6, RHEL7, RHEL8, RHEL9].freeze
+    RHEL10 = 'rhel-10'.freeze
+    ALLOWED_OS_VERSIONS = [RHEL6, RHEL7, RHEL8, RHEL9, RHEL10].freeze
 
     MIRRORING_POLICY_ADDITIVE = 'additive'.freeze
     MIRRORING_POLICY_CONTENT = 'mirror_content_only'.freeze
@@ -218,12 +219,6 @@ module Katello
       ::Host.joins(:content_facet => :bound_repositories).where("#{Katello::Repository.table_name}.root_id" => self.select(:id))
     end
 
-    def ensure_no_download_policy
-      if !yum? && download_policy.present?
-        errors.add(:download_policy, _("cannot be set for non-yum repositories."))
-      end
-    end
-
     def ensure_no_checksum_on_demand
       if checksum_type.present? && download_policy == DOWNLOAD_ON_DEMAND
         errors.add(:checksum_type, _("Checksum type cannot be set for yum repositories with on demand download policy."))
@@ -343,6 +338,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