katello 4.5.1 → 4.8.0.rc2

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

@@ -38,25 +38,29 @@ module Katello
 
         lazy_accessor :pulp_repositories, :initializer => lambda { |_s| pulp_node.extensions.repository.retrieve_all }
 
+        # A smart proxy's HTTP proxy is used for all related alternate content sources.
+        belongs_to :http_proxy, :inverse_of => :smart_proxies, :class_name => '::HttpProxy'
+
         has_many :capsule_lifecycle_environments,
-                 :class_name  => "Katello::CapsuleLifecycleEnvironment",
+                 :class_name => "Katello::CapsuleLifecycleEnvironment",
                  :foreign_key => :capsule_id,
-                 :dependent   => :destroy,
+                 :dependent => :destroy,
                  :inverse_of => :capsule
 
         has_many :lifecycle_environments,
                  :class_name => "Katello::KTEnvironment",
-                 :through    => :capsule_lifecycle_environments,
-                 :source     => :lifecycle_environment
+                 :through => :capsule_lifecycle_environments,
+                 :source => :lifecycle_environment
 
         has_many :content_facets, :class_name => "::Katello::Host::ContentFacet", :foreign_key => :content_source_id,
-                                  :inverse_of => :content_source, :dependent => :nullify
+                 :inverse_of => :content_source, :dependent => :nullify
 
         has_many :smart_proxy_sync_histories, :class_name => "::Katello::SmartProxySyncHistory", :inverse_of => :smart_proxy, dependent: :delete_all
 
         has_many :hostgroup_content_facets, :class_name => "::Katello::Hostgroup::ContentFacet", :foreign_key => :content_source_id,
-                              :inverse_of => :content_source, :dependent => :nullify
+                 :inverse_of => :content_source, :dependent => :nullify
         has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets
+        has_many :smart_proxy_alternate_content_sources, :class_name => "::Katello::SmartProxyAlternateContentSource", :inverse_of => :smart_proxy, :dependent => :delete_all
 
         validates :download_policy, inclusion: {
           :in => DOWNLOAD_POLICIES,
@@ -66,7 +70,7 @@ module Katello
 
         def self.with_repo(repo)
           joins(:capsule_lifecycle_environments).
-          where("#{Katello::CapsuleLifecycleEnvironment.table_name}.lifecycle_environment_id" => repo.environment_id)
+            where("#{Katello::CapsuleLifecycleEnvironment.table_name}.lifecycle_environment_id" => repo.environment_id)
         end
 
         def self.pulp_primary
@@ -100,12 +104,12 @@ module Katello
           features << PULP_FEATURE if include_default
 
           unscoped.with_features(features).joins(:capsule_lifecycle_environments).
-              where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
+            where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
         end
 
         def self.pulpcore_proxies_with_environment(environment)
           unscoped.where(id: unscoped.select { |p| p.pulp_mirror? }.pluck(:id)).joins(:capsule_lifecycle_environments).
-              where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
+            where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
         end
 
         def self.sync_needed?(environment)
@@ -113,6 +117,10 @@ module Katello
         end
       end
 
+      def alternate_content_sources
+        SmartProxy.joins(:smart_proxy_alternate_content_sources).where('katello_smart_proxy_alternate_content_sources.smart_proxy_id' => self.id)
+      end
+
       def sync_container_gateway
         if has_feature?(::SmartProxy::CONTAINER_GATEWAY_FEATURE)
           update_container_repo_list
@@ -179,7 +187,7 @@ module Katello
           config.host = uri.host
           config.scheme = uri.scheme
           pulp3_ssl_configuration(config)
-          config.debugging = false
+          config.debugging = ::Foreman::Logging.logger('katello/pulp_rest').debug?
           config.timeout = SETTINGS[:katello][:rest_client_timeout]
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
           config.username = self.setting(PULP3_FEATURE, 'username')
@@ -188,14 +196,12 @@ module Katello
       end
 
       def pulp3_ssl_configuration(config, connection_adapter = Faraday.default_adapter)
-        legacy_pulp_cert = !self.setting(PULP3_FEATURE, 'client_authentication')&.include?('client_certificate')
-
         if connection_adapter == :excon
-          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename(use_admin_as_cn_cert: legacy_pulp_cert)
-          config.ssl_client_key = ::Cert::Certs.ssl_client_key_filename(use_admin_as_cn_cert: legacy_pulp_cert)
+          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename
+          config.ssl_client_key = ::Cert::Certs.ssl_client_key_filename
         elsif connection_adapter == :net_http
-          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert(use_admin_as_cn_cert: legacy_pulp_cert)
-          config.ssl_client_key = ::Cert::Certs.ssl_client_key(use_admin_as_cn_cert: legacy_pulp_cert)
+          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
+          config.ssl_client_key = ::Cert::Certs.ssl_client_key
         else
           fail "Unexpected connection_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
         end
@@ -229,14 +235,6 @@ module Katello
         end
       end
 
-      def backend_service_type(repository)
-        if pulp3_support?(repository)
-          Actions::Pulp3::Abstract::BACKEND_SERVICE_TYPE
-        else
-          Actions::Pulp::Abstract::BACKEND_SERVICE_TYPE
-        end
-      end
-
       def pulp3_enabled?
         self.has_feature? PULP3_FEATURE
       end
@@ -250,7 +248,7 @@ module Katello
       end
 
       def fix_pulp3_capabilities(type)
-        if type.is_a?(String) ||  type.is_a?(Symbol)
+        if type.is_a?(String) || type.is_a?(Symbol)
           repository_type_obj = Katello::RepositoryTypeManager.defined_repository_types[type]
         else
           repository_type_obj = type
@@ -271,7 +269,7 @@ module Katello
         repository_type_obj.pulp3_plugin.present? &&
           pulp3_enabled? &&
           (self.capabilities(PULP3_FEATURE).try(:include?, repository_type_obj.pulp3_plugin) ||
-           self.capabilities(PULP3_FEATURE).try(:include?, 'pulp_' + repository_type_obj.pulp3_plugin))
+            self.capabilities(PULP3_FEATURE).try(:include?, 'pulp_' + repository_type_obj.pulp3_plugin))
       end
 
       def pulp3_content_support?(content_type)
