katello 3.15.1 → 3.16.0.rc2.1

data/app/jobs/create_expired_manifest_notifications.rb

@@ -0,0 +1,11 @@
+class CreateExpiredManifestNotifications < ApplicationJob
+  def perform
+    Katello::UINotifications::Subscriptions::ManifestExpiredWarning.deliver!
+  ensure
+    self.class.set(:wait => 24.hours).perform_later
+  end
+
+  def humanized_name
+    _('Subscription Manifest validity check')
+  end
+end

data/app/lib/actions/candlepin/consumer/remove_subscription.rb

@@ -14,7 +14,7 @@ module Actions
 
         def finalize
           pool = ::Katello::Pool.where(:cp_id => input[:pool_id]).first
-          pool.import_data if pool
+          pool&.import_data
         end
       end
     end

data/app/lib/actions/katello/activation_key/update.rb

@@ -6,7 +6,7 @@ module Actions
           # need to check if candlepin attributes have changed prior to updating attributes
           update_candlepin = update_candlepin?(activation_key, activation_key_params)
           action_subject activation_key
-          activation_key.update_attributes!(activation_key_params)
+          activation_key.update!(activation_key_params)
           if update_candlepin
             plan_action(::Actions::Candlepin::ActivationKey::Update,
                         cp_id: activation_key.cp_id,

data/app/lib/actions/katello/applicability/host/generate.rb

@@ -0,0 +1,28 @@
+module Actions
+  module Katello
+    module Applicability
+      module Host
+        class Generate < Actions::EntryAction
+          # This should be run through Katello::Events::GenerateHostApplicability
+
+          input_format do
+            param :host_id, Integer
+          end
+
+          def run
+            content_facet = ::Host.find(input[:host_id]).content_facet
+            content_facet.calculate_and_import_applicability
+          end
+
+          def resource_locks
+            :link
+          end
+
+          def humanized_name
+            _("Generate host applicability")
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/applicability/hosts/bulk_generate.rb

@@ -0,0 +1,32 @@
+module Actions
+  module Katello
+    module Applicability
+      module Hosts
+        class BulkGenerate < Actions::EntryAction
+          input_format do
+            param :host_ids, Array
+          end
+
+          def run
+            input[:host_ids].each do |host_id|
+              content_facet = ::Host.find(host_id).content_facet
+              content_facet.calculate_and_import_applicability
+            end
+          end
+
+          def queue
+            ::Katello::HOST_TASKS_QUEUE
+          end
+
+          def resource_locks
+            :link
+          end
+
+          def humanized_name
+            _("Bulk generate applicability for hosts")
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/applicability/repository/regenerate.rb

@@ -0,0 +1,31 @@
+module Actions
+  module Katello
+    module Applicability
+      module Repository
+        class Regenerate < Actions::EntryAction
+          middleware.use Actions::Middleware::ExecuteIfContentsChanged
+
+          input_format do
+            param :repo_id, Integer
+            param :contents_changed
+          end
+
+          def run
+            host_ids = ::Katello::Repository.find(input[:repo_id]).hosts_with_applicability.pluck(:id)
+            return if host_ids.empty?
+
+            host_ids.each do |host_id|
+              ::Katello::ApplicableHostQueue.push_host(host_id)
+            end
+
+            ::Katello::EventQueue.push_event(::Katello::Events::GenerateHostApplicability::EVENT_TYPE, 0)
+          end
+
+          def humanized_name
+            _("Generate repository applicability")
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -18,7 +18,6 @@ module Actions
           input['smart_proxy'].nil? || input['smart_proxy']['name'].nil? ? super : ["'#{input['smart_proxy']['name']}'"] + super
         end
 
-        # rubocop:disable MethodLength
         def plan(smart_proxy, options = {})
           action_subject(smart_proxy)
           smart_proxy.verify_ueber_certs

data/app/lib/actions/katello/capsule_content/sync_capsule.rb

@@ -3,8 +3,6 @@ module Actions
     module CapsuleContent
       class SyncCapsule < ::Actions::EntryAction
         include Actions::Katello::PulpSelector
-
-        # rubocop:disable MethodLength
         def plan(smart_proxy, options = {})
           action_subject(smart_proxy)
           environment = options[:environment]

data/app/lib/actions/katello/content_view/destroy.rb

@@ -17,7 +17,9 @@ module Actions
               end
             end
 
-            plan_action(Actions::Pulp3::ContentView::DeleteRepositoryReferences, content_view, SmartProxy.pulp_master)
+            if SmartProxy.pulp_master&.pulp3_enabled?
+              plan_action(Actions::Pulp3::ContentView::DeleteRepositoryReferences, content_view, SmartProxy.pulp_master)
+            end
             plan_self
           end
         end

data/app/lib/actions/katello/content_view/promote_to_environment.rb

@@ -1,4 +1,4 @@
-# rubocop:disable HandleExceptions
+# rubocop:disable Lint/SuppressedException
 module Actions
   module Katello
     module ContentView

data/app/lib/actions/katello/content_view/publish.rb

@@ -1,9 +1,9 @@
-# rubocop:disable HandleExceptions
+# rubocop:disable Lint/SuppressedException
 module Actions
   module Katello
     module ContentView
       class Publish < Actions::EntryAction
-        # rubocop:disable MethodLength,Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         def plan(content_view, description = "", options = {})
           action_subject(content_view)
           content_view.check_ready_to_publish!

data/app/lib/actions/katello/content_view/remove.rb

@@ -12,7 +12,7 @@ module Actions
         # key_content_view_id - content view to reassociate actvation keys with
         # key_environment_id - environment to reassociate activation keys with'
         # organization_destroy
-        # rubocop:disable MethodLength
+        # rubocop:disable Metrics/MethodLength
         def plan(content_view, options)
           cv_envs = options.fetch(:content_view_environments, [])
           versions = options.fetch(:content_view_versions, [])

data/app/lib/actions/katello/content_view/update.rb

@@ -4,7 +4,7 @@ module Actions
       class Update < Actions::EntryAction
         def plan(content_view, content_view_params)
           action_subject content_view
-          content_view.update_attributes!(content_view_params)
+          content_view.update!(content_view_params)
         end
       end
     end

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -173,6 +173,12 @@ module Actions
           history = ::Katello::ContentViewHistory.find(input[:history_id])
           history.status = ::Katello::ContentViewHistory::SUCCESSFUL
           history.save!
+
+          version.repositories.each do |repo|
+            SmartProxy.pulp_master.pulp_api.extensions.send(:module_default).
+              copy(repo.library_instance.pulp_id,
+              repo.pulp_id)
+          end
         end
 
         # given a composite version, and a list of new components, calculate the list of all components for the new version

data/app/lib/actions/katello/gpg_key/update.rb

@@ -4,7 +4,7 @@ module Actions
       class Update < Actions::EntryAction
         def plan(gpg_key, gpg_key_params)
           action_subject gpg_key
-          gpg_key.update_attributes!(gpg_key_params)
+          gpg_key.update!(gpg_key_params)
           gpg_key.repositories.each do |repository|
             if repository.content_type == ::Katello::Repository::DEB_TYPE
               plan_action(::Actions::Katello::Repository::RefreshRepository, repository)

data/app/lib/actions/katello/host/erratum/applicable_errata_install.rb

@@ -12,8 +12,18 @@ module Actions
 
             applicable_errata = host.content_facet.applicable_errata
             applicable_errata = applicable_errata.with_identifiers(errata_ids) unless options[:update_all]
-            plan_action(Actions::Katello::Host::Erratum::Install, host, applicable_errata.pluck(:errata_id))
-            plan_self(:hostname => host.name)
+            if applicable_errata.empty?
+              plan_self(:hostname => host.name, :skip => true)
+            else
+              plan_action(Actions::Katello::Host::Erratum::Install, host, applicable_errata.pluck(:errata_id))
+              plan_self(:hostname => host.name, :skip => false)
+            end
+          end
+
+          def run
+            if input[:skip]
+              output[:response] = _("No applicable errata for %s, skipping" % input[:hostname])
+            end
           end
 
           def humanized_name

data/app/lib/actions/katello/host/generate_applicability.rb

@@ -7,20 +7,31 @@ module Actions
         end
 
         def plan(hosts, use_queue = true)
-          uuids = hosts.map { |host| host.content_facet.try(:uuid) }.compact
-          unless uuids.empty?
-            plan_action(Pulp::Consumer::GenerateApplicability, :uuids => uuids)
-            plan_self(:host_ids => hosts.map(&:id), :use_queue => use_queue)
+          if SETTINGS[:katello][:katello_applicability]
+            plan_self(:host_ids => hosts.map(&:id))
+          else
+            uuids = hosts.map { |host| host.content_facet.try(:uuid) }.compact
+            unless uuids.empty?
+              plan_action(Pulp::Consumer::GenerateApplicability, :uuids => uuids)
+              plan_self(:host_ids => hosts.map(&:id), :use_queue => use_queue)
+            end
           end
         end
 
         def finalize
-          input[:host_ids].each do |host_id|
-            if input[:use_queue]
-              ::Katello::EventQueue.push_event(::Katello::Events::ImportHostApplicability::EVENT_TYPE, host_id)
-            else
-              host = ::Host.find(host_id)
-              host.content_facet.try(:import_applicability, true) if host
+          if SETTINGS[:katello][:katello_applicability]
+            input[:host_ids].each do |host_id|
+              ::Katello::ApplicableHostQueue.push_host(host_id)
+            end
+            ::Katello::EventQueue.push_event(::Katello::Events::GenerateHostApplicability::EVENT_TYPE, 0)
+          else
+            input[:host_ids].each do |host_id|
+              if input[:use_queue]
+                ::Katello::EventQueue.push_event(::Katello::Events::ImportHostApplicability::EVENT_TYPE, host_id)
+              else
+                host = ::Host.find(host_id)
+                host.content_facet.try(:import_applicability, true) if host
+              end
             end
           end
         end

data/app/lib/actions/katello/host/hypervisors_update.rb

@@ -37,7 +37,7 @@ module Actions
             host.subscription_facet ||= host.build_subscription_facet(uuid: uuid)
             # Only preload the virtual guests if 'guestIds' is not returned by Candlepin
             consumer = @candlepin_attributes[uuid]
-            next unless consumer && consumer.try(:[], 'guestIds').empty?
+            next unless consumer&.try(:[], 'guestIds')&.empty?
             host.subscription_facet.candlepin_consumer.virtual_guests
           end
         end

data/app/lib/actions/katello/host/recalculate_errata_status.rb

@@ -4,12 +4,10 @@ module Actions
       class RecalculateErrataStatus < Actions::Base
         def run
           ::Host.unscoped.find_each do |host|
-            begin
-              host.content_facet.update_errata_status if host.content_facet.try(:uuid)
-            rescue StandardError => error
-              output[:errors] ||= []
-              output[:errors] << (_("Error refreshing status for %s: ") % host.name) + error.message
-            end
+            host.content_facet.update_errata_status if host.content_facet.try(:uuid)
+          rescue StandardError => error
+            output[:errors] ||= []
+            output[:errors] << (_("Error refreshing status for %s: ") % host.name) + error.message
           end
         end
       end

data/app/lib/actions/katello/host/upload_profiles.rb

@@ -33,16 +33,42 @@ module Actions
           Dynflow::Action::Rescue::Skip
         end
 
+        def self.upload_modules_to_pulp(available_streams, host)
+          query_name_streams = available_streams.map do |profile|
+            ::Katello::ModuleStream.where(profile.slice(:name, :stream))
+          end
+
+          query_name_streams = query_name_streams.inject(&:or)
+
+          bound_library_instances = host.content_facet.bound_repositories.map(&:library_instance_or_self)
+          query = ::Katello::ModuleStream.in_repositories(bound_library_instances).
+                                          select(:name, :stream, :version, :context, :arch).
+                                            merge(query_name_streams)
+
+          updated_profiles = query.map do |module_stream|
+            module_stream.slice(:name, :stream, :version, :context, :arch)
+          end
+
+          # We also need to pass module streams that are not found in the ModuleStream table
+          # but are present on the content host
+          unassociated_profiles = available_streams.select do |profile|
+            updated_profiles.none? { |p| p[:name] == profile[:name] && p[:stream] == profile[:stream] }
+          end
+
+          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).
+              upload_module_stream_profile(updated_profiles + unassociated_profiles)
+        rescue RestClient::ResourceNotFound
+          Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % host.id)
+        end
+
         def import_module_streams(payload, host)
           enabled_payload = payload.map do |profile|
