katello 4.1.0.rc2.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b5fdc201af935cf74af29ff64e8b4ac30918984308a428615d4297780bf714e
-  data.tar.gz: df90a5fee570cae2ff2a3b9978fa91062a3d6dc8b1b704460780d6ef4141cc7a
+  metadata.gz: f30d037b42e387abe07cb200218782b7918735e7ae3e6eff511491914e7dc4e3
+  data.tar.gz: f92e5533113942c7f23d579f53dbe1474bbf68970d1ea9c53a850e98cfb7783c
 SHA512:
-  metadata.gz: 805ab590d81e32061ad21253b114e354189d8fa7379564a6bfa2b5f33215b3ed3715ee6d693b1ee61d709fa66f0fc72536efe1dcc51970b48de7f45390491674
-  data.tar.gz: a268def3988ff20934d0d218562e4b8f980457b5576803e9065a9f7b263a7371690ec510a40afa0719785868b8a3b7c31118e18a443d40ecf1ca002b474f7b99
+  metadata.gz: 9d408e0837a5efce7541213d3631d3d5f29dc552688cc54ca025d4add697c6443e0c6974b4bae66727eee4cbc34eb9cae37f8863b125b8725d1cdc71492480c0
+  data.tar.gz: 8ee4d0ab24c2d2525338cf6e44f54e67416682e3ce56db109d4460dd93d5bbdac7e038fa72fa9371817fa0f5ffd75ad68c3797fac3d365610ac29e3fefd7c48d

data/app/controllers/katello/api/v2/content_export_incrementals_controller.rb

@@ -83,7 +83,7 @@ module Katello
 
     def find_exportable_organization
       find_organization
-      unless @organization.can_export_library_content?
+      unless @organization.can_export_content?
         throw_resource_not_found(name: 'organization', id: params[:organization_id])
       end
     end

data/app/controllers/katello/api/v2/content_exports_controller.rb

@@ -67,7 +67,7 @@ module Katello
 
     def find_exportable_organization
       find_organization
-      unless @organization.can_export_library_content?
+      unless @organization.can_export_content?
         throw_resource_not_found(name: 'organization', id: params[:organization_id])
       end
     end

data/app/controllers/katello/api/v2/content_imports_controller.rb

@@ -49,7 +49,7 @@ module Katello
     private
 
     def check_authorized
-      fail HttpErrors::Forbidden, _("Action unauthorized to be performed in this organization.") unless ContentView.importable?
+      fail HttpErrors::Forbidden, _("Action unauthorized to be performed in this organization.") unless @organization.can_import_content?
     end
 
     def find_default_content_view
@@ -59,7 +59,7 @@ module Katello
 
     def find_importable_organization
       find_organization
-      throw_resource_not_found(name: 'organization', id: params[:organization_id]) unless @organization.can_import_library_content?
+      throw_resource_not_found(name: 'organization', id: params[:organization_id]) unless @organization.can_import_content?
     end
 
     def metadata_params

data/app/controllers/katello/api/v2/errata_controller.rb

@@ -3,10 +3,8 @@ module Katello
     apipie_concern_subst(:a_resource => N_("an erratum"), :resource => "errata")
     include Katello::Concerns::Api::V2::RepositoryContentController
 
-    before_action :find_host, :only => [:index, :available_errata]
-    before_action :find_optional_organization, :only => [:index, :auto_complete_search, :available_errata]
-    before_action :find_environment, :only => :available_errata
-    before_action :find_filter, :only => :available_errata
+    before_action :find_host, :only => [:index]
+    before_action :find_optional_organization, :only => [:index, :auto_complete_search]
 
     api :GET, "/errata", N_("List errata")
     param :organization_id, :number, :desc => N_("Organization identifier")
@@ -62,25 +60,6 @@ module Katello
       collection
     end
 
-    api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update. Will be removed in Katello 4.1."), :deprecated => true
-    param :id, :number, :desc => N_("Content View Version identifier"), :required => true
-    param :organization_id, :number, :desc => N_("Organization identifier")
-    param :content_view_filter_id, :number, :desc => N_("Content View Filter identifier")
-    param :repository_id, :number, :desc => N_("Repository identifier")
-    param :environment_id, :number, :desc => N_("Environment identifier")
-    param :cve, String, :desc => N_("CVE identifier")
-    param :host_id, :number, :desc => N_("Host id to list applicable errata for")
-    param :errata_restrict_applicable, :bool, :desc => N_("Return errata that are applicable to one or more hosts (defaults to true if host_id is specified)")
-    param :errata_restrict_installable, :bool, :desc => N_("Return errata that are upgradable on one or more hosts")
-    param_group :search, Api::V2::ApiController
-    def available_errata
-      params[:content_view_version_id] = params[:id]
-      find_content_view_version
-      params[:available_for] = "content_view_version"
-      sort_by, sort_order, options = sort_options
-      respond_for_index(:collection => scoped_search(index_relation, sort_by, sort_order, options))
-    end
-
     private
 
     def find_host

