katello 3.5.2 → 3.6.0.rc1

data/app/models/katello/pool.rb

@@ -3,11 +3,11 @@ module Katello
     include Katello::Authorization::Pool
     belongs_to :subscription, :inverse_of => :pools, :class_name => "Katello::Subscription"
 
-    has_many :activation_keys, :through => :pool_activation_keys, :class_name => "Katello::ActivationKey"
     has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :pool
+    has_many :activation_keys, :through => :pool_activation_keys, :class_name => "Katello::ActivationKey"
 
-    has_many :subscription_facets, :through => :subscription_facet_pools
     has_many :subscription_facet_pools, :class_name => "Katello::SubscriptionFacetPool", :dependent => :destroy
+    has_many :subscription_facets, :through => :subscription_facet_pools
 
     scope :in_organization, ->(org_id) { joins(:subscription).where("#{Katello::Subscription.table_name}.organization_id = ?", org_id) }
     scope :for_activation_key, ->(ak) { joins(:activation_keys).where("#{Katello::ActivationKey.table_name}.id" => ak.id) }
@@ -16,22 +16,23 @@ module Katello
     include Glue::Candlepin::CandlepinObject
 
     scoped_search :on => :cp_id, :complete_value => true, :rename => :id, :only_explicit => true
-    scoped_search :on => :quantity, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
-    scoped_search :on => :start_date, :complete_value => true, :rename => :starts
-    scoped_search :on => :end_date, :complete_value => true, :rename => :expires
-    scoped_search :on => :ram, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :quantity, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
+    scoped_search :on => :start_date, :complete_value => true, :rename => :starts, :only_explicit => true
+    scoped_search :on => :end_date, :complete_value => true, :rename => :expires, :only_explicit => true
+    scoped_search :on => :ram, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
     scoped_search :on => :multi_entitlement, :complete_value => true
-    scoped_search :on => :consumed, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :consumed, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
     scoped_search :on => :account_number, :complete_value => true, :rename => :account, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :contract_number, :complete_value => true, :rename => :contract, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :virt_who, :complete_value => true, :only_explicit => true
     scoped_search :on => :name, :relation => :subscription, :complete_value => true, :rename => :name
     scoped_search :on => :support_level, :relation => :subscription, :complete_value => true
-    scoped_search :on => :sockets, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
-    scoped_search :on => :cores, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
-    scoped_search :on => :product_id, :relation => :subscription, :complete_value => true
-    scoped_search :on => :stacking_id, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
-    scoped_search :on => :instance_multiplier, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :sockets, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
+    scoped_search :on => :cores, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
+    scoped_search :on => :product_id, :relation => :subscription, :complete_value => true, :only_explicit => true
+    scoped_search :on => :stacking_id, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
+    scoped_search :on => :instance_multiplier, :relation => :subscription, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
+    scoped_search :on => :pool_type, :complete_value => true, :rename => :type
 
     validates_lengths_from_database
 

data/app/models/katello/product.rb

@@ -13,6 +13,8 @@ module Katello
     belongs_to :provider, :inverse_of => :products
     belongs_to :sync_plan, :inverse_of => :products, :class_name => 'Katello::SyncPlan'
     belongs_to :gpg_key, :inverse_of => :products
+    has_many :product_contents, :foreign_key => 'product_id', :class_name => "Katello::ProductContent", :dependent => :destroy
+    has_many :displayable_product_contents, -> { displayable }, :foreign_key => 'product_id', :class_name => "Katello::ProductContent", :dependent => :destroy
     has_many :repositories, :class_name => "Katello::Repository", :dependent => :restrict_with_exception
 
     has_many :subscription_products, :class_name => "Katello::SubscriptionProduct", :dependent => :destroy
@@ -51,9 +53,10 @@ module Katello
       where(:organization_id => organizations)
     end
 
-    scope :syncable_content, -> { uniq.where(Katello::Repository.arel_table[:url].not_eq(nil)).joins(:repositories) }
+    scope :syncable_content, -> { distinct.where(Katello::Repository.arel_table[:url].not_eq(nil)).joins(:repositories) }
     scope :redhat, -> { joins(:provider).where("#{Provider.table_name}.provider_type" => Provider::REDHAT) }
     scope :custom, -> { joins(:provider).where("#{Provider.table_name}.provider_type" => [Provider::CUSTOM, Provider::ANONYMOUS]) }
