katello 4.6.2.1 → 4.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd589cc9f10f642c5e8eac5dec7145c6e36eb35ba7ff39da34e295998277e0f
-  data.tar.gz: 8e6e3b9674bc9c153cb54ff2408a6c504d61c9bb95e4dd45b30ecbaabc3c1cd3
+  metadata.gz: 366dabf3ddc6fab48cf353603f9ac49fb9ed3c87ac47e965eba48a63b4ce4847
+  data.tar.gz: a8307026cb41c314df92d6a89590ee38ba7547e215bbed82dd454e5fc135c68f
 SHA512:
-  metadata.gz: 166848d61324a18d58a58708146b5525888788707ffac5c1d0899cb9f1663a42f075628d691289c54771db0dd769bfbbdd159df68c9249c4dc87fd11f265fef8
-  data.tar.gz: 9a693e7711623e663ceadaea211a5aa2d2b4a0c658d36fd36f1705f0d5a799a763574c75415af9373caec26f41b34de227e2e70e7a3e4915279d7603fe8c39f2
+  metadata.gz: 0b167060d9d9795261b6262d47fbcca7fae09a587b170e173a7cbb9ceb382371c1b8414ef7b361ab51e96088d1485f2be2d35758f34cb8574257f81951d082a5
+  data.tar.gz: 06b29d35d28b57eb6484a34622b9fec4b4395dcb66f938440051bb9cec8323e1f808e1216e0500183f1f6f7e894abd882a30dcd0468207df7a08126bac3e3281

data/app/assets/javascripts/katello/common/vendor.js

@@ -3,4 +3,3 @@
 //= require "jquery-ui/effect"
 //= require "jquery-ui/effect.all"
 //= require "katello/jquery.periodicalupdater"
-//= require "katello/jquery.trunk8"

data/app/controllers/katello/api/v2/activation_keys_controller.rb

@@ -230,6 +230,7 @@ module Katello
     param :id, String, :desc => N_("ID of the activation key"), :required => true
     param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
     param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the activation key's content view version")
+    param_group :search, Api::V2::ApiController
     def product_content
       # note this is just there as a place holder for apipie.
       # The routing would automatically redirect it to repository_sets#index

data/app/controllers/katello/api/v2/alternate_content_sources_controller.rb

@@ -21,8 +21,8 @@ module Katello
       param :ssl_ca_cert_id, :number, desc: N_("Identifier of the content credential containing the SSL CA Cert"), required: false
       param :ssl_client_cert_id, :number, desc: N_("Identifier of the content credential containing the SSL Client Cert"), required: false
       param :ssl_client_key_id, :number, desc: N_("Identifier of the content credential containing the SSL Client Key"), required: false
-      param :http_proxy_id, :number, desc: N_("ID of a HTTP Proxy"), required: false
       param :verify_ssl, :bool, desc: N_("If SSL should be verified for the upstream URL"), required: false
+      param :use_http_proxies, :bool, desc: N_("If the smart proxies' assigned HTTP proxies should be used"), required: false
       param :product_ids, Array, desc: N_("IDs of products to copy repository information from into a Simplified Alternate Content Source. Products must include at least one repository of the chosen content type."), required: false
     end
 
@@ -34,7 +34,7 @@ module Katello
         format.csv do
           options[:csv] = true
           alternate_content_sources = scoped_search(index_relation, :name, :asc)
-          if @acs.custom?
+          if @acs.custom? || @acs.rhui?
             csv_response(alternate_content_sources,
                         [:id, :name, :description, :label, :base_url, :subpaths, :content_type, :alternate_content_source_type],
                         ['Id', 'Name', 'Description', 'label', 'Base URL', 'Subpaths', 'Content Type', 'Alternate Content Source Type'])
@@ -114,8 +114,8 @@ module Katello
     protected
 
     def acs_params
