katello 4.14.1 → 4.15.0.rc1

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

@@ -0,0 +1,54 @@
+module Katello
+  class Api::V2::ContentViewEnvironmentsController < Api::V2::ApiController
+    before_action :find_optional_organization, :only => [:index, :auto_complete_search]
+    before_action :find_environment
+    before_action :find_content_view
+    before_action :find_activation_key
+    before_action :find_host
+
+    resource_description do
+      api_version "v2"
+    end
+
+    api :GET, "/content_view_environments", N_("List content view environments")
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
+    param :lifecycle_environment_id, :number, :desc => N_("environment identifier"), :required => false
+    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => false
+    param :activation_key_id, :number, :desc => N_("Activation key identifier"), :required => false
+    param :host_id, :number, :desc => N_("Host identifier"), :required => false
+    param_group :search, Api::V2::ApiController
+    def index
+      respond(:collection => scoped_search(index_relation.distinct, :id, :asc, resource_class: ContentViewEnvironment))
+    end
+
+    def index_relation
+      content_view_environments = ContentViewEnvironment.readable.non_generated
+      content_view_environments = content_view_environments.in_organization(@organization) if @organization
+      content_view_environments = content_view_environments.where(environment: @environment) if @environment
+      content_view_environments = content_view_environments.where(content_view: @content_view) if @content_view
+      content_view_environments = content_view_environments.where(id: @activation_key.content_view_environments) if @activation_key
+      content_view_environments = content_view_environments.where(id: @host.content_view_environments) if @host
+      content_view_environments
+    end
+
+    def find_environment
+      return unless params.key?(:lifecycle_environment_id)
+      @environment = KTEnvironment.readable.find(params[:lifecycle_environment_id])
+    end
+
+    def find_content_view
+      return unless params.key?(:content_view_id)
+      @content_view = ContentView.readable.find(params[:content_view_id])
+    end
+
+    def find_activation_key
+      return unless params.key?(:activation_key_id)
+      @activation_key = ActivationKey.readable.find(params[:activation_key_id])
+    end
+
+    def find_host
+      return unless params.key?(:host_id)
+      @host = ::Host::Managed.authorized("view_hosts").find(params[:host_id])
+    end
+  end
+end

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

@@ -28,7 +28,7 @@ module Katello
     add_scoped_search_description_for(ContentViewVersion)
     def index
       options = {
-        :includes => [:content_view, :environments, :composite_content_views, :history => :task]
+        :includes => [:content_view, :environments, :composite_content_views, :history => :task],
       }
       respond(:collection => scoped_search(index_relation.distinct, :version, :desc, options))
     end
@@ -200,7 +200,7 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. New ver
       list.each do |combination|
         version_environment = {
           :content_view_version => ContentViewVersion.find(combination[:content_view_version_id]),
-          :environments => KTEnvironment.where(:id => combination[:environment_ids])
+          :environments => KTEnvironment.where(:id => combination[:environment_ids]),
         }
 
         view = version_environment[:content_view_version].content_view
@@ -230,7 +230,7 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. New ver
       component.composites.select { |c| c.environments.any? }.map do |composite|
         {
           :content_view_version => composite,
-          :environments => composite.environments
+          :environments => composite.environments,
         }
       end
     end

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

@@ -41,7 +41,7 @@ module Katello
     def filtered_associations
       {
         :component_ids => Katello::ContentViewVersion,
-        :repository_ids => Katello::Repository
+        :repository_ids => Katello::Repository,
       }
     end
 

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

@@ -154,7 +154,7 @@ module Katello
       collection = {
         :results => paths,
         :total => paths.size,
-        :subtotal => paths.size
+        :subtotal => paths.size,
       }
       respond_for_index(:collection => collection, :template => :paths)
     end

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

@@ -21,7 +21,7 @@ module Katello
                                   syncable_repos: ::Katello::Repository.exportable_types(
                                     format: ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE).join(", "),
                                   importable_repos: ::Katello::Repository.exportable_types(
-                                    format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE).join(", ")
+                                    format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE).join(", "),
                                 }),
                      :required => false
     end

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

@@ -8,7 +8,7 @@ module Katello
       :destroy,
       :add_hosts,
       :remove_hosts,
-      :hosts
+      :hosts,
     ]
     before_action :find_readable_activation_key, :only => [:index]
     before_action :find_editable_host, :only => [:index]
