katello 4.14.0 → 4.15.0.rc1

data/app/assets/javascripts/katello/organizations/download_certificate.js

@@ -1,4 +1,4 @@
-$(document).ready(function() {
+$(document).on('loadJS', function() {
     $('body').on('click', '#download_debug_cert_key', function(e) {
         e.preventDefault();
         window.location.href = $("#download_debug_cert_key").data("url");

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -205,10 +205,22 @@ KT.content = (function () {
           $(this).collapse();
         });
     };
+    populate_repo_status = function () {
+      var ids = [];
+      $.each(KT.repo_status, function (repo_id, status) {
+        if (status.is_running) {
+          ids.push(repo_id);
+          KT.content.draw_syncing(repo_id, status.progress.progress, status.sync_id);
+        }
+      });
+      KT.content.reset_products(KT.repo_status);
+      KT.content_actions.addSyncing(ids);
+    }
 
   return {
     updateProduct: updateProduct,
     updateRepo: updateRepo,
+    populateRepoStatus: populate_repo_status,
     finishRepo: finishRepo,
     select_all: select_all,
     select_none: select_none,
@@ -346,31 +358,23 @@ KT.content_actions = (function () {
   };
 })();
 
-var ids = [];
-$.each(KT.repo_status, function (repo_id, status) {
-  if (status.is_running) {
-    ids.push(repo_id);
-    KT.content.draw_syncing(repo_id, status.progress.progress, status.sync_id);
-  }
-});
-KT.content.reset_products(KT.repo_status);
-KT.content_actions.addSyncing(ids);
+KT.content.populateRepoStatus();
 
-$("#select_all").click(KT.content.select_all);
-$("#select_none").click(KT.content.select_none);
-$("#collapse_all").click(KT.content.collapse_all);
-$("#expand_all").click(KT.content.expand_all);
+$("#select_all").on("click", KT.content.select_all);
+$("#select_none").on("click", KT.content.select_none);
+$("#collapse_all").on("click", KT.content.collapse_all);
+$("#expand_all").on("click", KT.content.expand_all);
 
 KT.content.showAll();
 KT.content.select_repo();
 
-$("#products_table").delegate(".cancel_sync", "click", function () {
+$("#products_table").on("click", ".cancel_sync", function () {
   var repo_id = $(this).parents("tr").attr("data-id");
   KT.content_actions.cancelSync(repo_id, $(this));
 });
 
 $("#sync_product_form")
-  .bind("ajax:success", function (evt, data, status, xhr) {
+  .on("ajax:success", function (evt, data, status, xhr) {
     var ids = [];
     $.each(data, function (index, item) {
       ids.push(item.id);
@@ -379,13 +383,13 @@ $("#sync_product_form")
     });
     KT.content_actions.addSyncing(ids);
   })
-  .bind("ajax:beforeSend", function (evt, data, status, xhr) {
+  .on("ajax:beforeSend", function (evt, data, status, xhr) {
     if ($("input[name='repoids[]']:checked").length === 0) {
       return false;
     }
   });
 
-$("#sync_toggle").change(function () {
+$("#sync_toggle").on("change", function () {
   var img = "<img src='" + KT.common.spinner_path() + "'>";
   $("#sync_toggle_cont").append(img);
   if ($(this).is(":checked")) {
@@ -397,5 +401,5 @@ $("#sync_toggle").change(function () {
 });
 
 $.each($("input[name='repoids[]']"), function (index, checkbox) {
-  $(checkbox).click(KT.content.select_repo);
+  $(checkbox).on("click", KT.content.select_repo);
 });

data/app/assets/javascripts/katello/widgets/env_content_view_selector.js

@@ -20,13 +20,13 @@ KT.env_content_view_selector = (function() {
             saved_content_view_id = current_content_view_id;
 
             env_select = KT.path_select(env_div_id, name, envs, {select_mode:'single', inline: true});
-            $(document).unbind(env_select.get_select_event());
+            $(document).off(env_select.get_select_event());
 
             // select the current environment
             env_select.select(current_env_id);
 
             // if the user changes the environment, update the available content views
-            $(document).bind(env_select.get_select_event(), function(event) {
+            $(document).on(env_select.get_select_event(), function(event) {
                 update_content_views(KT.utils.keys(env_select.get_selected()));
                 enable_buttons();
             });
@@ -34,7 +34,7 @@ KT.env_content_view_selector = (function() {
             // render the content view selector and the save/cancel buttons
             render_selector(content_view_div, selector_buttons_div, content_views, current_content_view_id);
 
-            $('#content_view_select').unbind('change').change(function() {
+            $('#content_view_select').off('change').on("change", function() {
                 enable_buttons();
             });
             disable_buttons();
@@ -44,7 +44,7 @@ KT.env_content_view_selector = (function() {
         },
         register_cancel = function() {
             var cancel_button = $('.cancel_env_content_view');
-            cancel_button.unbind('click').click(function(e) {
+            cancel_button.off('click').on("click", function(e) {
                var current_env = KT.utils.values(env_select.get_selected());
 
                 if ((current_env.length === 0) || (current_env[0]['id'] !== saved_env_id)) {
@@ -60,7 +60,7 @@ KT.env_content_view_selector = (function() {
         },
         register_save = function() {
             var save_button = $('.save_env_content_view');
-            save_button.unbind('click').click(function(e) {
+            save_button.off('click').on("click", function(e) {
                 e.preventDefault();
                 disable_buttons();
 

data/app/assets/javascripts/katello/widgets/path_selector.js

@@ -52,7 +52,7 @@ KT.path_select = function(div_id, name, environments, options_in){
             }
 
             if(options.submit_button_text){
-                path_selector.find('.KT_path_select_submit_button').click(function(e){
+                path_selector.find('.KT_path_select_submit_button').on("click", function(e){
                     if(!options.inline) {
                         path_selector.hide();
                     }
@@ -61,7 +61,7 @@ KT.path_select = function(div_id, name, environments, options_in){
             }
 
             if(options.cancel_button_text){
-                path_selector.find('.KT_path_select_cancel_button').click(function(e){
+                path_selector.find('.KT_path_select_cancel_button').on("click", function(e){
                     clear_selected();
                     if(!options.inline) {
                         path_selector.hide();
@@ -77,7 +77,7 @@ KT.path_select = function(div_id, name, environments, options_in){
                 path_selector.hide();
 
                 if(options.activate_on_click)  {
-                    div.click(function(e) { path_selector.show(); });
+                    div.on("click", function(e) { path_selector.show(); });
                 } else {
                     div.hoverIntent({
                         over:function(){ path_selector.show(); },
@@ -96,7 +96,7 @@ KT.path_select = function(div_id, name, environments, options_in){
                 disable_all();
             }
 
-            $(document).mouseup(function(e){
+            $(document).on("mouseup", function(e){
                 if(path_selector.has(e.target).length === 0 && !options.inline) {
                     path_selector.hide();
                 }
@@ -259,11 +259,11 @@ KT.path_select = function(div_id, name, environments, options_in){
            }
            if(!options.inline){
                path_selector.show();
-               scroll_obj.bind('#' + KT.common.escapeId(paths_id));
+               scroll_obj.on('#' + KT.common.escapeId(paths_id));
                path_selector.hide();
            }
            else {
-               scroll_obj.bind('#' + KT.common.escapeId(paths_id));
+               scroll_obj.on('#' + KT.common.escapeId(paths_id));
            }
         },
         get_submit_event = function(){

data/app/assets/javascripts/katello/widgets/subpanel_new.js

@@ -1,4 +1,4 @@
-$(document).ready(function(){
+$(document).on('loadJS', function(){
   var form_id = $('#new_subpanel'),
       form_submit_id = form_id.find('.subpanel_create'),
       url_after_submit = form_submit_id.data('url_after_submit');

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -118,7 +118,7 @@ module Katello
           schema: "label",
           organization: segments[2],
           product: segments[3],
-          name: segments[4]
+          name: segments[4],
         }
       elsif segments.length >= 8 && segments[0] == "" && segments[1] == "v2" &&
         segments[2] == "id" && (segments[6] == "blobs" || segments[6] == "manifests")
@@ -128,7 +128,7 @@ module Katello
           schema: "id",
           organization: segments[3],
           product: segments[4],
-          name: segments[5]
+          name: segments[5],
         }
       else
         return {valid_format: false}
@@ -354,7 +354,7 @@ module Katello
           container_push_name: @container_path_input,
           container_push_name_format: @container_push_name_format
         )
-        sync_task(::Actions::Katello::Repository::CreateRoot, root, @container_path_input)
+        sync_task(::Actions::Katello::Repository::CreateContainerPushRoot, root, @container_path_input)
       end
     end
 
@@ -505,7 +505,7 @@ module Katello
         # We're keeping the 'expires_at' field for now to maintain compatibility with existing
         # smart-proxies during 4.11 upgrades. This is not a part of OAuth2 spec.
         # TODO - Remove 'expires_at' in Katello 4.13 or later.
-        expires_at: expiry_time.rfc3339
+        expires_at: expiry_time.rfc3339,
       }
     end
 
@@ -639,7 +639,7 @@ module Katello
 
       authenticate # to set current_user, not to enforce
       options = {
-        resource_class: Katello::Repository
+        resource_class: Katello::Repository,
       }
       params[:per_page] = params[:n] || 25
       params[:search] = params[:q]
@@ -649,7 +649,7 @@ module Katello
 
       results = {
         num_results: search_results[:subtotal],
-        query: params[:search]
+        query: params[:search],
       }
       results[:results] = search_results[:results].collect do |repository|
         { name: repository[:container_repository_name], description: repository[:description] }
@@ -672,7 +672,7 @@ module Katello
       tags.sort!
       render json: {
         name: @repository.container_repository_name,
-        tags: tags
+        tags: tags,
       }
     end
 

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -115,7 +115,7 @@ module Katello
           :id => env.cp_id,
           :name => env.label,
           :display_name => env.name,
-          :description => env.content_view.description
+          :description => env.content_view.description,
         }
       end
 
@@ -390,6 +390,11 @@ module Katello
           activation_key = organization.activation_keys.find_by(:name => ak_name)
           fail HttpErrors::NotFound, _("Couldn't find activation key '%s'") % ak_name unless activation_key
 
+          if activation_key.multi_content_view_environment? && !Setting['allow_multiple_content_views']
+            fail HttpErrors::BadRequest, _("Activation key '%s' is associated to multiple environments"\
+                                           " and registering to multiple environments is not enabled.") % ak_name
+          end
+
           if !activation_key.unlimited_hosts && activation_key.usage_count >= activation_key.max_hosts
             fail Errors::MaxHostsReachedException, _("Max Hosts (%{limit}) reached for activation key '%{name}'") %
                 { :limit => activation_key.max_hosts, :name => activation_key.name }

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

@@ -1,19 +1,43 @@
 module Katello
-  class Api::V2::ActivationKeysController < Api::V2::ApiController
+  class Api::V2::ActivationKeysController < Api::V2::ApiController  # rubocop:disable Metrics/ClassLength
     include Katello::Concerns::FilteredAutoCompleteSearch
     include Katello::Concerns::Api::V2::ContentOverridesController
+    include Katello::Concerns::Api::V2::MultiCVParamsHandling
     before_action :verify_presence_of_organization_or_environment, :only => [:index]
-    before_action :find_environment, :only => [:index, :create, :update]
     before_action :find_optional_organization, :only => [:index, :create, :show]
-    before_action :find_content_view, :only => [:index]
     before_action :find_authorized_katello_resource, :only => [:show, :update, :destroy, :available_releases,
                                                                :available_host_collections, :add_host_collections, :remove_host_collections,
                                                                :content_override, :add_subscriptions, :remove_subscriptions,
                                                                :subscriptions]
+    before_action :find_content_view_environments, :only => [:create, :update]
     before_action :verify_simple_content_access_disabled, :only => [:add_subscriptions]
     before_action :validate_release_version, :only => [:create, :update]
 
-    wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level auto_attach purpose_role purpose_usage purpose_addons content_view_environment))
+    wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level auto_attach purpose_role purpose_usage purpose_addons content_view_environments))
+
+    def_param_group :activation_key do
+      param :organization_id, :number, :desc => N_("organization identifier"), :required => true
+      param :description, String, :desc => N_("description")
+      param :max_hosts, :number, :desc => N_("maximum number of registered content hosts")
+      param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
+      param :release_version, String, :desc => N_("content release version")
+      param :service_level, String, :desc => N_("service level")
+      param :auto_attach, :bool, :desc => N_("auto attach subscriptions upon registration"), deprecated: true
+      param :purpose_usage, String, :desc => N_("Sets the system purpose usage")
+      param :purpose_role, String, :desc => N_("Sets the system purpose usage")
+      param :purpose_addons, Array, :desc => N_("Sets the system add-ons")
+
+      param :environment, Hash, :desc => N_("Hash containing the Id of the single lifecycle environment to be associated with the activation key."), deprecated: true
+      param :content_view_id, Integer, :desc => N_("Id of the single content view to be associated with the activation key.")
+      param :environment_id, Integer, :desc => N_("Id of the single lifecycle environment to be associated with the activation key.")
+      param :content_view_environments, Array, :desc => N_("Comma-separated list of content view environment labels to be associated with the activation key,"\
+                                              " 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.")
+      param :content_view_environment_ids, Array, :desc => N_("Array of content view environment ids to be associated with the activation key."\
+                                              " Ignored if content_view_id and lifecycle_environment_id are specified."\
+                                              " Requires allow_multiple_content_views setting to be on.")
+    end
 
     api :GET, "/activation_keys", N_("List activation keys")
     api :GET, "/environments/:environment_id/activation_keys"
@@ -22,31 +46,27 @@ module Katello
     param :environment_id, :number, :desc => N_("environment identifier")
     param :content_view_id, :number, :desc => N_("content view identifier")
     param :name, String, :desc => N_("activation key name to filter by")
+    param :content_view_environments, Array, :desc => N_("Comma-separated list of content view environment labels associated with the activation key,"\
+                                            " 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.")
+    param :content_view_environment_ids, Array, :desc => N_("Array of content view environment ids associated with the activation key. " \
+                                            "Ignored if content_view_id and lifecycle_environment_id are specified."\
+                                            "Requires allow_multiple_content_views setting to be on.")
+
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ActivationKey)
     def index
-      activation_key_includes = [:content_view, :environment, :host_collections, :organization]
+      activation_key_includes = [:content_view_environments, :host_collections, :organization]
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :includes => activation_key_includes))
     end
 
     api :POST, "/activation_keys", N_("Create an activation key")
-    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("name"), :required => true
-    param :description, String, :desc => N_("description")
-    param :environment, Hash, :desc => N_("environment")
-    param :environment_id, :number, :desc => N_("environment id")
-    param :content_view_id, :number, :desc => N_("content view id")
-    param :max_hosts, :number, :desc => N_("maximum number of registered content hosts")
-    param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
-    param :release_version, String, :desc => N_("content release version")
-    param :service_level, String, :desc => N_("service level")
-    param :auto_attach, :bool, :desc => N_("auto attach subscriptions upon registration"), deprecated: true
-    param :purpose_usage, String, :desc => N_("Sets the system purpose usage")
-    param :purpose_role, String, :desc => N_("Sets the system purpose usage")
-    param :purpose_addons, Array, :desc => N_("Sets the system add-ons")
+    param_group :activation_key
     def create
       @activation_key = ActivationKey.new(activation_key_params) do |activation_key|
-        activation_key.environment = @environment if @environment
+        activation_key.content_view_environments = @content_view_environments if update_cves?
         activation_key.organization = @organization
         activation_key.user = current_user
       end
@@ -57,21 +77,20 @@ module Katello
     end
 
     api :PUT, "/activation_keys/:id", N_("Update an activation key")
+    param_group :activation_key
     param :id, :number, :desc => N_("ID of the activation key"), :required => true
-    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("name"), :required => false
-    param :description, String, :desc => N_("description")
-    param :environment_id, :number, :desc => N_("environment id")
-    param :content_view_id, :number, :desc => N_("content view id")
-    param :max_hosts, :number, :desc => N_("maximum number of registered content hosts")
-    param :unlimited_hosts, :bool, :desc => N_("can the activation key have unlimited hosts")
-    param :release_version, String, :desc => N_("content release version")
-    param :service_level, String, :desc => N_("service level")
-    param :auto_attach, :bool, :desc => N_("auto attach subscriptions upon registration")
-    param :purpose_usage, String, :desc => N_("Sets the system purpose usage")
-    param :purpose_role, String, :desc => N_("Sets the system purpose usage")
-    param :purpose_addons, Array, :desc => N_("Sets the system add-ons")
     def update
+      if @content_view_environments.present? || update_cves?
+        if single_assignment? && @content_view_environments.length == 1
+          @activation_key.assign_single_environment(
+            content_view: @content_view_environments.first.content_view,
+            lifecycle_environment: @content_view_environments.first.lifecycle_environment
+          )
+        else
+          @activation_key.update!(content_view_environments: @content_view_environments)
+        end
+      end
       sync_task(::Actions::Katello::ActivationKey::Update, @activation_key, activation_key_params)
       respond_for_show(:resource => @activation_key)
     end
@@ -138,7 +157,7 @@ module Katello
       response = {
         :results => @activation_key.available_releases,
         :total => @activation_key.available_releases.size,
-        :subtotal => @activation_key.available_releases.size
+        :subtotal => @activation_key.available_releases.size,
       }
       respond_for_index :collection => response
     end
@@ -220,10 +239,10 @@ module Katello
           validate_content_overrides_enabled(override)
         end
         specified_labels.uniq!
-        existing_labels = organization.contents.where(label: specified_labels).uniq
+        existing_labels = organization.contents.where(label: specified_labels).pluck(:label).uniq
 
         unless specified_labels.size == existing_labels.size
-          missing_labels = specified_labels - existing_labels.pluck(:label)
+          missing_labels = specified_labels - existing_labels
           msg = "Content label(s) \"#{missing_labels.join(", ")}\" were not found in the Organization \"#{organization}\""
           fail HttpErrors::BadRequest, _(msg)
         end
@@ -247,8 +266,9 @@ module Katello
       activation_keys = ActivationKey.readable
       activation_keys = activation_keys.where(:name => params[:name]) if params[:name]
       activation_keys = activation_keys.where(:organization_id => @organization) if @organization
-      activation_keys = activation_keys.where(:environment_id => @environment) if @environment
-      activation_keys = activation_keys.where(:content_view_id => @content_view) if @content_view
+      activation_keys = activation_keys.with_content_view_environments(@content_view_environments) if @content_view_environments
+      activation_keys = activation_keys.with_content_views(params[:content_view_id]) if params[:content_view_id]
+      activation_keys = activation_keys.with_environments(params[:lifecycle_environments]) if params[:lifecycle_environments]
       activation_keys
     end
 
@@ -256,25 +276,84 @@ module Katello
 
     def subscription_index
       subs = @activation_key.subscriptions
-      subscriptions = {
+      {
         :results => subs,
         :subtotal => subs.count,
         :total => subs.count,
         :page => 1,
-        :per_page => subs.count
+        :per_page => subs.count,
       }
-      subscriptions
     end
 
-    def find_environment
-      environment_id = params[:environment_id]
-      environment_id = params[:environment][:id] if !environment_id && params[:environment]
-      return unless environment_id
+    def find_cve_for_single
+      environment_id = params.dig(:environment, :id) || params[:environment_id]
+      content_view_id = params.dig(:content_view, :id) || params[:content_view_id]
+      if environment_id.blank? || content_view_id.blank?
+        fail HttpErrors::BadRequest, _("Environment ID and content view ID must be provided together")
+      end
+      cve = ::Katello::ContentViewEnvironment.readable.where(environment_id: environment_id,
+                                                             content_view_id: content_view_id).first
+      if cve.blank?
+        fail HttpErrors::NotFound, _("Couldn't find content view environment with content view ID '%{cv}'"\
+                                    " and environment ID '%{env}'") % { cv: content_view_id, env: environment_id }
+      end
+      @content_view_environments = [cve]
+    end
+
+    def params_likely_not_from_angularjs?
+      # AngularJS sends back the activation key's existing API response values.
+      # A side effect of this is that when it sends params[:content_view_environments] or params[:content_view_environment_ids],
+      # it incorrectly sends the nested objects from the rabl response, instead of the required single comma-separated string of CVE labels.
+      # This would cause fetch_content_view_environments to fail.
+      # Therefore, we need a way to (a) detect if the request is from AngularJS, and (b) avoid trying to handle the nested objects as if they were strings.
+      # So we look at params[:multi_content_view_environment]. This is a computed value, not meant to be submitted as part of an update request.
+      # If it's true or false, it's likely AngularJS.
+      # And if the key is omitted, it's likely from Hammer or API, so it's safe to proceed.
+      !params.key?(:multi_content_view_environment)
+    end
+
+    def find_content_view_environments
+      @content_view_environments = []
+      if params[:environment_id] || params[:environment]
+        find_cve_for_single
+      elsif params_likely_not_from_angularjs? && (params[:content_view_environments] || params[:content_view_environment_ids])
+        @content_view_environments = ::Katello::ContentViewEnvironment.fetch_content_view_environments(
+          labels: params[:content_view_environments],
+          ids: params[:content_view_environment_ids],
+          organization: @organization || @activation_key&.organization)
+        if @content_view_environments.blank?
+          handle_errors(labels: params[:content_view_environments],
+          ids: params[:content_view_environment_ids])
+        end
+      end
+      handle_blank_cve_params
+      @organization ||= @content_view_environments.first&.organization
+    end
+
+    def handle_blank_cve_params
+      if params.key?(:environment) && params.key?(:content_view)
+        return # AngularJS sends nested environment and content_view params, but with blank _id values
+      end
+      # Activation keys do not require CVEs to be associated. So it's possible the user intends to clear them.
+      if params.key?(:environment_id) && params[:environment_id].blank? && params.key?(:content_view_id) && params[:content_view_id].blank?
+        @content_view_environments = []
+      elsif params.key?(:content_view_environments) && params[:content_view_environments].blank?
+        @content_view_environments = []
+      elsif params.key?(:content_view_environment_ids) && params[:content_view_environment_ids].blank?
+        @content_view_environments = []
+      end
+    end
+
+    # AngularJS sends :environment and :content_view_id
+    def single_assignment?
+      (params.key?(:environment) || params.key?(:environment_id)) &&
+      (params.key?(:content_view) || params.key?(:content_view_id))
+    end
 
-      @environment = KTEnvironment.readable.find_by(id: environment_id)
-      fail HttpErrors::NotFound, _("Couldn't find environment '%s'") % params[:environment_id] if @environment.nil?
-      @organization = @environment.organization
-      @environment
+    def update_cves?
+      single_assignment? ||
+        params.key?(:content_view_environments) || # multi
+        params.key?(:content_view_environment_ids)
     end
 
     def find_host_collections
@@ -293,14 +372,6 @@ module Katello
       fail HttpErrors::BadRequest, _("Either organization ID or environment ID needs to be specified")
     end
 
-    def find_content_view
-      if params.include?(:content_view_id)
-        cv_id = params[:content_view_id]
-        @content_view = ContentView.readable.find_by(:id => cv_id)
-        fail HttpErrors::NotFound, _("Couldn't find content view '%s'") % cv_id if @content_view.nil?
-      end
-    end
-
     def permitted_params
       params.require(:activation_key).permit(:name,
                                              :description,
@@ -316,14 +387,15 @@ module Katello
                                              :purpose_usage,
                                              :purpose_addon_ids,
                                              :content_overrides => [],
-                                             :host_collection_ids => []).to_h
+                                             :host_collection_ids => [],
+                                             :content_view_environments => [],
+                                             :content_view_environment_ids => []).to_h
     end
 
     def activation_key_params
-      key_params = permitted_params
+      key_params = permitted_params.except(:environment_id, :content_view_id,
+                      :content_view_environments, :content_view_environment_ids)
 
-      key_params[:environment_id] = params[:environment][:id] if params[:environment].try(:[], :id)
-      key_params[:content_view_id] = params[:content_view][:id] if params[:content_view].try(:[], :id)
       unless params[:purpose_addons].nil?
         key_params[:purpose_addon_ids] = params[:purpose_addons].map { |addon| ::Katello::PurposeAddon.find_or_create_by(name: addon).id }
       end

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

@@ -170,7 +170,7 @@ module Katello
         :selectable => selectable.blank? ? total : selectable,
         :page => page,
         :per_page => per_page,
-        :error => error
+        :error => error,
       }
     end
 

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

@@ -26,13 +26,6 @@ module Katello
       render json: @capsule.content_counts.to_json
     end
 
-    api :POST, '/capsules/:id/content/update_counts', N_('Update content counts for the smart proxy')
-    param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
-    def update_counts
-      task = async_task(::Actions::Katello::CapsuleContent::UpdateContentCounts, @capsule)
-      respond_for_async :resource => task
-    end
-
     api :GET, '/capsules/:id/content/lifecycle_environments', N_('List the lifecycle environments attached to the smart proxy')
     param_group :lifecycle_environments
     def lifecycle_environments
@@ -77,7 +70,7 @@ module Katello
         :environment_id => @environment.try(:id),
         :content_view_id => @content_view.try(:id),
         :repository_id => @repository.try(:id),
-        :skip_metadata_check => skip_metadata_check
+        :skip_metadata_check => skip_metadata_check,
       }
       sync_options[:environment_ids] = @capsule.lifecycle_environments&.pluck(:id) unless (@environment || @content_view || @repository)
       task = async_task(::Actions::Katello::CapsuleContent::Sync,
@@ -86,6 +79,24 @@ module Katello
       respond_for_async :resource => task
     end
 
+    api :POST, '/capsules/:id/content/update_counts', N_('Update content counts for the smart proxy')
+    param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
+    param :environment_id, Integer, :desc => N_('Id of the environment to limit the content counting on')
+    param :content_view_id, Integer, :desc => N_('Id of the content view to limit the content counting on')
+    param :repository_id, Integer, :desc => N_('Id of the repository to limit the content counting on')
+    def update_counts
+      find_environment if params[:environment_id]
+      find_content_view if params[:content_view_id]
+      find_repository if params[:repository_id]
+      count_options = {
+        :environment_id => @environment.try(:id),
+        :content_view_id => @content_view.try(:id),
+        :repository_id => @repository.try(:id),
+      }
+      task = async_task(::Actions::Katello::CapsuleContent::UpdateContentCounts, @capsule, count_options)
+      respond_for_async :resource => task
+    end
+
     api :GET, '/capsules/:id/content/sync', N_('Get current smart proxy synchronization status')
     param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     param :organization_id, Integer, :desc => N_('Id of the organization to get the status for'), :required => false
@@ -126,7 +137,7 @@ module Katello
       repair_options = {
         :environment_id => @environment.try(:id),
         :content_view_id => @content_view.try(:id),
-        :repository_id => @repository.try(:id)
+        :repository_id => @repository.try(:id),
       }
       repair_options[:environment_ids] = @capsule.lifecycle_environments&.pluck(:id) unless (@environment || @content_view || @repository)
 
@@ -142,7 +153,7 @@ module Katello
       collection = {
         :results => environments,
         :total => environments.size,
-        :subtotal => environments.size
+        :subtotal => environments.size,
       }
       respond_for_index(:collection => collection, :template => :lifecycle_environments)
     end

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

@@ -25,7 +25,7 @@ module Katello
       {
         :results => results.uniq,
         :subtotal => results.count,
-        :total => results.count
+        :total => results.count,
       }
     end