katello 3.17.0.rc1 → 3.17.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/details/puppet-module-repositories.controller.js

@@ -16,7 +16,7 @@
 
         repositoriesNutupane = new Nutupane(Repository, params);
         $scope.controllerName = 'katello_repositories';
-        repositoriesNutupane.masterOnly = true;
+        repositoriesNutupane.primaryOnly = true;
         repositoriesNutupane.setSearchKey('repositoriesSearch');
 
         $scope.table = repositoriesNutupane.table;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-modules.controller.js

@@ -20,7 +20,7 @@
 
         nutupane = new Nutupane(PuppetModule, params);
         $scope.controllerName = 'katello_puppet_modules';
-        nutupane.masterOnly = true;
+        nutupane.primaryOnly = true;
 
         $scope.table = nutupane.table;
         $scope.controllerName = 'katello_puppet_modules';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details-info.controller.js

@@ -30,7 +30,7 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
             function updateSyncPlan(syncPlan) {
                 var syncDate;
                 if (syncPlan['sync_date']) {
-                    syncDate = new Date(syncPlan['sync_date'].replace(/\s/, 'T').replace(/\s/, ''));
+                    syncDate = new Date(syncPlan['sync_date']);
                 } else {
                     syncDate = new Date();
                 }
@@ -68,11 +68,12 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
                     syncDate = new Date(syncPlan.syncDate),
                     syncTime = new Date(syncPlan.syncTime || new Date());
 
+                var options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' };
+
                 syncDate.setHours(syncTime.getHours());
                 syncDate.setMinutes(syncTime.getMinutes());
                 syncDate.setSeconds(0);
-                syncPlan['sync_date'] = syncDate.toString();
-
+                syncPlan['sync_date'] = syncDate.toLocaleString("en-US", options);
                 syncPlan.$update(function (response) {
                     updateSyncPlan(syncPlan);
                     deferred.resolve(response);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html

@@ -20,7 +20,7 @@
       <dt translate>Start Date</dt>
       <dd bst-edit-custom="syncPlan.syncDate"
           formatter="date"
-          formatter-options="'medium'"
+          formatter-options="'MMMM d, y, hh:mm a'"
           on-save="save(syncPlan)"
           readonly="denied('edit_sync_plans', syncPlan)">
 

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

@@ -28,7 +28,7 @@ angular.module('Bastion.sync-plans').controller('SyncPlansController',
 
             nutupane = new Nutupane(SyncPlan, params);
             $scope.controllerName = 'katello_sync_plans';
-            nutupane.masterOnly = true;
+            nutupane.primaryOnly = true;
 
             $scope.syncPlanTable = nutupane.table;
             $scope.removeRow = nutupane.removeRow;

data/lib/katello/engine.rb

@@ -76,7 +76,9 @@ module Katello
     # make sure the Katello plugin is initialized before `after_initialize`
     # hook so that the resumed Dynflow tasks can rely on everything ready.
     initializer 'katello.register_plugin', :before => :finisher_hook do
+      ::Foreman::AccessControl::Permission.prepend ::Katello::Concerns::PermissionExtensions
       require 'katello/plugin'
+
       # extend builtin permissions from core with new actions
       require 'katello/permissions'
     end

data/lib/katello/permission_creator.rb

@@ -71,7 +71,8 @@ module Katello
                    'katello/api/v2/content_view_filter_rules' => [:index, :show],
                    'katello/api/v2/content_view_histories' => [:index, :auto_complete_search],
                    'katello/api/v2/content_view_puppet_modules' => [:index, :show, :auto_complete_search],
-                   'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
+                   'katello/api/v2/content_view_repositories' => [:show_all],
+                   'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search, :export_histories],
                    'katello/api/v2/content_view_components' => [:index, :show],
                    'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
@@ -293,23 +294,24 @@ module Katello
                                                         :repo_compare_packages,
                                                         :repo_compare_puppet_modules]
                          },
-                         :resource_type => 'Katello::Product'
+                         :resource_type => 'Katello::Product',
+                         :finder_scope => :readable
       @plugin.permission :create_products,
                          {
                            'katello/api/v2/products' => [:create],
-                           'katello/api/v2/repositories' => [:create],
                            'katello/api/v2/package_groups' => [:create]
                          },
                          :resource_type => 'Katello::Product'
       @plugin.permission :edit_products,
                          {
                            'katello/api/v2/products' => [:update],
-                           'katello/api/v2/repositories' => [:update, :remove_content, :import_uploads, :upload_content, :republish],
-                           'katello/api/v2/products_bulk_actions' => [:update_sync_plans, :update_http_proxy],
+                           'katello/api/v2/repositories' => [:create, :update, :remove_content, :import_uploads, :upload_content, :republish, :verify_checksum],
+                           'katello/api/v2/products_bulk_actions' => [:update_sync_plans, :update_http_proxy, :verify_checksum_products],
                            'katello/api/v2/content_uploads' => [:create, :update, :destroy],
                            'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover]
                          },
-                         :resource_type => 'Katello::Product'
+                         :resource_type => 'Katello::Product',
+                         :finder_scope => :editable
       @plugin.permission :destroy_products,
                          {
                            'katello/api/v2/products' => [:destroy],
@@ -318,7 +320,8 @@ module Katello
                            'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories],
                            'katello/api/v2/package_groups' => [:destroy]
                          },
-                         :resource_type => 'Katello::Product'
+                         :resource_type => 'Katello::Product',
+                         :finder_scope => :deletable
       @plugin.permission :sync_products,
                          {
                            'katello/api/v2/products' => [:sync],
@@ -329,12 +332,14 @@ module Katello
                            'katello/api/v2/sync_plans' => [:sync],
                            'katello/sync_management' => [:index, :sync_status, :product_status, :sync, :destroy]
                          },
-                         :resource_type => 'Katello::Product'
+                         :resource_type => 'Katello::Product',
+                         :finder_scope => :syncable
       @plugin.permission :export_products,
                          {
                            'katello/api/v2/repositories' => [:export]
                          },
-                         :resource_type => 'Katello::Product'
+                         :resource_type => 'Katello::Product',
+                         :finder_scope => :exportable
     end
 
     def subscription_permissions # rubocop:disable Metrics/MethodLength

data/lib/katello/tasks/clean_published_repo_directories.rake

@@ -10,12 +10,12 @@ namespace :katello do
     end
 
     yum_distributor_directory = Dir.glob "#{OLD_DIRECTORY}/yum_distributor/*"
-    master_directory = Dir.glob "#{OLD_DIRECTORY}/*"
-    master_directory.delete "#{OLD_DIRECTORY}/yum_distributor"
+    primary_directory = Dir.glob "#{OLD_DIRECTORY}/*"
+    primary_directory.delete "#{OLD_DIRECTORY}/yum_distributor"
 
     republish = []
     delete = []
-    master_directory.each do |directory|
+    primary_directory.each do |directory|
       repo_name = directory.split('/').last
       (current_cv_directories.include?(repo_name) && yum_distributor_directory.exclude?("#{OLD_DIRECTORY}/yum_distributor/#{repo_name}")) ? republish << repo_name : delete << directory
     end

data/lib/katello/tasks/pulp3_content_switchover.rake

@@ -1,14 +1,32 @@
 require File.expand_path("../engine", File.dirname(__FILE__))
+require "#{Katello::Engine.root}/app/services/katello/pulp3/migration_switchover"
 
 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
-    ActiveRecord::Base.transaction do
-      switchover_service = Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_master)
-      switchover_service.run
+    begin
+      User.current = User.anonymous_admin
+
+      ActiveRecord::Base.transaction do
+        switchover_service = Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_primary)
+        switchover_service.run
+      end
+    rescue Katello::Pulp3::SwitchOverError => e
+      $stderr.print(e.message)
+      exit 1
+    end
+
+    task = ForemanTasks.sync_task(Actions::Pulp3::ContentGuard::RefreshAllDistributions, SmartProxy.pulp_primary)
+    until !task.pending? || task.paused?
+      sleep(10)
+      task = ForemanTasks::Task.find(task.id)
+    end
+    if task.result == 'error' || task.result == 'pending'
+      msg _("Content Guard Configuration failed, switchover aborted.  Switchover continuing, but after completion, you will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}")
+      Rails.logger.error(msg)
+      $stderr.print(msg)
+    else
+      puts _("Content Switchover completed successfully")
     end