@@ -187,7 +187,7 @@ module Katello
                :description,
                :max_hosts,
                :unlimited_hosts,
-               { :host_ids => [] }
+               { :host_ids => [] },
               ]
       params.fetch(:host_collection).permit(*attrs)
     end

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

@@ -3,7 +3,7 @@ module Katello
     def_param_group :content_facet_attributes do
       param :content_view_id, Integer, :desc => N_("Id of the single content view to be associated with the host.")
       param :lifecycle_environment_id, Integer, :desc => N_("Id of the single lifecycle environment to be associated with the host.")
-      param :content_view_environments, Array, :desc => N_("Comma-separated list of Candlepin environment names to be associated with the host,"\
+      param :content_view_environments, Array, :desc => N_("Comma-separated list of content view environment labels to be associated with the host,"\
                                               " in the format of 'lifecycle_environment_label/content_view_label'."\
                                               " Ignored if content_view_environment_ids is specified, or if content_view_id and lifecycle_environment_id are specified."\
                                               " Requires allow_multiple_content_views setting to be on.")

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

@@ -6,7 +6,7 @@ module Katello
     TYPES_FROM_PARAMS = {
       bugfix: Katello::Erratum::BUGZILLA, # ['bugfix', 'recommended']
       security: Katello::Erratum::SECURITY, # ['security']
-      enhancement: Katello::Erratum::ENHANCEMENT # ['enhancement', 'optional']
+      enhancement: Katello::Erratum::ENHANCEMENT, # ['enhancement', 'optional']
     }.freeze
 
     before_action :find_host, only: :index

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

@@ -260,7 +260,7 @@ module Katello
         @content_overrides = content_labels.map do |label|
           { content_label: label,
             value: Foreman::Cast.to_bool(params[:content_overrides_search][:enabled]),
-            remove: Foreman::Cast.to_bool(params[:content_overrides_search][:remove])
+            remove: Foreman::Cast.to_bool(params[:content_overrides_search][:remove]),
           }
         end
       else

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

@@ -232,10 +232,7 @@ module Katello
         version_environment[:environments] << cve.environment unless version_environment[:environments].include?(cve.environment)
         version_environment[:next_version] ||= version.next_incremental_version
         version_environment[:content_host_count] ||= 0
-        version_environment[:content_host_count] += content_facets.in_content_views_and_environments(
-          content_views: [cve.content_view],
-          lifecycle_environments: [cve.environment]
-        ).count
+        version_environment[:content_host_count] += content_facets.with_content_view_environments(cve).count
 
         if version.content_view.composite?
           version_environment[:components] = version.components_needing_errata(@errata)

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

@@ -134,7 +134,7 @@ module Katello
       response = {
         :results => available_releases,
         :total => available_releases.size,
-        :subtotal => available_releases.size
+        :subtotal => available_releases.size,
       }
       respond_for_index :collection => response
     end

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

@@ -350,7 +350,7 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. On the
       sync_options = {
         :skip_metadata_check => ::Foreman::Cast.to_bool(params[:skip_metadata_check]),
         :validate_contents => ::Foreman::Cast.to_bool(params[:validate_contents]),
-        :incremental => ::Foreman::Cast.to_bool(params[:incremental])
+        :incremental => ::Foreman::Cast.to_bool(params[:incremental]),
       }
 
       if @repository.url.blank?
@@ -515,7 +515,7 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. On the
         upload_args = {
           content_type: params[:content_type],
           generate_metadata: generate_metadata,
-          sync_capsule: sync_capsule
+          sync_capsule: sync_capsule,
         }
         upload_args.merge!(generic_content_type_import_upload_args)
 
@@ -650,6 +650,7 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. On the
         root.deb_releases = repo_params[:deb_releases] if repo_params[:deb_releases]
         root.deb_components = repo_params[:deb_components] if repo_params[:deb_components]
         root.deb_architectures = repo_params[:deb_architectures] if repo_params[:deb_architectures]
+        root.content_id = 'INITIAL_DUMMY_VALUE' unless Setting['deb_enable_structured_apt']
       end
 
       if root.ansible_collection?

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

@@ -85,7 +85,7 @@ module Katello
       collection = {
         :results => sorted_repos.reverse,
         :subtotal => repos.size,
-        :total => repos.size
+        :total => repos.size,
       }
 
       respond_for_index :collection => collection

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

@@ -3,6 +3,7 @@ module Katello
     module Api::V2::HostsControllerExtensions
       extend ActiveSupport::Concern
       include ForemanTasks::Triggers
+      include Katello::Concerns::Api::V2::MultiCVParamsHandling
 
       module Overrides
         def action_permission
@@ -45,23 +46,16 @@ module Katello
           content_facet_attributes = params.dig(:host, :content_facet_attributes)
           return if content_facet_attributes.blank? || @host&.content_facet.blank? ||
             (cve_params[:content_view_id].present? && cve_params[:lifecycle_environment_id].present?)
-          new_cves = nil
-          if cve_params[:content_view_environments].present? && cve_params[:content_view_environment_ids].blank?
-            # Must do maps here to ensure CVEs remain in the same order.
-            # Using ActiveRecord .where will return them in a different order.
-            environment_names = cve_params[:content_view_environments].map(&:strip)
-            Rails.logger.debug "new environment names: #{environment_names}"
-            new_cves = environment_names.map do |name|
-              ::Katello::ContentViewEnvironment.with_candlepin_name(name, organization: @host.organization)
-            end
-          end
-          if cve_params[:content_view_environment_ids].present?
-            new_cves = cve_params[:content_view_environment_ids].map do |id|
-              ::Katello::ContentViewEnvironment.find_by(id: id)
-            end
+          cves = ::Katello::ContentViewEnvironment.fetch_content_view_environments(
+            labels: cve_params[:content_view_environments],
+            ids: cve_params[:content_view_environment_ids],
+            organization: @organization || @host&.organization)
+          if cves.present?
+            @host.content_facet.content_view_environments = cves
+          else
+            handle_errors(labels: cve_params[:content_view_environments],
+              ids: cve_params[:content_view_environment_ids])
           end
-
-          @host.content_facet.content_view_environments = new_cves.compact if new_cves.present?
         end
 
         def cve_params

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

@@ -0,0 +1,24 @@
+module Katello
+  module Concerns
+    module Api::V2::MultiCVParamsHandling
+      extend ActiveSupport::Concern
+      include ::Katello::Api::V2::ErrorHandling
+
+      def handle_errors(labels: [], ids: [])
+        if labels.present?
+          fail HttpErrors::UnprocessableEntity, "No content view environments found with names: #{labels.join(',')}"
+        elsif ids.present?
+          fail HttpErrors::UnprocessableEntity, "No content view environments found with ids: #{ids}"
+        end
+      rescue HttpErrors::UnprocessableEntity => e
+        respond_for_exception(
+          e,
+          :status => :unprocessable_entity,
+          :text => e.message,
+          :errors => [e.message],
+          :with_logging => true
+        )
+      end
+    end
+  end
+end

data/app/controllers/katello/concerns/authorization/api/v2/content_views_controller.rb

@@ -118,10 +118,7 @@ module Katello
       # and also ensure that the environments have the remove permission
       return deny_access unless KTEnvironment.promotable.where(:id => env_ids).count == env_ids.size && view.promotable_or_removable?
 
-      total_count = Katello::Host::ContentFacet.in_content_views_and_environments(
-        :content_views => [view],
-        :lifecycle_environments => ::Katello::KTEnvironment.where(id: env_ids)
-      ).count
+      total_count = Katello::Host::ContentFacet.with_content_views(view).with_environments(env_ids).count
       if total_count > 0
         unless options[:system_content_view_id] && options[:system_environment_id]
           fail _("Unable to reassign content hosts. Please provide system_content_view_id and system_environment_id.")
@@ -135,7 +132,7 @@ module Katello
         end
       end
 
-      if Katello::ActivationKey.where(:content_view_id => view, :environment_id => env_ids).count > 0
+      if Katello::ActivationKey.with_content_views(view).with_environments(env_ids).count > 0
         # if we are reassigning activation key environments/ cv
         # make sure the activation key using present environments or cv are editable.
         unless options[:key_content_view_id] && options[:key_environment_id]

data/app/controllers/katello/concerns/hosts_controller_extensions.rb

@@ -101,7 +101,7 @@ module Katello
             content_hosts: content_hosts,
             hosts_without_content: hosts_without_content,
             content_sources: content_sources,
-            job_invocation_path: job_invocation_path
+            job_invocation_path: job_invocation_path,
           }
         end
       end

