katello 4.1.0.rc2.2 → 4.1.0

data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb

@@ -5,6 +5,7 @@ module Katello
         class << self
           def deliver!
             SmartProxy.unscoped.with_content.each do |proxy|
+              percentage = proxy.pulp_disk_usage[0]['percentage']
               if percentage < 90 && notification_already_exists?(proxy)
                 blueprint.notifications.where(subject: proxy).destroy_all
               elsif update_notifications(proxy).empty? && percentage > 90

data/app/views/katello/api/v2/repository_sets/show.json.rabl

@@ -38,16 +38,20 @@ child @resource.repositories => :repositories do
 end
 
 node :override do |pc|
-  pc.override
+  pc.override if pc.respond_to? :override
 end
 
 node :overrides do |pc|
-  pc.content_overrides.map do |override|
-    {:name => override.name, :value => override.computed_value}
+  if pc.respond_to? :content_overrides
+    pc.content_overrides.map do |override|
+      {:name => override.name, :value => override.computed_value}
+    end
   end
 end
 
 node :enabled_content_override do |pc|
-  override = pc.enabled_content_override
-  override&.computed_value
+  if pc.respond_to? :enabled_content_override
+    override = pc.enabled_content_override
+    override&.computed_value
+  end
 end

data/config/katello.yaml.example

@@ -66,19 +66,6 @@
     :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt
     :allow_push: false  # default false if omitted
 
-# Pulp 2 can be preferred over Pulp 3 for the desired content type.
-# Default is false.
-#  :use_pulp_2_for_content_type:
-#    :ansible_collection:       <true/false>
-#    :deb:                      <true/false>
-#    :docker:                   <true/false>
-#    :file:                     <true/false>
-#    :yum:                      <true/false>
-
-# Applicability can be calculated by Katello or Pulp 2.
-# Default is Pulp 2 (false).
-#  :katello_applicability: <true/false>
-
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.
 #

data/config/routes/api/v2.rb

@@ -131,7 +131,6 @@ Katello::Engine.routes.draw do
             post :promote
             post :export
             put :republish_repositories
-            get :available_errata, :controller => :errata
           end
           collection do
             get :auto_complete_search

data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -25,6 +25,16 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
     end
   end
 
+  # If an ID is not nil but the associated record does not exist, return false.
+  def all_records_exist?(content_source_id, kickstart_repository_id, content_view_id, lifecycle_environment_id)
+    return false if content_source_id.present? && ::SmartProxy.where(id: content_source_id).empty?
+    return false if kickstart_repository_id.present? && ::Katello::Repository.where(id: kickstart_repository_id).empty?
+    return false if content_view_id.present? && ::Katello::ContentView.where(id: content_view_id).empty?
+    return false if lifecycle_environment_id.present? && ::Katello::KTEnvironment.where(id: lifecycle_environment_id).empty?
+
+    true
+  end
+
   def copy_data_from_hostgroup
     hg_table = ::Hostgroup.arel_table
     hostgroups = ::Hostgroup.unscoped.where(
@@ -41,12 +51,16 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
         :content_view_id,
         :lifecycle_environment_id
       ).each do |hostgroup_id, content_source_id, kickstart_repository_id, content_view_id, lifecycle_environment_id|
+        unless all_records_exist?(content_source_id, kickstart_repository_id, content_view_id, lifecycle_environment_id)
+          Rails.logger.warn("Unable to save content facet hostgroup for #{Hostgroup.find(hostgroup_id).inspect} due to bad hostgroup data.")
+          next
+        end
         content_facet = ::Katello::Hostgroup::ContentFacet.find_or_create_by(hostgroup_id: hostgroup_id)
         content_facet.content_source_id = content_source_id
         content_facet.kickstart_repository_id = kickstart_repository_id
         content_facet.content_view_id = content_view_id
         content_facet.lifecycle_environment_id = lifecycle_environment_id
-        unless content_facet.save
+        unless content_facet.save(validate: false)
           Rails.logger.warn("Unable to save content facet hostgroup for #{content_facet.inspect} ")
           Rails.logger.warn(content_facet.errors.full_messages.join("\n"))
         end

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -32,28 +32,24 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
   end
 
   def up