-  rescue Katello::Pulp3::SwitchoverError => e
-    $stderr.print(e.message)
-    exit 1
   end
 end

data/lib/katello/tasks/pulp3_migration.rake

@@ -3,7 +3,7 @@ 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
-    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration)
+    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, SmartProxy.pulp_primary, reimport_all: ENV['reimport_all'])
 
     if ENV['wait'].nil? || ::Foreman::Cast.to_bool(ENV['wait'])
       until !task.pending? || task.paused?
@@ -11,7 +11,9 @@ namespace :katello do
         task = ForemanTasks::Task.find(task.id)
       end
 
-      if task.result == 'error' || task.result == 'pending'
+      if task.result == 'warning' || task.result == 'pending'
+        msg = _("Migration failed, You will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}\n")
+        $stderr.print(msg)
         fail ForemanTasks::TaskError, task
       else
         puts _("Content Migration completed successfully")

data/lib/katello/tasks/pulp3_post_migration_check.rake

@@ -4,10 +4,10 @@ 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
+    repository_types = Katello::Pulp3::Migration.repository_types_for_migration
 
     # Take care of repository deletions
-    ForemanTasks.sync_task(Actions::Pulp3::OrphanCleanup::DeleteOrphanedMigratedRepositories, SmartProxy.pulp_master)
+    ForemanTasks.sync_task(Actions::Pulp3::OrphanCleanup::DeleteOrphanedMigratedRepositories, SmartProxy.pulp_primary)
 
     repository_types.each do |type|
       # check version