@@ -345,7 +343,7 @@ module Katello
         content_type_string = content_type_obj&.label || content_type
         unless content_type_obj
           fail _("Content type %{content_type_string} does not belong to an enabled repo type.") %
-                { content_type_string: content_type_string }
+                 { content_type_string: content_type_string }
         end
         content_type_obj.pulp3_service_class
       end
@@ -378,7 +376,7 @@ module Katello
       end
 
       def sync_tasks
-        ForemanTasks::Task.for_resource(self)
+        ForemanTasks::Task.for_resource(self).where(:label => 'Actions::Katello::CapsuleContent::Sync')
       end
 
       def active_sync_tasks
@@ -389,10 +387,14 @@ module Katello
         sync_tasks.where('started_at > ?', last_sync_time).where.not(:result => 'pending')
       end
 
+      def last_sync_audit
+        Audited::Audit.where(:auditable_id => self, :auditable_type => SmartProxy.name, action: "sync capsule").order(:created_at).last
+      end
+
       def last_sync_time
         task = sync_tasks.where.not(:ended_at => nil).where(:result => 'success').order(:ended_at).last
 
-        task&.ended_at
+        task&.ended_at || last_sync_audit&.created_at&.to_s
       end
 
       def environment_syncable?(env)
@@ -441,15 +443,11 @@ module Katello
         repos_in_env_cv(environment, content_view) - repos_in_sync_history
       end
 
-      def smart_proxy_service
-        @smart_proxy_service ||= Pulp::SmartProxyRepository.new(self)
-      end
-
       def rhsm_url
         # Since Foreman 3.1 this setting is set
         if (rhsm_url = setting(SmartProxy::PULP3_FEATURE, 'rhsm_url'))
           URI(rhsm_url)
-        # Compatibility fall back
+          # Compatibility fall back
         elsif pulp_primary?
           URI("https://#{URI.parse(url).host}/rhsm")
         elsif pulp_mirror?
