katello 3.3.2 → 3.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aafb92d51f13eb142a3d6336be8e73f13fc70f3
-  data.tar.gz: f2d506e35428a7e34ab70860dfe1b4d2b46a64da
+  metadata.gz: 897fa651304dc5619b708e385760771d00b77b2c
+  data.tar.gz: eecdade43f76979c8d3a610745f9d924e02ffd15
 SHA512:
-  metadata.gz: 65f5203e595cebe8d47f169443ea88e5d84cc83bee0c4a998eaf19f2099dffa1afc9724e55840dcfe21b4d5258c85ff406718b96765698967cb4fb5038612d5f
-  data.tar.gz: 93580eae8da88bf7513fe39c613479a44dc0b3322c2948d6e10296fd5c61c8f2707aa98544c41810fde07880c1af5688e28e75fcf3b5cdd91bc06f36ff073951
+  metadata.gz: b2d7b411f35b2c9881233219db63ab76d7aba65612a84f175582d1f4b3f0e8db13218f0f3b60ada315e1d6a9294386c2d55e203ed69633906ad63ffad5cbb48c
+  data.tar.gz: ac61028dcca1a4af146cbc628d7d00003fe48b9798e795168342691741f63a91f8e10e46b6086805f81e55ad02d86c80edaac78b9aaf0db0ec765b4e31884cdb

data/app/assets/stylesheets/katello/containers/container.scss

@@ -1,4 +1,3 @@
 .spinner-form-control {
-  display: initial;
   width: 90%
-}
+}

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

@@ -257,6 +257,7 @@ module Katello
       render :json => status
     end
 
+    #api :PUT, "/consumers/:id", N_("Update consumer information")
     def facts
       User.current = User.anonymous_admin
       async_task(::Actions::Katello::Host::Update, @host, rhsm_params)
@@ -298,7 +299,7 @@ module Katello
         User.as_anonymous_admin { Resources::Candlepin::Consumer.get(uuid) }
         fail HttpErrors::NotFound, _("Couldn't find consumer '%s'") % uuid
       end
-      @host = facet.host
+      @host = ::Host::Managed.unscoped.find(facet.host_id)
     end
 
     def find_content_view_environment

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

@@ -1,7 +1,7 @@
 module Katello
   class Api::V2::ActivationKeysController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
-
+    include Katello::Concerns::Api::V2::ContentOverridesController
     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]
@@ -197,13 +197,36 @@ module Katello
 
     api :PUT, "/activation_keys/:id/content_override", N_("Override content for activation_key")
     param :id, :identifier, :desc => N_("ID of the activation key"), :required => true
-    param :content_override, Hash, :desc => N_("Content override parameters") do
+    param :content_override, Hash, :desc => N_("Content override parameters"), :deprecated => true do
+      param :content_label, String, :desc => N_("Label of the content"), :required => true
+      param :value, String, :desc => N_("Override to a boolean value or 'default'"), :required => true
+    end
+    param :content_overrides, Array, :desc => N_("Array of Content override parameters") do
       param :content_label, String, :desc => N_("Label of the content"), :required => true
-      param :value, [0, 1, "default"], :desc => N_("Override to 0/1, or 'default'"), :required => true
+      param :value, String, :desc => N_("Override value. Provide a boolean value if name is 'enabled'"), :required => false
+      param :name, String, :desc => N_("Override key or name. Note if name is not provided the default name will be 'enabled'"), :required => false
+      param :remove, :bool, :desc => N_("Set true to remove an override and reset it to 'default'"), :required => false
     end
     def content_override
-      content_override = validate_content_overrides(params[:content_override])
-      @activation_key.set_content_override(content_override[:content_label], 'enabled', content_override[:value])
+      content_overrides = []
+      if params[:content_override]
+        ::Foreman::Deprecation.api_deprecation_warning("The parameter content_override will be removed in Katello 3.5. Please update to use the content_overrides parameter.")
+        content_override_params = {:content_label => params[:content_override][:content_label]}
+        value = params[:content_override][:value]
+        if value == "default"
+          content_override_params[:remove] = true
+        elsif value
+          content_override_params[:value] = ::Foreman::Cast.to_bool(value)
+        end
+        content_overrides << content_override_params
+      elsif params[:content_overrides]
+        content_overrides = params[:content_overrides]
+      end
+
+      content_override_values = content_overrides.map do |override_params|
+        validate_content_overrides_enabled(override_params, @activation_key)
+      end
+      @activation_key.set_content_overrides(content_override_values)
       respond_for_show(:resource => @activation_key)
     end
 
