katello 3.15.1 → 3.16.0.rc2.1

data/app/models/katello/glue/candlepin/product.rb

@@ -45,7 +45,7 @@ module Katello
       Product.create!(product_attrs)
     rescue => e
       [Rails.logger, import_logger].each do |logger|
-        logger.error "Failed to create product #{attrs['name']}: #{e}" if logger
+        logger&.error "Failed to create product #{attrs['name']}: #{e}"
       end
       raise e
     end

data/app/models/katello/glue/candlepin/subscription.rb

@@ -34,7 +34,7 @@ module Katello
         subscription_attributes[:instance_multiplier] = product_json["multiplier"]
 
         exceptions = subscription_attributes.keys.map(&:to_sym) - self.attribute_names.map(&:to_sym)
-        self.update_attributes!(subscription_attributes.except!(*exceptions))
+        self.update!(subscription_attributes.except!(*exceptions))
       end
     end
   end

data/app/models/katello/glue/provider.rb

@@ -1,5 +1,7 @@
 module Katello
   module Glue::Provider
+    DISTRIBUTOR_VERSION = 'sat-6.7'.freeze
+
     def self.included(base)
       base.send :include, InstanceMethods
     end
@@ -73,7 +75,7 @@ module Katello
         params[:capabilities] = Resources::Candlepin::CandlepinPing.ping['managerCapabilities'].inject([]) do |result, element|
           result << {'name' => element}
         end
-        params[:facts] = {:distributor_version => 'sat-6.5'}
+        params[:facts] = {:distributor_version => DISTRIBUTOR_VERSION }
         Resources::Candlepin::UpstreamConsumer.update("#{url}#{upstream['uuid']}", upstream['idCert']['cert'],
                                                       upstream['idCert']['key'], ca_file, params)
       end
@@ -141,8 +143,8 @@ module Katello
 
       def import_product(product_json)
         product = organization.products.find_by(:cp_id => product_json['id'])
-        if product && product.redhat?
-          product.update_attributes!(:name => product_json['name']) unless product.name == product_json['name']
+        if product&.redhat?
+          product.update!(:name => product_json['name']) unless product.name == product_json['name']
         elsif product.nil?
           product = Glue::Candlepin::Product.import_from_cp(product_json, organization)
         end

data/app/models/katello/glue/pulp/repo.rb

@@ -1,7 +1,7 @@
 module Katello
   module Glue::Pulp::Repo
     # TODO: move into submodules
-    # rubocop:disable MethodLength
+    # rubocop:disable Metrics/MethodLength
     def self.included(base)
       base.send :include, LazyAccessor
       base.send :include, InstanceMethods

data/app/models/katello/host/content_facet.rb

@@ -69,10 +69,7 @@ module Katello
         end
 
         unless self.bound_repositories.sort == repos.sort
-          self.bound_repositories = repos
-          self.save!
-          self.propagate_yum_repos
-          ForemanTasks.async_task(Actions::Katello::Host::GenerateApplicability, [self.host])
+          update_bound_repositories(repos)
         end
         self.bound_repositories.pluck(:relative_path)
       end
@@ -82,6 +79,17 @@ module Katello
         Katello::Pulp::Consumer.new(self.uuid).bind_yum_repositories(pulp_ids)
       end
 
+      def update_bound_repositories(repos)
+        self.bound_repositories = repos
+        self.save!
+        self.propagate_yum_repos
+        if SETTINGS[:katello][:katello_applicability]
+          ::Katello::EventQueue.push_event(::Katello::Events::GenerateHostApplicability::EVENT_TYPE, self.host.id)
+        else
+          ForemanTasks.async_task(Actions::Katello::Host::GenerateApplicability, [self.host])
+        end
+      end
+
       def installable_errata(env = nil, content_view = nil)
         ApplicableContentHelper.new(Erratum, self).installable(env, content_view)
       end
@@ -104,6 +112,17 @@ module Katello
         hash
       end
 
+      # Katello applicability
+      def calculate_and_import_applicability
+        bound_repos = bound_repositories.collect do |repo|
+          repo.library_instance_id.nil? ? repo.id : repo.library_instance_id
+        end
+
+        ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::Rpm, bound_repos).calculate_and_import
+        ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::Erratum, bound_repos).calculate_and_import
+        ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::ModuleStream, bound_repos).calculate_and_import
+      end
+
       def import_applicability(partial = false)
         import_module_stream_applicability(partial)
         import_errata_applicability(partial)
@@ -198,6 +217,10 @@ module Katello
         self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => 'katello-agent').any?
       end
 
+      def tracer_installed?
+        self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => 'katello-host-tools-tracer').any?
+      end
+
       def update_errata_status
         host.get_status(::Katello::ErrataStatus).refresh!
         host.refresh_global_status!

data/app/models/katello/host/subscription_facet.rb

