katello 3.2.1.1 → 3.3.0.rc1

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

@@ -14,8 +14,6 @@ module Katello
 
         accepts_nested_attributes_for :subscription_facet, :update_only => true, :reject_if => lambda { |attrs| attrs.values.compact.empty? }
 
-        has_one :subscription_facet, :class_name => '::Katello::Host::SubscriptionFacet', :foreign_key => :host_id, :inverse_of => :host, :dependent => :destroy
-
         has_many :activation_keys, :through => :subscription_facet
         has_one :subscription_status_object, :class_name => 'Katello::SubscriptionStatus', :foreign_key => 'host_id'
         scoped_search :on => :status, :in => :subscription_status_object, :rename => :subscription_status,

data/app/models/katello/content_facet_applicable_rpm.rb

@@ -0,0 +1,8 @@
+module Katello
+  class ContentFacetApplicableRpm < Katello::Model
+    self.include_root_in_json = false
+
+    belongs_to :content_facet, :inverse_of => :content_facet_applicable_rpms, :class_name => 'Katello::Host::ContentFacet'
+    belongs_to :rpm, :inverse_of => :content_facet_applicable_rpms, :class_name => 'Katello::Rpm'
+  end
+end

data/app/models/katello/content_view.rb

@@ -1,4 +1,5 @@
 module Katello
+  # rubocop:disable Metrics/ClassLength
   class ContentView < Katello::Model
     self.include_root_in_json = false
 
@@ -16,14 +17,17 @@ module Katello
     has_many :content_view_versions, :class_name => "Katello::ContentViewVersion", :dependent => :destroy
     alias_method :versions, :content_view_versions
 
-    has_many :content_view_components, :class_name => "Katello::ContentViewComponent", :dependent => :destroy
-    has_many :components, :through => :content_view_components, :class_name => "Katello::ContentViewVersion",
-                          :source => :content_view_version do
-      def <<(*_args)
-        # this doesn't go through validation and generate a nice error message
-        fail "Adding components without doing validation is not supported"
-      end
-    end
+    # 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
+    #
+    # component_composites -> Bottom Up, given I am a component CV get the associated composites that I belong to
+    #
+    has_many :content_view_components, :class_name => "Katello::ContentViewComponent", :dependent => :destroy,
+             :inverse_of => :composite_content_view, :foreign_key => :composite_content_view_id
+
+    has_many :component_composites, :class_name => "Katello::ContentViewComponent",
+             :dependent => :destroy, :inverse_of => :content_view, :foreign_key => :content_view_id
 
     has_many :content_view_repositories, :dependent => :destroy, :inverse_of => :content_view
     has_many :repositories, :through => :content_view_repositories, :class_name => "Katello::Repository",
@@ -50,7 +54,6 @@ module Katello
     validates :name, :presence => true, :uniqueness => {:scope => :organization_id}
     validates :organization_id, :presence => true
     validate :check_non_composite_components
-    validate :check_repo_conflicts
     validate :check_puppet_conflicts
     validates :composite, :inclusion => [true, false]
 
@@ -79,18 +82,45 @@ module Katello
       hosts.count
     end
 
-    def copy(new_name)
-      new_view = ContentView.new
-      new_view.name = new_name
-      new_view.attributes = self.attributes.slice("description", "organization_id", "default", "composite")
-      new_view.save!
-      new_view.repositories = self.repositories
-      new_view.components = self.components
+    def components
+      content_view_components.map(&:latest_version).compact.freeze
+    end
 
-      self.content_view_puppet_modules.each do |puppet_module|
-        new_view.content_view_puppet_modules << puppet_module.dup
+    # Adds content view components based on the input
+    # [{:content_view_version_id=>1, :latest=> false}, {:content_view_id=>1, :latest=> true} ..]
+    def add_components(components_to_add)
+      components_to_add.each do |cvc|
+        content_view_components.build(cvc)
       end
