katello 4.18.1 → 4.19.0.rc1

data/app/services/katello/pulp3/repository/apt.rb

@@ -7,6 +7,15 @@ module Katello
         UNIT_LIMIT = 10_000
         SIGNING_SERVICE_NAME = 'katello_deb_sign'.freeze
 
+        def pulp_primary_api
+          # Sometimes we need to make sure we are talking to the pulp primary and not a smart proxy!
+          if smart_proxy.pulp_primary?
+            api
+          else
+            self.class.instance_for_type(repo, ::SmartProxy.pulp_primary).api
+          end
+        end
+
         def initialize_empty
           # For every empty APT library instance repository we must add at least a release component to
           # ensure we have a publishable repo with consumable metadata. Otherwise smart proxy syncs will
@@ -15,6 +24,25 @@ module Katello
           api.content_release_components_api.create(opts)
         end
 
+        def pulp_components
+          return [] if repo.version_href.blank?
+          return ["all"] if version_missing_structure_content?
+          pulp_primary_api.content_release_components_api.list({:repository_version => repo.version_href}).results.map { |x| x.plain_component }.uniq
+        end
+
+        def sanitize_pulp_distribution(distribution)
+          return "flat-repo" if distribution == "/"
+          return distribution.chomp("/") if distribution&.end_with?("/")
+          # Only needed for repository versions created with pulp_deb <= 3.6
+          distribution
+        end
+
+        def pulp_distributions
+          return [] if repo.version_href.blank?
+          return ["default"] if version_missing_structure_content?
+          pulp_primary_api.content_release_components_api.list({:repository_version => repo.version_href}).results.map { |x| sanitize_pulp_distribution(x.distribution) }.uniq
+        end
+
         def remote_options
           deb_remote_options = {
             policy: root.download_policy,
@@ -39,13 +67,7 @@ module Katello
         end
 
         def mirror_remote_options
-          distributions = if repo.deb_using_structured_apt? && !version_missing_structure_content?
-                            repo.deb_pulp_distributions.join(' ')
-                          else
-                            'default'
-                          end
-
-          super.merge({distributions: distributions})
+          super.merge({distributions: pulp_distributions.join(' ')})
         end
 
         def version_missing_structure_content?
@@ -54,9 +76,7 @@ module Katello
           # It may also affect filtered CV versions created with very old Katello versions.
           # This method can identify such cases, so that we may fall back to simple publishing.
           return false if repo.version_href.blank?
-          # We cannot just use api here, because this is sometimes the proxy api, and we always want to talk to the primary!
-          api_primary = self.class.instance_for_type(repo, ::SmartProxy.pulp_primary).api
-          version = api_primary.repository_versions_api.read(repo.version_href)
+          version = pulp_primary_api.repository_versions_api.read(repo.version_href)
           apt_content_types = version&.content_summary&.present&.keys
           return apt_content_types.include?('deb.package') && !apt_content_types.include?('deb.package_release_component')
         end
@@ -67,9 +87,6 @@ module Katello
           if version_missing_structure_content?
             popts.merge!({ structured: false })
             popts.merge!({ simple: true })
-          else
-            popts.merge!({ structured: true })
-            popts.merge!({ simple: true }) unless repository.deb_using_structured_apt?
           end
           popts[:signing_service] = ss[0].pulp_href if ss && ss.length == 1
           popts

data/app/services/katello/pulp3/repository.rb

@@ -25,6 +25,21 @@ module Katello
         href.include?('/publications/')
       end
 
+      # Build a PRN from a Pulp href
+      # @param href [String] Pulp href (e.g., "/pulp/api/v3/contentguards/certguard/rhsm/uuid/")
+      # @param pulp_plugin [String] Pulp plugin name (e.g., "certguard", "container", "rpm")
+      # @param pulp_model [String] Pulp model name (e.g., "rhsmcertguard", "containerrepository", "rpmrepository")
+      # @return [String, nil] PRN string (e.g., "prn:certguard.rhsmcertguard:uuid") or nil if href doesn't match expected format
+      def self.build_prn(href, pulp_plugin, pulp_model)
+        return nil unless href
+
+        # Extract UUID from href (last non-empty path segment)
+        uuid = href.split('/').reject(&:empty?).last
+        return nil unless uuid
+
+        "prn:#{pulp_plugin}.#{pulp_model}:#{uuid}"
+      end
+
       def partial_repo_path
         fail NotImplementedError
       end
@@ -70,14 +85,14 @@ module Katello
 
       def create_remote
         response = super
-        repo.update!(:remote_href => response.pulp_href)
+        repo.update!(:remote_href => response.pulp_href, :remote_prn => response.prn)
       end
 
       def update_remote
         href = repo.remote_href
         if remote_options[:url].blank?
           if href
-            repo.update(remote_href: nil)
+            repo.update(remote_href: nil, remote_prn: nil)
             delete_remote(href: href)
           end
         else
@@ -109,7 +124,10 @@ module Katello
       end
 
       def self.instance_for_type(repo, smart_proxy)
-        Katello::RepositoryTypeManager.enabled_repository_types[repo.root.content_type].pulp3_service_class.new(repo, smart_proxy)
+        repo_types = Katello::RepositoryTypeManager.enabled_repository_types(false)
+        # Populate cache on first call if empty
+        repo_types = Katello::RepositoryTypeManager.enabled_repository_types if repo_types.empty?
+        repo_types[repo.root.content_type].pulp3_service_class.new(repo, smart_proxy)
       end
 
       def should_purge_empty_contents?
@@ -157,7 +175,8 @@ module Katello
 
       def distribution_needs_update?
         if distribution_reference
-          expected = secure_distribution_options(relative_path).except(:name).compact
+          # FIXME: Workaround for https://github.com/pulp/pulpcore/issues/7004
+          expected = secure_distribution_options(relative_path).except(:name, :content_guard_prn).compact
           actual = get_distribution&.to_hash || {}
           expected != actual.slice(*expected.keys)
         elsif repo.environment
@@ -180,7 +199,8 @@ module Katello
           RepositoryReference.where(
             root_repository_id: repo.root_id,
             content_view_id: repo.content_view.id,
-            repository_href: response.pulp_href).create!
+            repository_href: response.pulp_href,
+            repository_prn: response.prn).create!
           response
         end
       end