@@ -177,7 +177,7 @@ module Katello
       def update_dmi_uuid_override(host_uuid = nil)
         host_uuid ||= SecureRandom.uuid
         param = HostParameter.find_or_create_by(name: DMI_UUID_OVERRIDE_PARAM, host: host)
-        param.update_attributes!(value: host_uuid)
+        param.update!(value: host_uuid)
         param
       end
 

data/app/models/katello/host_queue_element.rb

@@ -0,0 +1,4 @@
+module Katello
+  class HostQueueElement < Katello::Model
+  end
+end

data/app/models/katello/host_tracer.rb

@@ -1,12 +1,20 @@
 module Katello
   class HostTracer < Katello::Model
+    include Katello::Authorization::HostTracer
+
     belongs_to :host, :inverse_of => :host_traces, :class_name => '::Host::Managed'
 
+    scope :reboot_required, -> { where(app_type: 'static') }
+
     validates :application, :length => {:maximum => 255}, :presence => true
     validates :app_type, :length => {:maximum => 255}, :presence => true
 
     scoped_search :on => :application, :complete_value => true
     scoped_search :on => :app_type
     scoped_search :on => :helper
+
+    def reboot_required?
+      self.app_type == 'static'
+    end
   end
 end

data/app/models/katello/kt_environment.rb

@@ -232,7 +232,7 @@ module Katello
       if self.successor && self.prior
         prior_env = self.prior
         self.env_priors.destroy_all
-        self.successor.env_priors.first.update_attributes!(:prior_id => prior_env.id)
+        self.successor.env_priors.first.update!(:prior_id => prior_env.id)
       end
     end
 

data/app/models/katello/module_stream.rb

@@ -6,6 +6,8 @@ module Katello
     has_many :artifacts, class_name: "Katello::ModuleStreamArtifact", dependent: :destroy, inverse_of: :module_stream
     has_many :module_stream_errata_packages, class_name: "Katello::ModuleStreamErratumPackage", dependent: :destroy, inverse_of: :module_stream
     has_many :erratum_packages, class_name: "Katello::ErratumPackage", :through => :module_stream_errata_packages
+    has_many :module_stream_rpms, class_name: "Katello::ModuleStreamRpm", dependent: :destroy, inverse_of: :module_stream
+    has_many :rpms, class_name: "Katello::Rpm", :through => :module_stream_rpms
 
     has_many :content_facet_applicable_module_streams, :class_name => "Katello::ContentFacetApplicableModuleStream",
              :dependent => :destroy, :inverse_of => :module_stream

data/app/models/katello/module_stream_rpm.rb

@@ -0,0 +1,6 @@
+module Katello
+  class ModuleStreamRpm < Katello::Model
+    belongs_to :module_stream, class_name: "Katello::ModuleStream", inverse_of: :module_stream_rpms
+    belongs_to :rpm, class_name: "Katello::Rpm", inverse_of: :module_stream_rpms
+  end
+end

data/app/models/katello/package_group.rb

@@ -25,7 +25,8 @@ module Katello
     end
 
     def package_names
-      group = Pulp::PackageGroup.new(self.pulp_id)
+      service_class = SmartProxy.pulp_master!.content_service(CONTENT_TYPE)
+      group = service_class.new(self.pulp_id)
       group.default_package_names + group.conditional_package_names + group.optional_package_names + group.mandatory_package_names
     end
   end

data/app/models/katello/pool.rb

@@ -17,6 +17,11 @@ module Katello
 
     scope :in_organization, ->(org_id) { where(:organization_id => org_id) }
     scope :for_activation_key, ->(ak) { joins(:activation_keys).where("#{Katello::ActivationKey.table_name}.id" => ak.id) }
+    scope :expiring_in_days, ->(days) do
+      return self if days.blank?
+      where(["end_date < ?", days.to_i.days.from_now.end_of_day])
+    end
+    scope :upstream, -> { where.not(upstream_pool_id: nil) }
 
     include Glue::Candlepin::Pool
     include Glue::Candlepin::CandlepinObject
@@ -50,8 +55,15 @@ module Katello
       active
     end
 
+    # used for notification bell
     def expiring_soon?
-      (end_date.to_date - Date.today) <= Setting[:expire_soon_days]
+      days_until_expiration >= 0 &&
+        days_until_expiration <= Setting[:expire_soon_days].to_i
+    end
+
+    # used for entitlements report template
+    def days_until_expiration
+      (end_date.to_date - Date.today).to_i
     end
 
     def recently_expired?
@@ -69,7 +81,7 @@ module Katello
     end
 
     def upstream?
-      subscription.present? && subscription.redhat?
+      upstream_pool_id.present?
     end
 
     def import_audit_record(old_host_ids, new_host_ids = subscription_facets.pluck(:host_id))
