katello 4.13.1 → 4.14.0.rc1

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

@@ -6,9 +6,7 @@ module Katello
     skip_before_action :authorize
     before_action :optional_authorize, only: [:token, :catalog]
     before_action :registry_authorize, except: [:token, :v1_search, :catalog]
-    before_action :authorize_repository_read, only: [:pull_manifest, :tags_list]
-    # TODO: authorize_repository_write commented out due to container push changes. Additional task needed to fix.
-    # before_action :authorize_repository_write, only: [:start_upload_blob, :upload_blob, :finish_upload_blob, :push_manifest]
+    before_action :authorize_repository_read, only: [:pull_manifest, :tags_list, :check_blob, :pull_blob]
     before_action :container_push_prop_validation, only: [:start_upload_blob, :upload_blob, :finish_upload_blob, :push_manifest]
     before_action :create_container_repo_if_needed, only: [:start_upload_blob, :upload_blob, :finish_upload_blob, :push_manifest]
     skip_before_action :check_media_type, only: [:start_upload_blob, :upload_blob, :finish_upload_blob,
@@ -86,7 +84,6 @@ module Katello
 
     def container_push_prop_validation(props = nil)
       # Handle validation and repo creation for container pushes before talking to pulp
-      return false unless confirm_push_settings
       props = parse_blob_push_props if props.nil?
       return false unless check_blob_push_field_syntax(props)
 
@@ -143,7 +140,7 @@ module Katello
       unless props[:valid_format]
         return render_podman_error(
           "NAME_INVALID",
-          "Invalid format. Container pushes should follow 'organization_label/product_label/name' OR 'id/organization_id/product_id/name' schema.",
+          _("Invalid format. Container pushes should follow 'organization_label/product_label/name' OR 'id/organization_id/product_id/name' schema."),
           :bad_request
         )
       end
@@ -156,7 +153,7 @@ module Katello
       unless org_label.present? && org_label.length > 0
         return render_podman_error(
           "NAME_INVALID",
-          "Invalid format. Organization label cannot be blank.",
+          _("Invalid format. Organization label cannot be blank."),
           :bad_request
         )
       end
@@ -173,11 +170,12 @@ module Katello
               unless root_repos.empty?
                 return render_podman_error(
                   "NAME_INVALID",
-                  "Due to a change in your organizations, this container name has become "\
-                    "ambiguous (org name '#{org_label}'). If you wish to continue using this "\
-                    "container name, destroy the organization in conflict with '#{o.name} (id "\
-                    "#{o.id}). If you wish to keep both orgs, destroy '#{o.label}/#{prod.label}/"\
-                    "#{root_repos.first.label}' and retry your push using the id format.",
+                  _("Due to a change in your organizations, this container name has become "\
+                    "ambiguous (org name '%{org_label}'). If you wish to continue using this "\
+                    "container name, destroy the organization in conflict with '%{o_name} (id "\
+                    "%{o_id}). If you wish to keep both orgs, destroy '%{o_label}/%{prod_label}/"\
+                    "%{root_repo_label}' and retry your push using the id format.") %
+                      { org_label: org_label, o_name: o.name, o_id: o.id, o_label: o.label, prod_label: prod.label, root_repo_label: root_repos.first.label },
                   :conflict
                 )
               end
@@ -188,14 +186,14 @@ module Katello
         # Otherwise tell them to try pushing with ID format
         return render_podman_error(
           "NAME_INVALID",
-          "Organization label '#{org_label}' is ambiguous. Try using an id-based container name.",
+          _("Organization label '%s' is ambiguous. Try using an id-based container name.") % org_label,
           :conflict
         )
       end
       if org.length == 0
         return render_podman_error(
           "NAME_UNKNOWN",
-          "Organization not found: '#{org_label}'",
+          _("Organization not found: '%s'") % org_label,
           :not_found
         )
       end
@@ -208,7 +206,7 @@ module Katello
       unless org_id.present? && org_id == org_id.to_i.to_s
         return render_podman_error(
           "NAME_INVALID",
-          "Invalid format. Organization id must be an integer without leading zeros.",
+          _("Invalid format. Organization id must be an integer without leading zeros."),
           :bad_request
         )
       end
@@ -216,7 +214,7 @@ module Katello
       if @organization.nil?
         return render_podman_error(
           "NAME_UNKNOWN",
-          "Organization id not found: '#{org_id}'",
+          _("Organization id not found: '%s'") % org_id,
           :not_found
         )
       end
@@ -228,7 +226,7 @@ module Katello
       unless prod_label.present? && prod_label.length > 0
         return render_podman_error(
           "NAME_INVALID",
-          "Invalid format. Product label cannot be blank.",
+          _("Invalid format. Product label cannot be blank."),
           :bad_request
         )
       end
@@ -243,11 +241,12 @@ module Katello
             unless root_repos.empty?
               return render_podman_error(
                 "NAME_INVALID",
-                "Due to a change in your products, this container name has become ambiguous "\
-                  "(product name '#{prod_label}'). If you wish to continue using this container "\
-                  "name, destroy the product in conflict with '#{prod.name}' (id #{prod.id}). If "\
-                  "you wish to keep both products, destroy '#{@organization.label}/#{prod.label}/"\
-                  "#{root_repos.first.label}' and retry your push using the id format.",
+                _("Due to a change in your products, this container name has become ambiguous "\
+                  "(product name '%{prod_label}'). If you wish to continue using this container "\
+                  "name, destroy the product in conflict with '%{prod_name}' (id %{prod_id}). If "\
+                  "you wish to keep both products, destroy '%{org_label}/%{prod_dot_label}/"\
+                  "%{root_repo_label}' and retry your push using the id format.") %
+                    { prod_label: prod_label, prod_name: prod.name, prod_id: prod.id, org_label: @organization.label, prod_dot_label: prod.label, root_repo_label: root_repos.first.label },
                 :conflict
               )
             end
@@ -256,14 +255,14 @@ module Katello
 
         return render_podman_error(
           "NAME_INVALID",
-          "Product label '#{prod_label}' is ambiguous. Try using an id-based container name.",
+          _("Product label '%s' is ambiguous. Try using an id-based container name.") % prod_label,
           :conflict
         )
       end
       if product.length == 0
         return render_podman_error(
           "NAME_UNKNOWN",
-          "Product not found: '#{prod_label}'",
+          _("Product not found: '%s'") % prod_label,
           :not_found
         )
       end
@@ -276,7 +275,7 @@ module Katello
       unless prod_id.present? && prod_id == prod_id.to_i.to_s
         return render_podman_error(
           "NAME_INVALID",
-          "Invalid format. Product id must be an integer without leading zeros.",
+          _("Invalid format. Product id must be an integer without leading zeros."),
           :bad_request
         )
       end
@@ -284,7 +283,7 @@ module Katello
       if @product.nil?
         return render_podman_error(
           "NAME_UNKNOWN",
-          "Product id not found: '#{prod_id}'",
+          _("Product id not found: '%s'") % prod_id,
           :not_found
         )
       end
@@ -299,11 +298,16 @@ module Katello
       return product.root_repositories.where(label: root_repo_name)
     end
 
+    def root_repository
+      @root_repository ||= get_root_repo_from_product(@product, @container_name)&.first
+      @root_repository
+    end
+
     def check_blob_push_container(props)
       unless props[:name].present? && props[:name].length > 0
         return render_podman_error(
           "NAME_INVALID",
-          "Invalid format. Container name cannot be blank.",
+          _("Invalid format. Container name cannot be blank."),
           :bad_request
         )
       end
@@ -321,7 +325,8 @@ module Katello
       if !root_repo.nil? && @container_push_name_format != root_repo.container_push_name_format
         return render_podman_error(
           "NAME_INVALID",
-          "Repository name '#{@container_name}' already exists in this product using a different naming scheme. Please retry your request with the #{root_repo.container_push_name_format} format or destroy and recreate the repository using your preferred schema.",
+          _("Repository name '%{container_name}' already exists in this product using a different naming scheme. Please retry your request with the %{root_repo_container_push_name} format or destroy and recreate the repository using your preferred schema.") %
+            {container_name: @container_name, root_repo_container_push_name: root_repo.container_push_name_format},
           :conflict
         )
       end
@@ -330,6 +335,14 @@ module Katello
     end
 
     def create_container_repo_if_needed
+      unless @product.syncable?
+        return render_podman_error(
+          'DENIED',
+          _("Requested access to '%s' is denied") % @container_name,
+          :not_found
+        )
+      end
+
       if get_root_repo_from_product(@product, @container_name).empty?
         root = @product.add_repo(
           name: @container_name,
@@ -345,38 +358,74 @@ module Katello
       end
     end
 
-    def blob_push_cleanup
-      # after manifest upload, index content and set version href using pulp api
-      root_repo = get_root_repo_from_product(@product, @container_name)&.first
-      instance_repo = root_repo&.library_instance
+    def save_pulp_push_repository_href
+      instance_repo = root_repository&.library_instance
 
-      unless root_repo.present? && instance_repo.present?
+      unless root_repository.present? && instance_repo.present?
         return render_podman_error(
           "BLOB_UPLOAD_UNKNOWN",
-          "Could not locate local uploaded repository for content indexing.",
+          _("Could not locate local uploaded repository for content indexing."),
           :not_found
         )
       end
 
-      api = ::Katello::Pulp3::Repository.api(SmartProxy.pulp_primary, ::Katello::Repository::DOCKER_TYPE).container_push_api
-      api_response = api.list(name: @container_path_input)&.results&.first
-      latest_version_href = api_response&.latest_version_href
-      pulp_href = api_response&.pulp_href
+      pulp_api = instance_repo.backend_service(SmartProxy.pulp_primary).api
+      push_repo_api_response = pulp_api.container_push_repo_for_name(@container_path_input)
+
+      latest_version_href = push_repo_api_response&.latest_version_href
+      pulp_repo_href = push_repo_api_response&.pulp_href
 
-      if latest_version_href.empty? || pulp_href.empty?
+      if latest_version_href.empty? || pulp_repo_href.empty?
         return render_podman_error(
           "BLOB_UPLOAD_UNKNOWN",
-          "Could not locate repository properties for content indexing.",
+          _("Could not locate repository properties for content indexing."),
           :not_found
         )
       end
 
       instance_repo.update!(version_href: latest_version_href)
-      ::Katello::Pulp3::RepositoryReference.where(root_repository_id: instance_repo.root_id,
-        content_view_id: instance_repo.content_view.id, repository_href: pulp_href).create!
-      instance_repo.index_content
+      # The Pulp repository should not change after first creation
+      if root_repository.repository_references.empty?
+        ::Katello::Pulp3::RepositoryReference.where(root_repository_id: instance_repo.root_id,
+                                                    content_view_id: instance_repo.content_view.id,
+                                                    repository_href: pulp_repo_href).create!
+      end
+      return pulp_repo_href
+    end
 
-      true
+    def save_pulp_push_distribution_href(pulp_repo_href)
+      instance_repo = root_repository&.library_instance
+      pulp_api = instance_repo.backend_service(SmartProxy.pulp_primary).api
+      instance_repo = root_repository&.library_instance
+      distribution_api_response = pulp_api.container_push_distribution_for_repository(pulp_repo_href)
+      pulp_distribution_href = distribution_api_response&.pulp_href
+
+      if pulp_distribution_href.empty?
+        return render_podman_error(
+          "BLOB_UPLOAD_UNKNOWN",
+          _("Could not locate Pulp distribution."),
+          :not_found
+        )
+      end
+      dist = ::Katello::Pulp3::DistributionReference.where(path: @container_path_input,
+                                                           href: pulp_distribution_href,
+                                                           repository_id: instance_repo.id).first
+      if dist
+        if dist.href != pulp_distribution_href
+          dist.update(href: pulp_distribution_href)
+        end
+      else
+        ::Katello::Pulp3::DistributionReference.create!(path: @container_path_input,
+                                                       href: pulp_distribution_href,
+                                                       repository_id: instance_repo.id)
+      end
+    end
+
+    def save_push_repo_hrefs
+      # After content upload, save Pulp hrefs.
+      pulp_repo_href = save_pulp_push_repository_href
+      return unless pulp_repo_href
+      save_pulp_push_distribution_href(pulp_repo_href)
     end
 
     def find_writable_repository
@@ -466,7 +515,7 @@ module Katello
         key.match("^HTTP_.*")
       end
       env.each do |header|
-        headers[header[0].split('_')[1..-1].join('-')] = header[1]
+        headers[header[0].split('_')[1..].join('-')] = header[1]
       end
 
       if (manifest_response = redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
@@ -499,6 +548,17 @@ module Katello
       redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers, max_redirects: 0) }
     end
 
+    def translated_headers_for_proxy
+      current_headers = {}
+      env = request.env.select do |key, _value|
+        key.match("^HTTP_.*")
+      end
+      env.each do |header|
+        current_headers[header[0].split('_')[1..].join('-')] = header[1]
+      end
+      current_headers
+    end
+
     def start_upload_blob
       headers = translated_headers_for_proxy
       headers['Content-Type'] = request.headers['Content-Type'] if request.headers['Content-Type']
@@ -509,20 +569,10 @@ module Katello
         response.header[key.to_s] = value
       end
 
+      save_push_repo_hrefs if pulp_response.code.between?(200, 299)
       head pulp_response.code
     end
 
-    def translated_headers_for_proxy
-      current_headers = {}
-      env = request.env.select do |key, _value|
-        key.match("^HTTP_.*")
-      end
-      env.each do |header|
-        current_headers[header[0].split('_')[1..-1].join('-')] = header[1]
-      end
-      current_headers
-    end
-
     def upload_blob
       headers = translated_headers_for_proxy
       headers['Content-Type'] = request.headers['Content-Type'] if request.headers['Content-Type']
@@ -535,6 +585,7 @@ module Katello
         response.header[key.to_s] = value
       end
 
+      save_push_repo_hrefs if pulp_response.code.between?(200, 299)
       head pulp_response.code
     end
 
@@ -549,6 +600,7 @@ module Katello
         response.header[key.to_s] = value
       end
 
+      save_push_repo_hrefs if pulp_response.code.between?(200, 299)
       head pulp_response.code
     end
 
@@ -561,9 +613,9 @@ module Katello
         response.header[key.to_s] = value
       end
 
-      cleanup_result = blob_push_cleanup if pulp_response.code.between?(200, 299)
-      return false unless cleanup_result
-
+      save_push_repo_hrefs if pulp_response.code.between?(200, 299)
+      # Indexing content is only needed after pushing manifests
+      root_repository.library_instance.index_content
       head pulp_response.code
     end
 
@@ -573,7 +625,7 @@ module Katello
     end
 
     def v1_ping
-      head 200
+      head :ok
     end
 
     def v1_search
@@ -642,23 +694,24 @@ module Katello
 
     def get_manifest_files(repository, manifest)
       files = ['manifest.json']
-      if manifest['schemaVersion'] == 1
+      case manifest['schemaVersion']
+      when 1
         if manifest['fsLayers']
           files += manifest['fsLayers'].collect do |layer|
-            layerfile = "#{layer['blobSum'][7..-1]}.tar"
+            layerfile = "#{layer['blobSum'][7..]}.tar"
             force_include_layer(repository, layer['blobSum'], layerfile)
             layerfile
           end
         end
-      elsif manifest['schemaVersion'] == 2
+      when 2
         if manifest['layers']
           files += manifest['layers'].collect do |layer|
-            layerfile = "#{layer['digest'][7..-1]}.tar"
+            layerfile = "#{layer['digest'][7..]}.tar"
             force_include_layer(repository, layer['digest'], layerfile)
             layerfile
           end
         end
-        files << "#{manifest['config']['digest'][7..-1]}.tar"
+        files << "#{manifest['config']['digest'][7..]}.tar"
       else
         render_error 'custom_error', :status => :internal_server_error,
                              :locals => { :message => "Unsupported schema #{manifest['schemaVersion']}" }
@@ -720,15 +773,6 @@ module Katello
                    :locals => { :message => "Registry not configured" })
     end
 
