katello 3.15.1 → 3.16.0.rc2.1

data/app/lib/actions/katello/product/content_create.rb

@@ -11,7 +11,7 @@ module Actions
                                            owner:       root.product.organization.label,
                                            name:        root.name,
                                            type:        root.content_type,
-                                           arches:      root.arch == "noarch" ? nil : root.arch,
+                                           arches:      root.format_arches,
                                            label:       root.custom_content_label,
                                            content_url: root.custom_content_path)
               content_id = content_create.output[:response][:id]
@@ -29,7 +29,7 @@ module Actions
                           content_id:  content_id,
                           name:        root.name,
                           type:        root.content_type,
-                          arches:      root.arch == "noarch" ? "" : root.arch,
+                          arches:      root.format_arches,
                           label:       root.custom_content_label,
                           content_url: root.custom_content_path,
                           gpg_key_url: root.library_instance.yum_gpg_key_url)
@@ -41,7 +41,7 @@ module Actions
 
         def finalize
           root = ::Katello::RootRepository.find(input[:root_repository_id])
-          root.update_attributes(:content_id => input[:content_id])
+          root.update(:content_id => input[:content_id])
 
           content = ::Katello::Content.create!(name: root.name,
                                                organization_id: root.product.organization_id,

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

@@ -31,7 +31,7 @@ module Actions
 
         def run
           product = ::Katello::Product.find(input[:product][:id])
-          product.update_attributes!(:cp_id => input[:cp_id])
+          product.update!(:cp_id => input[:cp_id])
         end
 
         def humanized_name

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

@@ -2,7 +2,7 @@ module Actions
   module Katello
     module Product
       class Destroy < Actions::EntryAction
-        # rubocop:disable MethodLength
+        # rubocop:disable Metrics/MethodLength
         def plan(product, options = {})
           organization_destroy = options.fetch(:organization_destroy, false)
 

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

@@ -4,7 +4,7 @@ module Actions
       class Update < Actions::EntryAction
         def plan(product, product_params)
           action_subject product
-          product.update_attributes!(product_params)
+          product.update!(product_params)
           if product.previous_changes.key?('gpg_key_id')
             plan_action(::Actions::Katello::Product::RepositoriesGpgReset, product)
           end

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

@@ -15,7 +15,7 @@ module Actions
         private
 
         def update_url(provider, base_url)
-          provider.update_attributes!(:repository_url => base_url)
+          provider.update!(:repository_url => base_url)
 
           if provider.redhat_provider?
             provider.products.enabled.each do |product|

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

@@ -58,7 +58,7 @@ module Actions
         def finalize
           repository = ::Katello::Repository.find(input[:target_repo_id])
           source_checksum_type = input[:source_checksum_type]
-          repository.update_attributes!(saved_checksum_type: source_checksum_type) if (repository && source_checksum_type)
+          repository.update!(saved_checksum_type: source_checksum_type) if (repository && source_checksum_type)
         end
       end
     end

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

@@ -30,7 +30,7 @@ module Actions
 
           if clone
             clone = ::Katello::Repository.find(clone.id) # reload readonly object
-            clone.update_attributes!(content_view_version_id: version.id)
+            clone.update!(content_view_version_id: version.id)
           else
             clone = repository.build_clone(environment: environment, content_view: version.content_view)
           end

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

@@ -11,11 +11,11 @@ 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 3.16.  Any background repositories will be converted to Immediate")
+            ::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 3.16.")
+            ::Foreman::Deprecation.api_deprecation_warning("Repository types of 'Puppet' and 'OSTree' will no longer be supported in Katello 4.0.")
           end
 
           org = repository.organization

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

@@ -5,8 +5,9 @@ module Actions
         input_format do
           param :id, Integer
           param :filter
-          param :dependency
+          param :import_upload_task
           param :content_type
+          param :upload_actions
         end
 
         def run
@@ -23,8 +24,16 @@ module Actions
             unit_ids = search_units(repo)
             ::Katello::Deb.import_all(unit_ids, repo)
           elsif repo.yum?
-            unit_ids = search_units(repo)
-            if input[:content_type] == 'srpm'
+            if input[:import_upload_task] && input[:import_upload_task][:content_unit_href]
+              unit_ids = [input[:import_upload_task][:content_unit_href]]
+            elsif input[:upload_actions]&.any? { |action| action.try(:[], "content_unit_href") }
+              uploaded_content_unit_hrefs = []
+              input[:upload_actions].each { |action| uploaded_content_unit_hrefs << action.try(:[], "content_unit_href") }
+              unit_ids = uploaded_content_unit_hrefs.compact
+            else
+              unit_ids = search_units(repo)
+            end
+            if input[:content_type] == ::Katello::Srpm::CONTENT_TYPE
               ::Katello::Srpm.import_all(unit_ids, repo)
             else
               ::Katello::Rpm.import_all(unit_ids, repo)

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

@@ -3,7 +3,8 @@ module Actions
     module Repository
       class FinishUpload < Actions::Base
         def plan(repository, options = {})
-          dependency = options.fetch(:dependency, nil)
+          import_upload_task = options.fetch(:import_upload_task, nil)
+          upload_actions = options.fetch(:upload_actions, nil)
           content_type = options.fetch(:content_type)
           if content_type
             unit_type_id = SmartProxy.pulp_master.content_service(content_type)::CONTENT_TYPE
@@ -12,14 +13,15 @@ module Actions
             unit_type_id = SmartProxy.pulp_master.content_service(content_type)::CONTENT_TYPE
           end
           generate_metadata = options.fetch(:generate_metadata, true)
-          plan_action(Katello::Repository::MetadataGenerate, repository, :dependency => dependency) if generate_metadata
+          plan_action(Katello::Repository::MetadataGenerate, repository, :dependency => import_upload_task) if generate_metadata
 
           recent_range = 5.minutes.ago.utc.iso8601
           plan_action(Katello::Repository::FilteredIndexContent,
                       id: repository.id,
                       filter: {:association => {:created => {"$gt" => recent_range}}},
                       content_type: unit_type_id,
-                      dependency: dependency)
+                      import_upload_task: import_upload_task,
+                      upload_actions: upload_actions)
         end
       end
     end

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