data/app/controllers/katello/concerns/registration_commands_controller_extensions.rb

@@ -7,7 +7,7 @@ module Katello
         aks = ActivationKey.authorized(:view_activation_keys)
                            .where(organization_id: registration_params[:organization_id])
                            .order(:name)
-                           .map { |ak| { name: ak.name, lce: ak.environment&.name } }
+                           .map { |ak| { name: ak.name, cves: ak.content_view_environments.map(&:label).join(', ') } }
 
         lces = KTEnvironment.readable
                             .where(organization_id: registration_params[:organization_id])

data/app/helpers/katello/concerns/smart_proxy_helper_extensions.rb

@@ -29,20 +29,20 @@ module Katello
         policies = [
           {
             :name => _("On Demand"),
-            :label => ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
+            :label => ::Katello::RootRepository::DOWNLOAD_ON_DEMAND,
           },
           {
             :name => _("Immediate"),
-            :label => ::Katello::RootRepository::DOWNLOAD_IMMEDIATE
+            :label => ::Katello::RootRepository::DOWNLOAD_IMMEDIATE,
           },
           {
             :name => _("Streamed"),
-            :label => SmartProxy::DOWNLOAD_STREAMED
+            :label => SmartProxy::DOWNLOAD_STREAMED,
           },
           {
             :name => _("Inherit from Repository"),
-            :label => SmartProxy::DOWNLOAD_INHERIT
-          }
+            :label => SmartProxy::DOWNLOAD_INHERIT,
+          },
         ]
 
         policies.map { |p| OpenStruct.new(p) }

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -315,7 +315,7 @@ module Katello
           "/content_hosts/#{host.id}",
           :title => _("Host content and subscription details"),
           :class => 'btn btn-default'),