@@ -461,6 +459,10 @@ module Katello
         URI(setting(SmartProxy::PULP3_FEATURE, 'content_app_url'))
       end
 
+      def audit_capsule_sync
+        write_audit(action: "sync capsule", comment: _('Successfully synced capsule.'), audited_changes: {})
+      end
+
       class ::SmartProxy::Jail < ::Safemode::Jail
         allow :rhsm_url, :pulp_content_url
       end

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

@@ -63,6 +63,7 @@ module Katello
       end
 
       def update_candlepin_associations(consumer_params = nil)
+        content_facet.cves_changed = false if content_facet
         content_facet&.save!
 
         auto_attach_enabled_via_checkin = consumer_params.try(:[], 'autoheal')

data/app/models/katello/content.rb

@@ -41,7 +41,7 @@ module Katello
         cp_products = ::Katello::Resources::Candlepin::Product.all(org.label, [:id, :productContent])
         product_hash = cp_products.group_by { |prod| prod['id'] }
 
-        prod_content_importer = Katello::ProductContentImporter.new
+        prod_content_importer = Katello::ProductContentImporter.new(product_hash)
         org.products.each do |product|
           product_json = product_hash[product.cp_id]&.first
 
@@ -63,5 +63,20 @@ module Katello
       new_url_subs = new_url&.scan(/\$\w+/)&.sort
       current_subs == new_url_subs
     end
+
+    def self.substitute_content_path(arch: nil, releasever: nil, content_path:)
+      arch = nil if arch == "noarch"
+      substitutions = {
+        :releasever => releasever,
+        :basearch => arch
+      }.compact
+      path = substitutions.inject(content_path) do |path_url, (key, value)|
+        path_url.gsub("$#{key}", value)
+      end
+      {
+        path: path,
+        substitutions: substitutions
+      }
+    end
   end
 end

data/app/models/katello/content_credential.rb

@@ -9,26 +9,25 @@ module Katello
     GPG_KEY_TYPE = 'gpg_key'.freeze
     CERT_TYPE = 'cert'.freeze
 
-    has_many :root_repositories, :class_name => "Katello::RootRepository", :inverse_of => :gpg_key, :dependent => :nullify, :foreign_key => 'gpg_key_id'
+    has_many :root_repositories, :class_name => "Katello::RootRepository", :inverse_of => :gpg_key, :dependent => :restrict_with_exception, :foreign_key => 'gpg_key_id'
     has_many :repositories, :through => :root_repositories
 
-    has_many :products, :class_name => "Katello::Product", :inverse_of => :gpg_key, :dependent => :nullify, :foreign_key => 'gpg_key_id'
-
+    has_many :products, :class_name => "Katello::Product", :inverse_of => :gpg_key, :dependent => :restrict_with_exception, :foreign_key => 'gpg_key_id'
     has_many :ssl_ca_cdn_configurations, :class_name => "Katello::CdnConfiguration", :foreign_key => 'ssl_ca_credential_id',
       :inverse_of => :ssl_ca_credential, :dependent => :nullify
 
     has_many :ssl_ca_products, :class_name => "Katello::Product", :foreign_key => "ssl_ca_cert_id",
-                               :inverse_of => :ssl_ca_cert, :dependent => :nullify
+                               :inverse_of => :ssl_ca_cert, :dependent => :restrict_with_exception
     has_many :ssl_client_products, :class_name => "Katello::Product", :foreign_key => "ssl_client_cert_id",
-                                   :inverse_of => :ssl_client_cert, :dependent => :nullify
+                                   :inverse_of => :ssl_client_cert, :dependent => :restrict_with_exception
     has_many :ssl_key_products, :class_name => "Katello::Product", :foreign_key => "ssl_client_key_id",
-                                :inverse_of => :ssl_client_key, :dependent => :nullify
+                                :inverse_of => :ssl_client_key, :dependent => :restrict_with_exception
     has_many :ssl_ca_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_ca_cert_id",
-                            :inverse_of => :ssl_ca_cert, :dependent => :nullify
+                            :inverse_of => :ssl_ca_cert, :dependent => :restrict_with_exception
     has_many :ssl_client_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_client_cert_id",