-      keys = [:name, :label, :description, {smart_proxy_ids: []}, {smart_proxy_names: []}, :content_type, :alternate_content_source_type]
-      keys += [:base_url, {subpaths: []}, :upstream_username, :upstream_password, :ssl_ca_cert_id, :ssl_client_cert_id, :ssl_client_key_id, :http_proxy_id, :verify_ssl] if params[:action] == 'create' || @alternate_content_source&.custom?
+      keys = [:name, :label, :description, {smart_proxy_ids: []}, {smart_proxy_names: []}, :content_type, :alternate_content_source_type, :use_http_proxies]
+      keys += [:base_url, {subpaths: []}, :upstream_username, :upstream_password, :ssl_ca_cert_id, :ssl_client_cert_id, :ssl_client_key_id, :verify_ssl] if params[:action] == 'create' || @alternate_content_source&.custom? || @alternate_content_source&.rhui?
       keys += [{product_ids: []}] if params[:action] == 'create' || @alternate_content_source&.simplified?
       params.require(:alternate_content_source).permit(*keys).to_h.with_indifferent_access
     end

data/app/controllers/katello/api/v2/capsule_content_controller.rb

@@ -7,6 +7,7 @@ module Katello
     before_action :find_capsule, :except => [:sync, :cancel_sync, :add_lifecycle_environment, :remove_lifecycle_environment, :reclaim_space]
     before_action :find_editable_capsule, :only => [:sync, :cancel_sync, :add_lifecycle_environment, :remove_lifecycle_environment]
     before_action :find_environment, :only => [:add_lifecycle_environment, :remove_lifecycle_environment]
+    before_action :find_acs_http_proxy, :only => [:add_acs_http_proxy]
     before_action :find_optional_organization, :only => [:sync_status]
 
     def_param_group :lifecycle_environments do
@@ -123,6 +124,10 @@ module Katello
       @environment = Katello::KTEnvironment.readable.find(params[:environment_id])
     end
 
+    def find_acs_http_proxy
+      @acs_http_proxy = ::HttpProxy.readable.find(params[:alternate_content_source_http_proxy_id])
+    end
+
     def find_content_view
       @content_view = Katello::ContentView.readable.find(params[:content_view_id])
     end

data/app/controllers/katello/api/v2/content_imports_controller.rb

@@ -66,6 +66,7 @@ module Katello
         :toc,
         :incremental,
         :destination_server,
+        :format,
         gpg_keys: {},
         content_view: [:name, :label, :description, :generated_for],
         content_view_version: [:major, :minor, :description],

data/app/controllers/katello/api/v2/content_view_components_controller.rb

