katello 3.12.3 → 3.13.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57454653134acc1d275c22a1e8df7bed953b3cc15fbc45cf6a519f197867d2d5
-  data.tar.gz: 07ed05ad436f0cf25cc31324fdf0d613eeed837b55926573dfc874505556ce1a
+  metadata.gz: a68154d032a02256c3ff6e96034502c068733fe1d9a56563752eaf0872aaf3d8
+  data.tar.gz: 5c0142999143ffc5b34c5f8a7e22b706fde67ae5a19cde1e5f6efe91afe261a1
 SHA512:
-  metadata.gz: a177b3f0adfd8a8a02c697faf17ac209f3c9adad880006087c1fa0fa59f27967f216abea195df1ca840feb733c77a5d45e95d6381abd3ef33f6f17346eecc73a
-  data.tar.gz: 2dd25b82086662e95942e799f2b8822be30ce6b8d66597b09acdab2d93596867fe82a8dec7052f8498d4672262f28aa963ad1e9dcbfd7f21b3c1a8a9e43e6eb8
+  metadata.gz: 15618682b388b7d4c21599f02a15ad962a24dc82f67576f19df37d16456000e2c342c520b16d8b1092f3d97e3daae8fa07c1574a34f9780e5491990919bb361f
+  data.tar.gz: 63055d639c7ec06fa43dba4f659f3b87e7ace99a33e62b5a494eb90d79100ac1da22d4719f66b58378355d08ec0d52e6c7f869884b0c850e652b9a55b8e0ae9f

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

@@ -4,9 +4,11 @@ module Katello
     include ForemanTasks::Triggers
     include AbstractController::Callbacks
 
-    skip_before_action :authorize, :only => [:upload_package_profile, :upload_profiles]
-    before_action :find_host, :only => [:upload_package_profile, :upload_profiles]
-    before_action :authorize_client_or_user, :only => [:upload_package_profile, :upload_profiles]
+    before_action :deprecated, only: :deb_package_profile
+
+    skip_before_action :authorize, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
+    before_action :find_host, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
+    before_action :authorize_client_or_user, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
 
     skip_before_action :check_content_type
 
@@ -29,6 +31,19 @@ module Katello
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
 
+    api :PUT, "/systems/:id/deb_package_profile", N_("Update installed deb packages")
+    param :deb_package_profile, Hash, :required => true do
+      param :deb_packages, Array, :required => true do
+        param :name, String, :required => true
+        param :architecture, String, :required => true
+        param :version, String, :required => true
+      end
+    end
+    param :id, String, :desc => N_("UUID of the system"), :required => true
+    def deb_package_profile
+      upload_profiles
+    end
+
     def find_host(uuid = nil)
       params = request.path_parameters
       uuid ||= params[:id]
@@ -50,5 +65,9 @@ module Katello
       authorized = (User.current.uuid == @host.subscription_facet.uuid) if @host && User.consumer?
       authorized
     end
+
+    def deprecated
+      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 3.15 - please use /consumers/:id/profiles instead.")
+    end
   end
 end

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

@@ -185,8 +185,8 @@ module Katello
     end
     param :id, String, :desc => N_("UUID of the system"), :required => true
     def enabled_repos
-      repos_params = params['enabled_repos'] rescue raise(HttpErrors::BadRequest, _("Expected attribute is missing:") + " enabled_repos")
-      repos_params = repos_params['repos'] || []
+      repos_params = params.dig('enabled_repos', 'repos')
+      fail(HttpErrors::BadRequest, _("The request did not contain any repository information.")) if repos_params.nil?
 
       result = nil
       User.as_anonymous_admin do

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

@@ -12,7 +12,7 @@ module Katello
                                                   :subscriptions]
     before_action :authorize
 
-    wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level auto_attach 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_environment))
 
     api :GET, "/activation_keys", N_("List activation keys")
     api :GET, "/environments/:environment_id/activation_keys"
@@ -22,6 +22,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("content view identifier")
     param :name, String, :desc => N_("activation key name to filter by")
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(ActivationKey)
     def index
       activation_key_includes = [:content_view, :environment, :host_collections, :organization]
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :includes => activation_key_includes))
@@ -36,6 +37,9 @@ module Katello
     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 :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 create
       @activation_key = ActivationKey.new(activation_key_params) do |activation_key|
         activation_key.environment = @environment if @environment
