katello 4.18.1 → 4.19.0.rc2

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
 

data/db/migrate/20250912000000_add_pulp_prn_fields.rb

@@ -0,0 +1,73 @@
+class AddPulpPrnFields < ActiveRecord::Migration[7.0]
+  # rubocop:disable Metrics/MethodLength
+  def up
+    # Tables with pulp_href fields - add pulp_prn field
+    add_column :katello_content_guards, :pulp_prn, :string
+
+    # Tables with pulp_id fields - add pulp_prn field
+    add_column :katello_ansible_collections, :pulp_prn, :string
+    add_column :katello_generic_content_units, :pulp_prn, :string
+    add_column :katello_module_streams, :pulp_prn, :string
+    add_column :katello_docker_manifest_lists, :pulp_prn, :string
+    add_column :katello_docker_manifests, :pulp_prn, :string
+    add_column :katello_docker_tags, :pulp_prn, :string
+    add_column :katello_rpms, :pulp_prn, :string
+    add_column :katello_srpms, :pulp_prn, :string
+    add_column :katello_files, :pulp_prn, :string # FileUnit uses table_name 'katello_files'
+    add_column :katello_package_groups, :pulp_prn, :string
+    add_column :katello_debs, :pulp_prn, :string
+
+    # Tables with other href fields - add corresponding _prn fields
+    add_column :katello_repositories, :remote_prn, :string
+    add_column :katello_repositories, :publication_prn, :string
+    add_column :katello_repositories, :version_prn, :string
+    add_column :katello_distribution_references, :prn, :string
+    add_column :katello_distribution_references, :content_guard_prn, :string
+    add_column :katello_repository_references, :repository_prn, :string
+    add_column :katello_repository_errata, :erratum_prn, :string
+    add_column :katello_smart_proxy_alternate_content_sources, :remote_prn, :string
+    add_column :katello_smart_proxy_alternate_content_sources, :alternate_content_source_prn, :string
+
+    # Add indexes for performance on commonly queried fields
+    add_index :katello_content_guards, :pulp_prn
+    add_index :katello_repositories, :remote_prn
+    add_index :katello_repositories, :publication_prn
+    add_index :katello_repositories, :version_prn
+    add_index :katello_repository_errata, :erratum_prn
+  end
+
+  def down
+    # Remove indexes
+    remove_index :katello_content_guards, :pulp_prn
+    remove_index :katello_repositories, :remote_prn
+    remove_index :katello_repositories, :publication_prn
+    remove_index :katello_repositories, :version_prn
+    remove_index :katello_repository_errata, :erratum_prn
+
+    # Remove columns - pulp_prn fields
+    remove_column :katello_content_guards, :pulp_prn
+    remove_column :katello_ansible_collections, :pulp_prn
+    remove_column :katello_generic_content_units, :pulp_prn
+    remove_column :katello_module_streams, :pulp_prn
+    remove_column :katello_docker_manifest_lists, :pulp_prn
+    remove_column :katello_docker_manifests, :pulp_prn
+    remove_column :katello_docker_tags, :pulp_prn
+    remove_column :katello_rpms, :pulp_prn
+    remove_column :katello_srpms, :pulp_prn
+    remove_column :katello_files, :pulp_prn
+    remove_column :katello_package_groups, :pulp_prn
+    remove_column :katello_debs, :pulp_prn
+
+    # Remove columns - other _prn fields
+    remove_column :katello_repositories, :remote_prn
+    remove_column :katello_repositories, :publication_prn
+    remove_column :katello_repositories, :version_prn
+    remove_column :katello_distribution_references, :prn
+    remove_column :katello_distribution_references, :content_guard_prn
+    remove_column :katello_repository_references, :repository_prn
+    remove_column :katello_repository_errata, :erratum_prn
+    remove_column :katello_smart_proxy_alternate_content_sources, :remote_prn
+    remove_column :katello_smart_proxy_alternate_content_sources, :alternate_content_source_prn
+  end
+  # rubocop:enable Metrics/MethodLength
+end