katello 3.18.0.rc2.1 → 4.0.0.rc2

data/app/lib/actions/katello/host/package_group/remove.rb

@@ -2,16 +2,13 @@ module Actions
   module Katello
     module Host
       module PackageGroup
-        class Remove < Actions::EntryAction
-          include Helpers::Presenter
+        class Remove < Actions::Katello::AgentAction
+          def self.agent_message
+            :remove_package_group
+          end
 
-          def plan(host, groups)
-            action_subject(host, :groups => groups)
-            plan_action(Pulp::Consumer::ContentUninstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'package_group',
-                        args:          groups)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_uninstall
           end
 
           def humanized_name
@@ -19,21 +16,12 @@ module Actions
           end
 
           def humanized_input
-            [input[:groups].join(', ')] + super
-          end
-
-          def presenter
-            Helpers::Presenter::Delegated.new(
-                self, planned_actions(Pulp::Consumer::ContentUninstall))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
+            [input[:content].join(', ')] + super
           end
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Removal of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Removal of package group(s) requested: %{groups}") % {groups: input[:content].join(", ")}).truncate(255))
           end
         end
       end

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

@@ -14,7 +14,7 @@ module Actions
             host.subscription_facet.purpose_addons = purpose_addon_objects
           end
 
-          host.subscription_facet.save!
+          host.save!
           plan_self(:hostname => host.name)
         end
 

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/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/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/middleware/record_smart_proxy_sync_history.rb

@@ -1,12 +1,32 @@
 module Actions
   module Middleware
     class RecordSmartProxySyncHistory < Dynflow::Middleware
-      def run(*args)
+      def save_smart_proxy_sync_history
         if (action.input[:repository_id] && (action.input[:smart_proxy_id] || action.input[:capsule_id]) && !self.action.output[:smart_proxy_history_id])
-          repo = ::Katello::Repository.find(action.input[:repository_id])
+          repo_id = action.input[:repository_id]
+          repo = ::Katello::Repository.find_by(id: repo_id)
           smart_proxy_id = action.input[:smart_proxy_id] || action.input[:capsule_id]
-          smart_proxy = ::SmartProxy.find(smart_proxy_id)
-          self.action.output[:smart_proxy_history_id] = repo.create_smart_proxy_sync_history(smart_proxy)
+          smart_proxy = ::SmartProxy.find_by(id: smart_proxy_id)
+
+          #skip pulp2 puppet syncs
+          if (repo_pulp_id = action.input[:repo_pulp_id])
+            return if ::Katello::ContentViewPuppetEnvironment.find_by(pulp_id: repo_pulp_id)
+          end
+
+          if repo && smart_proxy
+            self.action.output[:smart_proxy_history_id] = repo.create_smart_proxy_sync_history(smart_proxy)
+          else
+            fail "Smart Proxy could not be found with id #{smart_proxy_id}" if smart_proxy.nil?
+            fail "Repository could not be found with id #{repo_id}" if repo.nil?
+          end
+        end
+      end
+
+      def run(*args)
+        begin
+          save_smart_proxy_sync_history
+        rescue => error
+          Rails.logger.error("Error saving smart proxy history: #{error.message}")
         end
         pass(*args)
       end

data/app/lib/actions/pulp/consumer.rb

@@ -9,8 +9,6 @@ module Actions
               ret << task_result_packages
             elsif task_result_packages.any?
               ret.concat(task_result_packages.map { |package| package[:qname] })
-            else
-              ret << humanized_no_package
             end
             if humanized_errors
               ret.concat(humanized_errors)
@@ -96,15 +94,6 @@ module Actions
         def humanized_errors
           task_errors&.map { |k, v| "#{k}: #{v}" }
         end
-
-        def humanized_no_package
-          case action
-          when Consumer::ContentInstall
-            _("No new packages installed")
-          when Consumer::ContentUninstall
-            _("No packages removed")
-          end
-        end
       end
     end
   end

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_migration.rb

@@ -1,6 +1,8 @@
 module Actions
   module Pulp3
     class ContentMigration < Pulp3::AbstractAsyncTask
+      include Helpers::Presenter
+
       def plan(smart_proxy, options)
         sequence do
           action = plan_self(smart_proxy_id: smart_proxy.id)
@@ -13,6 +15,14 @@ module Actions
         migration_service.create_and_run_migrations
       end
 
+      def humanized_name
+        _("Content Migration")
+      end
+
+      def presenter
+        Actions::Pulp3::ContentMigrationPresenter.new(self)
+      end
+
       def rescue_strategy
         Dynflow::Action::Rescue::Skip
       end

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

@@ -0,0 +1,59 @@
+require 'katello/content_migration_progress'
+
+module Actions
+  module Pulp3
+    class ContentMigrationPresenter < Helpers::Presenter::Base
+      def initialize(migration_action)
+        @migration_action = migration_action
+      end
+
+      def humanized_output
+        if !@migration_action.done?
+          ContentMigrationTaskPresenter.new(@migration_action).humanized_output
+        else
+          task = ForemanTasks::Task.find_by(:external_id => @migration_action.execution_plan_id)
+          ::Katello::ContentMigrationProgress.find_by(:task_id => task.id)&.progress_message
+        end
+      end
+
+      class ContentMigrationTaskPresenter
+        def initialize(action)
+          @action = action
+        end
+
+        def task_progress_reports
+          if @action.pulp_tasks.empty?
+            []
+          else
+            @action.pulp_tasks[0].progress_reports
+          end
+        end
+
+        def task_group_progress_reports
+          if @action.task_groups.empty?
+            []
+          else
+            @action.task_groups[0].group_progress_reports
+          end
+        end
+
+        def humanized_output
+          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
+            "#{report['message']} #{report['done']}/#{report['total']}"
+          elsif report
+            report['message']
+          elsif task_progress_reports.empty?
+            "Content migration starting. "
+          else
+            "Initial Migration steps complete."
+          end
+        rescue
+          ""
+        end
+      end
+    end
+  end
+end