@@ -59,6 +63,9 @@ module Katello
     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
       sync_task(::Actions::Katello::ActivationKey::Update, @activation_key, activation_key_params)
       respond_for_show(:resource => @activation_key)
@@ -304,24 +311,34 @@ module Katello
       end
     end
 
+    def permitted_params
+      params.require(:activation_key).permit(:name,
+                                             :description,
+                                             :environment_id,
+                                             :organization_id,
+                                             :content_view_id,
+                                             :release_version,
+                                             :service_level,
+                                             :auto_attach,
+                                             :max_hosts,
+                                             :unlimited_hosts,
+                                             :purpose_role,
+                                             :purpose_usage,
+                                             :purpose_addon_ids,
+                                             # For deep_munge; Remove for Rails 5
+                                             :host_collection_ids,
+                                             :content_overrides => [],
+                                             :host_collection_ids => []).to_h
+    end
+
     def activation_key_params
-      key_params = params.require(:activation_key).permit(:name,
-                                                          :description,
-                                                          :environment_id,
-                                                          :organization_id,
-                                                          :content_view_id,
-                                                          :release_version,
-                                                          :service_level,
-                                                          :auto_attach,
-                                                          :max_hosts,
-                                                          :unlimited_hosts,
-                                                          # For deep_munge; Remove for Rails 5
-                                                          :host_collection_ids,
-                                                          :content_overrides => [],
-                                                          :host_collection_ids => []).to_h
+      key_params = permitted_params
 
       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
       unlimited = params[:activation_key].try(:[], :unlimited_hosts)
       max_hosts = params[:activation_key].try(:[], :max_hosts)
 

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

@@ -0,0 +1,19 @@
+module Katello
+  class Api::V2::AnsibleCollectionsController < Api::V2::ApiController
+    resource_description do
+      name 'Ansible Collections'
+    end
+    apipie_concern_subst(:a_resource => N_("an ansible collection"), :resource_id => "ansible_collections")
+    include Katello::Concerns::Api::V2::RepositoryContentController
+
+    def default_sort
+      %w(name asc)
+    end
+
+    private
+
+    def repo_association
+      :repository_id
+    end
+  end
+end

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

@@ -13,6 +13,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("filter content view filters by name")
     param :types, Array, :desc => N_("types of filters")
+    add_scoped_search_description_for(ContentViewFilter)
     def index
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
     end
@@ -61,6 +62,8 @@ module Katello
                                                        "(package filter only)")
     param :inclusion, :bool, :desc => N_("specifies if content should be included or excluded, default: inclusion=false")
     param :repository_ids, Array, :desc => N_("list of repository ids")
+    param :description, String, :desc => N_("description of the filter"), :required => false
+
     def update
       @filter.update_attributes!(filter_params)
       respond :resource => @filter

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

@@ -11,6 +11,7 @@ module Katello
     param :author, String, :desc => N_("author of the puppet module")
     param :uuid, String, :desc => N_("uuid of the puppet module"), :deprecated => true
     param_group :search, ::Katello::Api::V2::ApiController
+    add_scoped_search_description_for(ContentViewPuppetModule)
     def index
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
     end

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

@@ -22,6 +22,7 @@ module Katello
     param :organization_id, :number, :desc => N_("Organization identifier")
     param :triggered_by_id, :number, :desc => N_("Filter composite versions whose publish was triggered by the specified component version"), :required => false
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(ContentViewVersion)
     def index
       options = {
         :includes => [:content_view, :environments, :composite_content_views, :history => :task]

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

@@ -32,6 +32,7 @@ module Katello
     param :without, Array, :desc => N_("Do not include this array of content views")
     param :name, String, :desc => N_("Name of the content view"), :required => false
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(ContentView)
     def index
       content_view_includes = [:activation_keys, :content_view_puppet_modules, :content_view_versions,
                                :environments, :organization, :repositories]

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

@@ -49,6 +49,7 @@ module Katello
     param :library, [true, false], :desc => N_("set true if you want to see only library environments")
     param :name, String, :desc => N_("filter only environments containing this name")
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(KTEnvironment)
     def index
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :resource_class => KTEnvironment))
     end

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