@@ -101,7 +113,11 @@ module Katello
     end
 
     class Jail < ::Safemode::Jail
-      allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date, :organization, :consumed
+      allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date, :organization, :consumed, :days_until_expiration
     end
   end
 end
+
+class ActiveRecord::AssociationRelation::Jail < Safemode::Jail
+  allow :sort_by
+end

data/app/models/katello/product.rb

@@ -157,7 +157,7 @@ module Katello
       self.class.where(["cp_id = ? AND id != ?", cp_id, id]).count > 0
     end
 
-    scope :all_in_org, ->(org) { Product.joins(:provider).where("#{Katello::Provider.table_name}.organization_id = ?", org.id) }
+    scope :all_in_org, ->(org) { joins(:provider).where("#{Katello::Provider.table_name}.organization_id = ?", org.id) }
 
     def assign_unique_label
       self.label = Util::Model.labelize(self.name) if self.label.blank?

data/app/models/katello/provider.rb

@@ -128,9 +128,8 @@ module Katello
       if redhat_provider? && self.send(attrib).blank?
         self.send("#{attrib}=", default_value)
       end
-      if self.send(attrib)
-        self.send(attrib).strip!
-      end
+
+      self.send(attrib)&.strip!
     end
   end
 end

data/app/models/katello/pulp3/content_guard.rb

@@ -0,0 +1,14 @@
+module Katello
+  module Pulp3
+    class ContentGuard < Katello::Model
+      def self.import(smart_proxy = SmartProxy.pulp_master!, force = false)
+        return unless (count == 0 || force)
+        content_guard_api = Katello::Pulp3::Api::ContentGuard.new(smart_proxy)
+        content_guard = content_guard_api.list&.results&.first
+        fail _("No Content Guard configured!") unless content_guard
+        katello_content_guard = self.new(name: content_guard.name, pulp_href: content_guard.pulp_href)
+        katello_content_guard.save!
+      end
+    end
+  end
+end

data/app/models/katello/puppet_module.rb

@@ -50,7 +50,7 @@ module Katello
     rescue Zlib::GzipFile::Error, Gem::Package::TarInvalidError
       raise Katello::Errors::InvalidPuppetModuleError, _("Could not unarchive puppet module. Please make sure the puppet module has been compressed properly.")
     ensure
-      tar_extract.close if tar_extract
+      tar_extract&.close
     end
 
     def self.group_by_repoid(puppet_modules)

data/app/models/katello/repository.rb

@@ -56,8 +56,9 @@ module Katello
     has_many :repository_srpms, :class_name => "Katello::RepositorySrpm", :dependent => :delete_all
     has_many :srpms, :through => :repository_srpms
 
-    has_many :repository_file_units, :class_name => "Katello::RepositoryFileUnit", :dependent => :destroy
+    has_many :repository_file_units, :class_name => "Katello::RepositoryFileUnit", :dependent => :delete_all
     has_many :files, :through => :repository_file_units, :source => :file_unit
+    alias_attribute :file_units, :files
 
     has_many :repository_puppet_modules, :class_name => "Katello::RepositoryPuppetModule", :dependent => :delete_all
     has_many :puppet_modules, :through => :repository_puppet_modules
@@ -82,7 +83,7 @@ module Katello
     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_facet_repositories, :class_name => "Katello::ContentFacetRepository", :dependent => :delete_all
     has_many :content_facets, :through => :content_facet_repositories
 
     has_many :repository_package_groups, :class_name => "Katello::RepositoryPackageGroup", :dependent => :delete_all
@@ -171,6 +172,10 @@ module Katello
       joins(:root).where("#{RootRepository.table_name}.content_type" => content_type)
     end
 
+    def to_label
+      name
+    end
+
     def backend_service(smart_proxy, force_pulp3 = false)
       if force_pulp3 || smart_proxy.pulp3_support?(self)
         @service ||= Katello::Pulp3::Repository.instance_for_type(self, smart_proxy)
@@ -195,6 +200,10 @@ module Katello
       end
     end
 
+    def organization_id
+      organization&.id
+    end
+
     def audit_sync
       write_audit(action: AUDIT_SYNC_ACTION, comment: _('Successfully synchronized.'), audited_changes: {})
     end
@@ -267,7 +276,7 @@ module Katello
     end
 
     def in_default_view?
-      content_view_version && content_view_version.default_content_view?
+      content_view_version&.default_content_view?
     end
 
     def on_demand?
@@ -385,7 +394,7 @@ module Katello
     end
 
     def promoted?
-      if environment && environment.library?
+      if environment&.library?
         self.clones.any?
       else
         false
@@ -422,8 +431,12 @@ module Katello
       path
     end
 
+    def library_instance_or_self
+      self.library_instance || self
+    end
+
     def generate_repo_path(content_path = nil)
