katello 4.9.1 → 4.10.0.rc2

data/app/models/katello/ping.rb

@@ -2,14 +2,13 @@ module Katello
   class Ping
     OK_RETURN_CODE = 'ok'.freeze
     FAIL_RETURN_CODE = 'FAIL'.freeze
-    PACKAGES = %w(katello candlepin pulp qpid foreman tfm hammer).freeze
+    PACKAGES = %w(katello candlepin pulp foreman hammer).freeze
 
     class << self
       def services(capsule_id = nil)
         proxy = fetch_proxy(capsule_id)
         services = [:candlepin, :candlepin_auth, :foreman_tasks, :katello_events, :candlepin_events]
         services += [:pulp3, :pulp3_content] if proxy&.pulp3_enabled?
-        services += [:katello_agent] if ::Katello.with_katello_agent?
         if proxy.nil? || proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) || proxy.has_feature?(SmartProxy::PULP_FEATURE)
           services += [:pulp, :pulp_auth]
         end
@@ -64,13 +63,6 @@ module Katello
         end
       end
 
-      def ping_katello_agent(result)
-        exception_watch(result) do
-          status = Katello::EventDaemon::Runner.service_status(:katello_agent_events)
-          event_daemon_status(status, result)
-        end
-      end
-
       def ping_pulp3_without_auth(service_result, capsule_id)
         exception_watch(service_result) do
           Katello::Ping.pulp3_without_auth(fetch_proxy(capsule_id).pulp3_url)
@@ -233,7 +225,6 @@ module Katello
         end
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity
       def ping_services_for_capsule(services, capsule_id)
         services ||= self.services(capsule_id)
         result = {}
@@ -249,14 +240,12 @@ module Katello
         ping_foreman_tasks(result[:foreman_tasks]) if result.include?(:foreman_tasks)
         ping_katello_events(result[:katello_events]) if result.include?(:katello_events)
         ping_candlepin_events(result[:candlepin_events]) if result.include?(:candlepin_events)
-        ping_katello_agent(result[:katello_agent]) if result.include?(:katello_agent)
 
         # set overall status result code
         result = {:services => result}
         result[:status] = result[:services].each_value.any? { |v| v[:status] == FAIL_RETURN_CODE } ? FAIL_RETURN_CODE : OK_RETURN_CODE
         result
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
 
       def fetch_proxy(capsule_id)
         capsule_id ? SmartProxy.unscoped.find(capsule_id) : SmartProxy.pulp_primary

data/app/models/katello/product_content.rb

@@ -52,11 +52,24 @@ module Katello
       where(:product_id => Katello::PoolProduct.where(:pool_id => organization.pools).select(:product_id))
     end
 
-    # used by Katello::Api::V2::RepositorySetsController#index
+    # following 4 methods used by Katello::Api::V2::RepositorySetsController#index
     def repositories
       Katello::Repository.in_default_view.where(:root_id => product.root_repositories.has_url.where(:content_id => content.cp_content_id))
     end
 
+    def unfiltered_repositories
+      # don't filter by url, as we want to show all repos in the product
+      Katello::Repository.in_default_view.where(:root_id => product.root_repositories.where(:content_id => content.cp_content_id))
+    end
+
+    def arch
+      unfiltered_repositories.first&.arch
+    end
+
+    def os_versions
+      unfiltered_repositories.first&.os_versions || []
+    end
+
     def enabled_value_from_candlepin
       cp_product = ::Katello::Resources::Candlepin::Product.get(product.organization.label, product.cp_id).first
       cp_content = cp_product['productContent'].find { |pc| pc['content']['id'] == content.cp_content_id }

data/app/models/katello/repository.rb

@@ -178,7 +178,7 @@ module Katello
              :upstream_authentication_token, :deb_releases,
              :deb_components, :deb_architectures, :ssl_ca_cert_id, :ssl_ca_cert, :ssl_client_cert, :ssl_client_cert_id,
              :ssl_client_key_id, :os_versions, :ssl_client_key, :ignorable_content, :description, :include_tags, :exclude_tags,
-             :docker_tags_whitelist, :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token,
+             :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token,
              :http_proxy_policy, :http_proxy_id, :to => :root
 
     delegate :content_id, to: :root, allow_nil: true
@@ -939,6 +939,7 @@ module Katello
         end
         repository_type.index_additional_data_proc&.call(self)
       end
+      self.update!(last_indexed: DateTime.now)
       true
     end
 