@@ -279,7 +299,9 @@ module Katello
       end
 
       def create_distribution(path)
-        distribution_data = api.distribution_class.new(secure_distribution_options(path))
+        options = secure_distribution_options(path)
+        options.delete(:content_guard_prn) # Remove PRN field before sending to Pulp
+        distribution_data = api.distribution_class.new(options)
         unless ::Katello::RepositoryTypeManager.find(repo.content_type).pulp3_skip_publication
           fail_missing_publication(distribution_data.publication)
         end
@@ -300,7 +322,8 @@ module Katello
           unless ::Katello::RepositoryTypeManager.find(repo.content_type).pulp3_skip_publication
             fail_missing_publication(options[:publication])
           end
-          distribution_reference.update(:content_guard_href => options[:content_guard])
+          content_guard_prn = options.delete(:content_guard_prn) # Extract PRN and remove from options
+          distribution_reference.update(:content_guard_href => options[:content_guard], :content_guard_prn => content_guard_prn)
           api.distributions_api.partial_update(distribution_reference.href, options)
         end
       end
@@ -368,7 +391,23 @@ module Katello
       def save_distribution_references(hrefs)
         hrefs.each do |href|
           pulp3_distribution_data = api.get_distribution(href)
-          path, content_guard_href = pulp3_distribution_data&.base_path, pulp3_distribution_data&.content_guard
+          path = pulp3_distribution_data&.base_path
+          content_guard_href = pulp3_distribution_data&.content_guard
+
+          # FIXME: Workaround for ansible distributions not returning PRN
+          # Remove once https://github.com/pulp/pulp_ansible/issues/2320 is fixed
+          if repo.ansible_collection?
+            prn = self.class.build_prn(href, 'ansible', 'ansibledistribution')
+          else
+            prn = pulp3_distribution_data&.prn
+          end
+
+          # Build content_guard PRN from href if content_guard exists
+          # FIXME: Workaround for https://github.com/pulp/pulpcore/issues/7004
+          content_guard_prn = if content_guard_href&.include?('/contentguards/certguard/rhsm/')
+                                self.class.build_prn(content_guard_href, 'certguard', 'rhsmcertguard')
+                              end
+
           if distribution_reference
             found_distribution = read_distribution(distribution_reference.href)
             unless found_distribution
