katello 3.18.0.rc2.1 → 4.0.0.rc2

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

@@ -0,0 +1,59 @@
+module Katello
+  class Api::V2::ContentImportsController < Api::V2::ApiController
+    before_action :find_publishable_content_view, :only => [:version]
+    before_action :find_importable_organization, :only => [:library]
+    before_action :find_default_content_view, :only => [:library]
+
+    api :POST, "/content_imports/version", N_("Import a content view version")
+    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => true
+    param :path, String, :desc => N_("Directory containing the exported Content View Version"), :required => true
+    param :metadata, Hash, :desc => N_("Metadata taken from the upstream export history for this Content View Version"), :required => true
+    def version
+      if @view.default?
+        fail HttpErrors::BadRequest, _("Cannot use this end point for importing to library. "\
+                                       "If you intented to upload to library, use the library endpoint.")
+      end
+
+      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path], metadata: metadata_params.to_h)
+      respond_for_async :resource => task
+    end
+
+    api :POST, "/content_imports/library", N_("Import a content view version to the library")
+    param :organization_id, :number, :desc => N_("Organization identifier"), :required => true
+    param :path, String, :desc => N_("Directory containing the exported Content View Version"), :required => true
+    param :metadata, Hash, :desc => N_("Metadata taken from the upstream export history for this Content View Version"), :required => true
+    def library
+      task = async_task(::Actions::Katello::ContentViewVersion::ImportLibrary, @organization, path: params[:path], metadata: metadata_params.to_h)
+      respond_for_async :resource => task
+    end
+
+    private
+
+    def find_publishable_content_view
+      @view = ContentView.publishable.find(params[:content_view_id])
+      throw_resource_not_found(name: 'content_view', id: params[:content_view_id]) if @view.blank?
+    end
+
+    def find_default_content_view
+      @view = @organization&.default_content_view
+      throw_resource_not_found(name: 'organization', id: params[:organization_id]) if @view.blank?
+    end
+
+    def find_importable_organization
+      find_organization
+      throw_resource_not_found(name: 'organization', id: params[:organization_id]) unless @organization.can_import_library_content?
+    end
+
+    def metadata_params
+      params.require(:metadata).permit(
+        :organization,
+        :content_view,
+        :repository_mapping,
+        :toc,
+        content_view_version: [:major, :minor]
+      ).tap do |nested|
+        nested[:repository_mapping] = params[:metadata].require(:repository_mapping).permit!
+      end
+    end
+  end
+end

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

@@ -73,7 +73,7 @@ module Katello
       respond :resource => @filter
     end
 
-    api :delefind_filterte, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
+    api :delete, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
     api :delete, "/content_view_filters/:id", N_("delete a filter")
     param :content_view_id, :number, :desc => N_("content view identifier")
     param :id, :number, :desc => N_("filter identifier"), :required => true

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

@@ -1,11 +1,13 @@
 module Katello
-  # rubocop:disable Metrics/ClassLength
   class Api::V2::ContentViewVersionsController < Api::V2::ApiController
     include Concerns::Api::V2::BulkHostsExtensions
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_content_view_version, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
-    before_action :find_content_view, :except => [:incremental_update]
+    before_action :find_authorized_katello_resource, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
+    before_action :find_content_view_from_version, :only => [:show, :update, :promote, :destroy, :export, :republish_repositories]
+    before_action :find_optional_readable_content_view, :only => [:index]
+    before_action :find_publishable_content_view, :only => [:import]
+
     before_action :find_environment, :only => [:index]
     before_action :find_environments, :only => [:promote]
     before_action :validate_promotable, :only => [:promote]
@@ -47,7 +49,7 @@ module Katello
     api :GET, "/content_view_versions/:id", N_("Show content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def show
-      respond :resource => @version
+      respond :resource => @content_view_version
     end
 
     api :POST, "/content_view_versions/:id/promote", N_("Promote a content view version")
@@ -58,7 +60,7 @@ module Katello
     def promote
       is_force = ::Foreman::Cast.to_bool(params[:force])
       task = async_task(::Actions::Katello::ContentView::Promote,
-                        @version, @environments, is_force, params[:description])
+                        @content_view_version, @environments, is_force, params[:description])
       respond_for_async :resource => task
     end
 
@@ -66,59 +68,54 @@ module Katello
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :description, String, :desc => N_("The description for the content view version"), :required => true
     def update
-      history = @version.history.publish.successful.first
+      history = @content_view_version.history.publish.successful.first
       if history.blank?
         fail HttpErrors::BadRequest, _("This content view version doesn't have a history.")
       else
         history.notes = params[:description]
         history.save!