@@ -224,24 +247,6 @@ module Katello
 
     private
 
-    def validate_content_overrides(content_params)
-      case content_params[:value].to_s
-      when 'default'
-        content_params[:value] = nil
-      when '1'
-        content_params[:value] = 1
-      when '0'
-        content_params[:value] = 0
-      else
-        fail HttpErrors::BadRequest, _("Value must be 0/1, or 'default'")
-      end
-
-      unless @activation_key.valid_content_label?(content_params[:content_label])
-        fail HttpErrors::BadRequest, _("Invalid content label: %s") % content_params[:content_label]
-      end
-      content_params
-    end
-
     def subscription_index
       subs = @activation_key.subscriptions
       subscriptions = {

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

@@ -51,6 +51,7 @@ module Katello
 
       total = scoped_search_total(query, group)
 
+      query = query.pluck(:id) if query.respond_to?(:pluck)
       query = resource.search_for(*search_options).where("#{resource.table_name}.id" => query)
 
       query = query.select(group).group(group) if group
@@ -74,7 +75,7 @@ module Katello
         query = query.paginate(paginate_options)
       end
       page = params[:page] || 1
-      per_page = params[:per_page] || ::Setting::General.entries_per_page
+      per_page = params[:per_page] || Setting[:entries_per_page]
       query = (total.zero? || sub_total.zero?) ? [] : query
 
       scoped_search_results(query, sub_total, total, page, per_page)

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

@@ -86,7 +86,7 @@ module Katello
     end
 
     def find_capsule
-      @capsule = SmartProxy.authorized(:manage_capsule_content).find(params[:id])
+      @capsule = SmartProxy.unscoped.authorized(:manage_capsule_content).find(params[:id])
       unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
         fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
       end

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

@@ -5,6 +5,7 @@ module Katello
 
     api :GET, "/content_view_filters/:content_view_filter_id/rules", N_("List filter rules")
     param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
+    param_group :search, Api::V2::ApiController
     def index
       ids = ContentViewFilter.rule_ids_for(@filter)
       results = ids.map { |id| ContentViewFilter.rule_class_for(@filter).find(id) }
@@ -20,6 +21,7 @@ module Katello
         N_("Create a filter rule. The parameters included should be based upon the filter type.")
     param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
     param :name, [String, Array], :desc => N_("package, package group, or docker tag names")
+    param :uuid, String, :desc => N_("package group: uuid")
     param :version, String, :desc => N_("package: version")
     param :arch, String, :desc => N_("package: architecture")
     param :min_version, String, :desc => N_("package: minimum version")

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

@@ -21,7 +21,7 @@ module Katello
       query = ContentViewFilter.where(:content_view_id => (@view || ContentView.readable))
       query = query.where(:name => params[:name]) if params[:name]
       if params[:types]
-        types = params[:types].each.collect do |type|
+        types = params[:types].collect do |type|
           ::Katello::ContentViewFilter.class_for(type)
         end
         query = query.where("#{::Katello::ContentViewFilter.table_name}.type IN (?)", types)

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

@@ -3,7 +3,7 @@ module Katello
     include Concerns::Api::V2::BulkHostsExtensions
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_content_view_version, :only => [:show, :promote, :destroy, :export]
+    before_action :find_content_view_version, :only => [:show, :promote, :destroy, :export, :republish_repositories]
     before_action :find_content_view, :except => [:incremental_update]
     before_action :find_environment, :only => [:index]
     before_action :find_environments, :only => [:promote]
@@ -53,10 +53,20 @@ module Katello
     param :environment_id, :identifier, :deprecated => true, :desc => N_("LifeCycle Environment identifier")
     param :environment_ids, Array, :desc => N_("Identifiers for Lifecycle Environment")
     param :description, String, :desc => N_("The description for the content view version promotion")
+    param :force_yum_metadata_regeneration, :bool, :desc => N_("Force metadata regeneration on the repositories " \
+                                                           "in the content view version")
     def promote
       is_force = ::Foreman::Cast.to_bool(params[:force])
       task = async_task(::Actions::Katello::ContentView::Promote,
-                        @version, @environments, is_force, params[:description])
+                        @version, @environments, is_force, params[:description],
+                        :force_yum_metadata_regeneration => params[:force_yum_metadata_regeneration])
+      respond_for_async :resource => task
+    end
+
+    api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata.")
+    param :id, :identifier, :desc => N_("Content view version identifier"), :required => true
+    def republish_repositories
+      task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @version)
       respond_for_async :resource => task
     end
 

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