-            profile.slice("name", "stream", "version", "context", "arch") if profile["status"] == "enabled"
+            profile.slice("name", "stream", "version", "context", "arch").with_indifferent_access if profile["status"] == "enabled"
           end
           enabled_payload.compact!
 
-          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_module_stream_profile(enabled_payload)
+          UploadProfiles.upload_modules_to_pulp(enabled_payload, host)
           host.import_module_streams(payload)
-        rescue RestClient::ResourceNotFound
-          Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % input[:host_id])
         end
 
         def import_deb_package_profile(host, profile)
@@ -69,6 +95,7 @@ module Actions
             payload = profiles.dig("deb_package_profile", "deb_packages") || []
             import_deb_package_profile(host, payload)
           else
+            module_streams = []
             profiles.each do |profile|
               payload = profile["profile"]
               case profile["content_type"]
@@ -79,9 +106,13 @@ module Actions
               when "enabled_repos"
                 host.import_enabled_repositories(payload)
               else
-                import_module_streams(payload, host)
+                module_streams << payload
               end
             end
+
+            module_streams.each do |module_stream_payload|
+              import_module_streams(module_stream_payload, host)
+            end
           end
         end
       end

data/app/lib/actions/katello/organization/manifest_delete.rb

@@ -13,7 +13,8 @@ module Actions
             plan_action(Candlepin::Owner::DestroyImports, label: organization.label)
 
             if SETTINGS[:katello][:use_pulp]