@@ -946,6 +947,10 @@ module Katello
       content_view.repositories.include? self
     end
 
+    def sync_status
+      return latest_dynflow_sync
+    end
+
     protected
 
     def unit_type_for_removal(type_class = nil)

data/app/models/katello/root_repository.rb

@@ -3,7 +3,6 @@ module Katello
   class RootRepository < Katello::Model
     audited :except => [:content_id]
     serialize :ignorable_content
-    serialize :docker_tags_whitelist
     serialize :include_tags
     serialize :exclude_tags
     serialize :os_versions
@@ -360,11 +359,6 @@ module Katello
       Katello::Content.find_by(:cp_content_id => self.content_id, :organization_id => self.product.organization_id)
     end
 
-    # For API support during deprecation period.
-    def docker_tags_whitelist
-      include_tags
-    end
-
     def docker?
       self.content_type == Repository::DOCKER_TYPE
     end
@@ -406,8 +400,8 @@ module Katello
     end
 
     def pulp_update_needed?
-      changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirroring_policy verify_ssl_on_sync
-                                 upstream_username upstream_password ignorable_content retain_package_versions_count
+      changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy verify_ssl_on_sync
+                                 upstream_username upstream_password retain_package_versions_count
                                  ssl_ca_cert_id ssl_client_cert_id ssl_client_key_id http_proxy_policy http_proxy_id download_concurrency)
       changeable_attributes += %w(name container_repository_name include_tags exclude_tags) if docker?
       changeable_attributes += %w(deb_releases deb_components deb_architectures gpg_key_id) if deb?

data/app/services/katello/applicability/applicable_content_helper.rb

@@ -133,13 +133,13 @@ module Katello
       end
 
       def newest_distinct_installed_packages_query
-        "SELECT DISTINCT ON (katello_installed_packages.name) katello_installed_packages.id " \
+        "SELECT DISTINCT ON (katello_installed_packages.name, katello_installed_packages.arch) katello_installed_packages.id " \
           "FROM katello_installed_packages INNER JOIN " \
           "katello_host_installed_packages ON " \
           "katello_installed_packages.id = " \
           "katello_host_installed_packages.installed_package_id " \
           "WHERE katello_host_installed_packages.host_id = " \
-          "#{content_facet.host.id} ORDER BY katello_installed_packages.name, katello_installed_packages.evr DESC"
+          "#{content_facet.host.id} ORDER BY katello_installed_packages.name, katello_installed_packages.arch, katello_installed_packages.evr DESC"
       end
 
       def applicable_differences

data/app/services/katello/registration_manager.rb

@@ -135,8 +135,6 @@ module Katello
         # if this fails, there is not much to do about it right now. We can't really re-create the candlepin consumer.
         # This can be cleaned up later via clean_backend_objects.
 
-        delete_agent_queue(host) if host.content_facet.try(:uuid)
-
         host.subscription_facet.try(:destroy!)
 
         if unregistering
@@ -281,16 +279,6 @@ module Katello
         Rails.logger.warn(_("Candlepin consumer %s has already been removed") % host_uuid)
       end
 
-      def delete_agent_queue(host)
-        return unless ::Katello.with_katello_agent?
-
-        queue_name = Katello::Agent::Dispatcher.host_queue_name(host)
-        Katello::EventQueue.push_event(::Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, host.id) do |attrs|
-          attrs[:metadata] = { queue_name: queue_name }
-          attrs[:process_after] = 10.minutes.from_now
-        end
-      end
-
       def populate_content_facet(host, content_view_environments, uuid)
         content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
         content_facet.content_view_environments = content_view_environments
@@ -317,6 +305,8 @@ module Katello
           host.content_facet.uuid = nil
           host.content_facet.content_view_environments = []
           host.content_facet.save!
+          Rails.logger.debug "remove_host_artifacts: marking CVEs unchanged to prevent backend update"
+          host.content_facet.mark_cves_unchanged
           host.content_facet.calculate_and_import_applicability
         end
 

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

