katello 3.18.5 → 4.0.0.rc1

data/app/lib/actions/katello/check_matching_content.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module CheckMatchingContent
+      def check_matching_content(new_repository, source_repositories)
+        check_matching_content = ::Katello::RepositoryTypeManager.find(new_repository.content_type).metadata_publish_matching_check
+        if new_repository.environment && source_repositories.count == 1 && check_matching_content
+          match_check_output = plan_action(Katello::Repository::CheckMatchingContent,
+                                           :source_repo_id => source_repositories.first.id,
+                                           :target_repo_id => new_repository.id).output
+
+          return match_check_output[:matching_content]
+        end
+        false
+      end
+    end
+  end
+end

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

@@ -4,14 +4,12 @@ module Actions
       class EnvironmentCreate < Actions::Base
         def plan(content_view_environment)
           content_view_environment.save!
-          if ::SETTINGS[:katello][:use_cp]
-            content_view = content_view_environment.content_view
-            plan_action(Candlepin::Environment::Create,
-                        organization_label: content_view.organization.label,
-                        cp_id:              content_view_environment.cp_id,
-                        name:               content_view_environment.label,
-                        description:        content_view.description)
-          end
+          content_view = content_view_environment.content_view
+          plan_action(Candlepin::Environment::Create,
+                      organization_label: content_view.organization.label,
+                      cp_id:              content_view_environment.cp_id,
+                      name:               content_view_environment.label,
+                      description:        content_view.description)
         end
 
         def humanized_name

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

@@ -6,7 +6,7 @@ module Actions
         include ::Katello::ContentViewHelper
         attr_accessor :version
         # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
-        def plan(content_view, description = "", options = {importing: false})
+        def plan(content_view, description = "", options = {importing: false}) # rubocop:disable Metrics/PerceivedComplexity
           action_subject(content_view)
 
           content_view.check_ready_to_publish!(importing: options[:importing])

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

@@ -19,7 +19,7 @@ module Actions
 
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
-        def plan(old_version, environments, options = {})
+        def plan(old_version, environments, options = {}) # rubocop:disable Metrics/CyclomaticComplexity
           dep_solve = options.fetch(:resolve_dependencies, true)
           description = options.fetch(:description, '')
           content = options.fetch(:content, {})
@@ -88,11 +88,15 @@ module Actions
                 end
               end
 
-              sequence do
-                new_puppet_environment = plan_action(Katello::ContentViewPuppetEnvironment::Clone, old_version,
-                                                   :new_version => new_content_view_version).new_puppet_environment
-                check_puppet_module_duplicates(content[:puppet_module_ids])
-                copy_action_outputs += copy_puppet_content(new_puppet_environment, content[:puppet_module_ids], old_version) unless content[:puppet_module_ids].blank?
+              if SmartProxy.pulp_primary.has_feature?(SmartProxy::PULP_FEATURE) && SETTINGS[:katello][:content_types][:puppet]
+                sequence do
+                  new_puppet_environment = plan_action(Katello::ContentViewPuppetEnvironment::Clone, old_version,
+                                                     :new_version => new_content_view_version).new_puppet_environment
+                  check_puppet_module_duplicates(content[:puppet_module_ids])
+                  unless content[:puppet_module_ids].blank?
+                    copy_action_outputs += copy_puppet_content(new_puppet_environment, content[:puppet_module_ids], old_version)
+                  end
+                end
               end
             end
 
@@ -201,7 +205,7 @@ module Actions
           end
         end
 