-      _org, _content, content_path = (self.library_instance || self).relative_path.split("/", 3) if content_path.blank?
+      _org, _content, content_path = library_instance_or_self.relative_path.split("/", 3) if content_path.blank?
       content_path = content_path.sub(%r|^/|, '')
       if self.environment
         cve = ContentViewEnvironment.where(:environment_id => self.environment,
@@ -496,7 +509,7 @@ module Katello
         end
       end
       clone = Repository.new(:environment => to_env,
-                     :library_instance => self.library_instance || self,
+                     :library_instance => library_instance_or_self,
                      :root => self.root,
                      :content_view_version => to_version,
                      :saved_checksum_type => checksum_type)
@@ -614,7 +627,7 @@ module Katello
 
     def import_distribution_data(target_repo = nil)
       if target_repo
-        self.update_attributes!(
+        self.update!(
           :distribution_version => target_repo.distribution_version,
           :distribution_arch => target_repo.distribution_arch,
           :distribution_family => target_repo.distribution_family,

data/app/models/katello/root_repository.rb

@@ -5,6 +5,9 @@ module Katello
     serialize :docker_tags_whitelist
 
     include Ext::LabelFromName
+    include Encryptable
+
+    encrypts :upstream_password
 
     IGNORABLE_CONTENT_UNIT_TYPES = %w(rpm drpm srpm distribution erratum).freeze
     CHECKSUM_TYPES = %w(sha1 sha256).freeze
@@ -325,6 +328,14 @@ module Katello
       super
     end
 
+    def format_arches
+      if content_type == ::Katello::Repository::DEB_TYPE
+        self.deb_architectures
+      else
+        self.arch == "noarch" ? nil : self.arch
+      end
+    end
+
     class Jail < ::Safemode::Jail
       allow :name, :label, :docker_upstream_name, :url
     end

data/app/models/katello/rpm.rb

@@ -6,7 +6,8 @@ module Katello
     has_many :content_facet_applicable_rpms, :class_name => "Katello::ContentFacetApplicableRpm",
              :dependent => :destroy, :inverse_of => :rpm
     has_many :content_facets, :through => :content_facet_applicable_rpms, :class_name => "Katello::Host::ContentFacet"
-
+    has_many :module_stream_rpms, class_name: "Katello::ModuleStreamRpm", inverse_of: :rpm, dependent: :destroy
+    has_many :module_streams, :through => :module_stream_rpms
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :version, :complete_value => true, :ext_method => :scoped_search_version
     scoped_search :on => :release, :complete_value => true, :ext_method => :scoped_search_release

data/app/models/katello/subscription.rb

@@ -5,11 +5,14 @@ module Katello
     include Katello::Authorization::Subscription
 
     has_many :pools, :class_name => "Katello::Pool", :inverse_of => :subscription, :dependent => :destroy
+    has_many :products, :class_name => "Katello::Product", :through => :pools
 
     belongs_to :organization, :class_name => "Organization", :inverse_of => :subscriptions
 
     scope :in_organization, ->(org) { where(:organization => org) }
 
+    scope :redhat, -> { joins(:products).merge(Katello::Product.redhat).distinct }
+
     def self.subscribable
       product_ids = Product.subscribable.pluck(:id) + [nil]
       joins(:pools).joins("LEFT OUTER JOIN #{Katello::PoolProduct.table_name} pool_prod ON #{Pool.table_name}.id = pool_prod.pool_id")
@@ -24,10 +27,7 @@ module Katello
     end
 
     def redhat?
-      # for custom subscriptions, there is no separate marketing and engineering product
-      #   so query our Products table and check there
-      product = Katello::Product.where(:cp_id => self.cp_id, :organization => self.organization).first
-      product.nil? || product.redhat?
+      products.redhat.any?
     end
 
     def active?

data/app/models/katello/sync_plan.rb

@@ -69,7 +69,7 @@ module Katello
       transaction do
         fail _("No recurring logic tied to the sync plan.") if self.foreman_tasks_recurring_logic.nil?
         params["cron_expression"] = '' if (params.key?("interval") && !params["interval"].eql?(CUSTOM_CRON) && self.interval.eql?(CUSTOM_CRON))
-        self.update_attributes!(params.except(:enabled))
+        self.update!(params.except(:enabled))
         if (rec_logic_changed? || (params["enabled"] && !self.enabled? && self.foreman_tasks_recurring_logic.cancelled?))
           old_rec_logic = self.foreman_tasks_recurring_logic
           associate_recurring_logic
@@ -114,7 +114,7 @@ module Katello
     end
 
     def cancel_recurring_logic
-      self.foreman_tasks_recurring_logic.cancel if self.foreman_tasks_recurring_logic
+      self.foreman_tasks_recurring_logic&.cancel
     end
 
     def validate_sync_date