@@ -0,0 +1,25 @@
+<%#
+kind: job_template
+name: Configure host for new content source
+job_category: Katello
+model: JobTemplate
+provider_type: script
+description_format: Configure subscription manager for new content source
+feature: katello_change_content_source
+%>
+#!/bin/sh
+
+# This job template alone will NOT change a host's content source!
+# It is invoked after changing a host's content source on the server,
+# which is done from the Change Content Source page in the web UI.
+
+<%= configure_host_for_new_content_source(@host, foreman_server_ca_cert) %>
+
+# If REX pull mode is enabled, update yggdrasil config to pull from the new content source.
+# If host is not configured for REX pull mode, this is a noop.
+
+if [ -f /etc/yggdrasil/config.toml ]; then
+  cp /etc/yggdrasil/config.toml /etc/yggdrasil/config.toml.bak
+  export YGGDRASIL_RESTART_DELAY=10
+  <%= snippet 'remote_execution_pull_setup' %>
+fi

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -38,7 +38,7 @@ child @lifecycle_environments => :lifecycle_environments do
           :label => content_view.label,
           :name => content_view.name,
           :composite => content_view.composite,
-          :last_published => content_view.versions.empty? ? nil : content_view.versions.last.created_at,
+          :last_published => content_view.versions.empty? ? nil : content_view.versions.in_environment(env).first&.created_at,
           :default => content_view.default,
           :up_to_date => @capsule.repos_pending_sync(env, content_view).empty?,
           :counts => {

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

@@ -21,22 +21,10 @@ child :content_facet => :content_facet_attributes do
     content_facet.single_lifecycle_environment&.library? || false
   end
 
-  node :katello_agent_installed do |content_facet|
-    content_facet.katello_agent_installed?
-  end
-
   node :katello_tracer_installed do |content_facet|
     content_facet.tracer_installed?
   end
 
-  node :katello_agent_enabled do
-    Katello.with_katello_agent?
-  end
-
-  node :remote_execution_by_default do
-    Katello.remote_execution_by_default?
-  end
-
   user = User.current # current_user is not available here
   child :permissions do
     node(:view_lifecycle_environments) { user.can?("view_lifecycle_environments") }

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

@@ -29,5 +29,8 @@ child :latest_version => :content_view_version do
 end
 
 child :component_content_view_versions => :component_content_view_versions do
-  attributes :id, :version
+  attributes :id, :version, :description
+  node :published_at_words do |version|
+    time_ago_in_words(version.created_at)
+  end
 end

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

@@ -44,7 +44,7 @@ node :environments do |cv|
     {
       id: env.id,
       label: env.label,
-      name: env.label,
+      name: env.name,
       activation_keys: cv&.activation_keys&.in_environment(env)&.ids,
       hosts: cv&.hosts&.in_environments([env])&.ids,
       permissions: {readable: env.readable?}
@@ -64,11 +64,15 @@ else
   attributes :repository_ids
 end
 
-child :versions => :versions do
+child :sorted_versions => :versions do
   attributes :id, :version
   attributes :created_at => :published
+  attributes :description
   attributes :environment_ids
   attributes :filters_applied? => :filters_applied
+  node :published_at_words do |version|
+    time_ago_in_words(version.created_at)
+  end
 end
 
 if params.key?(:include_permissions)

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

@@ -71,6 +71,9 @@ node(:published_content_view_ids) do |product|
   product.published_content_views.map(&:id).uniq
 end
 
+node(:has_last_affected_repo_in_filter) do |product|
+  product.repositories.any? { |repo| repo.filters.any? { |filter| filter.repositories.size == 1 } }
+end
 node :redhat do |product|
   product.redhat?
 end

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

@@ -36,6 +36,24 @@ child :published_in_versions => :content_view_versions do |_version|
   end
 end
 
+child :repository_content_view_filters => :filters do |_filters|
+  node :content_view_filter_id do |object|
+    object.filter.id
+  end
+  node :content_view_filter_name do |object|
+    object.filter.name
+  end
+  node :content_view_id do |object|
+    object.filter.content_view_id
+  end
+  node :content_view_name do |object|
+    object.filter.content_view_name
+  end
+  node :last_affected_repo do |object|
+    object.filter&.repositories&.size == 1
+  end
+end
+
 child :latest_dynflow_sync => :last_sync do |_object|
   attributes :id, :username, :started_at, :ended_at, :state, :result, :progress
 end

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

@@ -7,7 +7,6 @@ extends 'katello/api/v2/repositories/base'
 glue(@resource.root) do
   attributes :content_type
   attributes :docker_upstream_name
-  attributes :docker_tags_whitelist
   attributes :include_tags
   attributes :exclude_tags
   attributes :verify_ssl_on_sync

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

@@ -38,11 +38,11 @@ child @resource.repositories => :repositories do
 end
 
 node :archRestricted do |pc|
-  pc.repositories&.first&.arch
+  pc.arch
 end
 
 node :osRestricted do |pc|
-  pc.repositories&.first&.os_versions&.first
+  pc.os_versions&.first
 end
 
 node :override do |pc|

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -5,9 +5,8 @@
     option.kt-cv  { margin-left: 1em; }
 </style>
 <% spinner_path = asset_path('spinner.gif') %>
-<% edit_action = params[:action] == 'edit' %>
 
-<% if edit_action && !using_hostgroups_page? %>
+<% if edit_action? && !using_hostgroups_page? && !using_discovered_hosts_page? %>
   <div style="margin-left: 270px">
     <%= link_to _("Change content source"), "/change_host_content_source?host_id=#{@host.id}" %>
   </div>
@@ -22,7 +21,7 @@
     select_tag cs_select_id, content_source_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path},
                :class => 'form-control',  :name => cs_select_name
   else
-    select_tag cs_select_id, content_source_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, :disabled => edit_action
+    select_tag cs_select_id, content_source_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, :disabled => cv_lce_disabled?
   end
 end %>
 
@@ -35,7 +34,7 @@ end %>
     select_tag env_select_id, lifecycle_environment_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)),
                :class => 'form-control',  :name => env_select_name
   else