@@ -76,8 +76,11 @@ module Katello
     api :POST, "/content_views/:id/publish", N_("Publish a content view")
     param :id, :identifier, :desc => N_("Content view identifier"), :required => true
     param :description, String, :desc => N_("Description for the new published content view version")
+    param :force_yum_metadata_regeneration, :bool, :desc => N_("Force yum metadata regeneration on the repositories " \
+                                                           "in the content view version")
     def publish
-      task = async_task(::Actions::Katello::ContentView::Publish, @view, params[:description])
+      task = async_task(::Actions::Katello::ContentView::Publish, @view, params[:description],
+                        :force_yum_metadata_regeneration => params[:force_yum_metadata_regeneration])
       respond_for_async :resource => task
     end
 

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

@@ -3,6 +3,16 @@ module Katello
     apipie_concern_subst(:a_resource => N_("a docker tag"), :resource => "docker_tags")
     include Katello::Concerns::Api::V2::RepositoryContentController
 
+    before_action :find_repositories, :only => [:auto_complete_name]
+
+    def auto_complete_name
+      page_size = Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE
+      tags = Katello::DockerTag.in_repositories(@repositories)
+      col = "#{Katello::DockerTag.table_name}.name"
+      tags = tags.where("#{Katello::DockerTag.table_name}.name ILIKE ?", "#{params[:term]}%").select(col).group(col).order(col).limit(page_size)
+      render :json => tags.pluck(col)
+    end
+
     def index
       if params[:grouped]
         # group docker tags by name, repo, and product
@@ -18,6 +28,10 @@ module Katello
 
     private
 
+    def find_repositories
+      @repositories = Repository.readable.where(:id => params[:repoids])
+    end
+
     def resource_class
       DockerTag
     end

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

@@ -47,6 +47,7 @@ module Katello
     param :organization_id, :number, :desc => N_("organization identifier")
     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
     def index
       respond(:collection => scoped_search(index_relation.uniq, :name, :asc, :resource_class => KTEnvironment))
     end
@@ -125,7 +126,7 @@ module Katello
                   end
 
       paths = env_paths.inject([]) do |result, path|
-        result << { :environments => [@organization.library] + path }
+        result << { :environments => [@organization.library] + path.select(&:readable?) }
       end
       paths = [{ :environments => [@organization.library] }] if paths.empty?
 

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

@@ -92,7 +92,8 @@ module Katello
       already_added_host_ids = @host_collection.host_ids & host_ids
       unfound_host_ids = host_ids - @hosts.pluck(:id)
 