-        def run
+        def run # rubocop:disable Metrics/CyclomaticComplexity
           content = { ::Katello::Erratum::CONTENT_TYPE => [],
                       ::Katello::Rpm::CONTENT_TYPE => [],
                       ::Katello::ModuleStream::CONTENT_TYPE => [],

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

@@ -54,10 +54,10 @@ module Actions
 
         # Loads all resources needed for refreshing subscription facet
         def load_resources
-          @organizations = ::Organization.where(label: hypervisors_field(:organization_label)).map { |org| [org.label, org] }.to_h
+          @organizations = ::Organization.where(label: hypervisors_field(:organization_label)).index_by { |org| org.label }
 
           candlepin_data = ::Katello::Resources::Candlepin::Consumer.get_all_with_facts(hypervisors_field(:uuid))
-          @candlepin_attributes = candlepin_data.map { |consumer| [consumer[:uuid], consumer] }.to_h
+          @candlepin_attributes = candlepin_data.index_by { |consumer| consumer[:uuid] }
 
           @hosts = {}
           @hosts.merge!(load_hosts_by_uuid)
@@ -70,7 +70,7 @@ module Actions
           hosts_by_uuid.each do |host|
             validate_host_organization(host, host.organization.try(:id))
           end
-          hosts_by_uuid.map { |host| [host.subscription_facet.uuid, host] }.to_h
+          hosts_by_uuid.index_by { |host| host.subscription_facet.uuid }
         end
 
         def load_hosts_by_duplicate_name
@@ -82,7 +82,7 @@ module Actions
             validate_host_organization(host, duplicate_name_orgs[host.name].try(:id))
           end
 
-          hosts_by_dup_name.map { |host| [duplicate_names[host.name], host] }.to_h
+          hosts_by_dup_name.index_by { |host| duplicate_names[host.name] }
         end
 
         def create_missing_hosts

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

@@ -12,11 +12,9 @@ module Actions
           organization.save!
 
           sequence do
-            if ::SETTINGS[:katello][:use_cp]
-              cp_create = plan_action(Candlepin::Owner::Create,
-                                      label:  organization.label,
-                                      name: organization.name)
-            end
+            cp_create = plan_action(Candlepin::Owner::Create,
+                                    label:  organization.label,
+                                    name: organization.name)
             plan_action(Katello::Environment::LibraryCreate, organization.library)
           end
           if cp_create

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

@@ -17,7 +17,7 @@ module Actions
             remove_providers(organization)
             remove_environments(organization)
             plan_self
-            plan_action(Candlepin::Owner::Destroy, label: organization.label) if ::SETTINGS[:katello][:use_cp]
+            plan_action(Candlepin::Owner::Destroy, label: organization.label)
           end
         end
 

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

@@ -12,11 +12,9 @@ module Actions
           sequence do
             plan_action(Candlepin::Owner::DestroyImports, label: organization.label)
 
-            if SETTINGS[:katello][:use_pulp]
-              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
+            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
             plan_self
           end

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

@@ -17,7 +17,7 @@ module Actions
                         :force => force)
             plan_action(Candlepin::Owner::ImportProducts, :organization_id => organization.id)
 
-            if manifest_update && SETTINGS[:katello][:use_pulp]
+            if manifest_update
               repositories = ::Katello::Repository.in_default_view.in_product(::Katello::Product.redhat.in_org(organization))
               repositories.each do |repo|
                 plan_action(Katello::Repository::RefreshRepository, repo)

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

@@ -28,7 +28,7 @@ module Actions
                         :dependency => export_action.output)
             import_products = plan_action(Candlepin::Owner::ImportProducts, :organization_id => organization.id, :dependency => owner_import.output)
 
-            if manifest_update && SETTINGS[:katello][:use_pulp]
+            if manifest_update
               repositories = ::Katello::Repository.in_default_view.in_product(::Katello::Product.redhat.in_org(organization))
               repositories.each do |repo|
                 plan_action(Katello::Repository::RefreshRepository, repo, :dependency => import_products.output)

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

@@ -8,7 +8,7 @@ module Actions
         def plan(proxy)
           sequence do
             plan_action(Actions::Pulp::Orchestration::OrphanCleanup::RemoveOrphans, proxy)
-            if proxy.pulp3_enabled? && ::Katello::Ping.pulpcore_enabled
+            if proxy.pulp3_enabled?
               plan_action(
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)

data/app/lib/actions/katello/repository/check_matching_content.rb

@@ -23,8 +23,10 @@ module Actions
             yum_metadata_files = yum_metadata_files_match?(source_repo, target_repo)
             checksum_match = (target_repo.saved_checksum_type == source_repo.saved_checksum_type)
 
+            published = target_repo.backend_service(SmartProxy.pulp_primary).published?
+
             output[:checksum_match] = checksum_match
-            output[:matching_content] = yum_metadata_files && srpms_match && rpms && errata && package_groups && distributions && target_repo.published? && checksum_match
+            output[:matching_content] = yum_metadata_files && srpms_match && rpms && errata && package_groups && distributions && published && checksum_match
           end
 
           if source_repo.content_type == ::Katello::Repository::DEB_TYPE

data/app/lib/actions/katello/repository/clone_contents.rb

@@ -3,6 +3,8 @@ module Actions
     module Repository
       class CloneContents < Actions::Base
         include Actions::Katello::PulpSelector
+        include Actions::Katello::CheckMatchingContent
+
         def plan(source_repositories, new_repository, options)
           filters = options.fetch(:filters, nil)
           rpm_filenames = options.fetch(:rpm_filenames, nil)