data/app/controllers/katello/api/v2/host_errata_controller.rb

@@ -1,6 +1,7 @@
 module Katello
   class Api::V2::HostErrataController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
+    include Katello::Concerns::Api::V2::HostErrataExtensions
 
     before_action :find_host, only: :index
     before_action :find_host_editable, except: :index
@@ -52,7 +53,7 @@ module Katello
 
     api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param :host_id, :number, :desc => N_("Host ID"), :required => true
-    param :errata_ids, Array, :desc => N_("List of Errata ids to install. Will be removed in Katello 4.1."), :required => false, :deprecated => true
+    param :errata_ids, Array, :desc => N_("List of Errata ids to install. Will be removed in %s") % katello_agent_removal_release, required: false, deprecated: true
 
     param_group :bulk_errata_ids
     def apply
@@ -72,36 +73,8 @@ module Katello
     api :PUT, "/hosts/:host_id/errata/applicability", N_("Force regenerate applicability.")
     param :host_id, :number, :desc => N_("Host ID"), :required => true
     def applicability
-      task = async_task(::Actions::Katello::Host::GenerateApplicability, [@host], false)
-      respond_for_async :resource => task
-    end
-
-    def find_bulk_errata_ids(bulk_params)
-      #works on a structure of param_group bulk_params and transforms it into a list of errata_ids
-      bulk_params[:included] ||= {}
-      bulk_params[:excluded] ||= {}
-      @errata = []
-
-      unless bulk_params[:included][:ids].blank?
-        @errata = @host.content_facet.installable_errata.where(:errata_id => bulk_params[:included][:ids])
-      end
-
-      if bulk_params[:included][:search]
-        search_errata = @host.content_facet.installable_errata
-        search_errata = search_errata.search_for(bulk_params[:included][:search])
-        if @errata.any?
-          @errata = ::Katello::Erratum.where(errata_id: @errata).or(::Katello::Erratum.where(errata_id: search_errata))
-        else
-          @errata = search_errata
-        end
-      end
-
-      @errata = @errata.where.not(errata_id: bulk_params[:excluded][:ids]) unless @errata.empty? || bulk_params[:excluded][:ids].blank?
-
-      if bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
-        fail HttpErrors::BadRequest, _("No errata has been specified.")
-      end
-      @errata.pluck(:errata_id)
+      Katello::Host::ContentFacet.trigger_applicability_generation(@host.id)
+      respond_for_async :resource => {}
     end
 
     protected
@@ -142,7 +115,7 @@ module Katello
         fail HttpErrors::NotFound, _("Couldn't find errata ids '%s'") % missing.to_sentence if missing.any?
         @errata_ids = params[:errata_ids]
       else
-        @errata_ids = find_bulk_errata_ids(params[:bulk_errata_ids])
+        @errata_ids = find_bulk_errata_ids([@host], params[:bulk_errata_ids])
       end
     end
   end

data/app/controllers/katello/api/v2/host_packages_controller.rb

@@ -15,7 +15,7 @@ module Katello
 
     def_param_group :packages_or_groups do
       param :packages, Array, :desc => N_("List of package names"), :required => false
-      param :groups, Array, :desc => N_("List of package group names"), :required => false
+      param :groups, Array, :desc => N_("List of package group names (Deprecated)"), :required => false
     end
 
     api :GET, "/hosts/:host_id/packages", N_("List packages installed on the host")

data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb

@@ -120,7 +120,7 @@ module Katello
     param :content_type, String,
           :desc => N_("The type of content.  The following types are supported: 'package', 'package_group' and 'errata'."),
           :required => true
-    param :content, Array, :desc => N_("List of content (e.g. package names, package group names or errata ids)")
+    param :content, Array, :desc => N_("List of content (e.g. package names, package group names (Deprecated) or errata ids)")
     def install_content
       content_action
     end

data/app/controllers/katello/api/v2/products_bulk_actions_controller.rb

@@ -43,7 +43,6 @@ module Katello
       task = async_task(::Actions::BulkAction,
                         ::Actions::Katello::Repository::Sync,
                         syncable_repositories,
-                        nil,
                         :skip_metadata_check => skip_metadata_check,
                         :validate_contents => validate_contents)
 

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -286,7 +286,7 @@ module Katello
         fail HttpErrors::BadRequest, _("attempted to sync without a feed URL")
       end
 