+    scope :with_contents, -> { includes(:product_contents) }
 
     def self.subscribable
       joins("LEFT OUTER JOIN #{Katello::Repository.table_name} repo ON repo.product_id = #{self.table_name}.id")
@@ -63,7 +66,7 @@ module Katello
 
     def self.enabled
       self.where("#{Product.table_name}.id in (?) or #{Product.table_name}.id in (?)",
-                 Product.redhat.joins(:repositories).uniq.pluck(:id), Product.custom.pluck(:id))
+                 Product.redhat.joins(:repositories).distinct.pluck(:id), Product.custom.pluck(:id))
     end
 
     before_create :assign_unique_label
@@ -125,8 +128,7 @@ module Katello
       options = {} if options.nil?
 
       hash = super(options.merge(:except => [:cp_id, :id]))
-      hash = hash.merge(:productContent => self.productContent,
-                        :multiplier => self.multiplier,
+      hash = hash.merge(:multiplier => self.multiplier,
                         :attributes => self.attrs,
                         :id => self.cp_id,
                         :sync_plan_name => self.sync_plan ? self.sync_plan.name : nil,
@@ -212,9 +214,13 @@ module Katello
       repositories.any?(&:url?)
     end
 
+    def product_content_by_id(content_id)
+      product_contents.joins(:content).where("#{Katello::Content.table_name}.cp_content_id = ?", content_id).first
+    end
+
     def available_content(content_view_version_id = nil)
-      self.productContent.select do |content|
-        repos = self.repositories.subscribable.where(content_id: content.content.id)
+      product_contents.select do |product_content|
+        repos = self.repositories.subscribable.where(content_id: product_content.content.cp_content_id)
         repos.exists? && (content_view_version_id.nil? || repos.where(content_view_version_id: content_view_version_id.to_i).count > 0)
       end
     end

data/app/models/katello/product_content.rb

@@ -0,0 +1,36 @@
+module Katello
+  class ProductContent < Katello::Model
+    belongs_to :product, :class_name => 'Katello::Product', :foreign_key => 'product_id', :inverse_of => :product_contents
+    belongs_to :content, :class_name => 'Katello::Content', :foreign_key => 'content_id', :inverse_of => :product_contents
+
+    default_scope { includes(:content) }
+
+    validates :content_id, :presence => true, :uniqueness => { :scope => :product_id }
+    validates :product_id, :presence => true
+
+    delegate :content_type, to: :content
+
+    scope :displayable, -> {
+      joins(:content).where.not("#{content_table_name}.content_type IN (?)", Katello::Repository.undisplayable_types)
+      .order("LOWER(#{content_table_name}.name) ASC")
+    }
+
+    scoped_search :on => :name, :relation => :content
+    scoped_search :on => :content_type, :relation => :content
+    scoped_search :on => :label, :relation => :content
+    scoped_search :on => :name, :relation => :product, :rename => :product_name
+
+    def self.content_table_name
+      Katello::Content.table_name
+    end
+
+    def self.enabled(organization)
+      joins(:content).where("#{self.content_table_name}.cp_content_id" => Katello::Repository.in_organization(organization).select(:content_id))
+    end
+
+    # used by Katello::Api::V2::RepositorySetsController#index
+    def repositories
+      product.repositories.in_default_view.has_url.where(:content_id => content.cp_content_id)
+    end
+  end
+end

data/app/models/katello/provider.rb

@@ -47,7 +47,7 @@ module Katello
     def prevent_redhat_deletion
       if !being_deleted? && redhat_provider?
         Rails.logger.error _("Red Hat provider can not be deleted")
-        false
+        throw :abort
       else
         # organization that is being deleted via background destroyer can delete rh provider
         true

data/app/models/katello/puppet_module.rb

@@ -7,16 +7,16 @@ module Katello
 
     CONTENT_TYPE = Pulp::PuppetModule::CONTENT_TYPE
 
-    has_many :repositories, :through => :repository_puppet_modules, :class_name => "Katello::Repository"
     has_many :repository_puppet_modules, :class_name => "Katello::RepositoryPuppetModule", :dependent => :destroy, :inverse_of => :puppet_module
+    has_many :repositories, :through => :repository_puppet_modules, :class_name => "Katello::Repository"
 
-    has_many :content_view_puppet_environments,
-             :through => :content_view_puppet_environment_puppet_modules,
-             :class_name => "Katello::ContentViewPuppetEnvironment"
     has_many :content_view_puppet_environment_puppet_modules,
              :class_name => "Katello::ContentViewPuppetEnvironmentPuppetModule",
              :dependent => :destroy,
              :inverse_of => :puppet_module
+    has_many :content_view_puppet_environments,
+             :through => :content_view_puppet_environment_puppet_modules,
+             :class_name => "Katello::ContentViewPuppetEnvironment"
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :author, :complete_value => true
@@ -60,7 +60,7 @@ module Katello
     end
 
     def self.group_by_repoid(puppet_modules)
-      puppet_modules.flatten.each_with_object({}) do |puppet_module, result|
+      puppet_modules.each_with_object({}) do |puppet_module, result|
         repo = puppet_module.repositories.first
 
         if repo

data/app/models/katello/repository.rb

@@ -10,7 +10,7 @@ module Katello
     before_validation :update_ostree_upstream_sync_policy
 
     include ForemanTasks::Concerns::ActionSubject
-    include Glue::Candlepin::Content if (SETTINGS[:katello][:use_cp] && SETTINGS[:katello][:use_pulp])
+    include Glue::Candlepin::Repository
     include Glue::Pulp::Repo if SETTINGS[:katello][:use_pulp]
 
     include Glue if (SETTINGS[:katello][:use_cp] || SETTINGS[:katello][:use_pulp])
@@ -19,6 +19,7 @@ module Katello
     include Ext::LabelFromName
     include Katello::Engine.routes.url_helpers
 
+    DEB_TYPE = 'deb'.freeze
     YUM_TYPE = 'yum'.freeze
     FILE_TYPE = 'file'.freeze
     PUPPET_TYPE = 'puppet'.freeze
@@ -26,7 +27,7 @@ module Katello
     OSTREE_TYPE = 'ostree'.freeze
 
     CHECKSUM_TYPES = %w(sha1 sha256).freeze
-    SUBSCRIBABLE_TYPES = [YUM_TYPE, OSTREE_TYPE].freeze
+    SUBSCRIBABLE_TYPES = [YUM_TYPE, OSTREE_TYPE, DEB_TYPE].freeze
 
     OSTREE_UPSTREAM_SYNC_POLICY_LATEST = "latest".freeze
     OSTREE_UPSTREAM_SYNC_POLICY_ALL = "all".freeze
@@ -51,6 +52,9 @@ module Katello
     has_many :repository_rpms, :class_name => "Katello::RepositoryRpm", :dependent => :delete_all
     has_many :rpms, :through => :repository_rpms
 
+    has_many :repository_srpms, :class_name => "Katello::RepositorySrpm", :dependent => :delete_all
+    has_many :srpms, :through => :repository_srpms
+
     has_many :repository_files, :class_name => "Katello::RepositoryFile", :dependent => :destroy
     has_many :files, :through => :repository_files
 
@@ -60,6 +64,9 @@ module Katello
     has_many :repository_docker_manifests, :class_name => "Katello::RepositoryDockerManifest", :dependent => :delete_all
     has_many :docker_manifests, :through => :repository_docker_manifests
 
+    has_many :repository_docker_manifest_lists, :class_name => "Katello::RepositoryDockerManifestList", :dependent => :delete_all
+    has_many :docker_manifest_lists, :through => :repository_docker_manifest_lists
+
     has_many :docker_tags, :dependent => :destroy, :class_name => "Katello::DockerTag"
 
     has_many :docker_meta_tags, :dependent => :destroy, :class_name => "Katello::DockerMetaTag"
@@ -67,6 +74,9 @@ module Katello
     has_many :repository_ostree_branches, :class_name => "Katello::RepositoryOstreeBranch", :dependent => :delete_all
     has_many :ostree_branches, :through => :repository_ostree_branches
 
+    has_many :repository_debs, :class_name => "Katello::RepositoryDeb", :dependent => :delete_all
+    has_many :debs, :through => :repository_debs
+
     has_many :content_facet_repositories, :class_name => "Katello::ContentFacetRepository", :dependent => :destroy
     has_many :content_facets, :through => :content_facet_repositories
 
@@ -126,7 +136,8 @@ module Katello
 
     scope :has_url, -> { where('url IS NOT NULL') }
     scope :in_default_view, -> { joins(:content_view_version => :content_view).where("#{Katello::ContentView.table_name}.default" => true) }
-
+    scope :in_non_default_view, -> { joins(:content_view_version => :content_view).where("#{Katello::ContentView.table_name}.default" => false) }
+    scope :deb_type, -> { where(:content_type => DEB_TYPE) }
     scope :yum_type, -> { where(:content_type => YUM_TYPE) }
     scope :file_type, -> { where(:content_type => FILE_TYPE) }
     scope :puppet_type, -> { where(:content_type => PUPPET_TYPE) }
@@ -136,6 +147,7 @@ module Katello
     scope :non_archived, -> { where('environment_id is not NULL') }
     scope :archived, -> { where('environment_id is NULL') }
     scope :subscribable, -> { where(content_type: SUBSCRIBABLE_TYPES) }
+    scope :in_published_environments, -> { in_content_views(Katello::ContentView.non_default).where.not(:environment_id => nil) }
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :rename => :product, :on => :name, :relation => :product, :complete_value => true
@@ -149,6 +161,7 @@ module Katello
     scoped_search :on => :distribution_variant, :complete_value => true
     scoped_search :on => :distribution_bootable, :complete_value => true
     scoped_search :on => :distribution_uuid, :complete_value => true
+    scoped_search :on => :ignore_global_proxy, :complete_value => true
 
     def organization
       if self.environment
@@ -190,6 +203,16 @@ module Katello
       self.content_view_version.content_view
     end
 
+    def self.undisplayable_types
+      ret = [::Katello::Repository::CANDLEPIN_DOCKER_TYPE]
+
+      unless ::Katello::RepositoryTypeManager.enabled?(Repository::OSTREE_TYPE)
+        ret << ::Katello::Repository::CANDLEPIN_OSTREE_TYPE
+      end
+
+      ret
+    end
+
     def self.in_organization(org)
       where("#{Repository.table_name}.environment_id" => org.kt_environments.pluck("#{KTEnvironment.table_name}.id"))
     end
@@ -287,7 +310,7 @@ module Katello
 
     def group
       library_repo = library_instance? ? self : library_instance
-      clones << library_repo
+      clones.to_a << library_repo
     end
 
     #is the repo cloned in the specified environment
@@ -490,6 +513,18 @@ module Katello
       search.in_content_views([view])
     end
 
+    def archived_instance
+      if self.environment_id.nil? || self.library_instance_id.nil?
+        self
+      else
+        self.content_view_version.archived_repos.where(:library_instance_id => self.library_instance_id).first
+      end
+    end
+
+    def requires_yum_clone_distributor?
+      self.yum? && self.environment_id && !self.in_default_view?
+    end
+
     def url?
       url.present?
     end
@@ -620,12 +655,15 @@ module Katello
         self.ostree_branches -= units
       elsif file?
         self.files -= units
+      elsif deb?
+        self.debs -= units
       elsif docker?
         remove_docker_content(units)
       end
     end
 
-    def assert_deletable
+    # deleteable? is already taken by the authorization mixin
+    def destroyable?
       if self.environment.try(:library?) && self.content_view.default?
         if self.environment.organization.being_deleted?
           return true
@@ -640,6 +678,11 @@ module Katello
           return false
         end
       end
+      return true
+    end
+
+    def assert_deletable
+      throw :abort unless destroyable?
     end
 
     def hosts_with_applicability
@@ -650,6 +693,52 @@ module Katello
       DockerMetaTag.in_repositories(self.id).count
     end
 
+    # a master repository actually has content (rpms, errata, etc) in the pulp repository.  For these repositories, we can use the YumDistributor
+    # to generate metadata and can index the content from pulp, or for the case of content view archives without filters, can also use the YumCloneDistributor
+    #
+    def master?
+      !self.yum? || # non-yum repos
+          self.in_default_view? || # default content view repos
+          (self.archive? && !self.content_view.composite) || # non-composite content view archive repos
+          (self.content_view.composite? && self.component_source_repositories.count > 1) # composite archive repo with more than 1 source repository
+    end
+
+    # a link repository has no content in the pulp repository and serves as a shell.  It will always be empty.  Only the YumCloneDistributor can be used
+    # to publish yum metadata, and it cannot be indexed from pulp, but must have its indexed associations copied from another repository (its target).
+    def link?
+      !master?
+    end
+
+    # A link (empty repo) points to a target (a repository that actually has units in pulp).  Target repos are always archive repos of a content view version (a repo with no environment)
+    # But for composite view versions, an archive repo, usually won't be a master (but might be if multple components contain the same repo)
+    def target_repository
+      fail _("This is not a linked repository") if master?
+      return nil if self.archived_instance.nil?
+
+      #this is an environment repo, and the archived_instance is a master (not always true with composite)
+      if self.environment_id? && self.archived_instance.master?
+        self.archived_instance
+      elsif self.environment_id #this is an environment repo, but a composite who's archived_instance isn't a master
+        self.archived_instance.target_repository || self.archived_instance #to archived_instance if nil
+      else #must be a composite archive repo, with only one component repo
+        self.component_source_repositories.first
+      end
+    end
+
+    def component_source_repositories
+      #find other copies of this repositories, in the CV version's components, that are in the 'archive'
+      Katello::Repository.where(:content_view_version_id => self.content_view_version.components, :environment_id => nil,
+                                :library_instance_id => self.library_instance_id)
+    end
+
+    def self.linked_repositories
+      to_return = []
+      Katello::Repository.yum_type.in_non_default_view.find_each do |repo|
+        to_return << repo if repo.link?
+      end
+      to_return
+    end
+
     protected
 
     def removable_unit_association
@@ -663,6 +752,8 @@ module Katello
         self.ostree_branches
       elsif file?
         self.files
+      elsif deb?
+        self.debs
       else
         fail "Content type not supported for removal"
       end
@@ -707,14 +798,15 @@ module Katello
     end
 
     def remove_docker_content(manifests)
-      self.docker_tags.where(:docker_manifest_id => manifests.map(&:id)).destroy_all
-      DockerMetaTag.cleanup_tags
-      self.docker_manifests -= manifests
-
+      destroyable_manifests = manifests.select do |manifest|
+        manifest.repositories.empty? || manifest.docker_manifest_lists.empty?
+      end
       # destroy any orphan docker manifests
-      manifests.each do |manifest|
-        manifest.destroy if manifest.repositories.empty?
+      destroyable_manifests.each do |manifest|
+        self.docker_manifests.delete(manifest)
+        manifest.destroy
       end
+      DockerMetaTag.cleanup_tags
     end
 
     def update_ostree_upstream_sync_policy

data/app/models/katello/repository_deb.rb

@@ -0,0 +1,7 @@
+module Katello
+  class RepositoryDeb < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    belongs_to :repository, :inverse_of => :repository_debs, :class_name => 'Katello::Repository'
+    belongs_to :deb, :inverse_of => :repository_debs, :class_name => 'Katello::Deb'
+  end
+end

data/app/models/katello/repository_docker_manifest_list.rb

@@ -0,0 +1,7 @@
+module Katello
+  class RepositoryDockerManifestList < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    belongs_to :repository, :inverse_of => :repository_docker_manifest_lists, :class_name => 'Katello::Repository'
+    belongs_to :docker_manifest_list, :inverse_of => :repository_docker_manifest_lists
+  end
+end

data/app/models/katello/repository_srpm.rb

@@ -0,0 +1,7 @@
+module Katello
+  class RepositorySrpm < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    belongs_to :repository, :inverse_of => :repository_srpms, :class_name => 'Katello::Repository'
+    belongs_to :srpm, :inverse_of => :repository_srpms, :class_name => 'Katello::Srpm'
+  end
+end

data/app/models/katello/rhsm_fact_importer.rb

@@ -4,7 +4,7 @@ module Katello
       Katello::RhsmFactName
     end
 
-    def normalize(facts)
+    def normalize(_facts)
       facts = super
       facts = change_separator(facts)
       add_compose_facts(facts)
@@ -12,7 +12,7 @@ module Katello
 
     def add_compose_facts(facts)
       additional_keys = []
-      facts.keys.each do |fact_name|
+      facts.each_key do |fact_name|
         parts = fact_name.split(RhsmFactName::SEPARATOR)
         additional_keys += parts[0..-2].reduce([]) { |memo, part| memo << [memo.last, part].compact.join(RhsmFactName::SEPARATOR) }
       end