+    end
+
+    # Removes selected content view components
+    # [1,2,34] => content view component ids/
+    def remove_components(components_to_remove)
+      content_view_components.where(:id => components_to_remove).destroy_all
+    end
+
+    # Warning this call wipes out existing associations
+    # And replaces them with the component version ids passed in.
+    def component_ids=(component_version_ids_to_set)
+      content_view_components.destroy_all
+      component_version_ids_to_set.each do |content_view_version_id|
+        cvv = ContentViewVersion.find(content_view_version_id)
+        content_view_components.build(:content_view_version => cvv,
+                                      :latest => false,
+                                      :composite_content_view => self)
+      end
+    end
+
+    def copy_components(new_view)
+      self.content_view_components.each do |cvc|
+        component = cvc.dup
+        component.composite_content_view = new_view
+        new_view.content_view_components << component
+      end
+    end
 
+    def copy_filters(new_view)
       self.filters.each do |filter|
         new_filter = filter.dup
         new_filter.repositories = filter.repositories
@@ -111,10 +141,29 @@ module Katello
           end
         end
       end
+    end
+
+    def copy(new_name)
+      new_view = ContentView.new
+      new_view.name = new_name
+      new_view.attributes = self.attributes.slice("description", "organization_id", "default", "composite")
+      new_view.save!
+      new_view.repositories = self.repositories
+
+      copy_components(new_view)
+
+      self.content_view_puppet_modules.each do |puppet_module|
+        new_view.content_view_puppet_modules << puppet_module.dup
+      end
+      copy_filters(new_view)
       new_view.save!
       new_view
     end
 
+    def publish_puppet_environment?
+      force_puppet_environment? || puppet_modules.any? || component_modules_to_publish.present?
+    end
+
     def promoted?
       # if the view exists in more than 1 environment, it has been promoted
       self.environments.length > 1 ? true : false
@@ -159,6 +208,14 @@ module Katello
       self.versions.in_environment(env).order("#{Katello::ContentViewVersion.table_name}.id ASC").readonly(false).last
     end
 
+    def latest_version
+      latest_version_object.try(:version)
+    end
+
+    def latest_version_object
+      self.versions.order('major DESC').order('minor DESC').first
+    end
+
     def history
       Katello::ContentViewHistory.joins(:content_view_version).where(
           "#{Katello::ContentViewVersion.table_name}.content_view_id" => self.id)
@@ -223,6 +280,28 @@ module Katello
       composite? ? repositories_to_publish.pluck(&:id) : repository_ids
     end
 
+    def repositories_to_publish_by_library_instance
+      # retrieve the list of repositories in a hash, where the key
+      # is the library instance id, and the value is an array
+      # of the repositories for that instance.
+      repositories_to_publish.inject({}) do |result, repo|
+        result[repo.library_instance_id] ||= []
+        result[repo.library_instance_id] << repo
+        result
+      end
+    end
+
+    def publish_repositories
+      repositories = composite? ? repositories_to_publish_by_library_instance.values : repositories_to_publish
+      repositories.each do |repos|
+        if repos.is_a? Array
+          yield repos
+        else
+          yield [repos]
+        end
+      end
+    end
+
     # Returns actual puppet modules associated with all components
     def component_modules_to_publish
       composite? ? components.flat_map { |version| version.puppet_modules } : nil
@@ -322,14 +401,6 @@ module Katello
       end
     end
 
-    def check_repo_conflicts
-      duplicate_repositories.each do |repo|
-        versions = components.with_library_repo(repo).uniq.map(&:name).join(", ")
-        msg = _("Repository conflict: '%{repo}' is in %{versions}.") % {repo: repo.name, versions: versions}
-        errors.add(:base, msg)
-      end
-    end
-
     def check_puppet_conflicts
       duplicate_puppet_modules.each do |name|
         versions = components.select { |v| v.puppet_modules.map(&:name).include?(name) }
@@ -384,11 +455,10 @@ module Katello
       ContentViewEnvironment.where(:content_view_id => self, :environment_id => env).first.try(:cp_id)
     end
 
-    def create_new_version(description = '', major = next_version, minor = 0, components = self.components)
+    def create_new_version(major = next_version, minor = 0, components = self.components)
       version = ContentViewVersion.create!(:major => major,
                                            :minor => minor,
                                            :content_view => self,
-                                           :description => description,
                                            :components => components
                                           )
 
@@ -520,6 +590,10 @@ module Katello
       _("Content Views")
     end
 
+    def version_count
+      content_view_versions.count
+    end
+
     protected
 
     def remove_repository(repository)
@@ -576,8 +650,7 @@ module Katello
       # Intended Behaviour
       # Includes are cumulative -> If you say include errata and include packages, its the sum
       # Excludes are processed after includes