@@ -20,10 +22,12 @@ module Actions
                           filters: filters, rpm_filenames: rpm_filenames, solve_dependencies: solve_dependencies)
             end
 
-            metadata_generate(source_repositories, new_repository, filters, rpm_filenames) if generate_metadata
+            matching_content = check_matching_content(new_repository, source_repositories)
+            metadata_generate(source_repositories, new_repository, filters, rpm_filenames, matching_content) if generate_metadata
 
             index_options = {id: new_repository.id}
             index_options[:source_repository_id] = source_repositories.first.id if source_repositories.count == 1 && filters.empty? && rpm_filenames.nil?
+            index_options[:matching_content] = matching_content
             plan_action(Katello::Repository::IndexContent, index_options)
 
             if purge_empty_contents && new_repository.backend_service(SmartProxy.pulp_primary).should_purge_empty_contents?
@@ -32,22 +36,15 @@ module Actions
           end
         end
 
-        def metadata_generate(source_repositories, new_repository, filters, rpm_filenames)
+        def metadata_generate(source_repositories, new_repository, filters, rpm_filenames, matching_content)
           metadata_options = {}
 
+          metadata_options[:matching_content] = matching_content
+
           if source_repositories.count == 1 && filters.empty? && rpm_filenames.empty?
             metadata_options[:source_repository] = source_repositories.first
           end
 
-          check_matching_content = ::Katello::RepositoryTypeManager.find(new_repository.content_type).metadata_publish_matching_check
-          if new_repository.environment && source_repositories.count == 1 && check_matching_content && !SmartProxy.pulp_primary.pulp3_support?(new_repository)
-            match_check_output = plan_action(Katello::Repository::CheckMatchingContent,
-                                :source_repo_id => source_repositories.first.id,
-                                :target_repo_id => new_repository.id).output
-
-            metadata_options[:matching_content] = match_check_output[:matching_content]
-          end
-
           plan_action(Katello::Repository::MetadataGenerate, new_repository, metadata_options)
           unless source_repositories.first.saved_checksum_type == new_repository.saved_checksum_type
             plan_self(:source_checksum_type => source_repositories.first.saved_checksum_type,

data/app/lib/actions/katello/repository/create.rb

@@ -10,14 +10,6 @@ module Actions
 
           action_subject(repository)
 
-          if repository.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND
-            ::Foreman::Deprecation.api_deprecation_warning("Background download_policy will be removed in Katello 4.0.  Any background repositories will be converted to Immediate")
-          end
-
-          if root['content_type'] == 'puppet' || root['content_type'] == 'ostree'
-            ::Foreman::Deprecation.api_deprecation_warning("Repository types of 'Puppet' and 'OSTree' will no longer be supported in Katello 4.0.")
-          end
-
           org = repository.organization
           pulp2_create_action = plan_create ? Actions::Pulp::Repository::CreateInPlan : Actions::Pulp::Repository::Create
           sequence do

data/app/lib/actions/katello/repository/filtered_index_content.rb

@@ -11,6 +11,9 @@ module Actions
         end
 
         # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/PerceivedComplexity
         def run
           repo = ::Katello::Repository.find(input[:id])
           if repo.puppet?

data/app/lib/actions/katello/repository/index_content.rb

@@ -8,6 +8,7 @@ module Actions
           param :id, Integer
           param :dependency, Hash
           param :contents_changed
+          param :matching_content
           param :source_repository_id
         end
 

data/app/lib/actions/katello/repository/multi_clone_contents.rb

@@ -3,6 +3,8 @@ module Actions
     module Repository
       class MultiCloneContents < Actions::Base
         include Actions::Katello::PulpSelector
+        include Actions::Katello::CheckMatchingContent
+
         def plan(extended_repo_mapping, options)
           generate_metadata = options.fetch(:generate_metadata, true)
           copy_contents = options.fetch(:copy_contents, true)
@@ -18,34 +20,29 @@ module Actions
 
             concurrence do
               extended_repo_mapping.each do |source_repos, dest_repo_map|
+                dest_repo_map[:matching_content] = check_matching_content(dest_repo_map[:dest_repo], source_repos)
+
                 if generate_metadata
-                  metadata_generate(source_repos, dest_repo_map[:dest_repo], dest_repo_map[:filters])
+                  metadata_generate(source_repos, dest_repo_map[:dest_repo], dest_repo_map[:filters], dest_repo_map[:matching_content])
                 end
               end
 
               extended_repo_mapping.values.each do |dest_repo_map|
-                plan_action(Katello::Repository::IndexContent, id: dest_repo_map[:dest_repo].id)
+                plan_action(Katello::Repository::IndexContent, id: dest_repo_map[:dest_repo].id, matching_content: dest_repo_map[:matching_content])
               end
             end
           end
         end
 
-        def metadata_generate(source_repositories, new_repository, filters)
+        def metadata_generate(source_repositories, new_repository, filters, matching_content)
           metadata_options = {}
 
+          metadata_options[:matching_content] = matching_content
+
           if source_repositories.count == 1 && filters.empty?
             metadata_options[:source_repository] = source_repositories.first
           end
 
-          check_matching_content = ::Katello::RepositoryTypeManager.find(new_repository.content_type).metadata_publish_matching_check
-          if new_repository.environment && source_repositories.count == 1 && check_matching_content
-            match_check_output = plan_action(Katello::Repository::CheckMatchingContent,
-                                :source_repo_id => source_repositories.first.id,
-                                :target_repo_id => new_repository.id).output
-
-            metadata_options[:matching_content] = match_check_output[:matching_content]
-          end
-
           plan_action(Katello::Repository::MetadataGenerate, new_repository, metadata_options)
           unless source_repositories.first.saved_checksum_type == new_repository.saved_checksum_type
             plan_self(:source_checksum_type => source_repositories.first.saved_checksum_type,

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

@@ -72,11 +72,7 @@ module Actions
               end
               plan_self(:id => repo.id, :sync_result => output, :skip_metadata_check => skip_metadata_check, :validate_contents => validate_contents,
                         :contents_changed => contents_changed)
-
-              if generate_applicability && !SETTINGS[:katello][:katello_applicability]
-                plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed)
-              end
-
+              plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed) if generate_applicability
               plan_action(Katello::Repository::SyncHook, :id => repo.id)
             end
           end

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