-    if Katello::Repository.ostree_type.any? || puppet_repositories.any?
-      User.as_anonymous_admin do
-        FakeContentViewPuppetModule.delete_all
-        FakeContentViewPuppetEnvironmentPuppetModule.delete_all
-        FakeRepositoryPuppetModule.delete_all
-
-        FakeContentViewPuppetEnvironment.delete_all
-        FakePuppetModule.delete_all
-
-        ::Katello::Repository.delete(puppet_repositories)
-
-        FakeRepositoryOstreeBranch.delete_all
-        FakeOstreeBranch.delete_all
-        Katello::Repository.ostree_type.where.not(:library_instance_id => nil, :environment_id => nil).destroy_all #CV LCE repos
-        Katello::Repository.ostree_type.where.not(:library_instance_id => nil).destroy_all # archive repos
-        Katello::Repository.ostree_type.destroy_all #all the rest (should just be library repos)
-
-        Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
-          version.content_counts.except!('ostree', 'puppet_module')
-          version.save
-        end
-      end
+    FakeContentViewPuppetModule.delete_all
+    FakeContentViewPuppetEnvironmentPuppetModule.delete_all
+    FakeRepositoryPuppetModule.delete_all
+
+    FakeContentViewPuppetEnvironment.delete_all
+    FakePuppetModule.delete_all
+
+    ::Katello::Repository.delete(puppet_repositories) if puppet_repositories.any?
+
+    FakeRepositoryOstreeBranch.delete_all
+    FakeOstreeBranch.delete_all
+    Katello::Repository.ostree_type.where.not(:library_instance_id => nil, :environment_id => nil).destroy_all #CV LCE repos
+    Katello::Repository.ostree_type.where.not(:library_instance_id => nil).destroy_all # archive repos
+    Katello::Repository.ostree_type.destroy_all #all the rest (should just be library repos)
+
+    Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
+      version.content_counts.except!('ostree', 'puppet_module')
+      version.save
     end
   end
 

data/db/migrate/20210512170039_add_repo_timestamps.rb

@@ -0,0 +1,6 @@
+class AddRepoTimestamps < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_repositories, :last_contents_changed, :datetime, :default => Time.at(0).to_datetime
+    add_column :katello_repositories, :last_applicability_regen, :datetime, :default => Time.at(0).to_datetime
+  end
+end

data/db/migrate/20210512192745_fix_red_hat_root_repository_arch.rb

@@ -0,0 +1,11 @@
+class FixRedHatRootRepositoryArch < ActiveRecord::Migration[6.0]
+  def up
+    ::Katello::RootRepository.
+      joins("INNER JOIN katello_contents ON katello_contents.cp_content_id = katello_root_repositories.content_id").
+      where.not(arch: 'noarch').where.not("katello_contents.content_url ILIKE '%$basearch%'").update(arch: 'noarch')
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

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