-      # Excludes dont handle dependency. So if you say Include errata with pkgs P1, P2
-      #         and exclude P1  and P1 has a dependency P1d1, what gets copied over is P1d1, P2
+      # Excludes dont handle dependency. So if you say Include errata with pkgs P1, P2ve#         and exclude P1  and P1 has a dependency P1d1, what gets copied over is P1d1, P2
 
       # Another important aspect. PackageGroups & Errata are merely convinient ways to say "copy packages"
       # Its all about the packages

data/app/models/katello/content_view_component.rb

@@ -2,24 +2,81 @@ module Katello
   class ContentViewComponent < Katello::Model
     self.include_root_in_json = false
 
-    belongs_to :content_view, :class_name => "Katello::ContentView",
+    belongs_to :composite_content_view, :class_name => "Katello::ContentView",
                               :inverse_of => :content_view_components
     belongs_to :content_view_version, :class_name => "Katello::ContentViewVersion",
-                                      :inverse_of => :content_view_components
+                              :inverse_of => :content_view_components
+    belongs_to :content_view, :class_name => "Katello::ContentView",
+                              :inverse_of => :component_composites
 
     validates_lengths_from_database
-    validates :content_view_version_id, :uniqueness => {:scope => :content_view_id}
-    validate :content_view_types
+
+    validates :composite_content_view, :presence => true
+    validate :ensure_valid_attributes
+    validate :ensure_valid_content_view
+
+    before_validation :update_content_view, :on => :create
+
+    def latest_version
+      if latest?
+        self.content_view.latest_version_object
+      else
+        self.content_view_version
+      end
+    end
 
     private
 
-    def content_view_types
-      if content_view_version.content_view.composite?
+    def ensure_valid_content_view
+      view = content_view || content_view_version.try(:content_view)
+      return unless view
+
+      if content_view_version.present? && view.id != content_view_version.content_view_id
+        errors.add(:base, _("Invalid association of the content view id. Content View must match the content view version being saved"))
+      end
+
+      if view.composite?
         errors.add(:base, _("Cannot add composite versions to a composite content view"))
       end
-      if content_view_version.default?
+
+      if view.default?
         errors.add(:base, _("Cannot add default content view to composite content view"))
       end
+
+      if attached_content_view_ids.include?(view.id)
+        errors.add(:base, _("Duplicate Content View. Another component already includes this view"))
+      end
+    end
+
+    def ensure_valid_attributes
+      if !(content_view.present? || content_view_version.present?)
+        errors.add(:base, _("Either set the content view with the latest flag or set the content view version"))
+      elsif !composite_content_view.composite?
+        errors.add(:base, _("Cannot associate a component to a non composite content view"))
+      elsif latest?
+        if content_view_version.present?
+          errors.add(:base, _("Either set the latest content view or the content view version. Cannot set both"))
+        end
+      elsif content_view_version.nil?
+        errors.add(:base, _("Content View Version not set"))
+      end
+    end
+
+    def attached_content_view_ids
+      composite_content_view.content_view_components.map do |cvc|
+        next if cvc.id == self.id
+        if cvc.content_view_version
+          cvc.content_view_version.content_view_id
+        else
+          cvc.content_view_id
+        end
+      end
+    end
+
+    def update_content_view
+      if content_view_version.present? && !content_view.present?
+        self.content_view = content_view_version.content_view
+      end
     end
   end
 end

data/app/models/katello/content_view_erratum_filter_rule.rb

@@ -2,6 +2,8 @@ module Katello
   class ContentViewErratumFilterRule < Katello::Model
     self.include_root_in_json = false
 
+    before_create :default_types
+
     ISSUED = "issued".freeze
     UPDATED = "updated".freeze
     DATE_TYPES = [ISSUED, UPDATED].freeze
@@ -32,5 +34,11 @@ module Katello
     def pulp_date_type
       self.date_type == ISSUED ? "issued" : "updated"
     end
+
+    def default_types
+      if errata_id.nil? && types.blank?
+        self.types = ContentViewErratumFilter::ERRATA_TYPES.keys
+      end
+    end
   end
 end

data/app/models/katello/content_view_history.rb