-    def confirm_push_settings
-      return true if SETTINGS.dig(:katello, :container_image_registry, :allow_push)
-      render_podman_error(
-        "UNSUPPORTED",
-        "Registry push is not enabled. To enable, add ':katello:'->':container_image_registry:'->':allow_push: true' in the katello settings file.",
-        :unprocessable_entity
-      )
-    end
-
     def request_url
       request.protocol + request.host_with_port
     end
@@ -760,7 +804,7 @@ module Katello
     end
 
     def item_not_found(item)
-      render_podman_error("NAME_UNKNOWN", "#{item} was not found!", :not_found)
+      render_podman_error("NAME_UNKNOWN", _("%s was not found!") % item, :not_found)
     end
   end
 end

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

@@ -259,14 +259,7 @@ module Katello
     def facts
       User.current = User.anonymous_admin
       @host.update_candlepin_associations(rhsm_params)
-      if params[:environments]
-        new_envs = params[:environments].map do |env|
-          get_content_view_environment("cp_id", env['id'])
-        end
-        new_envs.compact!
-        Rails.logger.debug "Setting new content view environments for host #{@host.to_label}: #{new_envs.map(&:label)}"
-        @host.content_facet.content_view_environments = new_envs
-      end
+      update_environments_from_facts(params[:environments]) if params[:environments]
       update_host_registered_through(@host, request.headers)
       @host.refresh_statuses([::Katello::RhelLifecycleStatus])
       render :json => {:content => _("Facts successfully updated.")}, :status => :ok