@@ -20,6 +20,7 @@ module Katello
     param :errata_restrict_installable, :bool, :desc => N_("Return errata that are upgradable on one or more hosts")
     param :available_for, String, :desc => N_("Return errata that can be added to the specified object.  The values 'content_view_version' and 'content_view_filter are supported.")
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(Erratum)
     def index
       super
     end
@@ -42,7 +43,7 @@ module Katello
       collection = collection.where("#{date_type} >= ?", params[:start_date]) if params[:start_date]
       collection = collection.where("#{date_type} <= ?", params[:end_date]) if params[:end_date]
       collection = collection.of_type(params[:types]) if params[:types]
-      collection
+      collection.non_modular
     end
 
     def custom_index_relation(collection)

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

@@ -24,6 +24,7 @@ module Katello
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("name of the GPG key"), :required => false
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(GpgKey)
     def index
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
     end

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

@@ -33,6 +33,7 @@ module Katello
     param :host_id, :number, :desc => N_("Filter products by host id")
     param :available_for, String, :required => false,
           :desc => N_("Interpret specified object to return only Host Collections that can be associated with specified object. The value 'host' is supported.")
+    add_scoped_search_description_for(HostCollection)
     def index
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
     end

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

@@ -0,0 +1,34 @@
+module Katello
+  class Api::V2::HostDebsController < Api::V2::ApiController
+    include Katello::Concerns::FilteredAutoCompleteSearch
+
+    before_action :find_host
+
+    resource_description do
+      api_version 'v2'
+      api_base_url "/api"
+    end
+
+    api :GET, "/hosts/:host_id/debs", N_("List deb packages installed on the host")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
+    param_group :search, Api::V2::ApiController
+    def index
+      collection = scoped_search(index_relation, :name, :asc, :resource_class => ::Katello::InstalledDeb)
+      respond_for_index(:collection => collection)
+    end
+
+    def index_relation
+      @host.installed_debs
+    end
+
+    def resource_class
+      Katello::InstalledDeb
+    end
+
+    private
+
+    def find_host
+      @host = resource_finder(::Host::Managed.authorized(:view_hosts, ::Host::Managed), params[:host_id])
+    end
+  end
+end

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

@@ -17,6 +17,18 @@ module Katello
       Erratum
     end
 
+    def_param_group :bulk_errata_ids do
+      param :included, Hash, :desc => N_("Errata to exclusively include in the action"), :required => true, :action_aware => true do
+        param :search, String, :required => false, :desc => N_("Search string for erratum to perform an action on")
+        param :ids, Array, :required => false, :desc => N_("List of errata ids to perform an action on, (ex: RHSA-2019:1168)")
+      end
+      param :excluded, Hash, :desc => N_("Errata to explicitly exclude in the action."\
+                                         " All other applicable errata will be included in the action,"\
+                                         " unless an included parameter is passed as well."), :required => true, :action_aware => true do
+        param :ids, Array, :required => false, :desc => N_("List of errata ids to exclude and not run an action on, (ex: RHSA-2019:1168)")
+      end
+    end
+
     api :GET, "/hosts/:host_id/errata", N_("List errata available for the content host")
     param :host_id, :number, :desc => N_("UUID of the content host"), :required => true
     param :content_view_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Content View"), :required => false
@@ -39,9 +51,11 @@ module Katello
 
     api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation")
     param :host_id, :number, :desc => N_("Host ID"), :required => true
-    param :errata_ids, Array, :desc => N_("List of Errata ids to install"), :required => true
+    param :errata_ids, Array, :desc => N_("List of Errata ids to install"), :required => false, :deprecated => true
+
+    param_group :bulk_errata_ids
     def apply
-      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, params[:errata_ids])
+      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, @errata_ids)
       respond_for_async :resource => task
     end
 
@@ -61,6 +75,34 @@ module Katello
       respond_for_async :resource => task
     end
 