@@ -47,7 +47,7 @@ module Katello
          CAST (#{kcc}.composite_content_view_id as BOOLEAN) ASC, #{kc}.name
       SQL
       query = Katello::ContentView.readable.in_organization(@organization)
-      query = query&.non_composite&.non_default
+      query = query&.non_composite&.non_default&.generated_for_none
       component_cv_ids = Katello::ContentViewComponent.where(composite_content_view_id: @view.id).select(:content_view_id)
       query = case params[:status]
               when "Not added"

data/app/controllers/katello/api/v2/host_subscriptions_controller.rb

@@ -24,7 +24,7 @@ module Katello
       param :service_level, String, :desc => N_("Service level to be used for autoheal")
       param :hypervisor_guest_uuids, Array, :desc => N_("List of hypervisor guest uuids")
       param :installed_products_attributes, Array, :desc => N_("List of products installed on the host") do
-        param_group :installed_products
+        param_group :installed_products, Api::V2::HostSubscriptionsController
       end
     end
 
@@ -152,6 +152,7 @@ module Katello
     param :host_id, String, :desc => N_("Id of the host"), :required => true
     param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
     param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the host's content view version")
+    param_group :search, Api::V2::ApiController
     def product_content
       # note this is just there as a place holder for apipie.
       # The routing would automatically redirect it to repository_sets#index

data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb

@@ -319,7 +319,7 @@ module Katello
       lifecycle_environment = KTEnvironment.readable.find(params[:environment_id])
       content_view = Katello::ContentView.readable.find(params[:content_view_id])
       content_source = SmartProxy.authorized(:view_smart_proxies).find(params[:content_source_id])
-      template = prepare_ssl_cert(foreman_server_ca_cert) + configure_subman(content_source)
+      template = prepare_ssl_cert(foreman_server_ca_cert) + configure_subman(content_source) + reconfigure_yggdrasild(hosts.first)
 
       hosts.each do |host|
         next unless host.content_facet

data/app/controllers/katello/api/v2/organizations_controller.rb

@@ -29,6 +29,7 @@ module Katello
         param :hostgroup_ids, Array, N_("Host group IDs"), :required => false
         param :environment_ids, Array, N_("Environment IDs"), :required => false
         param :subnet_ids, Array, N_("Subnet IDs"), :required => false
+        param :ignore_types, Array, N_("List of resources types that will be automatically associated"), :required => false
         param :location_ids, Array, N_("Associated location IDs"), :required => false
       end
     end

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -81,7 +81,7 @@ module Katello
     def_param_group :repo_create do
       param :label, String, :required => false
       param :product_id, :number, :required => true, :desc => N_("Product the repository belongs to")
-      param :content_type, RepositoryTypeManager.creatable_repository_types(false).keys, :required => true, :desc => N_("type of repo")
+      param :content_type, String, :required => true, :desc => N_("Type of repository. Available types endpoint: /katello/api/repositories/repository_types")
     end
 
     api :GET, "/repositories", N_("List of enabled repositories")
@@ -102,18 +102,28 @@ module Katello
     param :ansible_collection_id, String, :desc => N_("Id of an ansible collection to find repositories that contain the ansible collection")
     param :library, :bool, :desc => N_("show repositories in Library and the default content view")
     param :archived, :bool, :desc => N_("show archived repositories")
-    param :content_type, RepositoryTypeManager.defined_repository_types.keys, :desc => N_("limit to only repositories of this type")
+    param :content_type, String, :desc => N_("Limit the repository type. Available types endpoint: /katello/api/repositories/repository_types")
     param :name, String, :desc => N_("name of the repository"), :required => false
     param :label, String, :desc => N_("label of the repository"), :required => false
     param :description, String, :desc => N_("description of the repository")
     param :available_for, String, :desc => N_("interpret specified object to return only Repositories that can be associated with specified object.  Only 'content_view' & 'content_view_version' are supported."),
           :required => false
-    param :with_content, RepositoryTypeManager.enabled_content_types(false), :desc => N_("only repositories having at least one of the specified content type ex: rpm , erratum")
+    param :with_content, String, :desc => N_("Filter repositories by content unit type (erratum, docker_tag, etc.). Check the \"Indexed?\" types here: /katello/api/repositories/repository_types")
     param :download_policy, ::Katello::RootRepository::DOWNLOAD_POLICIES, :desc => N_("limit to only repositories with this download policy")
     param :username, String, :desc => N_("only show the repositories readable by this user with this username")
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(Repository)
     def index
+      unless params[:content_type].empty? || RepositoryTypeManager.find(params[:content_type])
+        msg = _("Invalid params provided - content_type must be one of %s") %
+          RepositoryTypeManager.enabled_repository_types.keys.sort.join(",")
+        fail HttpErrors::UnprocessableEntity, msg
+      end
+      unless params[:with_content].empty? || RepositoryTypeManager.find_content_type(params[:with_content], true)
+        msg = _("Invalid params provided - with_content must be one of %s") %
+          RepositoryTypeManager.indexable_content_types.map(&:label).sort.join(",")
+        fail HttpErrors::UnprocessableEntity, msg
+      end
       base_args = [index_relation.distinct, :name, :asc]
       options = {:includes => [:environment, {:root => [:gpg_key, :product]}]}
 
@@ -224,6 +234,51 @@ module Katello
       query
     end
 
+    api :GET, "/repositories/compare/", N_("List :resource")
+    param :content_view_version_ids, Array, :desc => N_("content view versions to compare")
+    param :repository_id, :number, :desc => N_("Library repository id to restrict comparisons to")
+    param :restrict_comparison, String, :desc => N_("Return same, different or all results")
+
+    def compare
+      fail _("No content_view_version_ids provided") if params[:content_view_version_ids].empty?
+      @versions = ContentViewVersion.readable.where(:id => params[:content_view_version_ids])
+      if @versions.count != params[:content_view_version_ids].uniq.length
+        missing = params[:content_view_version_ids] - @versions.pluck(:id)
+        fail HttpErrors::NotFound, _("Couldn't find content view versions '%s'") % missing.join(',')
+      end
+
+      archived_version_repos = Katello::Repository.where(:content_view_version_id => @versions&.pluck(:id))&.archived
+      repos = Katello::Repository.where(id: archived_version_repos&.pluck(:library_instance_id))
+      repos = repos.where(:root_id => @repo.root_id) if @repo
+      repositories = restrict_comparison(repos, @versions, params[:restrict_comparison])
+      collection = scoped_search(repositories.distinct, :name, :asc)
+      collection[:results] = collection[:results].map { |item| ContentViewVersionComparePresenter.new(item, @versions, @repo) }
+      respond_for_index(:collection => collection)
+    end
+
+    def restrict_comparison(collection, content_view_versions = nil, compare = 'all')
+      case compare
+      when 'same'
+        same_repo_ids = compare_same(collection, content_view_versions)
+        collection.where(id: same_repo_ids)
+      when 'different'
+        same_repo_ids = compare_same(collection, content_view_versions)
+        collection.where.not(id: same_repo_ids)
+      else
+        collection
+      end
+    end
+
+    def compare_same(collection, content_view_versions = nil)
+      same_repo_ids = []
+      collection.each do |repo|
+        if (content_view_versions&.pluck(:id)&.- repo.published_in_versions&.pluck(:id))&.empty?
+          same_repo_ids << repo.id
+        end
+      end
+      same_repo_ids
+    end
+
     api :POST, "/repositories", N_("Create a custom repository")
     param :name, String, :desc => N_("Name of the repository"), :required => true
     param :description, String, :desc => N_("Description of the repository"), :required => false
@@ -233,7 +288,7 @@ module Katello
       repo_params = repository_params
       unless RepositoryTypeManager.creatable_by_user?(repo_params[:content_type], false)
         msg = _("Invalid params provided - content_type must be one of %s") %
-          RepositoryTypeManager.creatable_repository_types(false).keys.join(",")
+          RepositoryTypeManager.creatable_repository_types.keys.sort.join(",")
         fail HttpErrors::UnprocessableEntity, msg
       end
 
@@ -374,9 +429,14 @@ module Katello
     desc "Remove content from a repository"
     param :id, :number, :required => true, :desc => "repository ID"
     param 'ids', Array, :required => true, :desc => "Array of content ids to remove"
-    param :content_type, RepositoryTypeManager.removable_content_types(false).map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'rpm', 'srpm')")
+    param :content_type, String, :required => false, :desc => N_("The type of content to remove (srpm, docker_manifest, etc.). Check removable types here: /katello/api/repositories/repository_types")
     param 'sync_capsule', :bool, :desc => N_("Whether or not to sync an external capsule after upload. Default: true")
     def remove_content
