katello 3.15.1 → 3.16.0.rc2.1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/module-streams/module-stream.factory.js

@@ -8,9 +8,9 @@
      * @description
      *   Provides a BastionResource for interacting with Ostree Branches
      */
-    function ModuleStream(BastionResource) {
+    function ModuleStream(BastionResource, CurrentOrganization) {
         return BastionResource('katello/api/v2/module_streams/:id',
-            {'id': '@id'},
+            {'id': '@id', 'organization_id': CurrentOrganization},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
             }
@@ -22,6 +22,6 @@
         .module('Bastion.module-streams')
         .factory('ModuleStream', ModuleStream);
 
-    ModuleStream.$inject = ['BastionResource'];
+    ModuleStream.$inject = ['BastionResource', 'CurrentOrganization'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/package-groups/package-group.factory.js

@@ -8,9 +8,9 @@
      * @description
      *   Provides a BastionResource for interacting with Package Groups
      */
-    function PackageGroup(BastionResource) {
+    function PackageGroup(BastionResource, CurrentOrganization) {
         return BastionResource('katello/api/v2/package_groups/:id',
-            {'id': '@id'},
+            {'id': '@id', 'organization_id': CurrentOrganization},
             {
               autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
             }
@@ -21,6 +21,6 @@
         .module('Bastion.package-groups')
         .factory('PackageGroup', PackageGroup);
 
-    PackageGroup.$inject = ['BastionResource'];
+    PackageGroup.$inject = ['BastionResource', 'CurrentOrganization'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/package.factory.js

@@ -8,10 +8,10 @@
  *   Provides a BastionResource for product or list of providers.
  */
 angular.module('Bastion.packages').factory('Package',
-    ['BastionResource', 'CurrentOrganization', function (BastionResource) {
+    ['BastionResource', 'CurrentOrganization', function (BastionResource, CurrentOrganization) {
 
         return BastionResource('katello/api/v2/packages/:id',
-            {'id': '@id'},
+            {'id': '@id', 'organization_id': CurrentOrganization},
             {
                 'autocomplete': {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
                 'autocompleteName': {method: 'GET', isArray: false, params: {id: 'auto_complete_name'},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js

@@ -55,7 +55,7 @@
         $scope.hideSyncButton = function(repository, advancedSync) {
             var result = $scope.syncInProgress(repository.last_sync) || !repository.url || $scope.denied('sync_products', $scope.product);
             if (advancedSync) {
-                result = result || repository.content_type !== 'yum';
+                result = result || (repository.content_type !== 'yum' && repository.content_type !== 'deb');
             }
             return result;
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html

@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <div class="radio">
+  <div class="radio" ng-hide="repository.content_type === 'deb'">
     <label>
       <input type="radio" ng-model="syncType" value="skipMetadataCheck" />
       <span translate>
@@ -38,13 +38,13 @@
     </label>
     <div class="help-block">
       <span translate>
-        Performs a complete sync, verifying the checksum of all packages afterwards.  Any missing or corrupt RPMs will be re-downloaded.  This option will take the longest amount of time and is only relevant for yum repositories..  Choose this option if:
+        Performs a complete sync, verifying the checksum of all packages afterwards. Any missing or corrupt package will be re-downloaded. This option will take the longest amount of time. Choose this option if:
       </span>
       <ul class="list-aligned">
-        <li translate>Specific RPMs are throwing a 404 from yum or dnf.</li>
-        <li translate>RPMs are corrupt, often leading to an error "Package does not match intended download".</li>
+        <li translate>Specific packages are throwing a 404 from the package-manager.</li>
+        <li translate>Packages are corrupt, often leading to an error "Package does not match intended download" or "Hash Sum mismatch".</li>
       </ul>
-      <span ng-show="repository.download_policy === 'on_demand'">
+      <span ng-show="repository.download_policy === 'on_demand' && repository.content_type === 'yum'">
         <i class="fa fa-warning"></i>
         <span translate>
           When validating content, repositories using the "On Demand" download policy will download all packages within the repository.

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

@@ -29,7 +29,7 @@
 
     <div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
       <span class="pficon pficon-warning-triangle-o"></span>
-      <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 3.16.
+      <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 4.0.
     </div>
 
     <div class="divider"></div>

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

@@ -41,7 +41,7 @@
 
       <div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
         <span class="pficon pficon-warning-triangle-o"></span>
-        <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 3.16.
+        <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 4.0.
       </div>
 
       <div bst-form-group label="{{ 'Restrict to Architecture' | translate }}" ng-show="repository.content_type === 'yum'">
@@ -308,5 +308,3 @@
     </div>
   </form>
 </div>
-
-

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/product.factory.js

@@ -8,9 +8,9 @@
  *   Provides a BastionResource for product or list of products.
  */
 angular.module('Bastion.products').factory('Product',
-    ['BastionResource', function (BastionResource) {
+    ['BastionResource', 'CurrentOrganization', function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('katello/api/v2/products/:id/:action', {id: '@id'}, {
+        return BastionResource('katello/api/v2/products/:id/:action', {id: '@id', 'organization_id': CurrentOrganization}, {
             update: { method: 'PUT'},
             sync: { method: 'POST', params: { action: 'sync' }},
             updateSyncPlan: { method: 'POST', params: { action: 'sync_plan' }},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.routes.js

@@ -24,7 +24,6 @@ angular.module('Bastion.products').config(['$stateProvider', function ($statePro
 
     $stateProvider.state('products.new', {
         abstract: true,
-        template: '<div ui-view></div>',
         views: {
             '@': {
                 controller: 'NewProductController',

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/common.rake

@@ -0,0 +1,7 @@
+namespace :katello do
+  task :disable_dynflow do
+    #Ensures that we run as a dynflow 'client'
+    ::Rails.application.dynflow.initialize!
+    ForemanTasks.dynflow.config.remote = true
+  end
+end

data/lib/katello/tasks/delete_orphaned_content.rake

@@ -1,7 +1,9 @@
+load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
+
 namespace :katello do
   desc "Remove orphaned and unneeded content/repos from a smart proxy.\
         Run with SMART_PROXY_ID=1 to run for a single smart proxy."
-  task :delete_orphaned_content => ["environment"] do
+  task :delete_orphaned_content => ["environment", "disable_dynflow"] do
     User.current = User.anonymous_admin
     smart_proxy_id = ENV['SMART_PROXY_ID']
     if smart_proxy_id

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_migration.rake

@@ -1,3 +1,5 @@
+load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
+
 namespace :katello do
   desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
   task :pulp3_migration => ["environment", "disable_dynflow", "check_ping"] do

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