katello 4.4.2.2 → 4.5.0.rc1

data/app/models/katello/authorization/alternate_content_source.rb

@@ -0,0 +1,33 @@
+module Katello
+  module Authorization::AlternateContentSource
+    extend ActiveSupport::Concern
+
+    include Authorizable
+
+    def readable?
+      authorized?(:view_alternate_content_sources)
+    end
+
+    def editable?
+      authorized?(:edit_alternate_content_sources)
+    end
+
+    def deletable?
+      authorized?(:destroy_alternate_content_sources)
+    end
+
+    module ClassMethods
+      def readable
+        authorized(:view_alternate_content_sources)
+      end
+
+      def editable
+        authorized(:edit_alternate_content_sources)
+      end
+
+      def deletable
+        authorized(:destroy_alternate_content_sources)
+      end
+    end
+  end
+end

data/app/models/katello/authorization/repository.rb

@@ -4,12 +4,12 @@ module Katello
 
     delegate :editable?, to: :product
 
-    def deletable?(remove_from_content_view_versions = false)
-      product.editable? && (remove_from_content_view_versions || !promoted?)
+    def deletable?(remove_from_content_view_versions = true)
+      product.editable? && (remove_from_content_view_versions || !promoted? || !self.content_views.generated_for_none.exists?)
     end
 
     def redhat_deletable?(remove_from_content_view_versions = false)
-      (remove_from_content_view_versions || !self.promoted?) && self.product.editable?
+      (remove_from_content_view_versions || !self.promoted? || !self.content_views.generated_for_none.exists?) && self.product.editable?
     end
 
     def readable?

data/app/models/katello/candlepin/repository_mapper.rb

@@ -10,10 +10,17 @@ module Katello
       end
 
       def find_repository
-        root = ::Katello::RootRepository.where(product_id: product.id,
-                                    content_id: content.cp_content_id,
-                                    minor: minor,
-                                    arch: arch).first
+        if substitutions[:basearch]
+          root = ::Katello::RootRepository.where(product_id: product.id,
+                                                 content_id: content.cp_content_id,
+                                                 minor: minor,
+                                                 arch: arch).first
+        else
+          root = ::Katello::RootRepository.where(product_id: product.id,
+                                                 content_id: content.cp_content_id,
+                                                 minor: minor).first
+        end
+
         if root
           Katello::Repository.where(root: root,
                                     environment_id: product.organization.library.id).first
@@ -44,7 +51,7 @@ module Katello
       end
 
       def validate!
-        return if katello_content_type == Repository::OSTREE_TYPE || product.organization.cdn_configuration.airgapped?
+        return if katello_content_type == Repository::OSTREE_TYPE || product.organization.cdn_configuration.export_sync?
         substitutor.validate_substitutions(content, substitutions)
       end
 
@@ -74,7 +81,7 @@ module Katello
       end
 
       def feed_url
-        return if product.organization.cdn_configuration.airgapped?
+        return if product.organization.cdn_configuration.export_sync?
         @feed_url ||= if product.cdn_resource&.respond_to?(:repository_url)
                         product.cdn_resource.repository_url(content_label: content.label, arch: arch, major: version[:major], minor: version[:minor])
                       else

data/app/models/katello/cdn_configuration.rb

@@ -3,24 +3,24 @@ module Katello
     include Encryptable
     self.inheritance_column = nil
     CDN_TYPE = 'redhat_cdn'.freeze
-    UPSTREAM_SERVER_TYPE = 'upstream_server'.freeze
-    AIRGAPPED_TYPE = 'airgapped'.freeze
+    NETWORK_SYNC = 'network_sync'.freeze
+    EXPORT_SYNC = 'export_sync'.freeze
 
-    TYPES = [CDN_TYPE, UPSTREAM_SERVER_TYPE, AIRGAPPED_TYPE].freeze
+    TYPES = [CDN_TYPE, NETWORK_SYNC, EXPORT_SYNC].freeze
 
     belongs_to :organization, :inverse_of => :cdn_configuration
 
     belongs_to :ssl_ca_credential, :class_name => "Katello::ContentCredential", :inverse_of => :ssl_ca_cdn_configurations
 
     encrypts :password