-        :priority => 900
+        :priority => 900,
       }]
     end
 
@@ -331,7 +331,7 @@ module Katello
       icons = {
         green: "#{colour} host-status pficon pficon-ok status-ok",
         yellow: "#{colour} host-status pficon pficon-info status-warn",
-        red: "#{colour} host-status pficon pficon-error-circle-o status-error"
+        red: "#{colour} host-status pficon pficon-error-circle-o status-error",
       }
 
       "<span class=\"#{icons[colour]}\"></span>".html_safe

data/app/helpers/katello/katello_url_helper.rb

@@ -1,5 +1,5 @@
 module Katello
-  module KatelloUrlHelper
+  module KatelloURLHelper
     unless defined? CONSTANTS_DEFINED
       FILEPREFIX = ['file'].freeze
       PROTOCOLS = ['http', 'https', 'ftp', 'uln'].freeze

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

@@ -10,13 +10,24 @@ module Actions
           param :content_url
           param :owner
           param :os_versions
+          param :repository_id
         end
 
         def run
+          content_url = input[:content_url]
+          if input[:type] == ::Katello::Repository::DEB_TYPE
+            # We must retrieve the repository in the run phase, so the latest Pulp version_href is
+            # already set. This is needed to retrieve the latest repository.deb_content_url_options!
+            repository = ::Katello::Repository.find(input[:repository_id])
+            if repository.deb_using_structured_apt?
+              content_url += repository.deb_content_url_options
+            end
+          end
+
           output[:response] = ::Katello::Resources::Candlepin::Content.
               create(input[:owner],
                      name: input[:name],
-                     contentUrl: input[:content_url],
+                     contentUrl: content_url,
                      type: input[:type],
                      arches: input[:arches],
                      label: input[:label],

data/app/lib/actions/candlepin/product/content_update.rb

@@ -3,7 +3,7 @@ module Actions
     module Product
       class ContentUpdate < Candlepin::Abstract
         input_format do
-          param :content_id
+          param :repository_id
           param :name
           param :type
           param :arches
@@ -15,12 +15,20 @@ module Actions
           param :metadata_expire
         end
 
-        def run
+        def finalize
+          content_url = input[:content_url]
+          # We must retrieve the repository in the finalize phase, because Katello::Product::ContentCreate
+          # only updates the repository.content_id in the finalize phase!
+          repository = ::Katello::Repository.find(input[:repository_id])
+          if repository.deb_using_structured_apt?
+            content_url += repository.deb_content_url_options
+          end
+
           output[:response] = ::Katello::Resources::Candlepin::Content.
               update(input[:owner],
-                     id: input[:content_id],
+                     id: repository.content_id,
                      name: input[:name],
-                     contentUrl: input[:content_url],
+                     contentUrl: content_url,
                      gpgUrl: input[:gpg_key_url] || '', #candlepin ignores nil
                      type: input[:type],
                      arches: input[:arches] || '',
@@ -28,6 +36,15 @@ module Actions
                      label: input[:label],
                      metadataExpire: input[:metadata_expire] || 1,
                      vendor: ::Katello::Provider::CUSTOM)
+
+          repository.content.update!(
+            name: input[:name],
+            content_url: content_url,
+            content_type: input[:type],
+            label: input[:label],
+            gpg_url: input[:gpg_key_url],
+            vendor: ::Katello::Provider::CUSTOM
+          )
         end
       end
     end

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

@@ -3,9 +3,10 @@ module Actions
     module ActivationKey
       class Reassign < Actions::Base
         def plan(activation_key, content_view_id, environment_id)
-          activation_key.content_view_id = content_view_id
-          activation_key.environment_id = environment_id
-          activation_key.save!
+          activation_key.assign_single_environment(
+            content_view: ::Katello::ContentView.find(content_view_id),
+            lifecycle_environment: ::Katello::KTEnvironment.find(environment_id)
+          )
         end
       end
     end

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

@@ -5,7 +5,11 @@ module Actions
         # rubocop:disable Metrics/MethodLength
         execution_plan_hooks.use :update_content_counts, :on => :success
         def plan(smart_proxy, options = {})
-          plan_self(:smart_proxy_id => smart_proxy.id)
+          plan_self(:smart_proxy_id => smart_proxy.id,
+                    :environment_id => options[:environment_id],
+                    :content_view_id => options[:content_view_id],
+                    :repository_id => options[:repository_id],
+                    :skip_content_counts_update => options[:skip_content_counts_update])
           action_subject(smart_proxy)
           environment = options[:environment]
           content_view = options[:content_view]
@@ -69,9 +73,10 @@ module Actions
         end
 
         def update_content_counts(_execution_plan)
-          if Setting[:automatic_content_count_updates]
+          if Setting[:automatic_content_count_updates] && !input[:skip_content_counts_update]
             smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
-            ::ForemanTasks.async_task(::Actions::Katello::CapsuleContent::UpdateContentCounts, smart_proxy)
+            options = {environment_id: input[:environment_id], content_view_id: input[:content_view_id], repository_id: input[:repository_id]}
+            ::ForemanTasks.async_task(::Actions::Katello::CapsuleContent::UpdateContentCounts, smart_proxy, options)
           else
             Rails.logger.info "Skipping content counts update as automatic content count updates are disabled. To enable automatic content count updates, set the 'automatic_content_count_updates' setting to true.
 To update content counts manually, run the 'Update Content Counts' action."

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

@@ -2,8 +2,9 @@ module Actions
   module Katello
     module CapsuleContent
       class UpdateContentCounts < Actions::EntryAction
-        def plan(smart_proxy)
-          plan_self(:smart_proxy_id => smart_proxy.id)
+        def plan(smart_proxy, options = {})
+          input[:options] = options
+          plan_self(:smart_proxy_id => smart_proxy.id, environment_id: options[:environment_id], content_view_id: options[:content_view_id], repository_id: options[:repository_id])
         end
 
         def humanized_name
@@ -12,7 +13,24 @@ module Actions
 
         def run
           smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
-          smart_proxy.update_content_counts!
+          env = find_env(input[:environment_id])
+          content_view = find_content_view(input[:content_view_id])
+          repository = find_repository(input[:repository_id])
+          smart_proxy.update_content_counts!(environment: env,
+                                             content_view: content_view,
+                                             repository: repository)
+        end
+
+        def find_env(environment_id)
+          ::Katello::KTEnvironment.find_by(id: environment_id) if environment_id
+        end
+
+        def find_content_view(content_view_id)
+          ::Katello::ContentView.find_by(id: content_view_id) if content_view_id
+        end
+
+        def find_repository(repository_id)
+          ::Katello::Repository.find_by(id: repository_id) if repository_id
         end
 
         def rescue_strategy

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

@@ -21,7 +21,7 @@ module Actions
             full_path = if cdn_configuration.redhat_cdn? || cdn_configuration.custom_cdn?
                           root.product.repo_url(root.library_instance.generate_content_path)
                         elsif cdn_configuration.network_sync?
-                          resource.repository_url(content_label: root.content.label, arch: root.arch, major: root.major, minor: root.minor)
+                          resource.repository_url(content_label: root.library_instance.content.label, arch: root.arch, major: root.major, minor: root.minor)
                         end
             plan_action(::Actions::Katello::Repository::Update, root, url: full_path)
           end

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

@@ -12,9 +12,25 @@ module Actions
               smart_proxies = SmartProxy.unscoped.with_environment(environment).select { |sp| sp.authorized?(:manage_capsule_content) && sp.authorized?(:view_capsule_content) }
               unless smart_proxies.blank?
                 plan_action(::Actions::BulkAction, ::Actions::Katello::CapsuleContent::Sync, smart_proxies.sort,
-                            :content_view_id => content_view.id, :environment_id => environment.id)
+                            :content_view_id => content_view.id, :environment_id => environment.id, :skip_content_counts_update => true)
               end
             end