@@ -412,6 +405,18 @@ module Katello
       activation_keys
     end
 
+    def update_environments_from_facts(param_environments)
+      return if param_environments.blank?
+      new_envs = param_environments.map do |env|
+        get_content_view_environment("cp_id", env['id'])
+      end
+      new_envs.compact!
+      Rails.logger.debug "Setting new content view environments for host #{@host.to_label}: #{new_envs.map(&:label)}"
+      @host.content_facet.content_view_environments = new_envs
+    rescue ::Katello::Errors::MultiEnvironmentNotSupportedError => e
+      raise HttpErrors::BadRequest, e.message
+    end
+
     def get_content_view_environment(key, value)
       cve = nil
       if value
@@ -465,8 +470,8 @@ module Katello
     end
 
     def authorize_client_or_admin
-      unless client_authorized?
-        deny_access unless authorize
+      if !client_authorized? && !authorize
+        deny_access
       end
     end
 

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

@@ -239,7 +239,7 @@ module Katello
     param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the activation key's content view version")
     param_group :search, Api::V2::ApiController
     def product_content
-      # note this is just there as a place holder for apipie.
+      # NOTE: this is just there as a place holder for apipie.
       # The routing would automatically redirect it to repository_sets#index
     end
 

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

@@ -88,6 +88,13 @@ module Katello
       query = query.order("#{query.table_name}.id DESC") unless group #secondary order to ensure sort is deterministic
       query = query.includes(includes) if includes.length > 0
 