-    select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name, :disabled => edit_action
+    select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name, :disabled =>  cv_lce_disabled?
   end
 end %>
 
@@ -47,6 +46,6 @@ end %>
     select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path},
                :class => 'form-control',  :name => cv_select_name
   else
-    select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name, :disabled => edit_action
+    select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name, :disabled =>  cv_lce_disabled?
   end
 end %>

data/app/views/overrides/activation_keys/_host_media_type_select.html.erb

@@ -1,9 +1,17 @@
-<% media_selection = using_hostgroups_page? ? use_install_media(@hostgroup) : use_install_media(@host, :selected_host_group => @hostgroup)
+<%
+   if using_discovered_hosts_page?
+     media_selection =  use_install_media(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @host&.hostgroup)
+   elsif using_hostgroups_page?
+     media_selection =  use_install_media(@hostgroup)
+     kickstart_options = kickstart_repository_options(@hostgroup)
+   else
+    media_selection = use_install_media(@host, :selected_host_group => @hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @hostgroup)
+   end
    install_media_radio  = media_selection ? 'checked="checked"':''
    synced_content_radio  = media_selection ? '' : 'checked="checked"'
    install_media_disabled = os_media.empty? ? 'disabled = true' : ''
-
-   kickstart_options = using_hostgroups_page? ? kickstart_repository_options(@hostgroup) : kickstart_repository_options(@host, :selected_host_group => @hostgroup)
    synced_content_disabled = kickstart_options.empty? ? 'disabled = true' : ''
 %>
 

data/app/views/overrides/activation_keys/_host_synced_content_select.html.erb

@@ -1,11 +1,19 @@
 <%
-kickstart_repo_id = using_hostgroups_page? ? kickstart_repository_id(@hostgroup) : kickstart_repository_id(@host, :selected_host_group => @hostgroup)
-kickstart_repo_id = 'unset' if kickstart_repo_id.blank?
-host = using_hostgroups_page? ? @hostgroup : @host
-kickstart_options = kickstart_repository_options(host, :selected_host_group => @hostgroup)
-ks_repo_select_id =  using_hostgroups_page? ? :host_group_kickstart_repository_id : :host_kickstart_repository_id
-ks_repo_select_name =  using_hostgroups_page? ? 'hostgroup[kickstart_repository_id]' : 'host[content_facet_attributes][kickstart_repository_id]'
-ks_repo_select_attr = using_hostgroups_page? ? 'kickstart_repository' : 'content_facet.kickstart_repository'
+   if using_discovered_hosts_page?
+     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @host&.hostgroup)
+   elsif using_hostgroups_page?
+     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_options = kickstart_repository_options(@hostgroup)
+   else
+     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @hostgroup)
+   end
+
+   kickstart_repo_id = 'unset' if kickstart_repo_id.blank?
+   ks_repo_select_id =  using_hostgroups_page? ? :host_group_kickstart_repository_id : :host_kickstart_repository_id
+   ks_repo_select_name =  using_hostgroups_page? ? 'hostgroup[kickstart_repository_id]' : 'host[content_facet_attributes][kickstart_repository_id]'
+   ks_repo_select_attr = using_hostgroups_page? ? 'kickstart_repository' : 'content_facet.kickstart_repository'
 %>
 
 <% spinner_path = asset_path('spinner.gif') %>