-      @host_collection.host_ids += @editable_hosts.pluck(:id)
+      @host_collection.host_ids = (@host_collection.host_ids +
+                                   @editable_hosts.pluck(:id)).uniq
       @host_collection.save!
 
       messages = format_bulk_action_messages(

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

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

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

@@ -1,5 +1,6 @@
 module Katello
   class Api::V2::HostSubscriptionsController < Katello::Api::V2::ApiController
+    include Katello::Concerns::Api::V2::ContentOverridesController
     before_action :find_host, :except => :create
     before_action :check_subscriptions, :only => [:add_subscriptions, :remove_subscriptions]
     before_action :find_content_view_environment, :only => :create
@@ -133,12 +134,34 @@ module Katello
 
     api :PUT, "/hosts/:host_id/subscriptions/content_override", N_("Set content overrides for the host")
     param :host_id, String, :desc => N_("Id of the content host"), :required => true
-    param :content_label, String, :desc => N_("Label of the content"), :required => true
-    param :value, [0, 1, String], :desc => N_("Override to 'yes', 'no', or 'default'"), :required => true
+    param :content_label, String, :desc => N_("Label of the content"), :required => false
+    param :value, String, :desc => N_("Override to a boolean value or 'default'"), :required => false
+    param :content_overrides, Array, :desc => N_("Array of Content override parameters") do
+      param :content_label, String, :desc => N_("Label of the content"), :required => true
+      param :value, String, :desc => N_("Override value. Provide a boolean value if name is 'enabled'"), :required => false
+      param :name, String, :desc => N_("Override key or name. Note if name is not provided the default name will be 'enabled'"), :required => false
+      param :remove, :bool, :desc => N_("Set true to remove an override and reset it to 'default'"), :required => false
+    end
     def content_override
-      content_override = validate_content_overrides(params)
-      @host.subscription_facet.candlepin_consumer.set_content_override(content_override[:content_label], 'enabled', content_override[:value])
+      content_overrides = []
+      if params[:content_label]
+        ::Foreman::Deprecation.api_deprecation_warning("The parameter content_label will be removed in Katello 3.5. Please update to use the content_overrides parameter.")
+        content_override_params = {:content_label => params[:content_label]}
+        value = params[:value]
+        if value == "default"
+          content_override_params[:remove] = true
+        elsif value
+          content_override_params[:value] = ::Foreman::Cast.to_bool(value)
+        end
+        content_overrides << content_override_params
+      elsif params[:content_overrides]
+        content_overrides = params[:content_overrides]
+      end
 
+      content_override_values = content_overrides.map do |override_params|
+        validate_content_overrides_enabled(override_params, @host)
+      end
+      sync_task(::Actions::Katello::Host::UpdateContentOverrides, @host, content_override_values, false)
       product_content
     end
 
@@ -161,25 +184,6 @@ module Katello
 
     private
 
-    def validate_content_overrides(content_params)
-      case content_params[:value].to_s.downcase
-      when 'default'
-        content_params[:value] = nil
-      when '1', 'yes'
-        content_params[:value] = 1
-      when '0', 'no'
-        content_params[:value] = 0
-      else
-        fail HttpErrors::BadRequest, _("Value must be 'yes', 'no', or 'default'")
-      end
-
-      available_content = @host.subscription_facet.candlepin_consumer.available_product_content
-      unless available_content.map(&:content).any? { |content| content.label == content_params[:content_label] }
-        fail HttpErrors::BadRequest, _("Invalid content label: %s") % content_params[:content_label]
-      end
-      content_params
-    end
-
     def find_content_view_environment
       @content_view_environment = Katello::ContentViewEnvironment.where(:content_view_id => params[:content_view_id],
                                                                         :environment_id => params[:lifecycle_environment_id]).first

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

@@ -1,6 +1,7 @@
 module Katello
   class Api::V2::HostsBulkActionsController < Api::V2::ApiController
     include Concerns::Api::V2::BulkHostsExtensions
+    include Katello::Concerns::Api::V2::ContentOverridesController
 
     before_action :find_host_collections, :only => [:bulk_add_host_collections, :bulk_remove_host_collections]
     before_action :find_environment, :only => [:environment_content_view]
@@ -175,6 +176,24 @@ module Katello
       respond_for_async :resource => task
     end
 
+    api :PUT, "/hosts/bulk/subscriptions/content_overrides", N_("Set content overrides to one or more hosts")
+    param_group :bulk_params
+    param :content_overrides, Array, :desc => N_("Array of Content override parameters") do
+      param :content_label, String, :desc => N_("Label of the content"), :required => true
+      param :value, String, :desc => N_("Override value. Provide a boolean value if name is 'enabled'"), :required => false
+      param :name, String, :desc => N_("Override key or name. Note if name is not provided the default name will be 'enabled'"), :required => false
+      param :remove, :bool, :desc => N_("Set true to remove an override and reset it to 'default'"), :required => false
+    end
+    def content_overrides
+      content_overrides = params[:content_overrides] || []
+      content_override_values = content_overrides.map do |content_override_params|
+        validate_content_overrides_enabled(content_override_params)
+      end
+
+      task = async_task(::Actions::BulkAction, ::Actions::Katello::Host::UpdateContentOverrides, @hosts, content_override_values)
+      respond_for_async :resource => task
+    end
+
     api :PUT, "/hosts/bulk/environment_content_view", N_("Assign the environment and content view to one or more hosts")
     param_group :bulk_params
     param :environment_id, Integer

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

@@ -78,8 +78,8 @@ module Katello
       sync_task(::Actions::Katello::Organization::Create, @organization)
       @organization.reload
       respond_for_show :resource => @organization
-    rescue
-      process_resource_error
+    rescue => e
+      process_resource_error(message: e.message)
     end
 
     api :DELETE, '/organizations/:id', N_('Delete an organization')
@@ -91,10 +91,14 @@ module Katello
 
     api :PUT, "/organizations/:id/repo_discover", N_("Discover Repositories")
     param :id, :number, :desc => N_("Organization ID"), :required => true
-    param :url, String, :desc => N_("base url to perform repo discovery on")
+    param :url, String, :desc => N_("Base URL to perform repo discovery on")
+    param :content_type, String, :desc => N_("One of yum or docker")
+    param :upstream_username, String, :desc => N_("Username to access URL")
+    param :upstream_password, String, :desc => N_("Password to access URL")
     def repo_discover
       fail _("url not defined.") if params[:url].blank?
-      task = async_task(::Actions::Katello::Repository::Discover, params[:url])
+      task = async_task(::Actions::Katello::Repository::Discover, params[:url], params[:content_type],
+                        params[:upstream_username], params[:upstream_password])
       respond_for_async :resource => task
     end
 

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

@@ -3,6 +3,57 @@ module Katello
     apipie_concern_subst(:a_resource => N_("a package group"), :resource => "package_groups")
     include Katello::Concerns::Api::V2::RepositoryContentController
 
+    before_action :find_repository
+
+    api :POST, "/package_group", N_("Create a package group")
+    param :repository_id, String, :required => true, :desc => N_("repository_id")
+    param :name, String, :required => true, :desc => N_("package group name.")
+    param :description, String, :desc => N_("package group description. Defaults to params[:name]")
+    param :user_visible, :bool, :desc => N_("set \"user_visible\" flag on package group. Defaults to true")
+    param :mandatory_package_names, Array, :desc => N_("mandatory package names to include in the package group")
+    param :optional_package_names, Array, :desc => N_("optional package names to include in the package group")
+    param :conditional_package_names, Array, :desc => N_("conditional package names to include in the package group")
+    param :default_package_names, Array, :desc => N_("default package names to include in the package group")
+
+    def create
+      fail HttpErrors::BadRequest, _("name not defined.") if params[:name].blank?
+      fail HttpErrors::BadRequest, _("repository_id not defined.") if params[:repository_id].blank?
+      fail Katello::Errors::InvalidRepositoryContent, _("Can only upload to Yum Repositories.") unless @repo.yum?
+
+      if params[:mandatory_package_names].empty? && params[:optional_package_names].empty? &&
+         params[:conditional_package_names].empty? && params[:default_package_names].empty?
+        fail HttpErrors::BadRequest, _("Must supply at least one of mandatory_package_names, " \
+          "optional_package_names, conditional_package_names, default_package_names parameters")
+      end
+
+      params.each do |key, value|
+        if key.to_s.include?('_package_names')
+          if value.present?
+            fail HttpErrors::BadRequest, _("%s must be an array.") % key unless value.is_a?(Array)
+          end
+        end
+      end
+
+      params[:description] = params[:name] if params[:description].empty?
+      params[:user_visible] = ::Foreman::Cast.to_bool(params[:user_visible])
+      params[:user_visible] ||= true
+
+      sync_task(::Actions::Katello::Repository::UploadPackageGroup, @repo, params)
+      render :json => {:status => "success"}
+    end
+
+    api :DELETE, "/package_group", N_("Delete a package group")
+    param :name, String, :required => true, :desc => N_("package group name")
+    param :repository_id, String, :required => true, :desc => N_("repository_id")
+
+    def destroy
+      fail Katello::Errors::InvalidRepositoryContent, _("Can only destroy on Yum Repositories.") unless @repo.yum?
+      fail _("name not defined.") if params[:name].blank?
+
+      sync_task(::Actions::Katello::Repository::DestroyPackageGroup, @repo, params[:name])
+      render :json => {:status => "success"}
+    end
+
     def available_for_content_view_filter(filter, collection)
       collection_ids = []
       current_ids = filter.package_group_rules.map(&:uuid)