-    validates :password, presence: true, if: :upstream_server?
-    validates :username, presence: true, if: :upstream_server?
-    validates :upstream_organization_label, presence: true, if: :upstream_server?
+    validates :password, presence: true, if: :network_sync?
+    validates :username, presence: true, if: :network_sync?
+    validates :upstream_organization_label, presence: true, if: :network_sync?
 
-    validates :url, presence: true, unless: :airgapped?
-    validates_with Validators::KatelloUrlFormatValidator, attributes: :url, unless: :airgapped?
+    validates :url, presence: true, unless: :export_sync?
+    validates_with Validators::KatelloUrlFormatValidator, attributes: :url, unless: :export_sync?
     validates_with Validators::KatelloLabelFormatValidator, attributes: :upstream_organization_label, if: proc { upstream_organization_label.present? }
-    validate :non_redhat_configuration, if: :upstream_server?
+    validate :non_redhat_configuration, if: :network_sync?
 
     before_validation :reset_fields
 
@@ -32,20 +32,20 @@ module Katello
       type == CDN_TYPE
     end
 
-    def airgapped?
-      type == AIRGAPPED_TYPE
+    def export_sync?
+      type == EXPORT_SYNC
     end
 
-    def upstream_server?
-      type == UPSTREAM_SERVER_TYPE
+    def network_sync?
+      type == NETWORK_SYNC
     end
 
     private
 
     def reset_fields
-      return if upstream_server?
+      return if network_sync?
 
-      self.url = nil if airgapped?
+      self.url = nil if export_sync?
       self.url ||= SETTINGS[:katello][:redhat_repository_url] if redhat_cdn?
       self.username = nil
       self.password = nil

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

@@ -33,6 +33,9 @@ module Katello
         has_many :applicable_debs, :through => :content_facet
         has_many :applicable_rpms, :through => :content_facet
         has_many :applicable_module_streams, :through => :content_facet
+        has_many :bound_repositories, :through => :content_facet
+        has_many :bound_root_repositories, :through => :content_facet
+        has_many :bound_content, :through => :content_facet
 
         scoped_search :relation => :content_view, :on => :name, :complete_value => true, :rename => :content_view
         scoped_search :relation => :content_facet, :on => :content_view_id, :rename => :content_view_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
@@ -46,6 +49,8 @@ module Katello
         scoped_search :relation => :applicable_rpms, :on => :nvra, :rename => :applicable_rpms, :complete_value => true, :ext_method => :find_by_applicable_rpms, :only_explicit => true
         scoped_search :relation => :applicable_rpms, :on => :nvra, :rename => :upgradable_rpms, :complete_value => true, :ext_method => :find_by_installable_rpms, :only_explicit => true
         scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source