+      unless params[:content_type].empty? || RepositoryTypeManager.removable_content_types.map(&:label).include?(params[:content_type])
+        msg = _("Invalid params provided - content_type must be one of %s") %
+          RepositoryTypeManager.removable_content_types.map(&:label).sort.join(",")
+        fail HttpErrors::UnprocessableEntity, msg
+      end
       sync_capsule = ::Foreman::Cast.to_bool(params.fetch(:sync_capsule, true))
       fail _("No content ids provided") if @content.blank?
       respond_for_async :resource => sync_task(::Actions::Katello::Repository::RemoveContent, @repository, @content, content_type: params[:content_type], sync_capsule: sync_capsule)
@@ -385,7 +445,7 @@ module Katello
     api :POST, "/repositories/:id/upload_content", N_("Upload content into the repository")
     param :id, :number, :required => true, :desc => N_("repository ID")
     param :content, File, :required => true, :desc => N_("Content files to upload. Can be a single file or array of files.")
-    param :content_type, RepositoryTypeManager.uploadable_content_types(false).map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'rpm', 'srpm')")
+    param :content_type, String, :required => false, :desc => N_("The type of content to upload (srpm, file, etc.). Check uploadable types here: /katello/api/repositories/repository_types")
     def upload_content
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Container Image content.") if @repository.docker?
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Ansible collections.") if @repository.ansible_collection?
@@ -426,7 +486,7 @@ module Katello
       param 'content_unit_id', String
       param 'size', String
       param 'checksum', String