@@ -377,7 +416,14 @@ module Katello
           end
           unless distribution_reference
             # Ensure that duplicates won't be created in the case of a race condition
-            DistributionReference.where(path: path, href: href, repository_id: repo.id, content_guard_href: content_guard_href).first_or_create!
+            DistributionReference.where(
+              path: path,
+              href: href,
+              prn: prn,
+              repository_id: repo.id,
+              content_guard_href: content_guard_href,
+              content_guard_prn: content_guard_prn
+            ).first_or_create!
           end
         end
       end
@@ -444,8 +490,11 @@ module Katello
         secured_distribution_options = {}
         if root.unprotected
           secured_distribution_options[:content_guard] = nil
+          secured_distribution_options[:content_guard_prn] = nil
         else
-          secured_distribution_options[:content_guard] = ::Katello::Pulp3::ContentGuard.first.pulp_href
+          content_guard = ::Katello::Pulp3::ContentGuard.first
+          secured_distribution_options[:content_guard] = content_guard.pulp_href
+          secured_distribution_options[:content_guard_prn] = content_guard.pulp_prn
         end
         secured_distribution_options.merge!(distribution_options(path))
       end

data/app/services/katello/pulp3/rpm.rb

@@ -5,7 +5,7 @@ module Katello
       CONTENT_TYPE = "rpm".freeze
       PULPCORE_CONTENT_TYPE = "rpm.package".freeze
 
-      PULP_INDEXED_FIELDS = %w(pulp_href name version release arch epoch summary is_modular rpm_sourcerpm location_href pkgId).freeze
+      PULP_INDEXED_FIELDS = %w(pulp_href prn name version release arch epoch summary is_modular rpm_sourcerpm location_href pkgId).freeze
 
       lazy_accessor :description, :license, :buildhost, :vendor, :relativepath, :children, :checksumtype,
                     :changelog, :group, :size, :url, :build_time, :group,
@@ -90,7 +90,8 @@ module Katello
         custom_json = {}
         custom_json['modular'] = unit['is_modular']
         custom_json['pulp_id'] = unit['pulp_href']
-        (PULP_INDEXED_FIELDS - ['is_modular', 'pulp_href', 'rpm_sourcerpm', 'pkgId', 'location_href']).
+        custom_json['pulp_prn'] = unit['prn'] # Also store PRN alongside pulp_id
+        (PULP_INDEXED_FIELDS - ['is_modular', 'pulp_href', 'prn', 'rpm_sourcerpm', 'pkgId', 'location_href']).
           each { |field| custom_json[field] = unit[field] }
         custom_json['release_sortable'] = Util::Package.sortable_version(unit['release'])
         custom_json['version_sortable'] = Util::Package.sortable_version(unit['version'])

data/app/services/katello/pulp3/srpm.rb

@@ -6,7 +6,7 @@ module Katello
 
       CONTENT_TYPE = "srpm".freeze
 
-      PULP_INDEXED_FIELDS = %w(pulp_href name version release arch epoch summary location_href pkgId).freeze
+      PULP_INDEXED_FIELDS = %w(pulp_href prn name version release arch epoch summary location_href pkgId).freeze
 
       lazy_accessor :pulp_facts, :initializer => :backend_data
 
@@ -68,7 +68,8 @@ module Katello
       def self.generate_model_row(unit)
         custom_json = {}
         custom_json['pulp_id'] = unit['pulp_href']
-        (PULP_INDEXED_FIELDS - ['pulp_href', 'pkgId', 'location_href']).
+        custom_json['pulp_prn'] = unit['prn']
+        (PULP_INDEXED_FIELDS - ['pulp_href', 'prn', 'pkgId', 'location_href']).
           each { |field| custom_json[field] = unit[field] }
         custom_json['release_sortable'] = Util::Package.sortable_version(unit['release'])
         custom_json['version_sortable'] = Util::Package.sortable_version(unit['version'])