@@ -14,14 +14,6 @@ module Actions
 
           root.update!(repo_params)
 
-          if root.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND
-            ::Foreman::Deprecation.api_deprecation_warning("Background download_policy will be removed in Katello 4.0.  Any background repositories will be converted to Immediate")
-          end
-
-          if root['content_type'] == 'puppet' || root['content_type'] == 'ostree'
-            ::Foreman::Deprecation.api_deprecation_warning("Repository types of 'Puppet' and 'OSTree' will no longer be supported in Katello 4.0.")
-          end
-
           if update_content?(repository)
             content = root.content
 

data/app/lib/actions/middleware/execute_if_contents_changed.rb

@@ -13,7 +13,10 @@ module Actions
 
       def execute?
         if action.input.keys.include?('contents_changed') && action.input['contents_changed'] == false
-          self.action.output[:post_sync_skipped] = true
+          self.action.output[:post_action_skipped] = true
+          false
+        elsif action.input.keys.include?('matching_content') && action.input['matching_content'] == true
+          self.action.output[:post_action_skipped] = true
           false
         else
           true

data/app/lib/actions/pulp/orchestration/repository/refresh_repos.rb

@@ -4,12 +4,6 @@ module Actions
       module Repository
         class RefreshRepos < Pulp::AbstractAsyncTask
           include ::Actions::Katello::CapsuleContent::RefreshRepos
-          input_format do
-            param :smart_proxy_id
-            param :environment_id
-            param :content_view_id
-            param :repository_id
-          end
 
           def fetch_proxy_service(smart_proxy)
             ::Katello::Pulp::SmartProxyRepository.new(smart_proxy)

data/app/lib/actions/pulp3/capsule_content/refresh_distribution.rb

@@ -11,17 +11,17 @@ module Actions
                              :options => options)
         end
 
-        def run
+        def invoke_external_task
           smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
           options = input[:options]
           tasks = options[:tasks]
           repo = ::Katello::Repository.find(input[:repository_id])
           if options[:use_repository_version]
-            output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:use_repository_version => true)
+            repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:use_repository_version => true)
           elsif tasks && tasks[:pulp_tasks] && tasks[:pulp_tasks].first
             publication_href = tasks[:pulp_tasks].first[:created_resources].first
             if publication_href
-              output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:publication => publication_href)
+              repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:publication => publication_href)
             end
           end
         end

data/app/lib/actions/pulp3/content_guard/refresh_all_distributions.rb

@@ -6,8 +6,7 @@ module Actions
           sequence do
             plan_action(Actions::Pulp3::ContentGuard::Refresh, smart_proxy)
 