+        scoped_search :relation => :bound_root_repositories, :on => :name, :rename => :repository, :complete_value => true, :ext_method => :find_by_repository_name, :only_explicit => true
+        scoped_search :relation => :bound_content, :on => :label, :rename => :repository_content_label, :complete_value => true, :ext_method => :find_by_repository_content_label, :only_explicit => true
 
         # preserve options set by facets framework, but add new :reject_if statement
         accepts_nested_attributes_for(
@@ -129,6 +134,26 @@ module Katello
           end
         end
 
+        def find_by_repository_content_label(_key, operator, value)
+          conditions = sanitize_sql_for_conditions(["#{Katello::Content.table_name}.label #{operator} ?", value_to_sql(operator, value)])
+          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
+          if facets.empty?
+            { :conditions => "1=0" }
+          else
+            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
+          end
+        end
+
+        def find_by_repository_name(_key, operator, value)
+          conditions = sanitize_sql_for_conditions(["#{Katello::RootRepository.table_name}.name #{operator} ?", value_to_sql(operator, value)])
+          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
+          if facets.empty?
+            { :conditions => "1=0" }
+          else
+            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
+          end
+        end
+
         def in_content_view_environment(content_view: nil, lifecycle_environment: nil)
           relation = self.joins(:content_facet)
           relation = relation.where("#{::Katello::Host::ContentFacet.table_name}.content_view_id" => content_view) if content_view

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

@@ -45,7 +45,7 @@ module Katello
         prepend ::ForemanRemoteExecution::HostExtensions if ::Katello.with_remote_execution?
         prepend Overrides
 
-        delegate :content_source_id, :content_view_id, :lifecycle_environment_id, :kickstart_repository_id, to: :content_facet, allow_nil: true
+        delegate :content_source_id, :content_view_id, :lifecycle_environment_id, :kickstart_repository_id, :bound_repositories, to: :content_facet, allow_nil: true
 
         has_many :dispatch_histories, :class_name => "::Katello::Agent::DispatchHistory", :foreign_key => :host_id, :dependent => :delete_all
 
@@ -424,9 +424,10 @@ module Katello
         ::Katello::Erratum.installable_for_hosts([self]).search_for(search).pluck(:errata_id)
       end
 
-      def valid_content_override_label?(content_label)
-        available_content = subscription_facet.candlepin_consumer.available_product_content
-        available_content.map(&:content).any? { |content| content.label == content_label }
+      def filtered_entitlement_quantity_consumed(pool)
+        entitlements = subscription_facet.candlepin_consumer.filter_entitlements(pool.cp_id)
+        return nil if entitlements.empty?
+        entitlements.sum { |e| e[:quantity] }
       end
 
       protected
@@ -446,7 +447,8 @@ end
 class ::Host::Managed::Jail < Safemode::Jail
   allow :content_source, :subscription_manager_configuration_url, :rhsm_organization_label,
         :host_collections, :pools, :hypervisor_host, :lifecycle_environment, :content_view,
-        :installed_packages, :traces_helpers, :advisory_ids, :package_names_for_job_template
+        :installed_packages, :traces_helpers, :advisory_ids, :package_names_for_job_template,
+        :filtered_entitlement_quantity_consumed, :bound_repositories
 end
 
 class ActiveRecord::Associations::CollectionProxy::Jail < Safemode::Jail

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

@@ -6,6 +6,8 @@ module Katello
       included do
         has_many :root_repositories, :class_name => "::Katello::RootRepository", :foreign_key => :http_proxy_id,
           :inverse_of => :http_proxy, :dependent => :nullify
+        has_many :alternate_content_sources, :class_name => "::Katello::AlternateContentSource", :foreign_key => :http_proxy_id,
+          :inverse_of => :http_proxy, :dependent => :nullify
         after_update :update_default_proxy_setting
         after_commit :update_repository_proxy_details
         before_destroy :remove_references_to_proxy
@@ -29,6 +31,7 @@ module Katello
 
       def remove_references_to_proxy
         root_repos = repositories_with_proxy(nil).uniq.sort
+        acss = ::Katello::AlternateContentSource.where(http_proxy_id: id)
 
         setting = Setting.find_by(name: 'content_default_http_proxy')
         if setting&.value && setting.value == self.name
@@ -43,6 +46,17 @@ module Katello
             http_proxy_policy: Katello::RootRepository::GLOBAL_DEFAULT_HTTP_PROXY,
             http_proxy_id: nil)
         end
+
+        unless acss.empty?
+          acss.each do |acs|
+            ForemanTasks.async_task(
+              ::Actions::Katello::AlternateContentSource::Update,
+              acs,
+              acs.smart_proxies,
+              http_proxy_id: nil
+            )
+          end
+        end
       end
 
       def update_default_proxy_setting

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

@@ -90,8 +90,10 @@ module Katello
           self.providers.anonymous.first
         end
 
-        def manifest_imported?
-          owner_details['upstreamConsumer'].present?
+        def manifest_imported?(cached: false)
+          Rails.cache.fetch("#{self.label}_manifest_imported?", expires_in: 1.minute, force: !cached) do
+            owner_details['upstreamConsumer'].present?
+          end
         end
 
         def manifest_expired?

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

@@ -6,8 +6,11 @@ module Katello
       included do
         validates :value, inclusion: { in: ::Katello::RootRepository::DOWNLOAD_POLICIES },
           if: ->(setting) { setting.name == 'default_download_policy' }
+        validates_with ::Katello::Validators::ContentDefaultHttpProxySettingValidator,
+        if: proc { |s| s.name == 'content_default_http_proxy' && HttpProxy.table_exists? }
 
         after_save :recalculate_errata_status
+        after_save :add_organizations_and_locations_if_global_http_proxy
         after_commit :update_global_proxies
       end
 