data/app/services/katello/pulp3/task_group.rb

@@ -55,7 +55,7 @@ module Katello
       end
 
       def done?
-        task_group_data['all_tasks_dispatched'] == true && IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
+        IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
       end
 
       def group_progress_reports

data/app/services/katello/registration_manager.rb

@@ -125,12 +125,10 @@ module Katello
       #  * organization_destroy: destroy some data associated with host, but
       #    leave items alone that will be removed later as part of org destroy
       #  * unregistering: unregister the host but don't destroy it
-      #  * keep_kickstart_repository: ensure the KS repo ID is not set to nil
       def unregister_host(host, options = {})
         organization_destroy = options.fetch(:organization_destroy, false)
         unregistering = options.fetch(:unregistering, false)
-        keep_kickstart_repository = options.fetch(:keep_kickstart_repository, false)
-
+        preserve_for_provisioning = options.fetch(:preserve_for_provisioning, false)
         # if the first operation fails, just raise the error since there's nothing to clean up yet.
         candlepin_consumer_destroy(host.subscription_facet.uuid) if !organization_destroy && host.subscription_facet.try(:uuid)
 
@@ -140,14 +138,10 @@ module Katello
         host.subscription_facet.try(:destroy!)
 
         if unregistering
-          if keep_kickstart_repository
-            remove_host_artifacts(host, kickstart_repository_id: host&.content_facet&.kickstart_repository_id)
-          else
-            remove_host_artifacts(host)
-          end
+          remove_host_artifacts(host, preserve_for_provisioning: preserve_for_provisioning)
         elsif organization_destroy
           host.content_facet.try(:destroy!)
-          remove_host_artifacts(host, clear_content_facet: false)
+          remove_host_artifacts(host, clear_content_facet: false, preserve_for_provisioning: preserve_for_provisioning)
         else
           host.content_facet.try(:destroy!)
           destroy_host_record(host.id)
@@ -159,10 +153,11 @@ module Katello
         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 the host before re-registering
+          # The retain_build_profile_upon_unregistration setting controls whether
+          # provisioning information (including kickstart repository) is preserved
           begin
-            unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+            unregister_host(host, :unregistering => true, :preserve_for_provisioning => true)
           rescue RestClient::Gone
             Rails.logger.debug("Host %s has been removed in preparation for reregistration" % host&.name)
           end
@@ -319,15 +314,22 @@ module Katello
         subscription_facet
       end
 
-      def remove_host_artifacts(host, clear_content_facet: true, kickstart_repository_id: nil)
-        Rails.logger.debug "Host ID: #{host.id}, clear_content_facet: #{clear_content_facet}, kickstart_repository_id: #{kickstart_repository_id}"
+      def remove_host_artifacts(host, clear_content_facet: true, preserve_for_provisioning: false)
+        Rails.logger.debug "Host ID: #{host.id}, clear_content_facet: #{clear_content_facet}"
         if host.content_facet && clear_content_facet
           host.content_facet.bound_repositories = []
           host.content_facet.applicable_errata = []
           host.content_facet.uuid = nil
-          host.content_facet.content_view_environments = []
-          host.content_facet.content_source = ::SmartProxy.pulp_primary
-          host.content_facet.kickstart_repository_id = kickstart_repository_id
+
+          # Clear or retain provisioning information based on setting
+          unless Setting[:retain_build_profile_upon_unregistration] || preserve_for_provisioning
+            # Clear provisioning information if setting is disabled
+            host.content_facet.content_view_environments = []
+            host.content_facet.kickstart_repository_id = nil
+            host.content_facet.content_source = ::SmartProxy.pulp_primary
+          end
+          # If setting is enabled, keep current values (CVEs, kickstart_repository_id, content_source)
+
           host.content_facet.save!
           Rails.logger.debug "remove_host_artifacts: marking CVEs unchanged to prevent backend update"
           host.content_facet.mark_cves_unchanged

data/app/services/katello/repository_type_manager.rb

@@ -31,14 +31,16 @@ module Katello
       end
 
       def enabled_repository_types(update = true)