-      task = async_task(::Actions::Katello::Repository::Sync, @repository, nil, sync_options)
+      task = async_task(::Actions::Katello::Repository::Sync, @repository, sync_options)
       respond_for_async :resource => task
     rescue Errors::InvalidActionOptionError => e
       raise HttpErrors::BadRequest, e.message

data/app/controllers/katello/concerns/api/v2/host_errata_extensions.rb

@@ -0,0 +1,41 @@
+module Katello
+  module Concerns
+    module Api::V2::HostErrataExtensions
+      extend ActiveSupport::Concern
+
+      def find_bulk_errata_ids(hosts, bulk_errata_ids)
+        bulk_params = ActiveSupport::JSON.decode(bulk_errata_ids).deep_symbolize_keys
+        bulk_params[:included] ||= {}
+        bulk_params[:excluded] ||= {}
+
+        if bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
+          fail HttpErrors::BadRequest, _("No errata has been specified.")
+        end
+
+        #works on a structure of param_group bulk_params and transforms it into a list of errata_ids
+        errata = ::Katello::Erratum.installable_for_hosts(hosts)
+
+        if bulk_params[:included][:ids]
+          errata = errata.where(:errata_id => bulk_params[:included][:ids])
+        end
+
+        if bulk_params[:included][:search]
+          search_errata = ::Katello::Erratum.installable_for_hosts(hosts)
+          search_errata = search_errata.search_for(bulk_params[:included][:search])
+
+          if errata.any?
+            errata = errata.merge(search_errata)
+          else
+            errata = search_errata
+          end
+        end
+
+        if bulk_params[:excluded][:ids].present?
+          errata = errata.where.not(errata_id: bulk_params[:excluded][:ids])
+        end
+
+        errata.pluck(:errata_id)
+      end
+    end
+  end
+end

data/app/controllers/katello/remote_execution_controller.rb

@@ -2,6 +2,7 @@ module Katello
   if Katello.with_remote_execution?
     class RemoteExecutionController < JobInvocationsController
       include Concerns::Api::V2::BulkHostsExtensions
+      include Concerns::Api::V2::HostErrataExtensions
 
       def new
         @composer = prepare_composer
@@ -30,21 +31,16 @@ module Katello
       end
 
       def hosts
-        host_ids = params[:host_ids].is_a?(String) ? params[:host_ids].split(',') : params[:host_ids]
+        bulk_host_ids = ActiveSupport::JSON.decode(params[:bulk_host_ids]).deep_symbolize_keys
 
-        bulk_params = {
-          included: {
-            ids: host_ids,
-            search: params[:scoped_search]
-          }
-        }
-
-        find_bulk_hosts('edit_hosts', bulk_params)
+        find_bulk_hosts('edit_hosts', bulk_host_ids)
       end
 
       def errata_inputs
         if ::Foreman::Cast.to_bool(params[:install_all])
           Erratum.installable_for_hosts(hosts).pluck(:errata_id).join(',')
+        elsif params[:bulk_errata_ids]
+          find_bulk_errata_ids(hosts, params[:bulk_errata_ids]).join(',')
         else
           params[:name]
         end

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

@@ -32,7 +32,15 @@ module Actions
       private
 
       def poll_external_task
-        ::Katello::Resources::Candlepin::Job.get(external_task[:id])
+        task = ::Katello::Resources::Candlepin::Job.get(external_task[:id])
+        check_for_errors!(task)
+        task
+      end
+
+      def check_for_errors!(task)
+        if task[:state] == 'FAILED'
+          fail ::Katello::Errors::CandlepinError, task[:resultData]
+        end
       end
     end
   end

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

@@ -49,6 +49,8 @@ module Actions
 
             schedule_timeout(timeout)
           end
+        when Dynflow::Action::Skip
+          # Do not fail and goto a paused state, instead skip and send the state to warning so we do not block other host actions
         when Dynflow::Action::Timeouts::Timeout
           process_timeout
         when 'accepted'

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

@@ -3,22 +3,22 @@ module Actions
     module Applicability
       module Repository
         class Regenerate < Actions::EntryAction
-          middleware.use Actions::Middleware::ExecuteIfContentsChanged
-
           input_format do
-            param :repo_id, Integer
-            param :contents_changed
+            param :repo_ids, Array
           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)
+            repos = ::Katello::Repository.where(:id => input[:repo_ids]).select do |repo|
+              repo.last_contents_changed >= repo.last_applicability_regen
             end
 
