katello 3.16.1.2 → 3.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808bc23ecac2fda98ac24ce30217831caa4977d250e759baf83ab78150db70f3
-  data.tar.gz: 5531f14549ff16ea0f157a013ebf5ead92ab2acd5fa9a085face6f48fd0a3a50
+  metadata.gz: 7e3320c3167ac19ebd8119f1d4e58f0dcc141a4a18e4bccc98f1a4965e09262d
+  data.tar.gz: a9d5092691dca107610bfae636df54566cc07bf9fdf724d4c2e96312c3fdca9b
 SHA512:
-  metadata.gz: 40a2c815ff331564ff218ce5d688183b4595d4c423e16f27cdb1d1cfb083bbaaa678d9d09cd5303cc6d56825bd300d33b2192dd5c51edf260a09b37aa7e5102f
-  data.tar.gz: 785618e922bfa8a6f1a9675c4eccf2dc1d0e3038401ed9ac30ca1ddeb2294fbc2ba13987f07b08b96884aa90fcd1fd2a85acf18f28d2c9030a42782544941d0b
+  metadata.gz: 263362175e3deffd8bb979fd7464447b66524ccf5156a2a9836ae92b8ccd615b443202e3072309cc8d2d870ff899ddb4256887a5385c0fe860eb903b4b6a7066
+  data.tar.gz: af6e7d83da1cb8ac22dd279156e076cc42e605fb4f5b968d9e027f19903c3a819ebec6c8149f4a2f16ef43a9b3d5d34bb7ed4359c9b6b86e041ce0180c486a6a

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

@@ -1,6 +1,11 @@
 module Katello
   class Api::V2::HostTracerController < Api::V2::ApiController
-    before_action :find_host, :only => :index
+    before_action :find_host
+
+    resource_description do
+      api_version 'v2'
+      api_base_url "/api"
+    end
 
     api :GET, "/hosts/:host_id/traces", N_("List services that need restarting on the host")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
@@ -9,43 +14,18 @@ module Katello
       respond_for_index(:collection => collection)
     end
 
-    api :PUT, "/traces/resolve", N_("Resolve Traces")
+    api :PUT, "/hosts/:host_id/traces/resolve", N_("Resolve Traces")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param :trace_ids, Array, :required => true, :desc => N_("Array of Trace IDs")
     def resolve
-      traces = Katello::HostTracer.resolvable.where(id: params[:trace_ids])
-
-      traces.each do |trace|
-        if trace.reboot_required?
-          trace.helper = 'reboot'
-        end
-      end
-
-      traces_by_host_id = traces.group_by(&:host_id)
-      traces_by_helper = traces.group_by(&:helper)
-
-      composers = []
-
-      if traces_by_host_id.size < traces_by_helper.size
-        traces_by_host_id.each do |host_id, trace|
-          needed_traces = trace.map(&:helper).join(',')
-          joined_helpers = { :helper => needed_traces }
-          composers << JobInvocationComposer.for_feature(:katello_service_restart, [host_id], joined_helpers)
-        end
-      else
-        traces_by_helper.each do |helper, trace|
-          helpers = { :helper => helper }
-          composers << JobInvocationComposer.for_feature(:katello_service_restart, trace.map(&:host_id), helpers)
-        end
-      end
-
-      job_invocations = []
-
-      composers.each do |composer|
-        composer.trigger
-        job_invocations << composer.job_invocation
-      end
-
-      render json: job_invocations
+      traces = @host.host_traces.resolvable.where(id: params[:trace_ids])
+      fail HttpErrors::BadRequest, _("The requested traces were not found for this host") if traces.empty?
+
+      result = Katello::HostTraceManager.resolve_traces(traces)
+
+      task = ForemanTasks::Task.find(result.first.task_id)
+
+      respond_for_async(resource: task)
     end
 
     protected

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

@@ -6,7 +6,7 @@ module Katello
     before_action :find_host_collections, :only => [:bulk_add_host_collections, :bulk_remove_host_collections]
     before_action :find_environment, :only => [:environment_content_view]
     before_action :find_content_view, :only => [:environment_content_view]
-    before_action :find_editable_hosts, :except => [:destroy_hosts, :applicable_errata, :installable_errata]
+    before_action :find_editable_hosts, :except => [:destroy_hosts, :applicable_errata, :installable_errata, :resolve_traces]
     before_action :find_deletable_hosts, :only => [:destroy_hosts]
     before_action :find_readable_hosts, :only => [:applicable_errata, :installable_errata, :available_incremental_updates]
     before_action :find_errata, :only => [:available_incremental_updates]
@@ -230,6 +230,16 @@ module Katello
       respond_for_index(:collection => collection, :template => '../../../api/v2/host_tracer/index')
     end
 