+      if options[:select].present? # used in /packages/thindex
+        query = query.select(options[:select])
+        dist_total = ActiveRecord::Base.connection.execute("SELECT COUNT(*) FROM (#{query.to_sql}) AS result_rows").first['count']
+        total = dist_total
+        subtotal = dist_total
+        selectable = dist_total
+      end
       if ::Foreman::Cast.to_bool(params[:full_result])
         params[:per_page] = total
       else

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

@@ -266,12 +266,12 @@ Alternatively, use the 'force' parameter to regenerate metadata locally. New ver
         end
       end
 
-      if content[:package_ids]
-        fail _("package_ids is not an array") unless content[:package_ids].is_a?(Array)
+      if content[:package_ids] && !content[:package_ids].is_a?(Array)
+        fail _("package_ids is not an array")
       end
 
-      if content[:deb_ids]
-        fail _("deb_ids is not an array") unless content[:deb_ids].is_a?(Array)
+      if content[:deb_ids] && !content[:deb_ids].is_a?(Array)
+        fail _("deb_ids is not an array")
       end
     end
 

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

@@ -14,9 +14,10 @@ module Katello
       page_size = Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE
       debs = Deb.in_repositories(@repositories)
       col = ''
-      if search == 'name'
+      case search
+      when 'name'
         col = "#{Deb.table_name}.name"