-        if update && pulp_primary&.has_feature?(PULP3_FEATURE) && pulp_primary&.capabilities(PULP3_FEATURE)&.empty?
-          fix_pulp3_capabilities
-        end
+        return @enabled_repository_types unless update
 
         disabled_types = @defined_repository_types.keys - @enabled_repository_types.keys
-        if update && disabled_types.present?
-          disabled_types.each { |repo_type| update_enabled_repository_type(repo_type.to_s) }
+        return @enabled_repository_types if disabled_types.empty?
+
+        if pulp_primary&.has_feature?(PULP3_FEATURE) && pulp_primary&.capabilities(PULP3_FEATURE)&.empty?
+          fix_pulp3_capabilities
         end
+
+        disabled_types.each { |repo_type| update_enabled_repository_type(repo_type.to_s) }
         @enabled_repository_types
       end
 

data/app/services/katello/smart_proxy_helper.rb

@@ -1,6 +1,5 @@
 module Katello
   class SmartProxyHelper
-    include ::Actions::Helpers::RollingCVRepos
     attr_accessor :smart_proxy
 
     def initialize(smart_proxy)
@@ -40,11 +39,7 @@ module Katello
     def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
       lifecycle_environment_check(environment, repository)
       if repository && !library_export_repo(repository)
-        if repository.library_instance?
-          [repository] + find_related_rolling_repos(repository)
-        else
-          [repository]
-        end
+        [repository]
       else
         repositories_available_to_capsule(environment, content_view)
       end

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

@@ -9,7 +9,12 @@ feature: katello_upload_profile
 %>
 #!/bin/sh
 <% if @host.operatingsystem.family == 'Redhat' -%>
+# Use dnf for EL 8+ and use yum for below
+  <% if @host.operatingsystem.major.to_i >= 8 -%>
 dnf uploadprofile --force-upload
+  <% else -%>
+yum uploadprofile --force-upload
+  <% end -%>
 <% elsif @host.operatingsystem.family == 'Suse' -%>
 katello-package-upload --force
 <% else -%>

data/app/views/katello/api/v2/activation_keys/base.json.rabl

@@ -1,7 +1,7 @@
 extends 'katello/api/v2/common/org_reference'
 extends 'katello/api/v2/common/timestamps'
 
-attributes :id, :name, :description, :unlimited_hosts, :auto_attach, :content_view_environment_labels
+attributes :id, :name, :description, :unlimited_hosts, :content_view_environment_labels
 
 node :multi_content_view_environment do |ak|
   ak.multi_content_view_environment?

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -52,6 +52,7 @@ node :environments do |cv|
     }
   end
 end
+attributes :environment_ids
 
 if @object.composite?
   child :component_repositories => :repositories do

data/app/views/katello/api/v2/debs/thindex.json.rabl

@@ -0,0 +1,6 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+child @collection[:results] => :results do |_results|
+  attributes :name, :id
+end

data/app/views/katello/api/v2/docker_tags/_base.json.rabl

@@ -16,6 +16,26 @@ end
 child :docker_manifest => :manifest do
   attributes :pulp_id => :id
   attributes :schema_version, :digest, :manifest_type
+  attributes :labels, :annotations
+  attributes :is_bootable, :is_flatpak
+  attributes :created_at, :updated_at
+
+  node :manifests, :if => lambda { |m| m.manifest_type == 'list' } do |manifest|
+    manifest.docker_manifests.map do |child_manifest|
+      {
+        :id => child_manifest.id,
+        :digest => child_manifest.digest,
+        :schema_version => child_manifest.schema_version,
+        :manifest_type => child_manifest.manifest_type,
+        :labels => child_manifest.labels,
+        :annotations => child_manifest.annotations,
+        :is_bootable => child_manifest.is_bootable,
+        :is_flatpak => child_manifest.is_flatpak,
+        :created_at => child_manifest.created_at,
+        :updated_at => child_manifest.updated_at,
+      }
+    end
+  end
 end
 
 if @organization
@@ -25,6 +45,9 @@ if @organization
         :id => repo.id,
         :name => repo.name,
         :full_path => repo.full_path,
+        :library_instance => repo.library_instance?,
+        :product_id => repo.product&.id,
+        :product_name => repo.product&.name,
       }
       attributes
     end