data/lib/katello/tasks/reimport.rake

@@ -25,7 +25,7 @@ namespace :katello do
 
     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)
+      if SmartProxy.pulp_primary.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)

data/lib/katello/tasks/repository.rake

@@ -65,6 +65,10 @@ namespace :katello do
         handle_missing_repo(repo)
       end
     end
+
+    ::Katello::RootRepository.orphaned.each do |root_repo|
+      handle_missing_root_repo(root_repo)
+    end
   end
 
   desc "Correct missing pulp repositories for puppet environments. Specify CONTENT_VIEW=name and LIFECYCLE_ENVIRONMENT=name to narrow repositories.  COMMIT=true to perform operation."
@@ -135,9 +139,14 @@ namespace :katello do
   end
 
   def repo_exists?(repo)
-    Katello.pulp_server.extensions.repository.retrieve(repo.pulp_id)
+    if SmartProxy.pulp_primary!.pulp3_support?(repo)
+      backend_service = repo.backend_service(SmartProxy.pulp_primary!)
+      backend_service.api.repositories_api.read(backend_service.repository_reference.repository_href)
+    else
+      Katello.pulp_server.extensions.repository.retrieve(repo.pulp_id)
+    end
     true
-  rescue RestClient::ResourceNotFound
+  rescue RestClient::ResourceNotFound, PulpRpmClient::ApiError
     false
   end
 
@@ -152,6 +161,10 @@ namespace :katello do
     end
   end
 
+  def handle_missing_root_repo(root_repo)
+    root_repo.destroy! if commit?
+  end
+
   def handle_missing_puppet_env(puppet_env)
     puts "Content View Puppet Environment #{puppet_env.id} Missing, Creating."
     ForemanTasks.sync_task(::Actions::Katello::ContentViewPuppetEnvironment::Create, puppet_env) if commit?

data/lib/katello/tasks/unify_hosts.rake

@@ -122,6 +122,7 @@ namespace :katello do
 
       if content_facet
         content_facet.host = provisioning_host
+        provisioning_host.content_facet = content_facet
         content_facet.save!
         content_facet.update_errata_status
       end

data/lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake

@@ -2,7 +2,7 @@ namespace :katello do
   namespace :upgrades do
     namespace '3.11' do
       def wait_on_task(task, time = 0.1)
-        task = SmartProxy.pulp_master.pulp_api.resources.task.poll(task['task_id'])
+        task = SmartProxy.pulp_primary.pulp_api.resources.task.poll(task['task_id'])
         return if Actions::Pulp::AbstractAsyncTask::FINISHED_STATES.include?(task['state'])
         sleep time
         wait_on_task(task, time + 0.2)
@@ -13,9 +13,9 @@ namespace :katello do
         User.current = User.anonymous_admin
         Katello::Repository.puppet_type.each do |repo|
           puts "Refreshing repository #{repo.label} (#{repo.id})"
-          install_dist = repo.backend_service(SmartProxy.pulp_master).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
+          install_dist = repo.backend_service(SmartProxy.pulp_primary).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
           if install_dist
-            response = SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
+            response = SmartProxy.pulp_primary.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
             wait_on_task('task_id' => response['spawned_tasks'][0]['task_id'])
           end
           ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)

data/lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake

@@ -3,9 +3,9 @@ namespace :katello do
     namespace '3.12' do
       desc "removes the unused pulp2 notifier"
       task :remove_pulp2_notifier => %w(environment) do
-        SmartProxy.pulp_master!.pulp_api.resources.event_notifier.list.each do |notifier|
+        SmartProxy.pulp_primary!.pulp_api.resources.event_notifier.list.each do |notifier|
           Rails.logger.info("Deleting notifier #{notifier['id']}")