data/config/initializers/monkeys.rb

@@ -2,3 +2,4 @@
 require 'monkeys/anemone'
 require 'monkeys/ar_postgres_evr_t'
 require 'monkeys/fx_sqlite_skip'
+require 'monkeys/remove_hidden_distribution'

data/config/katello.yaml.example

@@ -39,10 +39,6 @@
     :upload_chunk_size: 1048575 # upload size in bytes to pulp. see SSLRenegBufferSize in apache
     :skip_checksum_validation: false
 
-  :qpid:
-    :url: amqp:ssl:katello-devel.example.com:5671
-    :subscriptions_queue_address: katello_event_queue
-
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.
 #

data/config/routes/api/v2.rb

@@ -353,6 +353,8 @@ Katello::Engine.routes.draw do
         ##############################
         ##############################
 
+        match '/alternate_content_sources/bulk/refresh_all' => 'alternate_content_sources_bulk_actions#refresh_all_alternate_content_sources', :via => :post
+
         api_resources :alternate_content_sources, :only => [], :constraints => { :id => /[0-9a-zA-Z\-_.]*/ } do
           collection do
             match '/bulk/destroy' => 'alternate_content_sources_bulk_actions#destroy_alternate_content_sources', :via => :put
@@ -484,6 +486,7 @@ Katello::Engine.routes.draw do
         end
 
         api_resources :sync_plans, :only => [:index, :show, :update, :destroy] do
+          api_resources :products, :only => [:index]
           get :auto_complete_search, :on => :collection
           put :sync
         end

data/config/routes/overrides.rb

@@ -52,7 +52,6 @@ Foreman::Application.routes.draw do
         resources :hosts, :only => [] do
           resources :errata, :only => [:show, :index], :controller => :host_errata do
             collection do
-              put :apply
               get :auto_complete_search
               put :applicability
             end
@@ -69,11 +68,8 @@ Foreman::Application.routes.draw do
             match '/bulk/auto_attach' => 'hosts_bulk_actions#auto_attach', :via => :put
             match '/bulk/content_overrides' => 'hosts_bulk_actions#content_overrides', :via => :put
 
-            match '/bulk/install_content' => 'hosts_bulk_actions#install_content', :via => :put
             match '/bulk/applicable_errata' => 'hosts_bulk_actions#applicable_errata', :via => :post
             match '/bulk/installable_errata' => 'hosts_bulk_actions#installable_errata', :via => :post
-            match '/bulk/update_content' => 'hosts_bulk_actions#update_content', :via => :put
-            match '/bulk/remove_content' => 'hosts_bulk_actions#remove_content', :via => :put
             match '/bulk/destroy' => 'hosts_bulk_actions#destroy_hosts', :via => :put
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
@@ -88,13 +84,6 @@ Foreman::Application.routes.draw do
 
           resources :packages, :only => [:index], :controller => :host_packages do
             get :auto_complete_search, :on => :collection
-
-            collection do
-              put :remove
-              put :install
-              put :upgrade
-              put :upgrade_all
-            end
           end
 
           resources :module_streams, :only => [:index], :controller => :host_module_streams do

data/db/migrate/20220228173251_remove_drpm_from_ignorable_content.rb

@@ -6,6 +6,7 @@ class RemoveDrpmFromIgnorableContent < ActiveRecord::Migration[6.0]
       else
         root.ignorable_content = []
       end
+      root.checksum_type = nil if root.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
       root.save!
     end
   end

data/db/migrate/20230609155411_add_custom_cdn_auth_enabled_to_katello_cdn_configurations.rb

@@ -0,0 +1,5 @@
+class AddCustomCdnAuthEnabledToKatelloCdnConfigurations < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_cdn_configurations, :custom_cdn_auth_enabled, :boolean, default: false
+  end
+end

data/db/migrate/20230710190626_remove_relative_path_limit.rb

@@ -0,0 +1,5 @@
+class RemoveRelativePathLimit < ActiveRecord::Migration[6.1]
+  def change
+    change_column :katello_repositories, :relative_path, :text
+  end
+end

data/db/migrate/20230717150442_change_change_content_source_job_template_name.rb