-                                :inverse_of => :ssl_client_cert, :dependent => :nullify
+                                :inverse_of => :ssl_client_cert, :dependent => :restrict_with_exception
     has_many :ssl_key_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_client_key_id",
-                             :inverse_of => :ssl_client_key, :dependent => :nullify
+                             :inverse_of => :ssl_client_key, :dependent => :restrict_with_exception
     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",

data/app/models/katello/content_view.rb

@@ -39,10 +39,13 @@ module Katello
 
     has_many :activation_keys, :class_name => "Katello::ActivationKey", :dependent => :restrict_with_exception
 
-    has_many :content_facets, :class_name => "Katello::Host::ContentFacet",
-             :inverse_of => :content_view, :dependent => :restrict_with_exception
+    has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet",
+             :through => :content_view_environments
+    has_many :content_facets, :class_name => "Katello::Host::ContentFacet", :through => :content_view_environment_content_facets,
+             :inverse_of => :content_views
     has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets,
-             :inverse_of => :content_view
+             :inverse_of => :content_views
+
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet",
              :inverse_of => :content_view, :dependent => :nullify
     has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets,
@@ -87,9 +90,17 @@ module Katello
     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_repository, -> {
+      where(:generated_for => [:repository_export,
+                               :repository_import,
+                               :repository_export_syncable])
+    }
+    scope :ignore_generated, -> {
+      where.not(:generated_for => [:repository_export,
+                                   :repository_import,
+                                   :library_export_syncable,
+                                   :repository_export_syncable])
+    }
     scope :generated_for_library, -> { where(:generated_for => [:library_export, :library_import]) }
 
     scoped_search :on => :name, :complete_value => true
@@ -104,7 +115,9 @@ module Katello
       library_export: 1,
       repository_export: 2,
       library_import: 3,
-      repository_import: 4
+      repository_import: 4,
+      library_export_syncable: 5,
+      repository_export_syncable: 6
     }, _prefix: true
 
     set_crud_hooks :content_view
@@ -204,6 +217,10 @@ module Katello
         new_view.filters << new_filter
 
         case filter.type
+        when ContentViewDebFilter.name
+          filter.deb_rules.each do |rule|
+            new_filter.deb_rules << rule.dup
+          end
         when ContentViewPackageFilter.name
           filter.package_rules.each do |rule|
             new_filter.package_rules << rule.dup
@@ -407,8 +424,10 @@ module Katello
       # update errata applicability counts for all hosts in the CV & LE
       Location.no_taxonomy_scope do
         User.as_anonymous_admin do
-          ::Katello::Host::ContentFacet.where(:content_view_id => self,
-                                              :lifecycle_environment_id => environment).each do |facet|
+          ::Katello::Host::ContentFacet.in_content_views_and_environments(
+            content_views: [self],
+            lifecycle_environments: [environment]
+          ).each do |facet|
             facet.update_applicability_counts
             facet.update_errata_status
           end
@@ -575,16 +594,17 @@ module Katello
       true
     end
 
-    def check_ready_to_publish!(importing: false)
+    def check_ready_to_publish!(importing: false, syncable: false)
       fail _("User must be logged in.") if ::User.current.nil?
       fail _("Cannot publish default content view") if default?
 
       if importing
         check_ready_to_import!
       else
-        fail _("Import-only content views can not be published directly") if import_only?
+        fail _("Import-only content views can not be published directly") if import_only? && !syncable
         check_composite_action_allowed!(organization.library)
         check_docker_repository_names!([organization.library])
+        check_orphaned_content_facets!(environments: self.environments)
       end
 
       true
@@ -631,6 +651,17 @@ module Katello
       true
     end
 
+    def check_orphaned_content_facets!(environments: [])
+      ::Katello::Host::ContentFacet.in_content_views_and_environments(
+        content_views: [self],
+        lifecycle_environments: environments
+      ).each do |facet|
+        unless facet.host
+          fail _("Orphaned content facets for deleted hosts exist for the content view and environment. Please run rake task : katello:clean_orphaned_facets and try again!")
+        end
+      end
+    end
+
     def check_remove_from_environment!(env)
       errors = []
 

data/app/models/katello/content_view_component.rb