-        respond_for_show(:resource => @version)
+        respond_for_show(:resource => @content_view_version)
       end
     end
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def republish_repositories
-      task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @version)
+      task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @content_view_version)
       respond_for_async :resource => task
     end
 
-    api :GET, "/content_view_versions/export_histories", N_("Show the export history for a content view version")
-    param :content_view_version_id, :number, :desc => N_("Content view version identifier"), :required => false
-    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => false
-    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
-    param :organization_id, :number, :desc => N_("Organization identifier"), :required => false
-    param_group :search, Api::V2::ApiController
-    add_scoped_search_description_for(ContentViewVersionExportHistory)
-    def export_histories
-      history = ContentViewVersionExportHistory.readable
-      history = history.where(:content_view_version_id => params[:content_view_version_id]) unless params[:content_view_version_id].blank?
-      history = history.where(:destination_server => params[:destination_server]) unless params[:destination_server].blank?
-      history = history.with_organization_id(params[:organization_id]) unless params[:organization_id].blank?
-      history = history.with_content_view_id(params[:content_view_id]) unless params[:content_view_id].blank?
-      respond_for_index(:collection => scoped_search(history, 'id', 'asc', resource_class: ContentViewVersionExportHistory),
-                        :template => '../../../api/v2/content_view_version_export_histories/index')
-    end
-
-    api :GET, "/content_view_versions/export_api_status", N_("true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only.")
-    def export_api_status
-      ::Foreman::Deprecation.api_deprecation_warning("export_api_status is being deprecated and will be removed in a future version of Katello.")
-      render json: { api_usable: SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE) }, status: :ok
-    end
-
-    api :POST, "/content_view_versions/:id/export", N_("Export a content view version")
+    api :POST, "/content_view_versions/:id/export", N_("Export a content view version.  Relevant only for Pulp 2 repositories.")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
-    param :destination_server, String, :desc => N_("Destination Server name, required for Pulp3")
-    param :chunk_size_mb, :number, :desc => N_("Chunk export-tarfile into pieces of chunk_size mega bytes. Relevant only for Pulp 3 repositories"), :required => false
-    param :export_to_iso, :bool, :desc => N_("Export to ISO format. Relevant only for Pulp 2 repositories"), :required => false
+    param :export_to_iso, :bool, :desc => N_("Export to ISO format."), :required => false
     param :iso_mb_size, :number, :desc => N_("maximum size of each ISO in MB. Relevant only for Pulp 2 repositories"), :required => false
     param :since, Date, :desc => N_("Optional date of last export (ex: 2010-01-01T12:00:00Z). Relevant only for Pulp 2 repositories"), :required => false
     def export
-      task = if SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
-               export_pulp_v3
-             else
-               export_pulp_v2
-             end
+      if SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+        fail HttpErrors::BadRequest, _("Invalid usage for Pulp 3 repositories. "\
+                                       "Use hammer content-export for Yum repositories")
+      end
+      ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
+      if params[:export_to_iso].blank? && params[:iso_mb_size].present?
+        fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
+      end
+
+      if (repos = @content_view_version.content_view.on_demand_repositories).any?
+        fail HttpErrors::BadRequest, _("This content view has on demand repositories that cannot be exported: %{repos}" % {repos: repos.pluck(:label).join(", ")})
+      end
+
+      if params[:since].present?
+        begin
+          params[:since].to_datetime
+        rescue
+          raise HttpErrors::BadRequest, _("Invalid date provided.")
+        end
+      end
+      task = async_task(::Actions::Katello::ContentViewVersion::Export, @content_view_version,
+                        ::Foreman::Cast.to_bool(params[:export_to_iso]),
+                        params[:since].try(:to_datetime),
+                        params[:iso_mb_size])
+
       respond_for_async :resource => task
     end
 