+            #For Content view triggered capsule sync, we need to update content counts in one action in finalize, instead of one action per CV, per env, per smart proxy
+            plan_self(:content_view_id => content_view.id, :environment_id => environment.id)
+          end
+        end
+
+        def finalize
+          if Setting[:automatic_content_count_updates]
+            environment = ::Katello::KTEnvironment.find(input[:environment_id])
+            smart_proxies = SmartProxy.unscoped.with_environment(environment).select { |sp| sp.authorized?(:manage_capsule_content) && sp.authorized?(:view_capsule_content) }
+            options = {environment_id: input[:environment_id], content_view_id: input[:content_view_id]}
+            smart_proxies.each do |smart_proxy|
+              ::ForemanTasks.async_task(::Actions::Katello::CapsuleContent::UpdateContentCounts, smart_proxy, options)
+            end
+          else
+            Rails.logger.info "Skipping content counts update as automatic content count updates are disabled. To enable automatic content count updates, set the 'automatic_content_count_updates' setting to true.
+To update content counts manually, run the 'Update Content Counts' action."
           end
         end
       end

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

@@ -83,7 +83,7 @@ module Actions
           output[:changed_content] = input[:version_outputs].map do |version_output|
             {
               :content_view_version => {:id => version_output[:version_id]},
-              :added_units => version_output[:output][:added_units]
+              :added_units => version_output[:output][:added_units],
             }
           end
         end