@@ -27,6 +30,17 @@ module Katello
           end
         end
       end
+
+      def add_organizations_and_locations_if_global_http_proxy
+        if name == 'content_default_http_proxy' && (::HttpProxy.table_exists? rescue(false))
+          proxy = HttpProxy.where(name: value).first
+
+          if proxy
+            proxy.update_attribute(:organizations, Organization.unscoped.all)
+            proxy.update_attribute(:locations, Location.unscoped.all)
+          end
+        end
+      end
     end
   end
 end

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

@@ -22,7 +22,8 @@ module Katello
       CONTAINER_GATEWAY_FEATURE = "Container_Gateway".freeze
 
       DOWNLOAD_INHERIT = 'inherit'.freeze
-      DOWNLOAD_POLICIES = [::Katello::RootRepository::DOWNLOAD_ON_DEMAND, ::Katello::RootRepository::DOWNLOAD_IMMEDIATE, DOWNLOAD_INHERIT].freeze
+      DOWNLOAD_STREAMED = 'streamed'.freeze
+      DOWNLOAD_POLICIES = [::Katello::RootRepository::DOWNLOAD_ON_DEMAND, ::Katello::RootRepository::DOWNLOAD_IMMEDIATE, DOWNLOAD_INHERIT, DOWNLOAD_STREAMED].freeze
 
       included do
         include ForemanTasks::Concerns::ActionSubject

data/app/models/katello/content.rb

@@ -10,6 +10,7 @@ module Katello
     scoped_search :on => :label, :complete_value => true
     scoped_search :relation => :products, :on => :name, :rename => :product_name, :complete_value => true
     scoped_search :on => :label, :rename => :content_label, :complete_value => true
+    scoped_search :on => :cp_content_id, :complete_value => true
 
     after_update :update_repository_names, :if => :propagate_name_change?
 

data/app/models/katello/content_credential.rb

@@ -29,6 +29,12 @@ module Katello
                                 :inverse_of => :ssl_client_cert, :dependent => :nullify
     has_many :ssl_key_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_client_key_id",
                              :inverse_of => :ssl_client_key, :dependent => :nullify
+    has_many :ssl_ca_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_ca_cert_id",
+                                :inverse_of => :ssl_ca_cert, :dependent => :nullify
+    has_many :ssl_client_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_client_cert_id",
+                                :inverse_of => :ssl_client_cert, :dependent => :nullify
+    has_many :ssl_key_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_client_key_id",
+                                :inverse_of => :ssl_client_key, :dependent => :nullify
     belongs_to :organization, :inverse_of => :gpg_keys
 
     validates_lengths_from_database

data/app/models/katello/content_override.rb

@@ -43,9 +43,13 @@ module Katello
     end
 
     def ==(other)
-      self.content_label == other.content_label &&
-        self.name == other.name &&
-        self.value == other.value
+      if self.class == other.class
+        self.content_label == other.content_label &&
+          self.name == other.name &&
+          self.value == other.value
+      else
+        super
+      end
     end
 
     def to_hash

data/app/models/katello/content_view.rb

@@ -11,7 +11,6 @@ module Katello
     CONTENT_DIR = "content_views".freeze
     IMPORT_LIBRARY = "Import-Library".freeze
     EXPORT_LIBRARY = "Export-Library".freeze
-
     belongs_to :organization, :inverse_of => :content_views, :class_name => "::Organization"
 
     has_many :content_view_environments, :class_name => "Katello::ContentViewEnvironment", :dependent => :destroy
@@ -19,7 +18,6 @@ module Katello
 
     has_many :content_view_versions, :class_name => "Katello::ContentViewVersion", :dependent => :destroy
     alias_method :versions, :content_view_versions
-
     # Note the difference between content_view_components and component_composites both refer to
     # ContentViewComponent but mean different things.
     # content_view_components -> Topdown, given I am a composite CV get the associated components belonging to me
@@ -73,6 +71,12 @@ module Katello
               inclusion: { in: [false], message: "Import-only Content Views can not solve dependencies"},
               if: :solve_dependencies
     validate :import_only_immutable