@@ -134,7 +131,7 @@ module Katello
     api :DELETE, "/content_view_versions/:id", N_("Remove content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def destroy
-      task = async_task(::Actions::Katello::ContentViewVersion::Destroy, @version)
+      task = async_task(::Actions::Katello::ContentViewVersion::Destroy, @content_view_version)
       respond_for_async :resource => task
     end
 
@@ -174,7 +171,7 @@ module Katello
 
       validate_content(params[:add_content])
       resolve_dependencies = params.fetch(:resolve_dependencies, true)
-      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @version_environments, @composite_version_environments,
+      task = async_task(::Actions::Katello::ContentView::IncrementalUpdates, @content_view_version_environments, @composite_version_environments,
                         params[:add_content], resolve_dependencies, hosts, params[:description])
       respond_for_async :resource => task
     end
@@ -200,17 +197,22 @@ module Katello
       find_bulk_hosts(:edit_hosts, params[:update_hosts], restrict_hosts)
     end
 
-    def find_content_view_version
-      @version = ContentViewVersion.find(params[:id])
-    end
-
-    def find_content_view
-      @view = @version ? @version.content_view : ContentView.where(:id => params[:content_view_id]).first
+    def find_content_view_from_version
+      @view = @content_view_version.content_view
       if @view&.default? && params[:action] == "promote"
         fail HttpErrors::BadRequest, _("The default content view cannot be promoted")
       end
     end
 
+    def find_optional_readable_content_view
+      @view = ContentView.readable.find_by(:id => params[:content_view_id])
+    end
+
+    def find_publishable_content_view
+      @view = ContentView.publishable.find_by(:id => params[:content_view_id])
+      throw_resource_not_found(name: 'product', id: params[:product_id]) if @view.nil?
+    end
+
     def find_version_environments
       #Generates a data structure for incremental update:
       # [{:content_view_version => ContentViewVersion, :environments => [KTEnvironment]}]
@@ -218,7 +220,7 @@ module Katello
       list = params[:content_view_version_environments]
       fail _("At least one Content View Version must be specified") if list.empty?
 
-      @version_environments = []
+      @content_view_version_environments = []
       @composite_version_environments = []
       list.each do |combination|
         version_environment = {
@@ -242,7 +244,7 @@ module Katello
         if view.composite?
           @composite_version_environments << version_environment
         else
-          @version_environments << version_environment
+          @content_view_version_environments << version_environment
           @composite_version_environments += lookup_all_composites(version_environment[:content_view_version]) if params[:propagate_all_composites]
         end
       end
@@ -261,7 +263,7 @@ module Katello
     def find_version_environments_for_hosts(include_composites)
       if include_composites
         version_environments_for_systems_map = {}
-        @version_environments.each do |version_environment|
+        @content_view_version_environments.each do |version_environment|
           version_environment[:content_view_version].composites.each do |composite_version|
             version_environments_for_systems_map[composite_version.id] ||= {:content_view_version => composite_version,
                                                                             :environments => composite_version.environments}
@@ -270,7 +272,7 @@ module Katello
 
         version_environments_for_systems_map.values
       else
-        @version_environments.select { |ve| !ve[:environments].blank? }
+        @content_view_version_environments.select { |ve| !ve[:environments].blank? }
       end
     end
 
@@ -313,55 +315,15 @@ module Katello
 
     def validate_promotable
       fail HttpErrors::BadRequest, _("Could not find environments for promotion") if @environments.blank?
-      return deny_access unless @environments.all?(&:promotable_or_removable?) && @version.content_view.promotable_or_removable?
+      return deny_access unless @environments.all?(&:promotable_or_removable?) && @content_view_version.content_view.promotable_or_removable?
       true
     end
 
     def authorize_destroy
-      return deny_access unless @version.content_view.deletable?
+      return deny_access unless @content_view_version.content_view.deletable?
       true
     end
 
-    def export_pulp_v2
-      ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
-      if params[:export_to_iso].blank? && params[:iso_mb_size].present?
-        fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
-      end
-
-      if (repos = @version.content_view.on_demand_repositories).any?
-        fail HttpErrors::BadRequest, _("This content view has on demand repositories that cannot be exported: %{repos}" % {repos: repos.pluck(:label).join(", ")})
-      end
-
-      if params[:since].present?
-        begin
-          params[:since].to_datetime
-        rescue
-          raise HttpErrors::BadRequest, _("Invalid date provided.")
-        end
-      end
-      async_task(::Actions::Katello::ContentViewVersion::Export, @version,
-                        ::Foreman::Cast.to_bool(params[:export_to_iso]),
-                        params[:since].try(:to_datetime),
-                        params[:iso_mb_size])
-    end
-
-    def export_pulp_v3
-      invalid_params = [:export_to_iso, :iso_mb_size, :since].reject { |param| params[param].blank? }
-      unless invalid_params.empty?
-        fail HttpErrors::BadRequest, _("Invalid parameters provided - %{params}. These are only relevant for Pulp 2 repositories" % { params: invalid_params.join(', ')})
-      end
-
-      if params[:destination_server].blank?
-        fail HttpErrors::BadRequest, _("Destination Server Name required for Pulp3 repositories")
-      end
-
-      history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id]) unless params[:from_history_id].blank?
-
-      async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export, @version, destination_server: params[:destination_server],
-                                                                                         chunk_size: params[:chunk_size_mb],
-                                                                                         from_history: history)
-    end
-
     def metadata_params
       params.require(:metadata).permit(
         :organization,

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

@@ -190,8 +190,8 @@ module Katello
 
     api :PUT, "/content_views/:id/remove", N_("Remove versions and/or environments from a content view and reassign systems and keys")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
-    param :environment_ids, :number, :desc => N_("environment numeric identifiers to be removed")
-    param :content_view_version_ids, :number, :desc => N_("content view version identifiers to be deleted")
+    param :environment_ids, Array, of: :number, :desc => N_("environment numeric identifiers to be removed")
+    param :content_view_version_ids, Array, of: :number, :desc => N_("content view version identifiers to be deleted")
     param :system_content_view_id, :number, :desc => N_("content view to reassign orphaned systems to")
     param :system_environment_id, :number, :desc => N_("environment to reassign orphaned systems to")
     param :key_content_view_id, :number, :desc => N_("content view to reassign orphaned activation keys to")

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

@@ -55,7 +55,7 @@ module Katello
 
     param_group :bulk_errata_ids
     def apply
-      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, @errata_ids)
+      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, content: @errata_ids)
       respond_for_async :resource => task
     end
 

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