+    api :PUT, "/hosts/bulk/resolve_traces", N_("Resolve traces for one or more hosts")
+    param_group :bulk_params
+    param :trace_ids, Array, :required => true, :desc => N_("Array of Trace IDs")
+    def resolve_traces
+      traces = Katello::HostTracer.resolvable.where(id: params[:trace_ids])
+      result = Katello::HostTraceManager.resolve_traces(traces)
+
+      render json: result
+    end
+
     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

data/app/lib/actions/katello/applicability/hosts/bulk_generate.rb

@@ -9,8 +9,12 @@ module Actions
 
           def run
             input[:host_ids].each do |host_id|
-              content_facet = ::Host.find(host_id).content_facet
-              content_facet.calculate_and_import_applicability
+              content_facet = ::Katello::Host::ContentFacet.find_by_host_id(host_id)
+              if content_facet.present?
+                content_facet.calculate_and_import_applicability
+              else
+                Rails.logger.warn(_("Content Facet for host with id %s is non-existent. Skipping applicability calculation.") % host_id)
+              end
             end
           end
 

data/app/lib/actions/katello/repository/multi_clone_contents.rb

@@ -16,14 +16,16 @@ module Actions
                           solve_dependencies: solve_dependencies)
             end
 
-            extended_repo_mapping.each do |source_repos, dest_repo_map|
-              if generate_metadata
-                metadata_generate(source_repos, dest_repo_map[:dest_repo], dest_repo_map[:filters])
+            concurrence do
+              extended_repo_mapping.each do |source_repos, dest_repo_map|
+                if generate_metadata
+                  metadata_generate(source_repos, dest_repo_map[:dest_repo], dest_repo_map[:filters])
+                end
               end
-            end
 
-            extended_repo_mapping.values.each do |dest_repo_map|
-              plan_action(Katello::Repository::IndexContent, id: dest_repo_map[:dest_repo].id)
+              extended_repo_mapping.values.each do |dest_repo_map|
+                plan_action(Katello::Repository::IndexContent, id: dest_repo_map[:dest_repo].id)
+              end
             end
           end
         end

data/app/lib/actions/pulp3/abstract_async_task.rb

@@ -74,6 +74,7 @@ module Actions
 
       def cancel
         pulp_tasks.each { |task| task.cancel }
+        task_groups.each { |task_group| task_group.cancel }
       end
 
       def rescue_external_task(error)

data/app/lib/actions/pulp3/content_view/delete_repository_references.rb

@@ -14,7 +14,7 @@ module Actions
           content_view.repository_references.each do |repository_reference|
             repo = repository_reference.root_repository.library_instance
             #force pulp3 in case we've done migrations, but haven't switched over yet
-            tasks << repo.backend_service(smart_proxy, true).delete(repository_reference.repository_href)
+            tasks << repo.backend_service(smart_proxy, true).delete_repository(repository_reference)
           end
           content_view.repository_references.destroy_all
 

data/app/lib/actions/pulp3/repository/delete.rb

@@ -8,7 +8,7 @@ module Actions
 
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repo.backend_service(smart_proxy).delete
+          output[:response] = repo.backend_service(smart_proxy).delete_repository
         end
       end
     end

data/app/models/katello/glue/pulp/repo.rb

@@ -367,7 +367,7 @@ module Katello
       pulp_uri = URI.parse(smart_proxy ? smart_proxy.url : SETTINGS[:katello][:pulp][:url])
       scheme   = (self.unprotected && !force_https) ? 'http' : 'https'
       if docker?
-        "#{pulp_uri.host.downcase}:#{Setting['pulp_docker_registry_port']}/#{container_repository_name}"
+        "#{pulp_uri.host.downcase}/#{container_repository_name}"
       elsif file?
         "#{scheme}://#{pulp_uri.host.downcase}/pulp/isos/#{relative_path}/"
       elsif puppet?

data/app/models/katello/root_repository.rb

@@ -330,7 +330,11 @@ module Katello
 
     def format_arches
       if content_type == ::Katello::Repository::DEB_TYPE
-        self.deb_architectures
+        # FIXME: This should be set to self.deb_architectures but it needs to have the
+        # subscription-manager PR https://github.com/candlepin/subscription-manager/pull/2213
+        # merged. Otherwise subscription-manager returns _NO_ debian repository as described in
+        # https://community.theforeman.org/t/katello-3-16-1-1-el7-subscription-manager-doesnt-create-rhsm-repos-for-ubuntu/20928/38
+        nil
       else
         self.arch == "noarch" ? nil : self.arch
       end

data/app/services/katello/host_trace_manager.rb