@@ -56,6 +56,10 @@ module Katello
       if attached_content_view_ids.include?(view.id)
         errors.add(:base, _("Another component already includes content view with ID %s" % view.id))
       end
+
+      unless view.generated_for_none?
+        errors.add(:base, _("Cannot add generated content view versions to composite content view"))
+      end
     end
 
     def ensure_valid_attributes

data/app/models/katello/content_view_deb_filter.rb

@@ -0,0 +1,51 @@
+module Katello
+  class ContentViewDebFilter < ContentViewFilter
+    CONTENT_TYPE = Deb::CONTENT_TYPE
+
+    has_many :deb_rules, :dependent => :destroy, :foreign_key => :content_view_filter_id,
+                                   :class_name => "Katello::ContentViewDebFilterRule"
+    validates_lengths_from_database
+
+    def generate_clauses(repo)
+      package_filenames = []
+
+      self.deb_rules.each do |rule|
+        package_filenames.concat(query_debs(repo, rule))
+      end
+
+      ContentViewDebFilter.generate_deb_clauses(package_filenames)
+    end
+
+    def content_unit_pulp_ids(repo)
+      deb_filenames = []
+      self.deb_rules.each do |rule|
+        deb_filenames.concat(query_debs(repo, rule))
+      end
+      debs = Deb.in_repositories(repo)
+      debs.where(filename: deb_filenames).pluck(:pulp_id).flatten.uniq
+    end
+
+    def self.generate_deb_clauses(package_filenames = [])
+      { 'filename' => { "$in" => package_filenames } } unless package_filenames.empty?
+    end
+
+    def applicable_debs
+      Deb.in_repositories(self.applicable_repos)
+    end
+
+    def query_debs(repo, rule)
+      debs = Deb.in_repositories(repo)
+      query_debs_from_collection(debs, rule).pluck("#{Deb.table_name}.filename")
+    end
+
+    def query_debs_from_collection(collection, rule)
+      query_name = rule.name.tr("*", "%")
+      query = collection.where("#{Deb.table_name}.name ilike ?", query_name)
+      if rule.architecture.present?
+        query_arch = rule.architecture.tr("*", "%")
+        query = query.where("#{Deb.table_name}.architecture ilike ?", query_arch)
+      end
+      query.default_sort
+    end
+  end
+end

data/app/models/katello/content_view_deb_filter_rule.rb

@@ -0,0 +1,24 @@
+module Katello
+  class ContentViewDebFilterRule < Katello::Model
+    include ::Katello::Concerns::ContentViewFilterRuleCommon
+
+    belongs_to :filter,
+               :class_name => "Katello::ContentViewDebFilter",
+               :inverse_of => :deb_rules,
+               :foreign_key => :content_view_filter_id
+
+    validates :name, :presence => true
+    validate :ensure_unique_attributes
+    validates_with Validators::ContentViewFilterVersionValidator
+
+    def ensure_unique_attributes
+      other = self.class.where(:name => self.name,
+                               :content_view_filter_id => self.content_view_filter_id,
+                               :architecture => self.architecture)
+      other = other.where.not(:id => self.id) if self.id
+      if other.exists?
+        errors.add(:base, "This deb package filter rule already exists.")
+      end
+    end
+  end
+end

data/app/models/katello/content_view_environment.rb

@@ -8,9 +8,13 @@ module Katello
 
     belongs_to :content_view, :class_name => "Katello::ContentView", :inverse_of => :content_view_environments
     belongs_to :environment, :class_name => "Katello::KTEnvironment", :inverse_of => :content_view_environments
+    belongs_to :lifecycle_environment, :class_name => "Katello::KTEnvironment", :foreign_key => :environment_id, :inverse_of => :content_view_environments
     belongs_to :content_view_version, :class_name => "Katello::ContentViewVersion",
                :inverse_of => :content_view_environments
 
+    has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet", :dependent => :destroy, :inverse_of => :content_view_environment
+    has_many :content_facets, through: :content_view_environment_content_facets, :class_name => "::Katello::Host::ContentFacet", :inverse_of => :content_view_environments
+
     validates_lengths_from_database
     validates :environment_id, uniqueness: {scope: :content_view_id}, presence: true
     validates :content_view_id, presence: true