@@ -0,0 +1,20 @@
+class ChangeChangeContentSourceJobTemplateName < ActiveRecord::Migration[6.1]
+  TEMPLATE_NAMES = {
+    "Change content source" => "Configure host for new content source"
+  }.freeze
+
+  def up
+    TEMPLATE_NAMES.each do |from, to|
+      token = SecureRandom.base64(5)
+      ::Template.unscoped.find_by(name: to)&.update_columns(:name => "#{to} Backup #{token}")
+      ::Template.unscoped.find_by(name: from)&.update_columns(:name => to)
+    end
+  end
+
+  def down
+    TEMPLATE_NAMES.each do |from, to|
+      ::Template.unscoped.find_by(name: from)&.delete
+      ::Template.unscoped.find_by(name: to)&.update_columns(:name => from)
+    end
+  end
+end

data/db/migrate/20230828143236_remove_katello_agent_dispatch_history.rb

@@ -0,0 +1,15 @@
+class RemoveKatelloAgentDispatchHistory < ActiveRecord::Migration[6.1]
+  def up
+    drop_table :katello_agent_dispatch_histories
+  end
+
+  def down
+    create_table :katello_agent_dispatch_histories do |t|
+      t.integer :host_id, null: false, foreign_key: true
+      t.datetime :accepted_at
+      t.string :dynflow_execution_plan_id
+      t.integer :dynflow_step_id
+      t.text :result
+    end
+  end
+end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -9,7 +9,6 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:4.2:remove_checksum_values'},
     {:name => 'katello:upgrades:4.4:publish_import_cvvs'},
     {:name => 'katello:upgrades:4.8:fix_incorrect_providers'},
-    {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'},
-    {:name => 'katello:upgrades:4.9:update_custom_products_enablement'}
+    {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'}
   ]
 end

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -25,7 +25,6 @@
     angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson(`<%= Setting[:unregister_delete_host] %>`));
     angular.module('Bastion').value('globalContentProxy', angular.fromJson(`<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>`));
     angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
-    angular.module('Bastion').value('contentViewSolveDependencies', "<%= Setting[:content_view_solve_dependencies] %>");
     angular.module('Bastion').constant('BastionConfig', angular.fromJson(`<%= Bastion.config.to_json.html_safe %>`));
     angular.module('Bastion.auth').value('CurrentUser', {
         id: <%= User.current.id %>,
@@ -33,6 +32,7 @@
     });
     angular.module('Bastion.auth').value('Permissions', angular.fromJson(`<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>`));
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
+    angular.module('Bastion').value('experimentalLabsSetting', "<%= Setting[:lab_features] %>");
   </script>
   <% Bastion.plugins.each do |name, plugin| %>
     <%= include_plugin_js(plugin) %>

data/engines/bastion_katello/README.md

@@ -7,7 +7,8 @@ The only real difference, as far as the user is concerned, is that the applicati
 # Running tests:
 
 ```
-sudo yum -y install npm chromium-headless chromium
+sudo dnf -y install epel-release epel-next-release
+sudo dnf -y install npm chromium-headless chromium
 cd ./engines/bastion_katello
 sudo npm install -g grunt-cli
 npm install

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.controller.js

@@ -8,6 +8,7 @@
  * @requires Nutupane
  * @requires ActivationKey
  * @requires CurrentOrganization
+ * @requires experimentalLabsSetting
  *
  * @description
  *   Provides the functionality specific to activation keys for use with the Nutupane UI pattern.
@@ -15,8 +16,8 @@
  *   within the table.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeysController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'CurrentOrganization',
-    function ($scope, $location, translate, Nutupane, ActivationKey, CurrentOrganization) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'CurrentOrganization', 'experimentalLabsSetting',
+    function ($scope, $location, translate, Nutupane, ActivationKey, CurrentOrganization, experimentalLabsSetting) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -30,5 +31,6 @@ angular.module('Bastion.activation-keys').controller('ActivationKeysController',
         $scope.controllerName = 'katello_activation_keys';
         nutupane.primaryOnly = true;
         $scope.table = nutupane.table;
+        $scope.experimentalLabsSetting = experimentalLabsSetting;
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -37,8 +37,8 @@
             <span ng-class="getHostStatusIcon(host.subscription_global_status)">
             </span>
           </td>
-          <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment_name }}</td>
-          <td bst-table-cell>{{ host.content_facet_attributes.content_view_name || "" }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.content_view.name || "" }}</td>
           <td bst-table-cell>{{ host.subscription_facet_attributes.service_level }}</td>
           <td bst-table-cell>{{ host.subscription_facet_attributes.release_version }}</td>
         </tr>