@@ -0,0 +1,38 @@
+module Katello
+  class HostTraceManager
+    def self.resolve_traces(traces)
+      traces.each do |trace|
+        if trace.reboot_required?
+          trace.helper = 'reboot'
+        end
+      end
+
+      traces_by_host_id = traces.group_by(&:host_id)
+      traces_by_helper = traces.group_by(&:helper)
+
+      composers = []
+
+      if traces_by_host_id.size < traces_by_helper.size
+        traces_by_host_id.each do |host_id, trace|
+          needed_traces = trace.map(&:helper).join(',')
+          joined_helpers = { :helper => needed_traces }
+          composers << ::JobInvocationComposer.for_feature(:katello_service_restart, [host_id], joined_helpers)
+        end
+      else
+        traces_by_helper.each do |helper, trace|
+          helpers = { :helper => helper }
+          composers << ::JobInvocationComposer.for_feature(:katello_service_restart, trace.map(&:host_id), helpers)
+        end
+      end
+
+      job_invocations = []
+
+      composers.each do |composer|
+        composer.trigger
+        job_invocations << composer.job_invocation
+      end
+
+      job_invocations
+    end
+  end
+end

data/app/services/katello/pulp3/repository.rb

@@ -1,5 +1,4 @@
 require "pulpcore_client"
-
 module Katello
   module Pulp3
     class Repository
@@ -188,8 +187,9 @@ module Katello
         api.repositories_api.read(repository_reference.try(:repository_href))
       end
 
-      def delete(href = repository_reference.try(:repository_href))
-        repository_reference.try(:destroy)
+      def delete_repository(repo_reference = repository_reference)
+        href = repo_reference.try(:repository_href)
+        repo_reference.try(:destroy)
         ignore_404_exception { api.repositories_api.delete(href) } if href
       end
 

data/app/services/katello/pulp3/repository/yum.rb

@@ -154,8 +154,7 @@ module Katello
 
             data_dup.config[i][:content] = leftover_units.pop(copy_amount)
             unit_copy_counter += copy_amount
-            # Do copy call if limit is reached or if we're under the limit but on the last repo config.
-            if unit_copy_counter >= UNIT_LIMIT || (i == data_dup.config.size - 1 && leftover_units.empty?)
+            if unit_copy_counter != 0
               tasks << api.copy_api.copy_content(data_dup)
               unit_copy_counter = 0
             end

data/app/services/katello/pulp3/task.rb

@@ -79,7 +79,7 @@ module Katello
 
       def error
         if task_data[:state] == CANCELED
-          self.new(_("Task canceled"))
+          _("Task canceled")
         elsif task_data[:state] == FAILED
           if task_data[:error][:description].blank?
             _("Pulp task error")
@@ -90,8 +90,8 @@ module Katello
       end
 
       def cancel
-        data = PulpcoreClient::Task.new(state: 'canceled')
-        tasks_api.tasks_cancel(pulp_task['pulp_href'], data)
+        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
+        tasks_api.tasks_cancel(task_data['pulp_href'], data)
         #the main task may have completed, so cancel spawned tasks too
         task_data['spawned_tasks']&.each { |spawned| tasks_api.tasks_cancel(spawned['pulp_href'], data) }
       end

data/app/services/katello/pulp3/task_group.rb

@@ -73,6 +73,12 @@ module Katello
       end
 
       def cancel
+        tasks_api = ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
+        tasks_response = tasks_api.list(task_group: task_group_data['pulp_href'])
+        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
+        tasks_response.results.collect do |result|
+          tasks_api.tasks_cancel(result.pulp_href, data)
+        end
       end
     end
   end

data/config/routes/api/v2.rb

@@ -304,12 +304,6 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :traces, :only => [], :controller => 'host_tracer' do
-          collection do
-            put :resolve
-          end
-        end
-
         api_resources :srpms, :only => [:index, :show], :controller => 'srpms' do
           collection do
             get :auto_complete_search

data/config/routes/overrides.rb

@@ -77,6 +77,7 @@ Foreman::Application.routes.draw do
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
             match '/bulk/traces' => 'hosts_bulk_actions#traces', :via => :post
+            match '/bulk/resolve_traces' => 'hosts_bulk_actions#resolve_traces', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
@@ -114,6 +115,9 @@ Foreman::Application.routes.draw do
           end
 
           resources :traces, :only => [:index], :controller => :host_tracer do
+            collection do
+              put :resolve
+            end
           end
         end
       end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-traces-modal.controller.js

@@ -9,7 +9,6 @@
  * @requires Nutupane
  * @requires BastionConfig
  * @requires hostIds
- * @requires HostTracesResolve
  * @required ContentHostsHelper
  * @requires translate
  *