-      elsif search == 'arch'
+      when 'arch'
         col = "#{Deb.table_name}.architecture"
       end
       debs = debs.where("#{col} ILIKE ?", "#{params[:term]}%").select(col).group(col).order(col).limit(page_size)

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

@@ -108,8 +108,7 @@ module Katello
       update_params[:name] = params[:environment][:new_name] if params[:environment][:new_name]
       @environment.update!(update_params)
       if update_params[:registry_name_pattern] || update_params[:registry_unauthenticated_pull]
-        task = send(async ? :async_task : :sync_task, ::Actions::Katello::Environment::PublishRepositories,
-                    @environment, content_type: Katello::Repository::DOCKER_TYPE)
+        task = send(async ? :async_task : :sync_task, ::Actions::Katello::Environment::PublishContainerRepositories, @environment)
       end
 
       if params.include?(:async) && async && task
@@ -189,8 +188,7 @@ module Katello
         attrs = [:name, :description, :registry_name_pattern, :registry_unauthenticated_pull]
       end
       attrs << :label if params[:action] == "create"
-      parms = params.require(:environment).permit(*attrs)
-      parms
+      params.require(:environment).permit(*attrs)
     end
 
     def find_content_view

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

@@ -1,9 +1,14 @@
 module Katello
   class Api::V2::HostContentsController < Katello::Api::V2::ApiController
     def_param_group :content_facet_attributes do