@@ -19,10 +23,10 @@ module Katello
     before_save :generate_info
 
     scope :non_default, -> { joins(:content_view).where("katello_content_views.default" => false) }
+    alias :lifecycle_environment :environment
 
     def self.for_content_facets(content_facets)
-      joins("INNER JOIN #{Host::ContentFacet.table_name} on #{Host::ContentFacet.table_name}.lifecycle_environment_id = #{ContentViewEnvironment.table_name}.environment_id").
-          where("#{Host::ContentFacet.table_name}.content_view_id = #{ContentViewEnvironment.table_name}.content_view_id").where("#{Host::ContentFacet.table_name}.id" => content_facets).uniq
+      joins(:content_view_environment_content_facets, :content_facets).where("#{Katello::ContentViewEnvironmentContentFacet.table_name}.content_facet_id" => content_facets).uniq
     end
 
     # retrieve the owning environment for this content view environment.
@@ -38,6 +42,11 @@ module Katello
       content_view.activation_keys.in_environment(environment)
     end
 
+    # TODO: uncomment when we need to start showing multiple CVE names in UI
+    # def candlepin_name
+    #   "#{environment.label}/#{content_view.label}"
+    # end
+
     private
 
     def generate_info

data/app/models/katello/content_view_environment_content_facet.rb

@@ -0,0 +1,9 @@
+module Katello
+  class ContentViewEnvironmentContentFacet < Katello::Model
+    belongs_to :content_view_environment, :class_name => "::Katello::ContentViewEnvironment", :inverse_of => :content_view_environment_content_facets
+    belongs_to :content_facet, :class_name => "::Katello::Host::ContentFacet", :inverse_of => :content_view_environment_content_facets
+
+    validates :content_view_environment_id, presence: true
+    validates :content_facet_id, presence: true, unless: :new_record?
+  end
+end

data/app/models/katello/content_view_erratum_filter.rb

@@ -34,10 +34,10 @@ module Katello
         # 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, [])
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(repo, 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)
+          errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)
         end
       else
         clauses = []
@@ -74,10 +74,11 @@ module Katello
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 
-    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids, additional_included_errata)
+    def errata_module_stream_pulp_ids_from_errata_ids(repo, 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)
+      ModuleStream.joins(:repository_module_streams).
+        where(:id => module_streams.pluck(:id), "#{RepositoryModuleStream.table_name}.repository_id" => repo.id).pluck(:pulp_id)
     end
 
     def errata_package_pulp_ids_from_errata_ids(repo, errata_ids, additional_included_errata)

data/app/models/katello/content_view_filter.rb

@@ -9,7 +9,7 @@ module Katello
     MODULE_STREAM   = ModuleStream::CONTENT_TYPE
     DEB             = Deb::CONTENT_TYPE
     CONTENT_TYPES   = [RPM, PACKAGE_GROUP, ERRATA, DOCKER, DEB, MODULE_STREAM].freeze
-    CONTENT_OPTIONS = { _('Packages') => RPM, _('Module Streams') => ModuleStream, _('Package Groups') => PACKAGE_GROUP, _('Errata') => ERRATA, _('Container Images') => DOCKER, _('deb Packages') => DEB }.freeze
+    CONTENT_OPTIONS = { _('Packages') => RPM, _('Module Streams') => ModuleStream, _('Package Groups') => PACKAGE_GROUP, _('Errata') => ERRATA, _('Container Images') => DOCKER, _('Deb Packages') => DEB }.freeze
 
     belongs_to :content_view,
                :class_name => "Katello::ContentView",