-      param 'name', String, :desc => N_("Needs to only be set for file repositories or docker tags")
+      param 'name', String, :desc => N_("Needs to only be set for file repositories or docker tags"), :required => true
       param 'digest', String, :desc => N_("Needs to only be set for docker tags")
     end
     Katello::RepositoryTypeManager.generic_repository_types.each_pair do |_, repo_type|
@@ -447,6 +507,14 @@ module Katello
         upload.permit(:id, :content_unit_id, :size, :checksum, :name, :digest).to_h
       end
 
+      if @repository.content_type != 'docker' && uploads.first['checksum'].nil?
+        fail HttpErrors::BadRequest, _('Checksum is a required parameter.')
+      end
+
+      if uploads.first['name'].nil?
+        fail HttpErrors::BadRequest, _('Name is a required parameter.')
+      end
+
       begin
         upload_args = {
           content_type: params[:content_type],
@@ -598,7 +666,7 @@ module Katello
 
     def handle_mirror_on_sync(repo_params)
       if !repo_params.key?(:mirroring_policy) && repo_params.key?(:mirror_on_sync)
-        ::Foreman::Deprecation.api_deprecation_warning("mirror_on_sync is deprecated in favor of mirroring_policy.  It will be removed in Katello 4.6.")
+        ::Foreman::Deprecation.api_deprecation_warning("mirror_on_sync is deprecated in favor of mirroring_policy.  It will be removed in Katello 4.8.")
         if ::Foreman::Cast.to_bool(repo_params[:mirror_on_sync])
           repo_params[:mirroring_policy] = Katello::RootRepository::MIRRORING_POLICY_CONTENT
         else
@@ -664,12 +732,10 @@ module Katello
     end
 
     def generic_remote_options_hash(repo_params)
-      generic_remote_options = {}
       content_type = @repository&.content_type || repo_params[:content_type]
-      RepositoryTypeManager.generic_remote_options(content_type: content_type).each do |option|
-        generic_remote_options[option.name] = repo_params[option.name]
+      RepositoryTypeManager.generic_remote_options(content_type: content_type).to_h do |option|
+        [option.name, repo_params[option.name].nil? ? option&.default : repo_params[option.name]]
       end
-      generic_remote_options
     end
 
     def generic_content_type_import_upload_args

data/app/controllers/katello/api/v2/upstream_subscriptions_controller.rb

@@ -48,7 +48,7 @@ module Katello
     end
 
     api :DELETE, "/organizations/:organization_id/upstream_subscriptions",
-      N_("Remove one or more subscriptions from an upstream subscription allocation")
+      N_("Remove one or more subscriptions from an upstream manifest")
     param :organization_id, :number, :desc => N_("Organization ID"), :required => true
     param :pool_ids, Array, desc: N_("Array of local pool IDs. Only pools originating upstream are accepted."), required: true
     def destroy

data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb

@@ -2,6 +2,7 @@ module Katello
   module Concerns
     module Api::V2::RegistrationControllerExtensions
       extend ActiveSupport::Concern
+      include ::Foreman::Controller::SmartProxyAuth
 
       def prepare_host
         if params['uuid']
@@ -35,7 +36,7 @@ module Katello
 
       def smart_proxy
         @smart_proxy ||= begin
-          proxy = params[:url] ? SmartProxy.unscoped.find_by(url: params[:url]) : SmartProxy.pulp_primary
+          proxy = params[:url] ? find_smart_proxy : SmartProxy.pulp_primary
 
           fail Foreman::Exception, _('Smart proxy content source not found!') unless proxy
           fail Foreman::Exception, _('Pulp 3 is not enabled on Smart proxy!') unless proxy.pulp3_enabled?
@@ -43,6 +44,11 @@ module Katello
           proxy
         end
       end
+
+      def find_smart_proxy
+        auth_smart_proxy
+        @detected_proxy
+      end
     end
   end
 end

data/app/controllers/katello/concerns/api/v2/smart_proxies_controller_extensions.rb

@@ -8,6 +8,7 @@ module Katello
           param :smart_proxy, Hash do
             param :download_policy, String, :required => false, :desc => N_('Download Policy of the capsule, must be one of %s') %
                 SmartProxy::DOWNLOAD_POLICIES.join(', ')
+            param :http_proxy_id, Integer, :required => false, :desc => N_('Id of the HTTP proxy to use with alternate content sources')
           end
         end
       end

data/app/controllers/katello/concerns/hosts_controller_extensions.rb

@@ -72,30 +72,32 @@ module Katello
         end
 
         def change_content_source_data
-          hosts = ::Host.where(id: params[:host_ids])
-          content_hosts_ids = []
+          hosts = params[:search].presence ? ::Host.search_for(params[:search]) : ::Host.where(id: params[:host_ids])
+          content_hosts = []
           hosts_without_content = []
 
           hosts.each do |host|
             if host.content_facet
-              content_hosts_ids << host.id
+              content_hosts << { id: host.id, name: host.name }
             else
-              hosts_without_content << host.name
+              hosts_without_content << { id: host.id, name: host.name }
             end
           end
 
-          environments = KTEnvironment.readable.where(organization: Organization.current).includes([:organization, :env_priors, :priors]).order(:name)
-          content_sources = SmartProxy.authorized(:view_smart_proxies).with_content.includes([:smart_proxy_features])
+          content_sources = SmartProxy.authorized(:view_smart_proxies)
+                                      .with_content
+                                      .includes([:smart_proxy_features])
+                                      .joins(:lifecycle_environments)
+                                      .distinct
 
           if Katello.with_remote_execution?
             template_id = JobTemplate.find_by(name: 'Change content source')&.id
-            job_invocation_path = new_job_invocation_path(template_id: template_id, host_ids: content_hosts_ids) if template_id
+            job_invocation_path = new_job_invocation_path(template_id: template_id, host_ids: content_hosts.map { |h| h[:id] }) if template_id
           end
 
           render json: {
-            content_hosts_ids: content_hosts_ids,
+            content_hosts: content_hosts,
             hosts_without_content: hosts_without_content,
-            environments: environments,
             content_sources: content_sources,
             job_invocation_path: job_invocation_path
           }

data/app/helpers/katello/content_source_helper.rb

@@ -41,5 +41,14 @@ module Katello
         subscription-manager facts --update
       CMD
     end
+
+    def reconfigure_yggdrasild(host)
+      template = Template.find_by(name: 'remote_execution_pull_setup')
+      return '' unless template
+
+      source = Foreman::Renderer.get_source(template: template, host: host)
+      scope = Foreman::Renderer.get_scope(source: source, host: host)
+      Foreman::Renderer.render(source, scope)
+    end
   end
 end

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -269,6 +269,37 @@ module Katello
       [{ action: [_('Change Content Source'), '/change_host_content_source', false], priority: 100 }]
     end
 
+    def host_status_icon(status)
+      colours = [:green, :yellow, :red]
+
+      colour = colours[status] || :red
+
+      icons = {
+        green: "#{colour} host-status pficon pficon-ok status-ok",
+        yellow: "#{colour} host-status pficon pficon-info status-warn",
+        red: "#{colour} host-status pficon pficon-error-circle-o status-error"
+      }
+
+      "<span class=\"#{icons[colour]}\"></span>".html_safe
+    end
+
+    def errata_counts(host)
+      counts = host.content_facet_attributes&.errata_counts || {}
+      render partial: 'katello/hosts/errata_counts', locals: { counts: counts, host: host }
+    end
+
+    def host_registered_time(host)
+      return _('Never registered') unless host.subscription_facet_attributes&.registered_at
+
+      date_time_relative_value(host.subscription_facet_attributes.registered_at)
+    end
+
+    def host_checkin_time(host)
+      return _('Never checked in') unless host.subscription_facet_attributes&.last_checkin
+
+      date_time_relative_value(host.subscription_facet_attributes.last_checkin)
+    end
+
     private
 
     def hostgroup_content_facet(hostgroup, param_host)

data/app/lib/actions/katello/activation_key/destroy.rb

@@ -3,6 +3,7 @@ module Actions
     module ActivationKey
       class Destroy < Actions::EntryAction
         def plan(activation_key, options = {})
+          activation_key.validate_destroyable!
           skip_candlepin = options.fetch(:skip_candlepin, false)
           action_subject(activation_key)
 

data/app/lib/actions/katello/agent_action.rb

@@ -91,6 +91,7 @@ module Actions
           if finish_limit < DateTime.now
             fail _("Host did not finish content action in %s seconds.  The task has been cancelled.") % finish_timeout
           end
+          suspend
         end
       end
 

data/app/lib/actions/katello/alternate_content_source/create.rb

@@ -11,7 +11,7 @@ module Actions
           smart_proxies = smart_proxies.present? ? smart_proxies.uniq : []
           concurrence do
             smart_proxies.each do |smart_proxy|
-              if acs.custom?
+              if acs.custom? || acs.rhui?
                 smart_proxy_acs = ::Katello::SmartProxyAlternateContentSource.create(alternate_content_source_id: acs.id, smart_proxy_id: smart_proxy.id)
                 plan_action(Pulp3::Orchestration::AlternateContentSource::Create, smart_proxy_acs)
               elsif acs.simplified?

data/app/lib/actions/katello/alternate_content_source/update.rb

@@ -37,7 +37,7 @@ module Actions
 
         def create_acss(acs, smart_proxies_to_associate)
           smart_proxies_to_associate&.each do |smart_proxy|
-            if acs.custom?
+            if acs.custom? || acs.rhui?
               smart_proxy_acs = ::Katello::SmartProxyAlternateContentSource.create(alternate_content_source_id: acs.id, smart_proxy_id: smart_proxy.id)
               plan_action(Pulp3::Orchestration::AlternateContentSource::Create, smart_proxy_acs)
             elsif acs.simplified?
@@ -56,7 +56,7 @@ module Actions
 
         def update_acss(acs, smart_proxies_to_update, products_to_associate, products_to_disassociate)
           smart_proxies_to_update&.each do |smart_proxy|
-            if acs.custom?
+            if acs.custom? || acs.rhui?
               smart_proxy_acs = ::Katello::SmartProxyAlternateContentSource.find_by(alternate_content_source_id: acs.id, smart_proxy_id: smart_proxy.id, repository_id: nil)
               plan_action(Pulp3::Orchestration::AlternateContentSource::Update, smart_proxy_acs)
             elsif acs.simplified?

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -31,8 +31,8 @@ module Actions
           fail _("Action not allowed for the default smart proxy.") if smart_proxy.pulp_primary?
 
           refresh_options = options.merge(content_view: content_view,
-                                             environment:  environment,
-                                             repository: repository)
+                                          environment: environment,
+                                          repository: repository)
           sequence do
             if smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE)
               plan_action(Actions::Pulp::Orchestration::Repository::RefreshRepos, smart_proxy, refresh_options)