-      param :content_view_id, Integer
-      param :lifecycle_environment_id, Integer
-      param :content_source_id, Integer
+      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,"\
+                                              " 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 host. Ignored if content_view_id and lifecycle_environment_id are specified. Requires allow_multiple_content_views setting to be on.")
+      param :content_source_id, Integer, :desc => N_("Id of the smart proxy from which the host consumes content.")
       param :kickstart_repository_id, Integer, :desc => N_("Repository Id associated with the kickstart repo used for provisioning")
     end
   end

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

@@ -146,11 +146,11 @@ module Katello
       if (params[:content_view_id] && params[:environment_id].nil?) || (params[:environment_id] && params[:content_view_id].nil?)
         fail _("Either both parameters 'content_view_id' and 'environment_id' should be specified or neither should be specified")
       end
-      if params[:type].present?
-        fail _("Type must be one of: %s" % TYPES_FROM_PARAMS.keys.join(', ')) unless TYPES_FROM_PARAMS.key?(params[:type].to_sym)
+      if params[:type].present? && !TYPES_FROM_PARAMS.key?(params[:type].to_sym)
+        fail _("Type must be one of: %s" % TYPES_FROM_PARAMS.keys.join(', '))
       end
-      if params[:severity].present?
-        fail _("Severity must be one of: %s") % Katello::Erratum::SEVERITIES.join(', ') unless Katello::Erratum::SEVERITIES.include?(params[:severity])
+      if params[:severity].present? && !Katello::Erratum::SEVERITIES.include?(params[:severity])
+        fail _("Severity must be one of: %s") % Katello::Erratum::SEVERITIES.join(', ')
       end
     end
   end

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