data/app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb

@@ -6,7 +6,7 @@ module Actions
           HUMANIZED_TYPES = {
             ::Katello::Erratum::CONTENT_TYPE => "Errata",
             ::Katello::ModuleStream::CONTENT_TYPE => "Module Streams",
-            ::Katello::Rpm::CONTENT_TYPE => "Packages"
+            ::Katello::Rpm::CONTENT_TYPE => "Packages",
           }.freeze
 
           def humanized_output

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

@@ -119,11 +119,13 @@ module Actions
           end
           all_cv_envs = combined_cv_envs(cv_envs, versions)
 
-          if all_cv_envs.flat_map(&:hosts).any? && system_cve(options).nil?
+          if all_cv_envs.flat_map(&:hosts).any? && !cve_exists?(options[:system_environment_id],
+                                                                options[:system_content_view_id])
             fail _("Unable to reassign systems. Please check system_content_view_id and system_environment_id.")
           end
 
-          if all_cv_envs.flat_map(&:activation_keys).any? && activation_key_cve(options).nil?
+          if all_cv_envs.flat_map(&:activation_keys).any? && !cve_exists?(options[:key_environment_id],
+                                                                          options[:key_content_view_id])
             fail _("Unable to reassign activation_keys. Please check activation_key_content_view_id and activation_key_environment_id.")
           end
         end
@@ -132,16 +134,10 @@ module Actions
           (cv_envs + versions.flat_map(&:content_view_environments)).uniq
         end
 
-        def system_cve(options)
-          ::Katello::ContentViewEnvironment.where(:environment_id => options[:system_environment_id],
-                                                  :content_view_id => options[:system_content_view_id]
-                                                 ).first
-        end
-
-        def activation_key_cve(options)
-          ::Katello::ContentViewEnvironment.where(:environment_id => options[:key_environment_id],
-                                                  :content_view_id => options[:key_content_view_id]
-                                                 ).first
+        def cve_exists?(environment_id, content_view_id)
+          ::Katello::ContentViewEnvironment.where(:environment_id => environment_id,
+                                                  :content_view_id => content_view_id
+                                                 ).exists?
         end
       end
     end