@@ -41,6 +64,15 @@ if @organization
 else
   child :repositories => :repositories do
     attributes :id, :name, :full_path
+    node :library_instance do |repo|
+      repo.library_instance?
+    end
+    node :product_id do |repo|
+      repo.product&.id
+    end
+    node :product_name do |repo|
+      repo.product&.name
+    end
   end
 
   child :product => :product do

data/app/views/katello/api/v2/docker_tags/show.json.rabl

@@ -2,11 +2,6 @@ object @resource
 
 extends 'katello/api/v2/docker_tags/base'
 
-child :docker_manifest => :manifest do
-  attributes :uuid => :id
-  attributes :schema_version, :digest, :manifest_type
-end
-
 child :related_tags => :related_tags do
   attributes :id, :name
 end

data/app/views/katello/api/v2/flatpak_remotes/index.json.rabl

@@ -3,6 +3,12 @@ object false
 extends "katello/api/v2/common/index"
 extends 'katello/api/v2/flatpak_remotes/permissions'
 
+node :has_redhat_flatpak_remote do
+  User.as_anonymous_admin do
+    ::Katello::FlatpakRemote.unscoped.where("url LIKE ?", "%flatpaks.redhat.io%").exists?
+  end
+end
+
 child @collection[:results] => :results do
   extends "katello/api/v2/flatpak_remotes/base"
 end

data/app/views/katello/api/v2/host_debs/installed_debs.json.rabl

@@ -0,0 +1,6 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+child @collection[:results] => :results do |_results|
+  attributes :name, :id
+end

data/app/views/katello/api/v2/hosts_bulk_actions/applicable_errata.json.rabl

@@ -3,5 +3,5 @@ object false
 extends "katello/api/v2/common/metadata"
 
 node :results do
-  partial("katello/api/v2/hosts_bulk_actions/erratum", :object => @collection[:results])
+  partial("katello/api/v2/hosts_bulk_actions/applicable_erratum", :object => @collection[:results])
 end

data/app/views/katello/api/v2/hosts_bulk_actions/applicable_erratum.json.rabl

@@ -0,0 +1,9 @@
+extends "katello/api/v2/errata/show"
+
+node :applicable_hosts do |erratum|
+  erratum.hosts_applicable(params[:organization_id]).where("#{::Host.table_name}.id" => @hosts).
+  pluck(:id, :name).
+  map { |id, name| {:name => name, :id => id} }
+end
+
+node(:affected_hosts_count) { |erratum| erratum.hosts_applicable(params[:organization_id]).where("#{::Host.table_name}.id" => @hosts).count }

data/app/views/katello/api/v2/hosts_bulk_actions/installable_errata.json.rabl

@@ -3,5 +3,5 @@ object false
 extends "katello/api/v2/common/metadata"
 
 node :results do
-  partial("katello/api/v2/hosts_bulk_actions/erratum", :object => @collection[:results])
+  partial("katello/api/v2/hosts_bulk_actions/installable_erratum", :object => @collection[:results])
 end

data/app/views/katello/api/v2/hosts_bulk_actions/{erratum.json.rabl → installable_erratum.json.rabl}

@@ -1,9 +1,9 @@
 extends "katello/api/v2/errata/show"
 
 node :applicable_hosts do |erratum|
-  erratum.hosts_available.where("#{::Host.table_name}.id" => @hosts).
-  select(["#{::Host.table_name}.id", "#{::Host.table_name}.name"]).
-  collect { |host| {:name => host.name, :id => host.id} }
+  erratum.hosts_available(params[:organization_id]).where("#{::Host.table_name}.id" => @hosts).
+  pluck(:id, :name).
+  map { |id, name| {:name => name, :id => id} }
 end
 
 node(:affected_hosts_count) { |erratum| erratum.hosts_available(params[:organization_id]).where("#{::Host.table_name}.id" => @hosts).count }

data/app/views/katello/api/v2/subscription_facet/base.json.rabl

@@ -1,4 +1,4 @@
-attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :hypervisor, :convert2rhel_through_foreman
+attributes :id, :uuid, :last_checkin, :service_level, :release_version, :registered_at, :registered_through, :purpose_role, :purpose_usage, :hypervisor, :convert2rhel_through_foreman
 
 child :user => :user do
   attributes :id, :login