-          SmartProxy.pulp_master!.pulp_api.resources.event_notifier.delete(notifier['id'])
+          SmartProxy.pulp_primary!.pulp_api.resources.event_notifier.delete(notifier['id'])
         end
       end
     end

data/lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake

@@ -15,7 +15,7 @@ namespace :katello do
                   :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
                 }
 
-                SmartProxy.pulp_master.pulp_api.resources.repository.update_importer(repo.pulp_id, importer[:id], config) if (importer && importer[:id])
+                SmartProxy.pulp_primary.pulp_api.resources.repository.update_importer(repo.pulp_id, importer[:id], config) if (importer && importer[:id])
               end
             end
 
@@ -26,7 +26,7 @@ namespace :katello do
                 repo.update_attribute(:saved_checksum_type, nil)
 
                 if repo.find_distributor[:config]&.delete(:checksum_type)
-                  SmartProxy.pulp_master.pulp_api.resources.repository.update_distributor(
+                  SmartProxy.pulp_primary.pulp_api.resources.repository.update_distributor(
                     repo.pulp_id, repo.find_distributor[:id], repo.find_distributor[:config])
                 end
               # rubocop:disable Lint/SuppressedException

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.17.0.rc1".freeze
+  VERSION = "3.17.0.rc2".freeze
 end

data/locale/action_names.rb

@@ -1,70 +1,70 @@
 # Autogenerated!
-_("Action with sub plans")
-_("Import facts")
-_("Import Puppet classes")
-_("Abstract async task")
-_("Create")
-_("Delete Activation Key")
-_("Update")
-_("Generate host applicability")
-_("Bulk generate applicability for hosts")
-_("Generate repository applicability")
-_("Synchronize smart proxy")
-_("Sync capsule")
-_("Delete")
+_("Index module streams")
+_("Index package groups")
+_("Upload into")
+_("Index content")
+_("Fetch pxe files")
+_("Discover")
 _("Errata mail")
-_("Incremental Update of  Content View Version(s) ")
-_("Promote")
-_("Promotion to Environment")
-_("Publish")
-_("Remove Versions and Associations")
-_("Remove from Environment")
-_("Remove Version")
-_("Export")
-_("Incremental Update")
-_("Republish Version Repositories")
-_("Delete Lifecycle Environment")
-_("Publish Lifecycle Environment Repositories")
+_("Delete")
+_("Delete Package Group")
+_("Create")
+_("Delete Product")
+_("Reindex subscriptions")
+_("Product Create")
+_("Destroy")
+_("Combined Profile Update")
+_("Update release version for host")
+_("Remove subscriptions")
+_("Update Content Overrides")
+_("Install package")
+_("Update package")
+_("Install package group")
+_("Install Applicable Errata")
 _("Attach subscriptions")
+_("Update")
 _("Auto attach subscriptions")
 _("Destroy Content Host")
-_("Install Applicable Errata")
 _("Install erratum")
 _("Hypervisors")
 _("Hypervisors update")
-_("Install package")
 _("Remove package")
-_("Update package")
-_("Install package group")
 _("Remove package group")
-_("Remove subscriptions")
-_("Update Content Overrides")
 _("Update for host")
-_("Update release version for host")
 _("Package Profile Update")
-_("Combined Profile Update")
-_("Destroy")
-_("Product Create")
-_("Delete Product")
-_("Reindex subscriptions")
-_("Delete Package Group")
-_("Discover")
-_("Fetch pxe files")
+_("Abstract async task")
+_("Update http proxy")
+_("Export")
 _("Filtered index content")
-_("Upload into")
-_("Index content")
 _("Index errata")
-_("Index module streams")
-_("Index package groups")
 _("Instance update")
+_("Import facts")
+_("Import Puppet classes")
+_("Action with sub plans")
 _("Remove Content")
 _("Synchronize")
 _("Update content urls")
 _("Update http proxy details")
-_("Disable")
-_("Enable")
 _("Update redhat repository")
 _("Upload errata into")
 _("Create Package Group")
+_("Disable")
+_("Enable")
 _("Run Sync Plan:")
-_("Update http proxy")
+_("Publish Lifecycle Environment Repositories")
+_("Delete Lifecycle Environment")
+_("Incremental Update")
+_("Republish Version Repositories")
+_("Remove Version")
+_("Remove from Environment")
+_("Remove Versions and Associations")
+_("Promotion to Environment")
+_("Publish")
+_("Promote")
+_("Incremental Update of  Content View Version(s) ")
+_("Sync capsule")
+_("Synchronize smart proxy")
+_("Generate repository applicability")
+_("Bulk generate applicability for hosts")
+_("Generate host applicability")
+_("Delete Activation Key")