@@ -31,6 +31,7 @@ module Katello
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :type, :rename => :content_type,
                   :complete_value => {Rpm::CONTENT_TYPE.to_sym => "Katello::ContentViewPackageFilter",
+                                      Deb::CONTENT_TYPE.to_sym => "Katello::ContentViewDebFilter",
                                       PackageGroup::CONTENT_TYPE.to_sym => "Katello::ContentViewPackageGroupFilter",
                                       Erratum::CONTENT_TYPE.to_sym => "Katello::ContentViewErratumFilter",
                                       DOCKER.to_sym => "Katello::ContentViewDockerFilter",
@@ -47,8 +48,7 @@ module Katello
     end
 
     def self.deb
-      # TODO
-      []
+      where(:type => ::Katello::ContentViewDebFilter.name)
     end
 
     def self.docker
@@ -69,6 +69,7 @@ module Katello
 
     def content_type
       {
+        ContentViewDebFilter => DEB,
         ContentViewPackageFilter => RPM,
         ContentViewErratumFilter => ERRATA,
         ContentViewPackageGroupFilter => PACKAGE_GROUP,
@@ -79,6 +80,8 @@ module Katello
 
     def self.class_for(content_type)
       case content_type
+      when DEB
+        ContentViewDebFilter
       when RPM
         ContentViewPackageFilter
       when PACKAGE_GROUP
@@ -97,6 +100,8 @@ module Katello
 
     def self.rule_class_for(filter)
       case filter.type
+      when ContentViewDebFilter.name
+        ContentViewDebFilterRule
       when ContentViewPackageFilter.name
         ContentViewPackageFilterRule
       when ContentViewPackageGroupFilter.name
@@ -115,6 +120,8 @@ module Katello
 
     def self.rule_ids_for(filter)
       case filter.type
+      when ContentViewDebFilter.name
+        filter.deb_rule_ids
       when ContentViewPackageFilter.name
         filter.package_rule_ids
       when ContentViewPackageGroupFilter.name

data/app/models/katello/content_view_version.rb

@@ -56,7 +56,7 @@ module Katello
     scope :with_organization_id, ->(organization_id) do
       joins(:content_view).where("#{Katello::ContentView.table_name}.organization_id" => organization_id)
     end
-
+    scope :not_ignorable, -> { where(content_view_id: Katello::ContentView.ignore_generated) }
     scope :triggered_by, ->(content_view_version_id) do
       sql = Katello::ContentViewHistory.where(:triggered_by_id => content_view_version_id).select(:katello_content_view_version_id).to_sql
       where("#{Katello::ContentViewVersion.table_name}.id in (#{sql})")
@@ -99,8 +99,7 @@ module Katello
     def self.for_version(version)
       major, minor = version.to_s.split('.')
       minor ||= 0
-      query = where(:major => major, :minor => minor)
-      query
+      where(:major => major, :minor => minor)
     end
 
     def to_s
@@ -165,6 +164,10 @@ module Katello
       "#{major}.#{minor}"
     end
 
+    def incrementally_updated?
+      minor != 0
+    end
+
     def repos(env)
       self.repositories.in_environment(env)
     end
@@ -333,9 +336,10 @@ module Katello
     def update_content_counts!
       self.content_counts = {}
       RepositoryTypeManager.indexable_content_types.each do |content_type|
-        if content_type&.model_class::CONTENT_TYPE == DockerTag::CONTENT_TYPE
+        case content_type&.model_class::CONTENT_TYPE
+        when DockerTag::CONTENT_TYPE
           content_counts[DockerTag::CONTENT_TYPE] = docker_tags.count
-        elsif content_type&.model_class::CONTENT_TYPE == GenericContentUnit::CONTENT_TYPE
+        when GenericContentUnit::CONTENT_TYPE
           content_counts[content_type.content_type] = content_type&.model_class&.in_repositories(self.repositories.archived)&.where(:content_type => content_type.content_type)&.count
         else
           content_counts[content_type&.model_class::CONTENT_TYPE] = content_type&.model_class&.in_repositories(self.repositories.archived)&.count
@@ -376,9 +380,10 @@ module Katello
       fail _("Default content view versions cannot be promoted") if default?
       content_view.check_composite_action_allowed!(to_env)
       content_view.check_docker_repository_names!(to_env)
+      content_view.check_orphaned_content_facets!(environments: [to_env])
     end
 
-    def validate_destroyable!(skip_environment_check = false)
+    def validate_destroyable!(skip_environment_check: false)
       unless organization.being_deleted?
         if !skip_environment_check && in_environment?
           fail _("Cannot delete version while it is in environments: %s") %