@@ -18,8 +17,8 @@
  */
 /*jshint camelcase:false*/
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesController',
-    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Notification', 'Nutupane', 'BastionConfig', 'hostIds', 'HostTracesResolve', 'ContentHostsHelper', 'translate',
-    function ($scope, $uibModalInstance, HostBulkAction, Notification, Nutupane, BastionConfig, hostIds, HostTracesResolve, ContentHostsHelper, translate) {
+    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Notification', 'Nutupane', 'BastionConfig', 'hostIds', 'ContentHostsHelper', 'translate',
+    function ($scope, $uibModalInstance, HostBulkAction, Notification, Nutupane, BastionConfig, hostIds, ContentHostsHelper, translate) {
 
         var tracesNutupane = new Nutupane(HostBulkAction, hostIds, 'traces');
         tracesNutupane.enableSelectAllResults();
@@ -46,7 +45,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesContro
                 });
             };
             /* eslint-disable camelcase */
-            HostTracesResolve.resolve({trace_ids: traceids}, onSuccess, onFailure);
+            HostBulkAction.resolveTraces({trace_ids: traceids}, onSuccess, onFailure);
             /* eslint-enable camelcase */
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js

@@ -26,7 +26,8 @@ angular.module('Bastion.hosts').factory('HostBulkAction',
             releaseVersion: {method: 'PUT', params: {action: 'release_version'}},
             availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}},
             moduleStreams: {method: 'POST', params: {action: 'module_streams'}},
-            traces: {method: 'POST', params: {action: 'traces'}}
+            traces: {method: 'POST', params: {action: 'traces'}},
+            resolveTraces: {method: 'PUT', isArray: true, params: {action: 'resolve_traces'}}
         });
 
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -208,7 +208,7 @@
       <dt translate>Publish via HTTPS</dt>
       <dd translate>Yes</dd>
 
-      <span ng-hide="repository.content_type === 'ostree'">
+      <span ng-hide="repository.content_type === 'ostree' || repository.content_type === 'docker'">
         <dt translate>Publish via HTTP</dt>
         <dd bst-edit-checkbox="repository.unprotected"
             formatter="booleanToYesNo"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -63,7 +63,7 @@
                ng-model="repository.url"
                type="text"/>
         <p class="help-block" ng-show="repository.content_type === 'docker'" translate>
-          URL of the registry you want to sync. Example: https://registry-1.docker.io/
+          URL of the registry you want to sync. Example: https://registry-1.docker.io/ or https://quay.io/
         </p>
         <p class="help-block" ng-show="repository.content_type === 'ansible_collection'" translate>
           Content synced depends on the specifity of the URL and/or the optional requirements.yaml specified below <a class="fa fa-question-circle" ng-show="repository.content_type === 'ansible_collection'"
@@ -144,7 +144,7 @@
                ng-model="repository.docker_upstream_name"
                type="text"/>
         <p class="help-block" translate>
-          Name of the upstream repository you want to sync. Example: 'busybox' or 'fedora/ssh'.
+          Name of the upstream repository you want to sync. Example: 'quay/busybox' or 'fedora/ssh'.
         </p>
 
       </div>

data/lib/katello/permissions/host_permissions.rb

@@ -27,6 +27,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/environment_content_view',
   'katello/api/v2/hosts_bulk_actions/release_version',
   'katello/api/v2/hosts_bulk_actions/traces',
+  'katello/api/v2/hosts_bulk_actions/resolve_traces',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
   'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',

data/lib/katello/tasks/reimport.rake

@@ -12,7 +12,7 @@ namespace :katello do
   end
 
   desc "Reimports information from backend systems"
-  task :reimport => ["environment", "katello:check_ping"] do
+  task :reimport => ["dynflow:client", "katello:check_ping"] do
     User.current = User.anonymous_admin #set a user for orchestration
     Dir.glob(Katello::Engine.root.to_s + '/app/models/katello/*.rb').each { |file| require file }
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.16.1.2".freeze
+  VERSION = "3.16.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.16.1.2
+  version: 3.16.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1349,6 +1349,7 @@ files:
 - app/services/katello/event_daemon.rb
 - app/services/katello/event_monitor/poller_thread.rb
 - app/services/katello/event_queue.rb
+- app/services/katello/host_trace_manager.rb
 - app/services/katello/managed_content_medium_provider.rb
 - app/services/katello/product_content_finder.rb
 - app/services/katello/product_content_importer.rb
@@ -4131,7 +4132,6 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-module-streams.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces-resolve.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/hosts.module.js

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces-resolve.factory.js

@@ -1,18 +0,0 @@
-/**
- * @ngdoc service
- * @name  Bastion.hosts.factory:HostTracesResolve
- *
- * @requires BastionResource
- *
- * @description
- *   Provides a BastionResource for resolving traces on a set of systems.
- */
-angular.module('Bastion.hosts').factory('HostTracesResolve',
-    ['BastionResource', function (BastionResource) {
-
-        return BastionResource('katello/api/v2/traces/:action', {}, {
-            resolve: {method: 'PUT', isArray: true, params: {action: 'resolve'}}
-        });
-
-    }]
-);