@@ -33,14 +33,14 @@ module Katello
     def install
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Install, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Install, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, content: groups)
         respond_for_async :resource => task
       end
     end
@@ -51,7 +51,7 @@ module Katello
     def upgrade
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Update, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Update, @host, content: packages)
         respond_for_async :resource => task
       end
     end
@@ -59,7 +59,7 @@ module Katello
     api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     def upgrade_all
-      task = async_task(::Actions::Katello::Host::Package::Update, @host, [])
+      task = async_task(::Actions::Katello::Host::Package::Update, @host, content: [])
       respond_for_async :resource => task
     end
 
@@ -69,14 +69,14 @@ module Katello
     def remove
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, content: groups)
         respond_for_async :resource => task
       end
     end

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

@@ -42,9 +42,8 @@ module Katello
     def index_response(reload_host = false)
       # Host needs to be reloaded because of lazy accessor
       @host.reload if reload_host
-      entitlements = @host.subscription_facet.candlepin_consumer.entitlements
-      subscriptions = entitlements.map { |entitlement| ::Katello::HostSubscriptionPresenter.new(entitlement) }
-      full_result_response(subscriptions)
+      presenter = ::Katello::HostSubscriptionsPresenter.new(@host)
+      full_result_response(presenter.subscriptions)
     end
 
     api :PUT, "/hosts/:host_id/subscriptions/auto_attach", N_("Trigger an auto-attach of subscriptions")

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

@@ -267,8 +267,9 @@ module Katello
     api :POST, "/hosts/bulk/available_incremental_updates", N_("Given a set of hosts and errata, lists the content view versions" \
                                                                  " and environments that need updating.")
     param_group :bulk_params
-    param :errata_ids, Array, :desc => N_("List of Errata ids")
+    param :errata_ids, Array, :desc => N_("List of Errata ids"), :required => true
     def available_incremental_updates
+      fail HttpErrors::BadRequest, _("errata_ids is a required parameter") if params[:errata_ids].empty?
       version_environments = {}
       content_facets = Katello::Host::ContentFacet.with_non_installable_errata(@errata, @hosts)
 
@@ -364,7 +365,7 @@ module Katello
         if params[:action] == :update_content && params[:update_all]
           content = []
         end
-        task = async_task(::Actions::BulkAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content)
+        task = async_task(Actions::Katello::BulkAgentAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content: content)
         respond_for_async :resource => task
       end
     end

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

@@ -25,7 +25,6 @@ module Katello
     before_action(:only => [:create, :update]) { find_content_credential CONTENT_CREDENTIAL_SSL_CA_CERT_TYPE }
     before_action(:only => [:create, :update]) { find_content_credential CONTENT_CREDENTIAL_SSL_CLIENT_CERT_TYPE }
     before_action(:only => [:create, :update]) { find_content_credential CONTENT_CREDENTIAL_SSL_CLIENT_KEY_TYPE }
-    before_action :check_ignore_global_proxy, :only => [ :update, :create ]
     skip_before_action :authorize, :only => [:gpg_key_content]
     skip_before_action :check_media_type, :only => [:upload_content]
 
@@ -45,7 +44,7 @@ module Katello
       param :checksum_type, String, :desc => N_("Checksum of the repository, currently 'sha1' & 'sha256' are supported")
       param :docker_upstream_name, String, :desc => N_("Name of the upstream docker repository")
       param :docker_tags_whitelist, Array, :desc => N_("Comma-separated list of tags to sync for Container Image repository")