@@ -98,8 +98,8 @@ module Katello
     end
 
     def validate_index_params!
-      if params[:status].present?
-        fail _("Status must be one of: %s" % VERSION_STATUSES.join(', ')) unless VERSION_STATUSES.include?(params[:status])
+      if params[:status].present? && !VERSION_STATUSES.include?(params[:status])
+        fail _("Status must be one of: %s" % VERSION_STATUSES.join(', '))
       end
     end
   end

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

@@ -59,7 +59,7 @@ module Katello
     param_group :resource
     def update
       if params[:redhat_repository_url]
-        sync_task(::Actions::Katello::CdnConfiguration::Update, @organization.cdn_configuration, url: params[:redhat_repository_url])
+        sync_task(::Actions::Katello::CdnConfiguration::Update, @organization.cdn_configuration, url: params[:redhat_repository_url], type: CdnConfiguration::CUSTOM_CDN_TYPE)
       end
       super
     end

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

@@ -43,7 +43,19 @@ module Katello
     param :available_for, String, :desc => N_("Return packages that can be added to the specified object.  Only the value 'content_view_version' is supported.")
     param_group :search, ::Katello::Api::V2::ApiController
     def index
-      super
+      super # RepositoryContentController
+    end
+
+    api :GET, "/packages/thindex", N_("List all packages unique by name")
+    param_group :search, ::Katello::Api::V2::ApiController
+    def thindex
+      sort_by, sort_order, options = sort_options
+
+      options[:select] = "DISTINCT ON (#{Rpm.table_name}.name) #{Rpm.table_name}.id, #{Rpm.table_name}.name"
+      final_relation = custom_index_relation(Rpm.all)
+
+      result = scoped_search(final_relation, sort_by, sort_order, options)
+      respond_for_index(:collection => result, :template => "thindex")
     end
 
     def available_for_content_view_version(version)
@@ -54,7 +66,6 @@ module Katello
       applicable = ::Foreman::Cast.to_bool(params[:packages_restrict_applicable]) || params[:host_id]
       upgradable = ::Foreman::Cast.to_bool(params[:packages_restrict_upgradable])
       not_installed = ::Foreman::Cast.to_bool(params[:packages_restrict_not_installed])
-
       if upgradable
         collection = collection.installable_for_hosts(@hosts)
       elsif not_installed && params[:host_id]
@@ -63,7 +74,6 @@ module Katello
       elsif applicable
         collection = collection.applicable_to_hosts(@hosts)
       end
-
       collection
     end
 

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

@@ -6,7 +6,7 @@ module Katello
     param :ids, Array, :desc => N_("List of repository ids"), :required => true
     def destroy_repositories
       deletion_authorized_repositories = @repositories.deletable
-      unpromoted_repos = deletion_authorized_repositories.reject { |repo| repo.promoted? && repo.content_views.generated_for_none.exists? }
+      unpromoted_repos = Setting.find_by(name: 'delete_repo_across_cv')&.value ? deletion_authorized_repositories : deletion_authorized_repositories.reject { |repo| repo.promoted? && repo.content_views.generated_for_none.exists? }
       unpromoted_repos_non_last_affected_repo = unpromoted_repos.reject { |repo| repo.filters.any? { |filter| filter.repositories.size == 1 } }
       messages1 = format_bulk_action_messages(
           :success    => "",
@@ -33,7 +33,11 @@ module Katello
 
       task = nil
       if unpromoted_repos_non_last_affected_repo.any?
-        task = async_task(::Actions::BulkAction, ::Actions::Katello::Repository::Destroy, unpromoted_repos_non_last_affected_repo)
+        task = async_task(::Actions::BulkAction,
+                          ::Actions::Katello::Repository::Destroy,
+                          unpromoted_repos_non_last_affected_repo,
+                          remove_from_content_view_versions: Setting.find_by(name: 'delete_repo_across_cv')&.value
+        )
       else
         status = 400
       end