@@ -15,12 +15,22 @@ module Katello
     validates_lengths_from_database
     validates :status, :inclusion => {:in          => STATUSES,
                                       :allow_blank => false}
+    validates :action, presence: true
 
     scope :active, -> { where(:status => IN_PROGRESS) }
+    scope :successful, -> { where(:status => SUCCESSFUL) }
     alias_method :version, :content_view_version
+    alias_attribute :description, :notes
 
     scoped_search :on => :name, :in => :environment, :rename => :environment, :complete_value => true
 
+    enum action: {
+      publish: 1,
+      promotion: 2,
+      removal: 3,
+      export: 4
+    }
+
     def content_view
       self.content_view_version.try(:content_view)
     end
@@ -42,14 +52,13 @@ module Katello
     end
 
     def humanized_action
-      case self.task.try(:label)
-      when "Actions::Katello::ContentViewVersion::Export"
+      if export?
         _("Exported version")
-      when "Actions::Katello::ContentView::Publish"
+      elsif publish?
         _("Published new version")
-      when "Actions::Katello::ContentView::Promote"
+      elsif promotion?
         _("Promoted to %{environment}") % { :environment => self.environment.try(:name) || _('Unknown') }
-      when "Actions::Katello::ContentView::Remove"
+      elsif removal?
         _("Deleted from %{environment}") % { :environment => self.environment.try(:name) || _('Unknown')}
       else
         _("Unknown Action")

data/app/models/katello/content_view_package_filter.rb

@@ -33,6 +33,10 @@ module Katello
     def query_rpms(repo, rule)
       query_name = rule.name.tr("*", "%")
       query = Rpm.in_repositories(repo).where("#{Rpm.table_name}.name ilike ?", query_name)
+      if rule.architecture
+        query_arch = rule.architecture.tr("*", "%")
+        query = query.where("#{Rpm.table_name}.arch ilike ?", query_arch)
+      end
       if !rule.version.blank?
         query = query.search_version_equal(rule.version)
       elsif !rule.min_version.blank? || !rule.max_version.blank?

data/app/models/katello/content_view_version.rb

@@ -23,7 +23,7 @@ module Katello
     has_one :task_status, :class_name => "Katello::TaskStatus", :as => :task_owner, :dependent => :destroy
 
     has_many :content_view_components, :inverse_of => :content_view_version, :dependent => :destroy
-    has_many :composite_content_views, :through => :content_view_components, :source => :content_view
+    has_many :composite_content_views, :through => :content_view_components, :source => :composite_content_view
 
     has_many :content_view_version_components, :inverse_of => :composite_version, :dependent => :destroy, :foreign_key => :composite_version_id,
              :class_name => "Katello::ContentViewVersionComponent"
@@ -105,6 +105,10 @@ module Katello
       "#{content_view} #{version}"
     end
 
+    def description
+      history.publish.successful.first.try(:notes)
+    end
+
     def default_content_view?
       default?
     end
@@ -137,6 +141,10 @@ module Katello
       self.content_view_puppet_environments.in_environment(env).first
     end
 
+    def promote_puppet_environment?
+      puppet_module_count > 0 || self.content_view.force_puppet_environment?
+    end
+
     def archived_repos
       self.default? ? self.repositories : self.repos(nil)
     end
@@ -184,8 +192,12 @@ module Katello
           self.content_view.versions.in_environment(from_env).count > 1
     end
 
-    def promotable?(environment)
-      environments.include?(environment.prior) || environments.empty? && environment == organization.library
+    def promotable?(target_envs)
+      target_envs = Array.wrap(target_envs)
+      all_environments = target_envs + environments
+      target_envs.all? do |environment|
+        all_environments.include?(environment.prior) || environments.empty? && environment == organization.library
+      end
     end
 
     def archive_puppet_environment

data/app/models/katello/docker_manifest.rb

@@ -2,7 +2,7 @@ module Katello
   class DockerManifest < Katello::Model
     include Concerns::PulpDatabaseUnit
 
-    has_one :docker_tag, :dependent => :destroy, :class_name => "Katello::DockerTag"
+    has_many :docker_tags, :dependent => :destroy, :class_name => "Katello::DockerTag"
     has_many :repository_docker_manifests, :dependent => :destroy
     has_many :repositories, :through => :repository_docker_manifests, :inverse_of => :docker_manifests