@@ -1,4 +1,4 @@
-# rubocop:disable HandleExceptions
+# rubocop:disable Lint/SuppressedException
 module Actions
   module Katello
     module Repository
@@ -30,7 +30,7 @@ module Actions
                 import_upload = plan_pulp_action([Actions::Pulp::Repository::ImportUpload,
                                                   Actions::Pulp3::Orchestration::Repository::ImportUpload],
                                   repository, SmartProxy.pulp_master, import_upload_args)
-                plan_action(FinishUpload, repository, :dependency => import_upload.output,
+                plan_action(FinishUpload, repository, :import_upload_task => import_upload.output,
                             generate_metadata: false, content_type: options[:content_type])
                 import_upload.output
               end

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

@@ -1,4 +1,4 @@
-# rubocop:disable HandleExceptions
+# rubocop:disable Lint/SuppressedException
 module Actions
   module Katello
     module Repository
@@ -15,29 +15,31 @@ module Actions
         # @param repo
         # @param pulp_sync_task_id in case the sync was triggered outside
         #   of Katello and we just need to finish the rest of the orchestration
-        # rubocop:disable MethodLength
-        # rubocop:disable CyclomaticComplexity
+        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/AbcSize
         def plan(repo, _pulp_sync_task_id = nil, options = {})
           action_subject(repo)
 
           source_url = options.fetch(:source_url, nil)
           incremental = options.fetch(:incremental, false)
           validate_contents = options.fetch(:validate_contents, false)
-          skip_metadata_check = options.fetch(:skip_metadata_check, false) || validate_contents
-          # TODO: Remove the check for Pulp 3 once Pulp 3 errata is working fully
-          generate_applicability = repo.yum? && !SmartProxy.pulp_master.pulp3_support?(repo)
-
-          pulp_sync_options = {}
-          pulp_sync_options[:download_policy] = ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND if validate_contents
-          pulp_sync_options[:force_full] = true if skip_metadata_check
-          pulp_sync_options[:remove_missing] = false if incremental
+          skip_metadata_check = options.fetch(:skip_metadata_check, false) || (validate_contents && repo.yum?)
+          generate_applicability = repo.yum?
 
           fail ::Katello::Errors::InvalidActionOptionError, _("Unable to sync repo. This repository does not have a feed url.") if repo.url.blank? && source_url.blank?
-          fail ::Katello::Errors::InvalidActionOptionError, _("Cannot validate contents on non-yum repositories.") if validate_contents && !repo.yum?
+          fail ::Katello::Errors::InvalidActionOptionError, _("Cannot validate contents on non-yum/deb repositories.") if validate_contents && !repo.yum? && !repo.deb?
           fail ::Katello::Errors::InvalidActionOptionError, _("Cannot skip metadata check on non-yum repositories.") if skip_metadata_check && !repo.yum?
 
+          pulp_sync_options = {}
+          pulp_sync_options[:download_policy] = ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND if validate_contents && repo.yum?
+          pulp_sync_options[:force_full] = true if skip_metadata_check && repo.yum?
+          pulp_sync_options[:repair_sync] = true if validate_contents && repo.deb?
+          pulp_sync_options[:remove_missing] = false if incremental
+
           sequence do
-            plan_action(Pulp::Repository::RemoveUnits, :repo_id => repo.id, :content_unit_type => ::Katello::YumMetadataFile::CONTENT_TYPE) if validate_contents
+            plan_action(Pulp::Repository::RemoveUnits, :repo_id => repo.id, :content_unit_type => ::Katello::YumMetadataFile::CONTENT_TYPE) if validate_contents && repo.yum?
             sync_args = {:smart_proxy_id => SmartProxy.pulp_master.id, :repo_id => repo.id, :source_url => source_url, :options => pulp_sync_options}
             sync_action = plan_pulp_action([Actions::Pulp::Orchestration::Repository::Sync,
                                             Actions::Pulp3::Orchestration::Repository::Sync],
@@ -53,10 +55,12 @@ module Actions
             plan_action(Katello::Repository::FetchPxeFiles, :id => repo.id)
             plan_action(Katello::Repository::CorrectChecksum, repo)
             concurrence do
-              plan_action(Pulp::Repository::Download, :pulp_id => repo.pulp_id, :options => {:verify_all_units => true}) if validate_contents
-              plan_action(Katello::Repository::MetadataGenerate, repo, :force => true) if skip_metadata_check
+              plan_action(Pulp::Repository::Download, :pulp_id => repo.pulp_id, :options => {:verify_all_units => true}) if validate_contents && repo.yum?
+              plan_action(Katello::Repository::MetadataGenerate, repo, :force => true) if skip_metadata_check && repo.yum?
               plan_action(Katello::Repository::ErrataMail, repo, nil, contents_changed)
-              plan_action(Pulp::Repository::RegenerateApplicability, :repository_id => repo.id, :contents_changed => contents_changed) if generate_applicability
+              if generate_applicability
+                regenerate_applicability(repo, contents_changed)
+              end
             end
             plan_self(:id => repo.id, :sync_result => output, :skip_metadata_check => skip_metadata_check, :validate_contents => validate_contents,
                       :contents_changed => contents_changed)
@@ -97,6 +101,14 @@ module Actions
           end
         end
 
+        def regenerate_applicability(repo, contents_changed)
+          if SETTINGS[:katello][:katello_applicability]
+            plan_action(Actions::Katello::Applicability::Repository::Regenerate, :repo_id => repo.id, :contents_changed => contents_changed)
+          else
+            plan_action(Pulp::Repository::RegenerateApplicability, :repository_id => repo.id, :contents_changed => contents_changed)
+          end
+        end
+
         def rescue_strategy
           Dynflow::Action::Rescue::Skip
         end

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

@@ -10,14 +10,16 @@ module Actions
           action_subject root.library_instance
 
           repo_params[:url] = nil if repo_params[:url] == ''
-          root.update_attributes!(repo_params)
+          update_cv_cert_protected = (repo_params[:unprotected] != repository.unprotected)
+
+          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 3.16.  Any background repositories will be converted to Immediate")
+            ::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 3.16.")
+            ::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)
@@ -31,9 +33,9 @@ module Actions
                         :gpg_key_url => repository.yum_gpg_key_url,
                         :label => content.label,
                         :type => root.content_type,
-                        :arches => root.arch == "noarch" ? nil : root.arch)
+                        :arches => root.format_arches)
 