+    validates :generated_for,
+              exclusion: { in: [:none], message: "Generated Content Views can not be Composite"},
+              if: :composite
+    validates :generated_for,
+              exclusion: { in: [:none], message: "Generated Content Views can not solve dependencies"},
+              if: :solve_dependencies
 
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
@@ -81,11 +85,26 @@ module Katello
     scope :non_default, -> { where(:default => false) }
     scope :composite, -> { where(:composite => true) }
     scope :non_composite, -> { where(:composite => [nil, false]) }
+    scope :generated, -> { where.not(:generated_for => :none) }
+    scope :generated_for_repository, -> { where(:generated_for => [:repository_export, :repository_import]) }
+    scope :not_generated_for_repository, -> { where.not(id: generated_for_repository) }
+
+    scope :generated_for_library, -> { where(:generated_for => [:library_export, :library_import]) }
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :label, :complete_value => true
     scoped_search :on => :composite, :complete_value => true
+    scoped_search :on => :generated_for, :complete_value => true
+    scoped_search :on => :default # just for ordering
+
+    enum generated_for: {
+      none: 0,
+      library_export: 1,
+      repository_export: 2,
+      library_import: 3,
+      repository_import: 4
+    }, _prefix: true
 
     set_crud_hooks :content_view
 
@@ -123,6 +142,14 @@ module Katello
       name.start_with? EXPORT_LIBRARY
     end
 
+    def generated_for_repository?
+      generated_for_repository_export? || generated_for_repository_import?
+    end
+
+    def generated_for_library?
+      generated_for_library_export? || generated_for_library_import?
+    end
+
     def content_host_count
       hosts.count
     end
@@ -211,6 +238,10 @@ module Katello
       self.environments.many?
     end
 
+    def generated?
+      !generated_for_none?
+    end
+
     #NOTE: this function will most likely become obsolete once we drop api v1
     def as_json(options = {})
       result = self.attributes

data/app/models/katello/content_view_erratum_filter.rb

@@ -26,21 +26,33 @@ module Katello
       end
     end
 
-    def content_unit_pulp_ids(repo)
+    def content_unit_pulp_ids(repo, additional_included_errata = [])
       return [] if erratum_rules.blank?
 
       if filter_by_id?
         errata_ids = erratum_rules.map(&:errata_id)
-        errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
-        errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
+        # additional_included_errata and inclusion filters don't work together (since it only applies when excluding)
+        if self.inclusion?
+          errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids, [])
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids, [])
+        else
+          errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids, additional_included_errata)
+        end
       else
         clauses = []
         clauses << errata_from
         clauses << errata_to
         clauses << types_clause
-        package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact)
-        errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
-        errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact)
+        if self.inclusion?
+          package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact, [])
+          errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact, [])
+        else
+          package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact, additional_included_errata)
+          errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact, additional_included_errata)
+        end
       end
 
       errata_pulp_ids
@@ -53,8 +65,8 @@ module Katello
       repo.rpms.where("filename ILIKE ANY ( array[?] )", query_params)
     end
 
-    def errata_module_stream_pulp_ids_from_clauses(repo, clauses)
-      module_streams = Erratum.list_modular_streams_by_clauses(repo, clauses)
+    def errata_module_stream_pulp_ids_from_clauses(repo, clauses, additional_included_errata)
+      module_streams = Erratum.list_modular_streams_by_clauses(repo, clauses, additional_included_errata)
       module_streams.pluck(:pulp_id)
     end
 
@@ -62,13 +74,15 @@ module Katello
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 
-    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
-      module_streams = Katello::Erratum.where(:errata_id => errata_ids).map(&:module_streams).compact.flatten
+    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids, additional_included_errata)
+      module_streams = Katello::Erratum.where(:errata_id => errata_ids).map(&:module_streams).compact.flatten -
+        Katello::Erratum.where(:errata_id => additional_included_errata.pluck(:errata_id)).map(&:module_streams).compact.flatten
       module_streams.pluck(:pulp_id)
     end
 
-    def errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
-      package_filenames = Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => errata_ids).pluck(:filename)
+    def errata_package_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
+      package_filenames = Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => errata_ids).pluck(:filename) -
+        Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).pluck(:filename)
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 

data/app/models/katello/content_view_filter.rb

@@ -162,6 +162,10 @@ module Katello
       if self.content_view.import_only?
         errors.add(:base, _("cannot add filter to import-only view"))
       end