@@ -44,6 +44,14 @@ module Actions
             end
             plan_action(SyncCapsule, smart_proxy, refresh_options)
           end
+          plan_self(smart_proxy_id: smart_proxy.id)
+        end
+
+        def finalize
+          smart_proxy = SmartProxy.unscoped.authorized(:view_capsule_content).find(input[:smart_proxy_id])
+          unless smart_proxy&.pulp_primary?
+            smart_proxy&.audit_capsule_sync
+          end
         end
       end
     end

data/app/lib/actions/katello/cdn_configuration/update.rb

@@ -18,7 +18,7 @@ module Actions
           org = cdn_configuration.organization
           roots = ::Katello::RootRepository.redhat.in_organization(org)
           roots.each do |root|
-            full_path = if cdn_configuration.redhat_cdn?
+            full_path = if cdn_configuration.redhat_cdn? || cdn_configuration.custom_cdn?
                           root.product.repo_url(root.library_instance.generate_content_path)
                         elsif cdn_configuration.network_sync?
                           resource.repository_url(content_label: root.content.label, arch: root.arch, major: root.major, minor: root.minor)

data/app/lib/actions/katello/content_view/promote.rb

@@ -8,6 +8,7 @@ module Actions
         def plan(version, environments, is_force = false, description = nil, incremental_update = false)
           action_subject(version.content_view)
           version.check_ready_to_promote!(environments)