-            ::Katello::EventQueue.push_event(::Katello::Events::GenerateHostApplicability::EVENT_TYPE, 0)
+            if repos.any?
+              host_ids = ::Katello::RootRepository.where(:id => repos.map(&:root_id)).hosts_with_applicability.pluck(:id)
+              ::Katello::Host::ContentFacet.trigger_applicability_generation(host_ids) unless host_ids.empty?
+
+              ::Katello::Repository.where(:id => repos.map(&:id)).update_all(:last_applicability_regen => DateTime.now)
+            end
+            output[:regenerated => repos.map(&:id)]
           end
 
           def humanized_name

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

@@ -39,7 +39,7 @@ module Actions
             end
 
             if smart_proxy.has_feature?(SmartProxy::PULP3_FEATURE)
-              plan_action(Actions::Pulp3::CapsuleContent::RefreshContentGuard, smart_proxy)
+              plan_action(Actions::Pulp3::ContentGuard::Refresh, smart_proxy)
               plan_action(Actions::Pulp3::Orchestration::Repository::RefreshRepos, smart_proxy, refresh_options)
             end
             plan_action(SyncCapsule, smart_proxy, refresh_options)

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

@@ -11,7 +11,6 @@ module Actions
 
           sequence do
             plan_self(:host_id => host.id, :hostname => host.name, :profile_string => profile_string)
-            plan_action(GenerateApplicability, [host])
           end
         end
 
@@ -39,13 +38,8 @@ module Actions
             Rails.logger.warn("Host with ID %s has no content facet, continuing" % host_id)
           else
             begin
-              if SmartProxy.pulp_primary&.has_feature?(SmartProxy::PULP_FEATURE)
-                ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_package_profile(profile)
-              end
               simple_packages = profile.map { |item| ::Katello::Pulp::SimplePackage.new(item) }
               host.import_package_profile(simple_packages)
-            rescue RestClient::ResourceNotFound
-              Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % host_id)
             rescue ActiveRecord::InvalidForeignKey # this happens if the host gets deleted in between the "find_by" and "import_package_profile"
               Rails.logger.warn("Host installed package list with ID %s was not able to be written to the DB (host likely is deleted), continuing" % host_id)
             end
@@ -57,6 +51,7 @@ module Actions
           #free the huge string from the memory
           input[:profile_string] = 'TRIMMED'.freeze
           UploadPackageProfile.upload(input[:host_id], profile)
+          ::Katello::Host::ContentFacet.trigger_applicability_generation(input[:host_id])
         end
       end
     end

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

@@ -13,7 +13,6 @@ module Actions
 
           sequence do
             plan_self(:host_id => host.id, :hostname => host.name, :profile_string => profile_string)
-            plan_action(GenerateApplicability, [host])
           end
         end
 
@@ -33,52 +32,12 @@ 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
-
-          updated_profiles = []
-          unless query_name_streams.empty?
-            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
-          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
-
-          module_stream_profile = updated_profiles + unassociated_profiles
-
-          if SmartProxy.pulp_primary&.has_feature?(SmartProxy::PULP_FEATURE)
-            unless module_stream_profile.empty?
-              begin
-                ::Katello::Pulp::Consumer.new(host.content_facet.uuid).
-                  upload_module_stream_profile(module_stream_profile)
-              rescue RestClient::ResourceNotFound
-                Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % host.id)
-              end
-            end
-          end
-        end
-
         def import_module_streams(payload, host)
           enabled_payload = payload.map do |profile|
             profile.slice("name", "stream", "version", "context", "arch").with_indifferent_access if profile["status"] == "enabled"
           end
           enabled_payload.compact!
 
-          UploadProfiles.upload_modules_to_pulp(enabled_payload, host)
           host.import_module_streams(payload)
         end
 
@@ -124,6 +83,8 @@ module Actions
             module_streams.each do |module_stream_payload|
               import_module_streams(module_stream_payload, host)
             end
+
+            ::Katello::Host::ContentFacet.trigger_applicability_generation(host.id)
           end
         end
       end

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

@@ -1,13 +1,13 @@
 module Actions
   module Katello
     module OrphanCleanup
-      class RemoveOrphans < Pulp::Abstract
+      class RemoveOrphans < Actions::Base
         input_format do
           param :capsule_id
         end
         def plan(proxy)
           sequence do
-            plan_action(Actions::Pulp::Orchestration::OrphanCleanup::RemoveOrphans, proxy)
+            plan_action(Actions::Pulp::Orchestration::OrphanCleanup::RemoveOrphans, proxy) if (proxy.has_feature?(SmartProxy::PULP_FEATURE) || proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE))
             if proxy.pulp3_enabled?
               plan_action(
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,