-              organization.products.redhat.flat_map(&:repositories).each do |repo|
+              repositories = ::Katello::Repository.in_default_view.in_product(::Katello::Product.redhat.in_org(organization))
+              repositories.each do |repo|
                 plan_action(Katello::Repository::RefreshRepository, repo)
               end
             end

data/app/lib/actions/katello/organization/manifest_import.rb

@@ -18,7 +18,8 @@ module Actions
             plan_action(Candlepin::Owner::ImportProducts, :organization_id => organization.id)
 
             if manifest_update && SETTINGS[:katello][:use_pulp]
-              organization.products.redhat.flat_map(&:repositories).each do |repo|
+              repositories = ::Katello::Repository.in_default_view.in_product(::Katello::Product.redhat.in_org(organization))
+              repositories.each do |repo|
                 plan_action(Katello::Repository::RefreshRepository, repo)
               end
             end
@@ -44,6 +45,7 @@ module Actions
         end
 
         def finalize
+          subject_organization.clear_manifest_expired_notifications
           subject_organization.audit_manifest_action(_('Manifest imported'))
         end
       end

data/app/lib/actions/katello/organization/manifest_refresh.rb

@@ -34,7 +34,7 @@ module Actions
                 plan_action(Katello::Repository::RefreshRepository, repo, :dependency => import_products.output)
               end
             end
-            plan_self
+            plan_self(:organization_id => organization.id)
           end
         end
 
@@ -60,6 +60,8 @@ module Actions
         end
 
         def finalize
+          org = ::Organization.find(input[:organization_id])
+          org.clear_manifest_expired_notifications
           subject_organization.audit_manifest_action(_('Manifest refreshed'))
         end
       end

data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb

@@ -13,19 +13,6 @@ module Actions
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)
             end
-            plan_self
-          end
-        end
-
-        def run
-          models = []
-          ::Katello::RepositoryTypeManager.repository_types.each_value do |repo_type|
-            indexable_types = repo_type.content_types_to_index
-            models += indexable_types&.map(&:model_class)
-            models.select! { |model| model.many_repository_associations }
-          end
-          models.each do |model|
-            model.joins("left join katello_#{model.repository_association} on #{model.table_name}.id = katello_#{model.repository_association}.#{model.unit_id_field}").where("katello_#{model.repository_association}.#{model.unit_id_field} IS NULL").destroy_all
           end
         end
       end