+          ::Katello::Util::CandlepinRepositoryChecker.check_repositories_for_promote!(version)
 
           fail ::Katello::HttpErrors::BadRequest, _("Cannot promote environment out of sequence. Use force to bypass restriction.") if !is_force && !version.promotable?(environments)
 

data/app/lib/actions/katello/content_view/publish.rb

@@ -9,10 +9,13 @@ module Actions
         execution_plan_hooks.use :trigger_capsule_sync, :on => :success
 
         # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
-        def plan(content_view, description = "", options = {importing: false}) # rubocop:disable Metrics/PerceivedComplexity
+        def plan(content_view, description = "", options = {importing: false, syncable: false}) # rubocop:disable Metrics/PerceivedComplexity
           action_subject(content_view)
 
-          content_view.check_ready_to_publish!(importing: options[:importing])
+          content_view.check_ready_to_publish!(options.slice(:importing, :syncable))
+          unless options[:importing] || options[:syncable]
+            ::Katello::Util::CandlepinRepositoryChecker.check_repositories_for_publish!(content_view)
+          end
 
           if options[:repos_units].present?
             valid_labels_from_cv = content_view.repositories.map(&:label)

data/app/lib/actions/katello/content_view_version/auto_create_redhat_repositories.rb

@@ -2,16 +2,20 @@ module Actions
   module Katello
     module ContentViewVersion
       class AutoCreateRedhatRepositories < Actions::Base