-            content.update_attributes!(name: root.name,
+            content.update!(name: root.name,
                                        content_url: root.custom_content_path,
                                        content_type: repository.content_type,
                                        label: content.label,
@@ -44,15 +46,24 @@ module Actions
                               ::Actions::Pulp3::Orchestration::Repository::Update],
                              repository,
                              SmartProxy.pulp_master)
-            plan_self(:repository_id => root.library_instance.id)
+            plan_self(:repository_id => root.library_instance.id, :update_cv_cert_protected => update_cv_cert_protected)
           end
         end
 
         def run
           repository = ::Katello::Repository.find(input[:repository_id])
+          output[:repository_id] = input[:repository_id]
+          output[:update_cv_cert_protected] = input[:update_cv_cert_protected]
           ForemanTasks.async_task(Katello::Repository::MetadataGenerate, repository)
         end
 
+        def finalize
+          repository = ::Katello::Repository.find(output[:repository_id])
+          if output[:update_cv_cert_protected]
+            ForemanTasks.async_task(::Actions::Katello::Repository::UpdateCVRepoCertGuard, repository, SmartProxy.pulp_master)
+          end
+        end
+
         private
 
         def update_content?(repository)

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

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module Repository
+      class UpdateCVRepoCertGuard < Actions::Base
+        include Actions::Katello::PulpSelector
+
+        def plan(repository, smart_proxy)
+          plan_optional_pulp_action([::Actions::Pulp3::Repository::UpdateCVRepositoryCertGuard], repository, smart_proxy)
+        end
+
+        def humanized_name
+          _("Updating repository authentication configuration")
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,8 @@ module Actions
       class UpdateRedhatRepository < Actions::EntryAction
         def plan(repo)
           action_subject repo