data/config/initializers/monkeys.rb

@@ -1,3 +1,4 @@
 #place where monkey patches are required
 require 'monkeys/ar_postgres_evr_t'
 require 'monkeys/remove_hidden_distribution'
+require 'monkeys/fix_rpm_repository_gpgcheck'

data/config/routes/api/v2.rb

@@ -58,8 +58,6 @@ Katello::Engine.routes.draw do
             match '/product_content' => 'repository_sets#index', :via => :get, :entity => :activation_key
             match '/content_override' => 'activation_keys#content_override', :via => :put
             post :copy
-            put :add_subscriptions
-            put :remove_subscriptions
           end
           match '/releases' => 'activation_keys#available_releases', :via => :get, :on => :member
           api_resources :host_collections, :only => [:index]
@@ -191,6 +189,8 @@ Katello::Engine.routes.draw do
           end
         end
 
+        get "/debs/thindex" => "debs#thindex"
+
         api_resources :debs, :only => [:index, :show] do
           collection do
             get :auto_complete_search

data/config/routes/overrides.rb

@@ -9,7 +9,7 @@ module Katello
 end
 
 Foreman::Application.routes.draw do
-  override_message = '{"message": "Route overriden by Katello, use the /katello API endpoint instead.  See /apidoc for more details."}'
+  override_message = '{"message": "Route overridden by Katello, use the /katello API endpoint instead.  See /apidoc for more details."}'
 
   match "/api/v2/organizations/*all", :to => proc { [404, {}, [override_message]] },
                                       :via => :put,
@@ -64,9 +64,6 @@ Foreman::Application.routes.draw do
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
 
-            match '/bulk/add_subscriptions' => 'hosts_bulk_actions#add_subscriptions', :via => :put
-            match '/bulk/remove_subscriptions' => 'hosts_bulk_actions#remove_subscriptions', :via => :put
-            match '/bulk/auto_attach' => 'hosts_bulk_actions#auto_attach', :via => :put
             match '/bulk/content_overrides' => 'hosts_bulk_actions#content_overrides', :via => :put
 
             match '/bulk/applicable_errata' => 'hosts_bulk_actions#applicable_errata', :via => :post
@@ -82,6 +79,7 @@ Foreman::Application.routes.draw do
             match '/bulk/change_content_source' => 'hosts_bulk_actions#change_content_source', :via => :put
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
             match '/host_packages/installed_packages' => 'host_packages#installed_packages', :via => :get
+            match '/host_debs/installed_debs' => 'host_debs#installed_debs', :via => :get
           end
 
           resources :packages, :only => [:index], :controller => :host_packages do
@@ -98,13 +96,10 @@ Foreman::Application.routes.draw do
 
           resources :subscriptions, :only => [:index], :controller => :host_subscriptions do
             collection do
-              put :auto_attach
               match '/product_content' => 'repository_sets#index', :via => :get, :entity => :host
               get :available_release_versions
               get :enabled_repositories
               put :content_override
-              put :remove_subscriptions
-              put :add_subscriptions
               delete :destroy
             end
           end

data/config/routes.rb

@@ -35,6 +35,8 @@ Katello::Engine.routes.draw do
 
   match '/booted_container_images' => 'react#index', :via => [:get]
 
+  match '/container_images' => 'react#index', :via => [:get]
+
   match '/flatpak_remotes' => 'react#index', :via => [:get]
   match '/flatpak_remotes/*page' => 'react#index', :via => [:get]
 

data/db/migrate/20211019192121_create_cdn_configuration.katello.rb

@@ -23,7 +23,7 @@ class CreateCdnConfiguration < ActiveRecord::Migration[6.0]
     ::Organization.all.each do |org|
       FakeCdnConfiguration.where(
         organization_id: org.id,
-        url: org.redhat_provider.repository_url || ::Katello::Resources::CDN::CdnResource.redhat_cdn_url
+        url: org.redhat_provider&.repository_url || ::Katello::Resources::CDN::CdnResource.redhat_cdn_url
       ).first_or_create!
     end