@@ -23,14 +23,12 @@
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalController',
     ['$scope', '$http', '$location', '$window', '$timeout', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'Notification', 'BastionConfig', 'hostIds',
     function ($scope, $http, $location, $window, $timeout, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds) {
-        var nutupane;
-
         function installParams() {
             var params = hostIds;
             params['content_type'] = 'errata';
             params.content = _.map($scope.table.getSelected(), 'errata_id');
 
-            if (nutupane.table.allResultsSelected) {
+            if ($scope.nutupane.table.allResultsSelected) {
                 params['install_all'] = true;
             } else {
                 params['install_all'] = false;
@@ -44,20 +42,19 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
             $scope.erratum = Erratum.get({id: errataId, 'organization_id': CurrentOrganization});
         }
 
-        nutupane = new Nutupane(HostBulkAction, hostIds, 'installableErrata');
-        nutupane.enableSelectAllResults();
+        $scope.nutupane = new Nutupane(HostBulkAction, hostIds, 'installableErrata');
+        $scope.nutupane.enableSelectAllResults();
 
         $scope.controllerName = 'katello_errata';
-        nutupane.primaryOnly = true;
+        $scope.nutupane.primaryOnly = true;
         $scope.showErrata = false;
         $scope.showHosts = false;
-        $scope.table = nutupane.table;
+        $scope.table = $scope.nutupane.table;
         $scope.table.errataFilterTerm = "";
         $scope.table.initialLoad = false;
         $scope.initialLoad = true;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
-        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.allHostsSelected = hostIds.allResultsSelected;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 
@@ -65,11 +62,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')
         };
 
-        if ($scope.allHostsSelected) {
-            $scope.errataActionFormValues.scopedSearch = hostIds.included.search;
-        } else if (hostIds.included.ids.length > 0) {
-            $scope.errataActionFormValues.hostIds = hostIds.included.ids.join(',');
-        }
+        $scope.errataActionFormValues.bulkHostIds = angular.toJson(hostIds);
 
         $scope.showTable = function () {
             return (!$scope.showErrata && !$scope.showHosts);
@@ -78,10 +71,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.fetchErrata = function () {
             var params = hostIds;
             params['organization_id'] = CurrentOrganization;
-            nutupane.setParams(params);
+            $scope.nutupane.setParams(params);
             $scope.table.working = true;
             if ($scope.table.numSelected > 0) {
-                nutupane.refresh().then(function () {
+                $scope.nutupane.refresh().then(function () {
                     $scope.table.working = false;
                 });
             } else {
@@ -98,6 +91,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.installErrata = function () {
             if ($scope.remoteExecutionByDefault) {
                 $scope.installErrataViaRemoteExecution();
+
             } else {
                 $scope.installErrataViaKatelloAgent(false);
             }
@@ -106,23 +100,28 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.installErrataViaKatelloAgent = function () {
             var params = installParams();
             HostBulkAction.installContent(params,
-                function (data) {
-                    nutupane.invalidate();
-                    $scope.ok();
-                    $scope.transitionTo('content-hosts.bulk-task', {taskId: data.id});
-                },
-                function (response) {
-                    angular.forEach(response.data.errors, function (error) {
-                        Notification.setErrorMessage(error);
-                    });
-                });
+              function (data) {
+                  $scope.nutupane.invalidate();
+                  $scope.ok();
+                  $scope.transitionTo('content-hosts.bulk-task', {taskId: data.id});
+              },
+              function (response) {
+                  angular.forEach(response.data.errors, function (error) {
+                      Notification.setErrorMessage(error);
+                  });
+              });
+        };
+
+        $scope.selectedErrataIds = function () {
+            return $scope.nutupane.getAllSelectedResults('errata_id');
         };
 
         $scope.installErrataViaRemoteExecution = function(customize) {
-            var errataIds = _.map($scope.table.getSelected(), 'errata_id');
+            var errataIds = $scope.selectedErrataIds();
+
+            $scope.errataActionFormValues.bulkErrataIds = angular.toJson(errataIds);
 
             $scope.errataActionFormValues.remoteAction = 'errata_install';
-            $scope.errataActionFormValues.errata = errataIds.join(',');
             $scope.errataActionFormValues.customize = customize;
 
             $timeout(function () {

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

@@ -41,9 +41,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkModuleStream
             remoteAction: 'module_stream_action'
         };
 
-        if (hostIds.included.ids) {
-            $scope.moduleStreamActionFormValues.hostIds = hostIds.included.ids.join(',');
-        }
+        $scope.moduleStreamActionFormValues.bulkHostIds = angular.toJson(hostIds);
 
         $scope.performViaRemoteExecution = function(moduleSpec, actionType) {
             $scope.working = true;

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

@@ -137,11 +137,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
                 $scope.packageActionFormValues.remoteAction = 'package_' + action;
             }
 
-            if ($scope.allHostsSelected) {
-                $scope.packageActionFormValues.scopedSearch = selectedHosts.included.search;
-            } else if (selectedHosts.included.ids.length > 0) {
-                $scope.packageActionFormValues.hostIds = selectedHosts.included.ids.join(',');
-            }
+            $scope.packageActionFormValues.bulkHostIds = angular.toJson(selectedHosts);
 
             $timeout(function () {
                 angular.element('#packageActionForm').submit();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-host-bulk-module-streams-modal.html

@@ -9,7 +9,7 @@
       <input type="hidden" name="remote_action" ng-value="moduleStreamActionFormValues.remoteAction"/>
       <input type="hidden" name="module_stream_action" ng-value="moduleStreamActionFormValues.moduleStreamAction"/>
       <input type="hidden" name="module_spec" ng-value="moduleStreamActionFormValues.moduleSpec"/>
-      <input type="hidden" name="host_ids" ng-value="moduleStreamActionFormValues.hostIds"/>
+      <input type="hidden" name="bulk_host_ids" ng-value="moduleStreamActionFormValues.bulkHostIds"/>
       <input type="hidden" name="customize" ng-value="moduleStreamActionFormValues.customize"/>
       <input type="hidden" name="authenticity_token" ng-value="moduleStreamActionFormValues.authenticityToken"/>
     </form>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html

@@ -3,9 +3,9 @@
 
   <div data-block="modal-body">
     <form id="errataActionForm" name="errataActionForm" class="form" method="post" action="/katello/remote_execution">
-      <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
       <input type="hidden" name="remote_action" ng-value="errataActionFormValues.remoteAction"/>
-      <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
+      <input type="hidden" name="bulk_host_ids" ng-value="errataActionFormValues.bulkHostIds"/>
+      <input type="hidden" name="bulk_errata_ids" ng-value="errataActionFormValues.bulkErrataIds"/>
       <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
       <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
       <input type="hidden" ng-if="allHostsSelected" name="scoped_search" ng-value="errataActionFormValues.scopedSearch"/>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html

@@ -15,6 +15,11 @@
           Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
           </span>
       </p>
+      <p bst-alert="warning">
+        <span translate>
+          Group package actions are being deprecated, and will be removed in a future version.
+          </span>
+      </p>
     </div>
 
     <span uib-dropdown class="input-group-btn">
@@ -42,7 +47,7 @@
     <form id="packageActionForm" name="packageActionForm" class="form" method="post" action="/katello/remote_execution">
       <input type="hidden" name="name" ng-value="content.content"/>
       <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
-      <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
+      <input type="hidden" name="bulk_host_ids" ng-value="packageActionFormValues.bulkHostIds"/>
       <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
       <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
       <input type="hidden" ng-if="allHostsSelected" name="scoped_search" ng-value="packageActionFormValues.scopedSearch"/>
@@ -64,7 +69,7 @@
                  ng-change="updatePlaceholder(content.contentType)"
                  ng-disabled="content.confirm"
                  value="package_group"/>
-          <span translate>Package Group</span>
+          <span translate>Package Group (Deprecated)</span>
         </label>
       </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js

@@ -135,8 +135,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
 
         $scope.performViaRemoteExecution = function(customize) {
             var errataIds = $scope.selectedErrataIds();
-            $scope.errataActionFormValues.errata = errataIds.included.ids.join(',');
-            $scope.errataActionFormValues.hostIds = $scope.host.id;
+
+            $scope.errataActionFormValues.bulkErrataIds = angular.toJson(errataIds);
+            $scope.errataActionFormValues.bulkHostIds = angular.toJson({ included: { ids: [$scope.host.id] }});
+
+            $scope.errataActionFormValues.remoteAction = 'errata_install';
             $scope.errataActionFormValues.customize = customize;
 
             $timeout(function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-module-streams.controller.js

@@ -49,7 +49,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsCont
             $scope.working = true;
             $scope.moduleStreamActionFormValues.moduleSpec = moduleSpec;
             $scope.moduleStreamActionFormValues.moduleStreamAction = actionType;
-            $scope.moduleStreamActionFormValues.hostIds = $scope.host.id;
+            $scope.moduleStreamActionFormValues.bulkHostIds = angular.toJson({ included: { ids: [$scope.host.id] }});
 
             $timeout(function () {
                 angular.element('#moduleStreamActionForm').submit();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js

@@ -67,7 +67,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
             $scope.working = true;
             $scope.packageActionFormValues.package = terms.join(' ');
             $scope.packageActionFormValues.remoteAction = actionType;
-            $scope.packageActionFormValues.hostIds = $scope.host.id;
+            $scope.packageActionFormValues.bulkHostIds = angular.toJson({ included: { ids: [$scope.host.id] }});
             $scope.packageActionFormValues.customize = customize;
 
             $timeout(function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -34,10 +34,10 @@
   <form id="errataActionForm" method="post" action="/katello/remote_execution">
     <input type="hidden" name="remote_action" value="errata_install"/>
     <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
-    <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
+    <input type="hidden" name="bulk_host_ids" ng-value="errataActionFormValues.bulkHostIds"/>
+    <input type="hidden" name="bulk_errata_ids" ng-value="errataActionFormValues.bulkErrataIds"/>
     <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
-    <input type="hidden" name="install_all" ng-value="table.allResultsSelected" />
   </form>
 
   <div data-extend-template="layouts/partials/table.html">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html

@@ -13,7 +13,7 @@
     <input type="hidden" name="remote_action" ng-value="moduleStreamActionFormValues.remoteAction"/>
     <input type="hidden" name="module_stream_action" ng-value="moduleStreamActionFormValues.moduleStreamAction"/>
     <input type="hidden" name="module_spec" ng-value="moduleStreamActionFormValues.moduleSpec"/>
-    <input type="hidden" name="host_ids" ng-value="moduleStreamActionFormValues.hostIds"/>
+    <input type="hidden" name="bulk_host_ids" ng-value="moduleStreamActionFormValues.hostHostIds"/>
     <input type="hidden" name="customize" ng-value="moduleStreamActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="moduleStreamActionFormValues.authenticityToken"/>
   </form>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html

@@ -8,6 +8,11 @@
       Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
       </span>
   </p>
+  <p bst-alert="warning">
+    <span translate>
+      Group package actions are being deprecated, and will be removed in a future version.
+      </span>
+  </p>
   <section>
     <div class="row">
       <form ng-submit="performPackageAction(packageAction.actionType, packageAction.term)" role="form">
@@ -17,8 +22,8 @@
             <option value="packageInstall" translate>Package Install</option>
             <option value="packageUpdate" translate>Package Update</option>
             <option value="packageRemove" translate>Package Remove</option>
-            <option value="groupInstall" translate>Group Install</option>
-            <option value="groupRemove" translate>Group Remove</option>
+            <option value="groupInstall" translate>Group Install (Deprecated)</option>
+            <option value="groupRemove" translate>Group Remove (Deprecated)</option>
           </select>
         </div>