+    def find_bulk_errata_ids(bulk_params)
+      #works on a structure of param_group bulk_params and transforms it into a list of errata_ids
+      bulk_params[:included] ||= {}
+      bulk_params[:excluded] ||= {}
+      @errata = []
+
+      unless bulk_params[:included][:ids].blank?
+        @errata = @host.content_facet.installable_errata.where(:errata_id => bulk_params[:included][:ids])
+      end
+
+      if bulk_params[:included][:search]
+        search_errata = @host.content_facet.installable_errata
+        search_errata = search_errata.search_for(bulk_params[:included][:search])
+        if @errata.any?
+          @errata = ::Katello::Erratum.where(errata_id: @errata).or(::Katello::Erratum.where(errata_id: search_errata))
+        else
+          @errata = search_errata
+        end
+      end
+
+      @errata = @errata.where.not(errata_id: bulk_params[:excluded][:ids]) unless @errata.empty? || bulk_params[:excluded][:ids].blank?
+
+      if bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
+        fail HttpErrors::BadRequest, _("No errata has been specified.")
+      end
+      @errata.pluck(:errata_id)
+    end
+
     protected
 
     def index_relation
@@ -94,8 +136,13 @@ module Katello
     end
 
     def find_errata_ids
-      missing = params[:errata_ids] - Erratum.where(:errata_id => params[:errata_ids]).pluck(:errata_id)
-      fail HttpErrors::NotFound, _("Couldn't find errata ids '%s'") % missing.to_sentence if missing.any?
+      if params[:errata_ids]
+        missing = params[:errata_ids] - Erratum.where(:errata_id => params[:errata_ids]).pluck(:errata_id)
+        fail HttpErrors::NotFound, _("Couldn't find errata ids '%s'") % missing.to_sentence if missing.any?
+        @errata_ids = params[:errata_ids]
+      else
+        @errata_ids = find_bulk_errata_ids(params[:bulk_errata_ids])
+      end
     end
   end
 end

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

@@ -20,6 +20,7 @@ module Katello
     api :GET, "/hosts/:host_id/packages", N_("List packages installed on the host")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(Katello::InstalledPackage)
     def index
       collection = scoped_search(index_relation, :name, :asc, :resource_class => ::Katello::InstalledPackage)
       respond_for_index(:collection => collection)

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

@@ -11,6 +11,7 @@ module Katello
       param :host_ids, Array, :desc => N_("List of host id to list available module streams for")
       param :name_stream_only, :boolean, :desc => N_("Return name and stream information only)")
     end
+    add_scoped_search_description_for(ModuleStream)
     def index
       if @name_stream_only
         sort_by, sort_order, options = sort_options

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

@@ -41,6 +41,7 @@ module Katello
 
     api :GET, '/organizations', N_('List all organizations')
     param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(Organization)
     def index
       @render_template = 'katello/api/v2/organizations/index'
       super
@@ -70,9 +71,6 @@ module Katello
     end
 
     api :POST, '/organizations', N_('Create organization')
-    param :name, String, :desc => N_("name"), :required => true
-    param :label, String, :desc => N_("unique label")
-    param :description, String, :desc => N_("description")
     param_group :resource
     def create
       @organization = Organization.new(resource_params)

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

@@ -1,6 +1,7 @@
 module Katello
   class Api::V2::ProductsBulkActionsController < Api::V2::ApiController
     before_action :find_products
+    before_action :find_optional_proxy, :only => :update_http_proxy
 
     api :PUT, "/products/bulk/destroy", N_("Destroy one or more products")
     param :ids, Array, :desc => N_("List of product ids"), :required => true
@@ -49,6 +50,19 @@ module Katello
       respond_for_async :resource => task
     end
 
+    api :PUT, "/products/bulk/http_proxy", N_("Update the http proxy configuration on the repositories of one or more products.")
+    param :ids, Array, :desc => N_("List of product ids"), :required => true
+    param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policy for http proxy for content sync")
+    param :http_proxy_id, :number, :desc => N_("Http Proxy identifier to associated"), :required => false
+    def update_http_proxy
+      task = async_task(::Actions::Katello::Product::UpdateHttpProxy,
+                        @products.editable,
+                        params[:http_proxy_policy],
+                        @http_proxy)
+
+      respond_for_async :resource => task
+    end
+
     api :PUT, "/products/bulk/sync_plan", N_("Sync one or more products")
     param :ids, Array, :desc => N_("List of product ids"), :required => true
     param :plan_id, :number, :desc => N_("Sync plan identifier to attach"), :required => true
@@ -72,6 +86,10 @@ module Katello
 
     private
 
+    def find_optional_proxy
+      @http_proxy = ::HttpProxy.find(params[:http_proxy_id]) if params[:http_proxy_id]
+    end
+
     def find_products
       params.require(:ids)
       @products = Product.where(:id => params[:ids])