katello 3.15.3.1 → 3.16.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plans.routes.js

@@ -11,7 +11,6 @@ angular.module('Bastion.sync-plans').config(['$stateProvider', function ($stateP
     $stateProvider.state('sync-plans', {
         url: '/sync_plans',
         permission: 'view_sync_plans',
-        template: '<div ui-view></div>',
         views: {
             '@': {
                 controller: 'SyncPlansController',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task-details.controller.js

@@ -10,8 +10,8 @@
  *   Provides the functionality for the details of a task.
  */
 angular.module('Bastion.tasks').controller('TaskDetailsController',
-    ['$scope', 'Task',
-    function ($scope, Task) {
+    ['$scope', '$rootScope', 'Task',
+    function ($scope, $rootScope, Task) {
         var taskId;
 
         taskId = $scope.$stateParams.taskId;
@@ -24,6 +24,7 @@ angular.module('Bastion.tasks').controller('TaskDetailsController',
         $scope.updateTask = function (task) {
             $scope.task = task;
             if (!$scope.task.pending) {
+                $rootScope.$broadcast('TaskFinished', $scope.task);
                 $scope.unregisterSearch();
             }
         };

data/lib/katello.rb

@@ -12,7 +12,6 @@ require "securerandom"
 
 require "runcible"
 require "deface"
-require 'qpid_messaging'
 
 require "securerandom"
 
@@ -27,4 +26,8 @@ require "monkeys/anemone"
 module Katello
   require "katello/version"
   require "katello/engine"
+
+  def self.pulp_server
+    Katello::Pulp::Server.config(SETTINGS[:katello][:pulp][:url], User.remote_user)
+  end
 end

data/lib/katello/engine.rb

@@ -1,3 +1,5 @@
+require 'fx'
+
 module Katello
   HOST_TASKS_QUEUE = :hosts_queue
 
@@ -20,7 +22,7 @@ module Katello
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/mount_engine.rb"
     end
 
-    initializer 'katello.load_default_settings', :before => :load_config_initializers do
+    initializer 'katello.load_default_settings', :before => 'katello.register_plugin' do
       default_settings = {
         :use_pulp => true,
         :use_cp => true,
@@ -48,12 +50,22 @@ module Katello
           :oauth_secret => 'katello',
           :ca_cert_file => nil,
           :bulk_load_size => 1000
+        },
+        :candlepin_events => {
+          :broker_host => 'localhost',
+          :broker_port => 61_613,
+          :queue_name => 'katello.candlepin',
+          :subscription_name => 'candlepin_events',
+          :client_id => 'katello_candlepin_event_monitor'
         }
       }
 
       SETTINGS[:katello] = default_settings.deep_merge(SETTINGS[:katello] || {})
 
-      require_dependency File.expand_path('../../../app/models/setting/content.rb', __FILE__) if (Setting.table_exists? rescue(false))
+      if (Setting.table_exists? rescue(false))
+        require_dependency File.expand_path('../../../app/models/setting/content.rb', __FILE__)
+        Setting::Content.load_defaults
+      end
     end
 
     initializer "katello.apipie" do
@@ -122,6 +134,15 @@ module Katello
       ActionView::Base.include Katello::KatelloUrlsHelper
     end
 
+    initializer "katello.events" do
+      Katello::CandlepinEventListener.client_factory = proc do
+        Katello::Messaging::Connection.create(
+          connection_class: Katello::Messaging::StompConnection,
+          settings: SETTINGS[:katello][:candlepin_events]
+        )
+      end
+    end
+
     config.to_prepare do
       FastGettext.add_text_domain('katello',
                                     :path => File.expand_path("../../../locale", __FILE__),
@@ -152,7 +173,7 @@ module Katello
       ::HostsController.include Katello::Concerns::HostsControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
-      ::FactImporter.register_fact_importer(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactImporter)
+      ::Foreman::Plugin.fact_importer_registry.register(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactImporter)
       ::FactParser.register_fact_parser(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactParser)
 
       #Helper Extensions
@@ -209,6 +230,7 @@ module Katello
       Katello::EventQueue.register_event(Katello::Events::ImportHostApplicability::EVENT_TYPE, Katello::Events::ImportHostApplicability)
       Katello::EventQueue.register_event(Katello::Events::ImportPool::EVENT_TYPE, Katello::Events::ImportPool)
       Katello::EventQueue.register_event(Katello::Events::AutoPublishCompositeView::EVENT_TYPE, Katello::Events::AutoPublishCompositeView)
+      Katello::EventQueue.register_event(Katello::Events::GenerateHostApplicability::EVENT_TYPE, Katello::Events::GenerateHostApplicability)
 
       Katello::EventDaemon.initialize
     end

data/lib/katello/permissions/host_permissions.rb

@@ -26,12 +26,14 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/content_overrides',
   '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/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
   'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',
   'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
+  'katello/api/rhsm/candlepin_proxies/hypervisors_heartbeat',
   'katello/api/rhsm/candlepin_proxies/upload_tracer_profile'
 ]
 
@@ -54,6 +56,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_debs/index',
   'katello/api/v2/host_packages/index',
   'katello/api/v2/host_tracer/index',
+  'katello/api/v2/host_tracer/resolve',
   'katello/remote_execution/new',
   'katello/remote_execution/create'
 ]

data/lib/katello/permissions/organization_permissions.rb

@@ -14,8 +14,7 @@ Foreman::AccessControl.permission(:create_organizations).actions.concat [
 ]
 
 Foreman::AccessControl.permission(:edit_organizations).actions.concat [
-  'katello/api/v2/organizations/update',
-  'katello/api/v2/organizations/autoattach_subscriptions'
+  'katello/api/v2/organizations/update'
 ]
 
 Foreman::AccessControl.permission(:destroy_organizations).actions.concat [

data/lib/katello/plugin.rb

@@ -209,6 +209,15 @@ Foreman::Plugin.register :katello do
        :after => :content_hosts,
        :turbolinks => false
 
+  menu :labs_menu,
+       :content_publication,
+       :url => '/labs/content_views',
+       :url_hash => {:controller => 'katello/react',
+                     :action => 'index'},
+       :caption => N_('Content Views'),
+       :parent => :lab_features_menu,
+       :turbolinks => false
+
   allowed_template_helpers :subscription_manager_configuration_url, :repository_url
   extend_template_helpers Katello::KatelloUrlsHelper
   register_global_js_file 'fills'
@@ -335,9 +344,9 @@ Foreman::Plugin.register :katello do
 
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles
-
-  add_permissions_to_default_roles 'System admin' => [:create_lifecycle_environments, :create_content_views]
-
+  unless Rails.env.test?
+    add_permissions_to_default_roles 'System admin' => [:create_lifecycle_environments, :create_content_views]
+  end
   role 'Register hosts', [
     :view_hostgroups, :view_activation_keys, :view_hosts,
     :create_hosts, :edit_hosts, :destroy_hosts,

data/lib/katello/prevent_json_parsing.rb

@@ -6,7 +6,7 @@ module Katello
     end
 
     def call(env)
-      if @exclude && @exclude.call(env)
+      if @exclude&.call(env)
         env['CONTENT_TYPE'] = 'text/plain'
       end
       @app.call(env)

data/lib/katello/scheduled_jobs.rb

@@ -1,6 +1,6 @@
 # First, we check if there's a job already enqueued for any notifications
 ::Foreman::Application.dynflow.config.on_init do |world|
-  [CreatePulpDiskSpaceNotifications, SendExpireSoonNotifications].each do |job_class|
+  [CreateExpiredManifestNotifications, CreatePulpDiskSpaceNotifications, SendExpireSoonNotifications].each do |job_class|
     job_class.spawn_if_missing(world)
   end
 end

data/lib/katello/tasks/clean_backend_objects.rake

@@ -85,7 +85,7 @@ namespace :katello do
       ENV['COMMIT'] == 'true' || ENV['FOREMAN_UPGRADE'] == '1'
     end
 
-    # rubocop:disable HandleExceptions
+    # rubocop:disable Lint/SuppressedException
     def execute(error_msg)
       if commit?
         yield

data/lib/katello/tasks/import_applicability.rake

@@ -1,12 +1,10 @@
 namespace :katello do
   task :import_applicability => ["environment"] do
     Katello::Host::ContentFacet.find_each do |facet|
-      begin
-        facet.import_applicability
-      rescue StandardError => exception
-        puts _('Error importing applicability for %{name} - %{id}: %{message}') %
-            {:name => facet.host.name, :id => facet.host.id, :message => exception.message}
-      end
+      facet.import_applicability
+    rescue StandardError => exception
+      puts _('Error importing applicability for %{name} - %{id}: %{message}') %
+          {:name => facet.host.name, :id => facet.host.id, :message => exception.message}
     end
   end
 end

data/lib/katello/tasks/jenkins.rake

@@ -19,6 +19,6 @@ begin
       Rake::Task['rake:test:katello:test'].invoke
     end
   end
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
   # ci/reporter/rake/rspec not present, skipping this definition
 end

data/lib/katello/tasks/pulp3_content_switchover.rake

@@ -3,14 +3,12 @@ require File.expand_path("../engine", File.dirname(__FILE__))
 namespace :katello do
   desc "Runs a Pulp 3 migration of pulp3 hrefs to pulp ids for supported content types."
   task :pulp3_content_switchover => :environment do
-    begin
-      ActiveRecord::Base.transaction do
-        switchover_service = Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_master)
-        switchover_service.run
-      end
-    rescue Katello::Pulp3::SwitchoverError => e
-      $stderr.print(e.message)
-      exit 1
+    ActiveRecord::Base.transaction do
+      switchover_service = Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_master)
+      switchover_service.run
     end
+  rescue Katello::Pulp3::SwitchoverError => e
+    $stderr.print(e.message)
+    exit 1
   end
 end

data/lib/katello/tasks/pulp3_post_migration_check.rake

@@ -3,8 +3,12 @@ require File.expand_path("../engine", File.dirname(__FILE__))
 namespace :katello do
   desc "Runs a post Pulp3 migration check for supported content types."
   task :pulp3_post_migration_check => :environment do
+    User.current = User.anonymous_admin
     repository_types = Katello::Pulp3::Migration::REPOSITORY_TYPES
 
+    # Take care of repository deletions
+    ForemanTasks.sync_task(Actions::Pulp3::OrphanCleanup::DeleteOrphanedMigratedRepositories, SmartProxy.pulp_master)
+
     repository_types.each do |type|
       # check version
       nil_version_ids = Katello::Repository.with_type(type).where(version_href: nil).pluck(:id)

data/lib/katello/tasks/receptor/extract_orgs.rake

@@ -0,0 +1,27 @@
+namespace :katello do
+  namespace :receptor do
+    desc 'Extract Organization details for Receptor and write to OUTPUT_FILE.'
+    task :extract_orgs => ["environment", "check_ping"] do
+      output_file = ENV['OUTPUT_FILE']
+
+      unless output_file
+        fail("The OUTPUT_FILE environment variable must be specified")
+      end
+
+      data = Organization.with_upstream_pools.map do |org|
+        {
+          id: org.id,
+          redhat_account_number: org.redhat_account_number,
+          cert: org.owner_details.dig(:upstreamConsumer, :idCert, :cert),
+          key: org.owner_details.dig(:upstreamConsumer, :idCert, :key)
+        }
+      end
+
+      File.open(output_file, 'w') do |f|
+        f.write(JSON.pretty_generate(data))
+      end
+
+      puts "Wrote results to #{output_file}. Please delete it when finished."
+    end
+  end
+end

data/lib/katello/tasks/reimport.rake

@@ -14,27 +14,23 @@ namespace :katello do
   desc "Reimports information from backend systems"
   task :reimport => ["environment", "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 }
 
-    models = [Katello::Erratum,
-              Katello::PackageGroup,
-              Katello::PuppetModule,
-              Katello::Rpm,
-              Katello::Srpm,
-              Katello::ModuleStream,
-              Katello::YumMetadataFile,
-              Katello::FileUnit,
-              Katello::Subscription,
-              Katello::Pool,
-              Katello::DockerManifest,
-              Katello::DockerManifestList,
-              Katello::DockerTag,
-              Katello::ContentViewPuppetEnvironment,
-              Katello::Content]
-
-    models << Katello::OstreeBranch if Katello::RepositoryTypeManager.find(Katello::Repository::OSTREE_TYPE).present?
-    models << Katello::Deb if Katello::RepositoryTypeManager.find(Katello::Repository::DEB_TYPE).present?
+    models = [
+      Katello::Subscription,
+      Katello::Pool,
+      Katello::ContentViewPuppetEnvironment,
+      Katello::Content
+    ]
+
+    Katello::RepositoryTypeManager.repository_types.each_value do |repo_type|
+      indexable_types = repo_type.content_types_to_index
+      if SmartProxy.pulp_master.pulp3_repository_type_support?(repo_type)
+        puts "\e[33mIgnoring types: #{indexable_types&.map { |type| type.model_class.name }}\e[0m\n"
+      else
+        models += indexable_types&.map(&:model_class)
+      end
+    end
 
     models.each do |model|
       print "Importing #{model.name}\n"

data/lib/katello/tasks/repository.rake

@@ -12,14 +12,12 @@ namespace :katello do
       if org.default_content_view && !org.default_content_view.versions.empty?
         org.default_content_view.versions.first.repositories.joins(:root)
           .where.not(katello_root_repositories: { url: nil }).find_each do |repo|
-          begin
-            if repo.needs_metadata_publish?
-              Rails.logger.error("Repository metadata for #{repo.name} (#{repo.id}) is out of date, regenerating.")
-              needing_publish << repo.id
-            end
-          rescue => e
-            puts "Failed to check repository #{repo.id}: #{e}"
+          if repo.needs_metadata_publish?
+            Rails.logger.error("Repository metadata for #{repo.name} (#{repo.id}) is out of date, regenerating.")
+            needing_publish << repo.id
           end
+        rescue => e
+          puts "Failed to check repository #{repo.id}: #{e}"
         end
       end
     end

data/lib/katello/tasks/reset.rake

@@ -19,18 +19,18 @@ namespace :katello do
     end
 
     task :pulp do
-      SERVICES = %w(redis pulpcore-api pulpcore-resource-manager pulpcore-content).freeze
+      SERVICES = %w(rh-redis5-redis pulpcore-api pulpcore-resource-manager pulpcore-content).freeze
 
       puts "\e[33mStarting Pulp3 Reset\e[0m\n\n"
 
       SERVICES.each { |s| system(service_stop.gsub("%s", s)) }
       system("sudo systemctl stop 'pulpcore-worker@*' --all")
-      system("sudo runuser - postgres -c 'dropdb pulp -p 7878'")
-      system("sudo runuser - postgres -c 'createdb pulp -p 7878'")
-      Dir.chdir('/usr/local/lib/pulp/bin') do
-        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' ./django-admin migrate --no-input")
+      system("sudo runuser - postgres -c 'dropdb pulpcore'")
+      system("sudo runuser - postgres -c 'createdb pulpcore'")
+      Dir.chdir('/usr/lib/python3.6/site-packages/pulpcore') do
+        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin migrate --no-input")
         puts "\e[33mRecreating Admin User\e[0m\n\n"
-        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' ./django-admin reset-admin-password --password password")
+        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin reset-admin-password --password password")
       end
 
       SERVICES.each { |s| system(service_start.gsub("%s", s)) }
@@ -42,7 +42,10 @@ namespace :katello do
       puts "\e[33mStarting Candlepin Reset\e[0m\n\n"
 
       system(service_stop.gsub("%s", 'tomcat'))
-      system('sudo /usr/share/candlepin/cpdb --drop --create')
+      system("sudo runuser - postgres -c 'dropdb candlepin'")
+      system("sudo runuser - postgres -c 'createdb candlepin'")
+      system("sudo /usr/share/candlepin/cpdb --create --schema-only")
+      system("sudo /usr/share/candlepin/cpdb --update")
       system(service_start.gsub("%s", 'tomcat'))
       puts "\e[32mCandlepin Database Reset Complete\e[0m\n\n"
     end
@@ -57,12 +60,8 @@ namespace :katello do
   desc 'Resets the Foreman/Katello development environment. WARNING: This will destroy all your Foreman, Katello and Pulp data.'
   task :reset_backends do
     Rake::Task['katello:reset_backends:candlepin'].invoke
-    if File.exist?('/usr/local/lib/pulp/bin') # When Pulp2 is no longer on nightly we will need to change this
-      Rake::Task['katello:reset_backends:pulp'].invoke
-      Rake::Task['katello:reset_backends:pulp_legacy'].invoke
-    else
-      Rake::Task['katello:reset_backends:pulp_legacy'].invoke
-    end
+    Rake::Task['katello:reset_backends:pulp'].invoke
+    Rake::Task['katello:reset_backends:pulp_legacy'].invoke
   end
 
   task :reset => ['environment'] do

data/lib/katello/tasks/update_content_default_http_proxy.rake

@@ -50,7 +50,7 @@ namespace :katello do
 
     if http_proxy
       setting.update_attribute(:value, http_proxy.name)
-      http_proxy.update_attributes!(url: sanitized_url,
+      http_proxy.update!(url: sanitized_url,
                                    username: options[:username], password: options[:password])
       puts "Content default HTTP proxy set to #{http_proxy.name_and_url}."
     else

data/lib/katello/tasks/update_subscription_facet_backend_data.rake

@@ -38,24 +38,22 @@ namespace :katello do
     end
 
     Katello::Host::SubscriptionFacet.where.not(:uuid => nil).find_each do |subscription_facet|
-      begin
-        candlepin_attrs = subscription_facet.candlepin_consumer.consumer_attributes
-        subscription_facet.import_database_attributes(candlepin_attrs)
-        subscription_facet.host = ::Host::Managed.find(subscription_facet.host_id)
-        subscription_facet.save!
+      candlepin_attrs = subscription_facet.candlepin_consumer.consumer_attributes
+      subscription_facet.import_database_attributes(candlepin_attrs)
+      subscription_facet.host = ::Host::Managed.find(subscription_facet.host_id)
+      subscription_facet.save!
 
-        host = subscription_facet.host
-        host.name = ::Katello::Host::SubscriptionFacet.sanitize_name(host.name)
-        host.save! if host.name_changed?
+      host = subscription_facet.host
+      host.name = ::Katello::Host::SubscriptionFacet.sanitize_name(host.name)
+      host.save! if host.name_changed?
 
-        Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
-      rescue StandardError => exception
-        error("Error: #{subscription_facet.host.name} - #{subscription_facet.host.id}")
-        error(candlepin_attrs)
-        error(exception.message)
-        error(exception.backtrace.join("\n"))
-        error("\n")
-      end
+      Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
+    rescue StandardError => exception
+      error("Error: #{subscription_facet.host.name} - #{subscription_facet.host.id}")
+      error(candlepin_attrs)
+      error(exception.message)
+      error(exception.backtrace.join("\n"))
+      error("\n")
     end
     report_errors
   end