-            protected_types = [::Katello::Repository::YUM_TYPE, ::Katello::Repository::FILE_TYPE, ::Katello::Repository::DEB_TYPE]
-            roots = ::Katello::RootRepository.where(:content_type => protected_types).where(:unprotected => false)
+            roots = ::Katello::RootRepository.where.not(:content_type => ::Katello::Repository::DOCKER_TYPE).where(:unprotected => false)
             repositories = ::Katello::Repository.where(:root => roots)
             if repositories.any?
               plan_action(::Actions::BulkAction, Actions::Pulp3::Repository::RefreshDistribution, repositories, smart_proxy.id, assume_content_guard_exists: true)

data/app/lib/actions/pulp3/content_migration_presenter.rb

@@ -38,9 +38,7 @@ module Actions
         end
 
         def humanized_output
-          #prefer running reports where the done and total do not match
-          report = task_progress_reports.find { |current| current['state'] == 'running' && current['total'] != 0 && current['done'] != current['total'] }
-          report ||= task_progress_reports.find { |current| current['state'] == 'running' && current['total'] != 0 }
+          report = task_progress_reports.find { |current| current['state'] == 'running' && current['total'] != 0 }
           report ||= task_group_progress_reports.find { |current| current['total'] != 0 && current['done'] != current['total'] }
 
           if !report.blank? && report['total'] != 0
@@ -48,8 +46,7 @@ module Actions
           elsif report
             report['message']
           elsif task_progress_reports.empty?
-            "Content migration starting. These steps may take a while to complete. " \
-            "Refer to `foreman-maintain content migration-stats` for an estimate."
+            "Content migration starting. "
           else
             "Initial Migration steps complete."
           end

data/app/lib/actions/pulp3/orchestration/repository/refresh_repos.rb

@@ -4,12 +4,7 @@ module Actions
       module Repository
         class RefreshRepos < Pulp3::AbstractAsyncTask
           include ::Actions::Katello::CapsuleContent::RefreshRepos
-          input_format do
-            param :smart_proxy_id
-            param :environment_id
-            param :content_view_id
-            param :repository_id
-          end
+
           def fetch_proxy_service(smart_proxy)
             ::Katello::Pulp3::SmartProxyRepository.instance_for_type(smart_proxy)
           end

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -19,6 +19,11 @@ module Katello
         host.subscriptions.redhat.pluck(:name)
       end
 
+      def host_redhat_subscriptions_consumed(host)
+        presenter = ::Katello::HostSubscriptionsPresenter.new(host)
+        presenter.subscriptions.select(&:redhat?).sum(&:quantity_consumed)
+      end
+
       def host_content_facet(host)
         host.content_facet
       end
@@ -87,6 +92,9 @@ module Katello
       end
 
       # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def load_errata_applications(filter_errata_type: nil, include_last_reboot: 'yes', since: nil, up_to: nil, status: nil, host_filter: nil)
         result = []
 

data/app/lib/katello/errors.rb

@@ -53,7 +53,7 @@ module Katello
 
     class PulpcoreMissingCapabilities < StandardError
       def message
-        _("A smart proxy seems to have been refreshed without pulpcore being running. Please refresh the smart proxy after ensuring that pulpcore services are running.")
+        _("A smart proxy seems to have been refreshed without pulpcore being running.  You may want to ")
       end
     end
 

data/app/lib/katello/event_daemon/monitor.rb

@@ -0,0 +1,53 @@
+module Katello
+  module EventDaemon
+    class Monitor
+      def initialize(services)
+        @services = services
+        @service_statuses = {}
+        @services.keys.each do |service_name|
+          @service_statuses[service_name] = { running: 'starting' }
+        end
+      end
+
+      def start
+        write_statuses_to_cache
+        loop do
+          Rails.application.executor.wrap do
+            check_services
+          end
+          sleep 15
+        end
+      end
+
+      def write_statuses_to_cache
+        Rails.cache.write(
+          Katello::EventDaemon::Runner::STATUS_CACHE_KEY,
+          @service_statuses
+        )
+      end
+
+      def check_services
+        @services.each do |service_name, service_class|
+          @service_statuses[service_name] = service_class.status
+        rescue => error
+          Rails.logger.error("Error occurred while pinging #{service_class}")
+          Rails.logger.error(error.message)
+          Rails.logger.error(error.backtrace.join("\n"))
+        ensure
+          if error || !@service_statuses.dig(service_name, :running)
+            begin
+              service_class.close
+              service_class.run
+              @service_statuses[service_name] = service_class.status
+            rescue => error
+              Rails.logger.error("Error occurred while starting #{service_class}")
+              Rails.logger.error(error.message)
+              Rails.logger.error(error.backtrace.join("\n"))
+            end
+          end
+        end
+        write_statuses_to_cache
+      end
+    end
+  end
+end