-        def plan(import:)
+        def plan(import:, path:)
           helper = ::Katello::Pulp3::ContentViewVersion::ImportableRepositories.new(
             organization: import.organization,
-            metadata_repositories: import.metadata_map.repositories.select { |r| r.redhat }
+            metadata_repositories: import.metadata_map.repositories.select { |r| r.redhat },
+            syncable_format: import.metadata_map.syncable_format?,
+            path: path
           )
           helper.generate!
 
           sequence do
             helper.creatable.each do |root|
-              plan_action(::Actions::Katello::RepositorySet::EnableRepository, root[:product], root[:content], root[:substitutions])
+              plan_action(::Actions::Katello::RepositorySet::EnableRepository,
+                            root[:product], root[:content], root[:substitutions],
+                            override_url: root[:override_url])
             end
             helper.updatable.each do |root|
               plan_action(::Actions::Katello::Repository::Update, root[:repository], root[:options])

data/app/lib/actions/katello/content_view_version/auto_create_repositories.rb

@@ -2,10 +2,12 @@ module Actions
   module Katello
     module ContentViewVersion
       class AutoCreateRepositories < Actions::Base
-        def plan(import:)
+        def plan(import:, path:)
           helper = ::Katello::Pulp3::ContentViewVersion::ImportableRepositories.new(
             organization: import.organization,
-            metadata_repositories: import.metadata_map.repositories.select { |r| !r.redhat }
+            metadata_repositories: import.metadata_map.repositories.select { |r| !r.redhat },
+            syncable_format: import.metadata_map.syncable_format?,
+            path: path
           )
           helper.generate!