-          repo.root.update_attributes!(:url => upstream_url(repo)) if repo.library_instance?
-          repo.update_attributes!(relative_path: relative_path(repo))
+          repo.root.update!(:url => upstream_url(repo)) if repo.library_instance?
+          repo.update!(relative_path: relative_path(repo))
           plan_action(::Actions::Pulp::Repository::Refresh, repo)
           plan_self(:repository_id => repo.id)
         end

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

@@ -1,4 +1,4 @@
-# rubocop:disable HandleExceptions
+# rubocop:disable Lint/SuppressedException
 require 'fileutils'
 require 'English'
 
@@ -13,18 +13,21 @@ module Actions
 
           content_type ||= ::Katello::RepositoryTypeManager.find(repository.content_type).default_managed_content_type.label
           unit_type_id = SmartProxy.pulp_master.content_service(content_type)::CONTENT_TYPE
-
+          upload_actions = []
           sequence do
             concurrence do
               tmp_files.each do |file|
                 sequence do
-                  plan_pulp_action([Pulp::Orchestration::Repository::UploadContent,
-                                    Pulp3::Orchestration::Repository::UploadContent],
+                  upload_action = plan_pulp_action([Pulp::Orchestration::Repository::UploadContent,
+                                                    Pulp3::Orchestration::Repository::UploadContent],
                                                    repository, SmartProxy.pulp_master!, file, unit_type_id)
+
+                  upload_actions << upload_action.output
                 end
               end
             end
-            plan_action(FinishUpload, repository, content_type: content_type)
+
+            plan_action(FinishUpload, repository, content_type: content_type, upload_actions: upload_actions)
             plan_self(tmp_files: tmp_files)
           end
         ensure

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

@@ -3,7 +3,7 @@ module Actions
     module Subscription
       class Update < Actions::EntryAction
         def plan(subscription, subscription_params)
-          subscription.update_attributes!(subscription_params)
+          subscription.update!(subscription_params)
         end
       end
     end

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

@@ -55,7 +55,7 @@ module Actions
             _("checking Pulp task status")
           end
         when :suspended
-          if external_task && external_task.all? { |task| task[:start_time].nil? }
+          if external_task&.all? { |task| task[:start_time].nil? }
             _("waiting for Pulp to start the task")
           else
             _("waiting for Pulp to finish the task")
@@ -84,10 +84,8 @@ module Actions
       def cancel
         output[:pulp_tasks].each do |pulp_task|
           task_resource.cancel(pulp_task['task_id'])
-          if pulp_task['spawned_tasks']
-            #the main task may have completed, so cancel spawned tasks too
-            pulp_task['spawned_tasks'].each { |spawned| task_resource.cancel(spawned['task_id']) }
-          end
+          #the main task may have completed, so cancel spawned tasks too
+          pulp_task['spawned_tasks']&.each { |spawned| task_resource.cancel(spawned['task_id']) }
         end
       end
 

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

@@ -94,9 +94,7 @@ module Actions
         end
 
         def humanized_errors
-          if task_errors
-            task_errors.map { |k, v| "#{k}: #{v}" }
-          end
+          task_errors&.map { |k, v| "#{k}: #{v}" }
         end
 
         def humanized_no_package

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

@@ -28,7 +28,7 @@ module Actions
           output[:pulp_tasks].each do |pulp_task|
             error_details = pulp_task.try(:[], "result").try(:[], "details").try(:[], "rpm").try(:[], "details").try(:[], "trace")
             error_message = pulp_task.try(:[], "result").try(:[], "details").try(:[], "rpm").try(:[], "details").try(:[], "message")
-            if error_details && error_details.include?("YumDownloadError") && error_message
+            if error_details&.include?("YumDownloadError") && error_message
               fail _("An error occurred during the sync \n%{error_message}") % {:error_message => error_details}
             end
           end

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

@@ -3,7 +3,6 @@ module Actions
     module Orchestration
       module Repository
         class SmartProxySync < Pulp::Abstract
-          # rubocop:disable MethodLength
           def plan(repository, smart_proxy, options)
             skip_metadata_check = options.fetch(:skip_metadata_check, false)
             sequence do

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

@@ -3,6 +3,7 @@ module Actions
     module Orchestration
       module Repository
         class UploadContent < Pulp::Abstract
+          include Actions::Helpers::OutputPropagator
           def plan(repository, smart_proxy, file, unit_type_id)
             sequence do
               upload_request = plan_action(Pulp::Repository::CreateUploadRequest)
@@ -17,6 +18,7 @@ module Actions
                           upload_id: upload_request.output[:upload_id])
               plan_action(Pulp::Repository::DeleteUploadRequest,
                           upload_id: upload_request.output[:upload_id])
+              plan_self(:subaction_output => nil)
             end
           end