+
+      if self.content_view.generated?
+        errors.add(:base, _("cannot add filter to generated content views"))
+      end
     end
 
     def validate_filter_repos(errors, content_view)

data/app/models/katello/content_view_version.rb

@@ -344,6 +344,18 @@ module Katello
       save!
     end
 
+    def auto_publish_composites!
+      metadata = {
+        description: _("Auto Publish - Triggered by '%s'") % self.name,
+        triggered_by: self.id
+      }
+      self.content_view.auto_publish_components.pluck(:composite_content_view_id).each do |composite_id|
+        ::Katello::EventQueue.push_event(::Katello::Events::AutoPublishCompositeView::EVENT_TYPE, composite_id) do |attrs|
+          attrs[:metadata] = metadata
+        end
+      end
+    end
+
     def repository_type_counts_map
       counts = {}
       Katello::RepositoryTypeManager.enabled_repository_types.keys.each do |repo_type|

data/app/models/katello/content_view_version_export_history.rb

@@ -53,8 +53,10 @@ module Katello
 
     def self.generate_audit_comment(user:, content_view_version:, from_version: nil, metadata:)
       export_type = export_type_from_metadata(metadata)
-      if content_view_version.content_view.library_export?
+      if content_view_version.content_view.generated_for_library?
         export_descriptor = "library export"
+      elsif content_view_version.content_view.generated_for_repository?
+        export_descriptor = "repository export"
       else
         export_descriptor = "export of content view '#{content_view_version.content_view.name}' version #{content_view_version.version}"
         export_descriptor += " from #{from_version.name}" if from_version

data/app/models/katello/erratum.rb

@@ -108,25 +108,29 @@ module Katello
       installable_for_hosts(hosts).select(:id)
     end
 
-    def self.list_filenames_by_clauses(repo, clauses)
+    def self.list_filenames_by_clauses(repo, clauses, additional_included_errata)
       query_clauses = clauses.map do |clause|
         "(#{clause.to_sql})"
       end
       statement = query_clauses.join(" AND ")
 
       Katello::ErratumPackage.joins(:erratum => :repository_errata).
-          where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
-          where(statement).pluck(:filename)
+        where("#{RepositoryErratum.table_name}.repository_id" => repo.id).where(statement).pluck(:filename) -
+        Katello::ErratumPackage.joins(:erratum => :repository_errata).where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
+          where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).pluck(:filename)
     end
 
-    def self.list_modular_streams_by_clauses(repo, clauses)
+    def self.list_modular_streams_by_clauses(repo, clauses, additional_included_errata)
       query_clauses = clauses.map do |clause|
         "(#{clause.to_sql})"
       end
       statement = query_clauses.join(" AND ")
       ModuleStream.where(:id => ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata}).
           where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
-          where(statement).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id"))
+          where(statement).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id")) -
+      ModuleStream.where(:id => ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata}).
+          where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
+          where(statement).where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id"))
     end
 
     def module_streams

data/app/models/katello/events/delete_latest_content_view_version.rb

@@ -0,0 +1,40 @@
+module Katello
+  module Events
+    class DeleteLatestContentViewVersion
+      EVENT_TYPE = 'delete_latest_content_view_version'.freeze
+
+      attr_reader :content_view
+      attr_accessor :metadata, :retry
+
+      def self.retry_seconds
+        18
+      end
+
+      def initialize(content_view_id)
+        @content_view = ::Katello::ContentView.find_by_id(content_view_id)
+        Rails.logger.warn "Content View not found for ID #{object_id}" if @content_view.nil?
+        yield(self) if block_given?
+      end
+
+      def run
+        return unless content_view
+
+        begin
+          ForemanTasks.async_task(::Actions::Katello::ContentView::Remove, content_view,
+                        content_view_versions: [content_view.latest_version_object],
+                        content_view_environments: content_view.latest_version_object.content_view_environments)
+        rescue => e
+          self.retry = true if e.is_a?(ForemanTasks::Lock::LockConflict)
+          deliver_failure_notification
+          raise e
+        end
+      end
+
+      private
+
+      def deliver_failure_notification
+        ::Katello::UINotifications::ContentView::DelelteLatestVersionFailure.deliver!(content_view)
+      end
+    end
+  end
+end