-      param :download_policy, ["immediate", "on_demand", "background"], :desc => N_("download policy for yum repos (either 'immediate', 'on_demand', or 'background (deprecated)')")
+      param :download_policy, ["immediate", "on_demand"], :desc => N_("download policy for yum repos (either 'immediate' or 'on_demand')")
       param :download_concurrency, :number, :desc => N_("Used to determine download concurrency of the repository in pulp3. Use value less than 20. Defaults to 10")
       param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed")
       param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA")
@@ -56,11 +55,11 @@ module Katello
       param :deb_releases, String, :desc => N_("comma-separated list of releases to be synced from deb-archive")
       param :deb_components, String, :desc => N_("comma-separated list of repo components to be synced from deb-archive")
       param :deb_architectures, String, :desc => N_("comma-separated list of architectures to be synced from deb-archive")
-      param :ignore_global_proxy, :bool, :desc => N_("if true, will ignore the globally configured proxy when syncing"), :deprecated => true
       param :ignorable_content, Array, :desc => N_("List of content units to ignore while syncing a yum repository. Must be subset of %s") % RootRepository::IGNORABLE_CONTENT_UNIT_TYPES.join(",")
       param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
       param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for HTTP proxy for content sync")
       param :http_proxy_id, :number, :desc => N_("ID of a HTTP Proxy")
+      param :arch, String, :desc => N_("Architecture of content in the repository")
     end
 
     def_param_group :repo_create do
@@ -95,6 +94,7 @@ module Katello
     param :available_for, String, :desc => N_("interpret specified object to return only Repositories that can be associated with specified object.  Only 'content_view' & 'content_view_version' are supported."),
           :required => false
     param :with_content, RepositoryTypeManager.enabled_content_types, :desc => N_("only repositories having at least one of the specified content type ex: rpm , erratum")
+    param :download_policy, ::Runcible::Models::YumImporter::DOWNLOAD_POLICIES, :desc => N_("limit to only repositories with this download policy")
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(Repository)
     def index
@@ -138,6 +138,7 @@ module Katello
     def index_relation_product(query)
       query = query.joins(:root => :product).where("#{Product.table_name}.organization_id" => @organization) if @organization
       query = query.joins(:root).where("#{RootRepository.table_name}.product_id" => @product.id) if @product
+      query = query.joins(:root).where("#{RootRepository.table_name}.download_policy" => params[:download_policy]) if params[:download_policy]
       query
     end
 
@@ -224,10 +225,6 @@ module Katello
         fail HttpErrors::UnprocessableEntity, msg
       end
 
-      if repo_params['content_type'] == "puppet" || repo_params['content_type'] == "ostree"
-        ::Foreman::Deprecation.api_deprecation_warning("Puppet and OSTree will no longer be supported in Katello 4.0")
-      end
-
       gpg_key = get_content_credential(repo_params, CONTENT_CREDENTIAL_GPG_KEY_TYPE)
       ssl_ca_cert = get_content_credential(repo_params, CONTENT_CREDENTIAL_SSL_CA_CERT_TYPE)
       ssl_client_cert = get_content_credential(repo_params, CONTENT_CREDENTIAL_SSL_CLIENT_CERT_TYPE)
@@ -493,17 +490,6 @@ module Katello
       params.require(:repository).permit(*keys).to_h.with_indifferent_access
     end
 
-    def check_ignore_global_proxy
-      if params.key?(:ignore_global_proxy)
-        ::Foreman::Deprecation.api_deprecation_warning("The parameter ignore_global_proxy will be removed in a future Katello release. Please update to use the http_proxy_policy parameter.")
-        if ::Foreman::Cast.to_bool(params[:ignore_global_proxy])
-          params[:repository][:http_proxy_policy] = RootRepository::NO_DEFAULT_HTTP_PROXY
-        else
-          params[:repository][:http_proxy_policy] = RootRepository::GLOBAL_DEFAULT_HTTP_PROXY
-        end
-      end
-    end
-
     def get_content_credential(repo_params, content_type)
       credential_value = @product.send(content_type)
 
@@ -515,7 +501,7 @@ module Katello
     end
 
     # rubocop:disable Metrics/CyclomaticComplexity
-    def construct_repo_from_params(repo_params)
+    def construct_repo_from_params(repo_params) # rubocop:disable Metrics/AbcSize
       root = @product.add_repo(repo_params.slice(:label, :name, :description, :url, :content_type, :arch, :unprotected,
                                                             :gpg_key, :ssl_ca_cert, :ssl_client_cert, :ssl_client_key,
                                                             :checksum_type, :download_policy, :http_proxy_policy).to_h.with_indifferent_access)