katello 3.9.1 → 3.10.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69e80194e98966a9f7d9942fdd36fb5996718cca
-  data.tar.gz: 6daa564d8872d33964d3cda0c1f6f9268b603aa8
+  metadata.gz: 56354aa529245602ddac6bbb8fe6b4c46b68e80e
+  data.tar.gz: 875ed3e65866ebc2d0ec9ac51db388c47bfddb51
 SHA512:
-  metadata.gz: 7e6df8ffbe7dd816c21f438efe12b4a6973b2d2be4e37da959799ea7285ad7b38f49dff638432f2075c82b02185c3f69e473b66ac3d1a2f250fc57e3f3f923cf
-  data.tar.gz: 1f2b5d16fac33a4b81da05bd320bfcd68eed769d28b79c41adf273ffebe5533f68ff560b8112743873fd5234dd7c86bba6d6e9ff883c70d73c5f5a03ef5429b2
+  metadata.gz: 9ba4bcb89eae3327727e378960f2b37d03f6ac098d57cc9699de8908d8c1652c4f8b1794f0dbd657cbc7343c320ccc05f65c90c1dc83a596644da38d266c1892
+  data.tar.gz: 6480a7323599b59b66ac44f62c9b0c697c968ca5c73496cdfddc72684b061065bacbb7734694411e6f35b0d95e3314a953431954054343bf664dc0f1075ec5da

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -6,8 +6,8 @@ $(document).on('ContentLoad', function(){
     window.tfm.hosts.registerPluginAttributes("os",
          ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'content_source_id', 'architecture_id']);
 
-    $("#hostgroup_lifecycle_environment_id").change(KT.hosts.fetchContentViews);
-    $("#host_lifecycle_environment_id").change(KT.hosts.fetchContentViews);
+    $("#hostgroup_lifecycle_environment_id").change(KT.hosts.environmentChanged);
+    $("#host_lifecycle_environment_id").change(KT.hosts.environmentChanged);
 
     $("#hostgroup_content_view_id").change(KT.hosts.contentViewSelected);
     $("#host_content_view_id").change(KT.hosts.contentViewSelected);
@@ -19,18 +19,33 @@ $(document).on('ContentLoad', function(){
     KT.hosts.set_media_selection_bindings();
 });
 
+KT.hosts.environmentChanged = function() {
+  // if we don't save the currently selected view it's likely
+  // it will be undefined in toggle_installation_medium due to the CV dropdown reload
+  var previous_content_view = KT.hosts.getSelectedContentView();
+
+  KT.hosts.fetchContentViews();
+  KT.hosts.toggle_installation_medium(previous_content_view);
+};
+
 KT.hosts.fetchContentViews = function () {
     var select = KT.hosts.getContentViewSelect();
     var envId = KT.hosts.getSelectedEnvironment();
+    var option;
+    var previous_view = KT.hosts.getSelectedContentView();
+
     select.find('option').remove();
     if (envId) {
         KT.hosts.signalContentViewFetch(true);
         var url = foreman_url('/katello/api/v2/content_views/');
         $.get(url, {environment_id: envId, full_result: true}, function (data) {
-            select.find('option').remove();
             select.append($("<option />"));
             $.each(data.results, function(index, view) {
-                select.append($("<option />").val(view.id).text(view.name));
+                option = $("<option />").val(view.id).text(view.name);
+                if (view.id === parseInt(previous_view)) {
+                  option.prop('selected', true);
+                }
+                select.append(option);
             });
             KT.hosts.signalContentViewFetch(false);
         });
@@ -40,7 +55,6 @@ KT.hosts.fetchContentViews = function () {
 KT.hosts.signalContentViewFetch = function(fetching) {
     var select = KT.hosts.getContentViewSelect();
     var select2 = KT.hosts.getContentViewSelect2();
-        //parent = select.parent(),
         spinner = $('<img>').attr('src', select.data("spinner-path")),
         spinner_id = "content_view_spinner";
 
@@ -118,10 +132,10 @@ KT.hosts.getSelectedEnvironment = function () {
 };
 
 KT.hosts.onKatelloHostEditLoad = function(){
-    var prefxies = ['host', 'hostgroup'],
-        attributes = ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'architecture_id'];
+    var prefixes = ['host', 'hostgroup'],
+        attributes = ['content_view_id', 'environment_id', 'architecture_id'];
 
-    $.each(prefxies, function(index, prefix) {
+    $.each(prefixes, function(index, prefix) {
         $.each(attributes, function(attrIndex, attribute) {
             $('body').on('change', '#' + prefix + '_' + attribute, function () {
                 KT.hosts.toggle_installation_medium();
@@ -134,18 +148,20 @@ KT.hosts.onKatelloHostEditLoad = function(){
     });
 };
 
-KT.hosts.toggle_installation_medium = function() {
-    var lifecycle_environment_id, content_source_id, architecture_id, operatingsystem_id, content_view_id;
+KT.hosts.toggle_installation_medium = function(content_view_id) {
+    var lifecycle_environment_id, content_source_id, architecture_id, operatingsystem_id;
+
+    if (content_view_id === undefined) {
+      content_view_id = KT.hosts.getSelectedContentView();
+    }
 
     if ($('#hostgroup_parent_id').length > 0) {
       lifecycle_environment_id = KT.hosts.getSelectedEnvironment();
-      content_view_id = KT.hosts.getSelectedContentView();
       content_source_id = $('#content_source_id').val();
       architecture_id = $('#hostgroup_architecture_id').val();
       operatingsystem_id = $('#hostgroup_operatingsystem_id').val();
     } else {
       lifecycle_environment_id = KT.hosts.getSelectedEnvironment();
-      content_view_id = KT.hosts.getSelectedContentView();
       content_source_id = $('#content_source_id').val();
       architecture_id = $('#host_architecture_id').val();
       operatingsystem_id = $('#host_operatingsystem_id').val();

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

@@ -4,9 +4,9 @@ module Katello
     include ForemanTasks::Triggers
     include AbstractController::Callbacks
 
-    skip_before_action :authorize, :only => [:upload_package_profile]
-    before_action :find_host, :only => [:upload_package_profile]
-    before_action :authorize_client_or_user, :only => [:upload_package_profile]
+    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]
 
     skip_before_action :check_content_type
 
@@ -20,6 +20,15 @@ module Katello
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
 
+    api :PUT, "/consumers/:id/profiles", N_("Update installed packages, enabled repos, module inventory")
+    param :id, String, :desc => N_("UUID of the consumer"), :required => true
+    def upload_profiles
+      User.as_anonymous_admin do
+        async_task(::Actions::Katello::Host::UploadProfiles, @host, request.raw_post)
+      end
+      render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
+    end
+
     def find_host(uuid = nil)
       params = request.path_parameters
       uuid ||= params[:id]

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

@@ -9,10 +9,10 @@ module Katello
 
     around_action :repackage_message
     before_action :find_host, :only => [:consumer_show, :consumer_destroy, :consumer_checkin, :enabled_repos,
-                                        :upload_package_profile, :regenerate_identity_certificates, :facts,
+                                        :regenerate_identity_certificates, :facts,
                                         :available_releases, :serials, :upload_tracer_profile]
     before_action :authorize, :only => [:consumer_create, :list_owners, :rhsm_index]
-    before_action :authorize_client_or_user, :only => [:consumer_show, :upload_package_profile, :regenerate_identity_certificates, :upload_tracer_profile, :facts, :proxy_jobs_get_path]
+    before_action :authorize_client_or_user, :only => [:consumer_show, :regenerate_identity_certificates, :upload_tracer_profile, :facts, :proxy_jobs_get_path]
     before_action :authorize_client_or_admin, :only => [:hypervisors_update, :async_hypervisors_update]
     before_action :authorize_proxy_routes, :only => [:get, :post, :put, :delete]
     before_action :authorize_client, :only => [:consumer_destroy, :consumer_checkin,
@@ -188,18 +188,9 @@ module Katello
       repos_params = params['enabled_repos'] rescue raise(HttpErrors::BadRequest, _("Expected attribute is missing:") + " enabled_repos")
       repos_params = repos_params['repos'] || []
 
-      paths = repos_params.map do |repo|
-        if !repo['baseurl'].blank?
-          URI(repo['baseurl'].first).path
-        else
-          logger.warn("System #{@host.name} (#{@host.id}) attempted to bind to unspecific repo (#{repo}).")
-          nil
-        end
-      end
-
       result = nil
       User.as_anonymous_admin do
-        result = @host.content_facet.update_repositories_by_paths(paths.compact)
+        result = @host.import_enabled_repositories(repos_params)
       end
 
       respond_for_show :resource => result
@@ -250,7 +241,7 @@ module Katello
     #description N_("This service is available for unauthenticated users")
     def server_status
       candlepin_response = Resources::Candlepin::CandlepinPing.ping
-      status = { :managerCapabilities => candlepin_response['managerCapabilities'],
+      status = { :managerCapabilities => candlepin_response['managerCapabilities'] + ["combined_reporting"],
                  :result => candlepin_response['result'],
                  :rulesSource => candlepin_response['rulesSource'],
                  :rulesVersion => candlepin_response['rulesVersion'],

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

@@ -69,7 +69,7 @@ module Katello
     param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
     param_group :content_credential
     def update
-      @content_credential.update_attributes!(content_credential_params)
+      sync_task(::Actions::Katello::GpgKey::Update, @content_credential, content_credential_params.to_h)
       respond_for_show(:resource => @content_credential)
     end
 

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

@@ -107,7 +107,7 @@ module Katello
 
     def find_rule
       rule_clazz = ContentViewFilter.rule_class_for(@filter)
-      @rule = rule_clazz.find(params[:id])
+      @rule = rule_clazz.where(content_view_filter_id: @filter.id).find(params[:id])
     end
 
     def rule_params

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

@@ -54,13 +54,10 @@ module Katello
     param :environment_id, :number, :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],
-                        :force_yum_metadata_regeneration => params[:force_yum_metadata_regeneration])
+                        @version, @environments, is_force, params[:description])
       respond_for_async :resource => task
     end
 
@@ -133,6 +130,7 @@ module Katello
     param :add_content, Hash do
       param :errata_ids, Array, :desc => "Errata ids or uuids to copy into the new versions"
       param :package_ids, Array, :desc => "Package ids or uuids to copy into the new versions"
+      param :deb_ids, Array, :desc => "Deb Package ids or uuids to copy into the new versions"
       param :puppet_module_ids, Array, :desc => "Puppet Module ids or uuids to copy into the new versions"
     end
     param :update_hosts, Hash, :desc => N_("After generating the incremental update, apply the changes to the specified hosts.  Only Errata are supported currently.") do
@@ -277,6 +275,10 @@ module Katello
         fail _("package_ids is not an array") unless content[:package_ids].is_a?(Array)
       end
 
+      if content[:deb_ids]
+        fail _("deb_ids is not an array") unless content[:deb_ids].is_a?(Array)
+      end
+
       if content[:puppet_module_ids]
         fail _("puppet_module_ids is not an array") unless content[:puppet_module_ids].is_a?(Array)
       end

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

@@ -77,8 +77,6 @@ module Katello
     api :POST, "/content_views/:id/publish", N_("Publish a content view")
     param :id, :number, :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")
     param :major, :number, :desc => N_("Override the major version number"), :required => false
     param :minor, :number, :desc => N_("Override the minor version number"), :required => false
 
@@ -91,8 +89,15 @@ module Katello
         fail HttpErrors::BadRequest, _("Directly setting package lists on composite content views is not allowed. Please " \
                                      "update the components, then re-publish the composite.")
       end
+      if params[:major].present? && params[:minor].present? && ContentViewVersion.find_by(:content_view_id => params[:id], :major => params[:major], :minor => params[:minor]).present?
+        fail HttpErrors::BadRequest, _("A CV version already exists with the same major and minor version (%{major}.%{minor})") % {:major => params[:major], :minor => params[:minor]}
+      end
+
+      if params[:major].present? && params[:minor].nil? || params[:major].nil? && params[:minor].present?
+        fail HttpErrors::BadRequest, _("Both major and minor parameters have to be used to override a CV version")
+      end
+
       task = async_task(::Actions::Katello::ContentView::Publish, @view, params[:description],
-                        :force_yum_metadata_regeneration => params[:force_yum_metadata_regeneration],
                         :major => params[:major],
                         :minor => params[:minor],
                         :repos_units => params[:repos_units])

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

@@ -61,7 +61,8 @@ module Katello
     param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     param_group :gpg_key
     def update
-      @gpg_key.update_attributes!(gpg_key_params)
+      sync_task(::Actions::Katello::GpgKey::Update, @gpg_key, gpg_key_params.to_h)
+
       respond_for_show(:resource => @gpg_key)
     end
 

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

@@ -0,0 +1,39 @@
+module Katello
+  class Api::V2::HostModuleStreamsController < 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/module_streams", N_("List module streams available to the host")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
+    param :status, ::Katello::HostAvailableModuleStream::API_STATES.keys, :desc => N_("Streams based on the host based on their status")
+    param_group :search, Api::V2::ApiController
+    def index
+      collection = scoped_search(index_relation, :name, :asc, :resource_class => ::Katello::HostAvailableModuleStream)
+      respond_for_index(:collection => collection)
+    end
+
+    def index_relation
+      return HostAvailableModuleStream.upgradable([@host]) if params[:status] == HostAvailableModuleStream::UPGRADABLE
+
+      rel = @host.host_available_module_streams
+      return rel if params[:status].blank?
+      rel.send(::Katello::HostAvailableModuleStream::API_STATES[params[:status]])
+    end
+
+    def resource_class
+      Katello::HostAvailableModuleStream
+    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/hosts_bulk_actions_controller.rb

@@ -13,6 +13,9 @@ module Katello
 
     before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
 
+    # disable *_count fields on erratum rabl, since they perform N+1 queries
+    before_action :disable_erratum_hosts_count
+
     resource_description do
       api_version 'v2'
       api_base_url "/api"
@@ -20,17 +23,17 @@ module Katello
 
     PARAM_ACTIONS = {
       :install_content => {
-        :package => :install_packages,
-        :package_group => :install_package_groups,
+        :package => ::Actions::Katello::Host::Package::Install,
+        :package_group => ::Actions::Katello::Host::PackageGroup::Install,
         :errata => :install_errata
       },
       :update_content => {
-        :package => :update_packages,
-        :package_group => :update_package_groups
+        :package => ::Actions::Katello::Host::Package::Update,
+        :package_group => ::Actions::Katello::Host::PackageGroup::Install
       },
       :remove_content => {
-        :package => :uninstall_packages,
-        :package_group => :uninstall_package_groups
+        :package => ::Actions::Katello::Host::Package::Remove,
+        :package_group => ::Actions::Katello::Host::PackageGroup::Remove
       }
     }.with_indifferent_access
 
@@ -225,8 +228,7 @@ module Katello
     param :errata_ids, Array, :desc => N_("List of Errata ids")
     def available_incremental_updates
       version_environments = {}
-      content_facets = Katello::Host::ContentFacet.with_non_installable_errata(@errata).
-          where("#{Katello::Host::ContentFacet.table_name}.host_id" => @hosts)
+      content_facets = Katello::Host::ContentFacet.with_non_installable_errata(@errata, @hosts)
 
       ContentViewEnvironment.for_content_facets(content_facets).each do |cve|
         version = cve.content_view_version
@@ -308,9 +310,12 @@ module Katello
         task = async_task(::Actions::BulkAction, ::Actions::Katello::Host::Erratum::ApplicableErrataInstall, @hosts, errata_uuids.uniq)
         respond_for_async :resource => task
       else
-        action = Katello::BulkActions.new(@hosts)
-        job = action.send(PARAM_ACTIONS[params[:action]][params[:content_type]], params[:content], :update_all => params[:update_all])
-        respond_for_show :template => 'job', :resource => job
+        content = params[:content]
+        if params[:action] == :update_content && params[:update_all]
+          content = []
+        end
+        task = async_task(::Actions::BulkAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content)
+        respond_for_async :resource => task
       end
     end
 
@@ -330,5 +335,9 @@ module Katello
     def find_content_view
       @view = ContentView.find(params[:content_view_id])
     end
+
+    def disable_erratum_hosts_count
+      @disable_counts = true
+    end
   end
 end

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

@@ -6,7 +6,8 @@ module Katello
 
     before_action :check_params, :only => :index
 
-    update_api(:index) do
+    # updating params inherited from Katello::Concerns::Api::V2::RepositoryContentController
+    apipie_update_params([:index]) do
       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

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

@@ -4,8 +4,7 @@ module Katello
 
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_product, :except => [:index, :auto_complete_search]
-    before_action :find_product_or_organization, :only => [:index, :auto_complete_search]
+    before_action :find_product_or_organization
     before_action :custom_product?
     before_action :find_product_content, :except => [:index, :auto_complete_search]
 
@@ -15,7 +14,7 @@ module Katello
 
     api :GET, "/repository_sets", N_("List repository sets.")
     api :GET, "/products/:product_id/repository_sets", N_("List repository sets for a product.")
-    param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
+    param :product_id, :number, :required => false, :desc => N_("ID of a product to list repository sets from")
     param :name, String, :required => false, :desc => N_("Repository set name to search on")
     param :enabled, :bool, :required => false, :desc => N_("If true, only return repository sets that have been enabled. Defaults to false")
     param :with_active_subscription, :bool, :required => false, :desc => N_("If true, only return repository sets that are associated with an active subscriptions")
@@ -28,7 +27,8 @@ module Katello
     api :GET, "/repository_sets/:id", N_("Get info about a repository set")
     api :GET, "/products/:product_id/repository_sets/:id", N_("Get info about a repository set")
     param :id, :number, :required => true, :desc => N_("ID of the repository set")
-    param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
+    param :product_id, :number, :required => false, :desc => N_("ID of a product to list repository sets from")
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def show
       respond :resource => @product_content
     end
@@ -36,7 +36,8 @@ module Katello
     api :GET, "/repository_sets/:id/available_repositories", N_("Get list of available repositories for the repository set")
     api :GET, "/products/:product_id/repository_sets/:id/available_repositories", N_("Get list of available repositories for the repository set")
     param :id, :number, :required => true, :desc => N_("ID of the repository set")
-    param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
+    param :product_id, :number, :required => false, :desc => N_("ID of a product to list repository sets from")
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def available_repositories
       scan_cdn = sync_task(::Actions::Katello::RepositorySet::ScanCdn, @product, @product_content.content.cp_content_id)
       repos = scan_cdn.output[:results]
@@ -72,9 +73,10 @@ module Katello
     api :PUT, "/repository_sets/:id/enable", N_("Enable a repository from the set")
     api :PUT, "/products/:product_id/repository_sets/:id/enable", N_("Enable a repository from the set")
     param :id, :number, :required => true, :desc => N_("ID of the repository set to enable")
-    param :product_id, :number, :required => true, :desc => N_("ID of the product containing the repository set")
+    param :product_id, :number, :required => false, :desc => N_("ID of the product containing the repository set")
     param :basearch, String, :required => false, :desc => N_("Basearch to enable")
     param :releasever, String, :required => false, :desc => N_("Releasever to enable")
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def enable
       task = sync_task(::Actions::Katello::RepositorySet::EnableRepository, @product, @product_content.content, substitutions)
       respond_for_async :resource => task
@@ -83,9 +85,10 @@ module Katello
     api :PUT, "/repository_sets/:id/disable", N_("Disable a repository from the set")
     api :PUT, "/products/:product_id/repository_sets/:id/disable", N_("Disable a repository from the set")
     param :id, :number, :required => true, :desc => N_("ID of the repository set to disable")
-    param :product_id, :number, :required => true, :desc => N_("ID of the product containing the repository set")
+    param :product_id, :number, :required => false, :desc => N_("ID of the product containing the repository set")
     param :basearch, String, :required => false, :desc => N_("Basearch to disable")
     param :releasever, String, :required => false, :desc => N_("Releasever to disable")
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     def disable
       task = sync_task(::Actions::Katello::RepositorySet::DisableRepository, @product, @product_content.content, substitutions)
       respond_for_async :resource => task
@@ -118,8 +121,14 @@ module Katello
     end
 
     def find_product_content
-      @product_content = @product.product_content_by_id(params[:id])
+      if @product.present?
+        @product_content = @product.product_content_by_id(params[:id])
+      else
+        content = Katello::Content.find_by(:cp_content_id => params[:id], :organization_id => @organization[:id])
+        @product_content = Katello::ProductContent.find_by(:id => content[:id])
+      end
       fail HttpErrors::NotFound, _("Couldn't find repository set with id '%s'.") % params[:id] if @product_content.nil?
+      @product = @product_content.product if @product.nil?
     end
 
     def find_product_or_organization