katello 4.4.2.2 → 4.5.0.rc1

data/db/migrate/20220404190836_delete_old_setting_data.rb

@@ -0,0 +1,9 @@
+class DeleteOldSettingData < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(name: ['default_location_puppet_content', 'pulp_sync_node_action_accept_timeout',
+                         'pulp_sync_node_action_finish_timeout', 'subscriptions_return_host_data']).delete_all
+  end
+
+  def down
+  end
+end

data/db/migrate/20220405220616_update_cdn_configuration_type.rb

@@ -0,0 +1,11 @@
+class UpdateCdnConfigurationType < ActiveRecord::Migration[6.0]
+  class FakeCdnConfiguration < Katello::Model
+    self.table_name = 'katello_cdn_configurations'
+    self.inheritance_column = nil
+  end
+
+  def change
+    FakeCdnConfiguration.where(type: 'upstream_server').update_all(type: 'network_sync')
+    FakeCdnConfiguration.where(type: 'airgapped').update_all(type: 'export_sync')
+  end
+end

data/db/migrate/20220419193414_content_settings_to_dsl_category.rb

@@ -0,0 +1,5 @@
+class ContentSettingsToDslCategory < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::Content').update_all(category: 'Setting')
+  end
+end

data/db/seeds.d/110-content-view-autopublish.rb

@@ -11,5 +11,18 @@
       [
       ]
     }
+  },
+  {
+    group: N_('Content View'),
+    name: 'delete_latest_content_view_version_error',
+    message: N_('Failed to delete latest content view version of Content View \'%{subject}\'.'),
+    level: 'error',
+    actions:
+    {
+      links:
+      [
+      ]
+    }
+
   }
 ].each { |blueprint| UINotifications::Seed.new(blueprint).configure }

data/db/seeds.d/150-module_job_templates.rb

@@ -1,7 +1,7 @@
 if Katello.with_remote_execution?
   User.as_anonymous_admin do
     JobTemplate.without_auditing do
-      module_template = JobTemplate.find_by(name: 'Module Action - SSH Default')
+      module_template = JobTemplate.find_by(name: 'Module Action - Script Default')
       if module_template
         module_template.sync_feature('katello_module_stream_action')
         module_template.organizations << Organization.unscoped.all if module_template.organizations.empty?

data/engines/bastion/README.md

@@ -35,6 +35,7 @@ BASTION_MODULES.push('myModuleName');
 Bastion supplies a common set of testing and development using Grunt.  To setup your development environment, from your plugin's checkout:
 
 ```
+sudo yum -y install npm chromium-headless chromium
 sudo npm install -g grunt-cli
 npm install
 npm install ../bastion/

data/engines/bastion/app/assets/javascripts/bastion/components/bst-modal.directive.js

@@ -59,6 +59,7 @@ angular.module('Bastion.components').directive('bstModal',
 
                     modalInstance.result.then(function () {
                         scope.action();
+                    }, function() {
                     });
                 };
 

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -19,6 +19,7 @@
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
     angular.module('Bastion').value('simpleContentAccessEnabled', <%= Organization.current.simple_content_access? if Organization.current %>);
+    angular.module('Bastion').value('isManifestImported', <%= !!Organization.current&.manifest_imported?(cached: true) %>)
     angular.module('Bastion').value('foreman', tfm);
     angular.module('Bastion').value('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>'));
     angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js

@@ -12,18 +12,20 @@
  * @requires Notification
  * @requires ApiErrorHandler
  * @requires simpleContentAccessEnabled
+ * @requires isManifestImported
  *
  * @description
  *   Provides the functionality for the activation key details action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler', 'simpleContentAccessEnabled',
-    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler, simpleContentAccessEnabled) {
+    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler', 'simpleContentAccessEnabled', 'isManifestImported',
+    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler, simpleContentAccessEnabled, isManifestImported) {
         $scope.defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
         $scope.defaultUsages = ['Production', 'Development/Test', 'Disaster Recovery'];
 
         $scope.purposeAddonsCount = 0;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
+        $scope.isManifestImported = isManifestImported;
 
         $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
             $scope.purposeAddonsCount += org.system_purposes.addons.length;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js

@@ -23,9 +23,14 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
         var urlMatcher = $urlMatcherFactory.compile("/smart_proxies/:capsuleId");
         var capsuleId = urlMatcher.exec($location.path()).capsuleId;
 
-        function processError(response) {
+        function processError(response, prependMsg) {
+            var msg = '';
             if (response.data && response.data.displayMessage) {
-                Notification.setErrorMessage(response.data.displayMessage);
+                if (angular.isDefined(prependMsg)) {
+                    msg = msg + prependMsg;
+                }
+                msg = msg + response.data.displayMessage;
+                Notification.setErrorMessage(msg);
             }
         }
 
@@ -113,7 +118,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
                     'active_sync_tasks': [],
                     'last_failed_sync_tasks': []
                 };
-                processError(response);
+                processError(response, translate('Last sync failed: '));
             });
         };
 
@@ -141,7 +146,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
                     $scope.syncTask = aggregateTasks($scope.syncStatus['active_sync_tasks']);
                     $scope.syncState.set(syncState.RECLAIMING_SPACE);
                 }, function (response) {
-                    processError(response);
+                    processError(response, translate('Last reclaim space failed: '));
                     $scope.syncState.set(syncState.DEFAULT);
                 });
             }
@@ -157,7 +162,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
                     $scope.syncTask = aggregateTasks($scope.syncStatus['active_sync_tasks']);
                     $scope.syncState.set(syncState.SYNCING);
                 }, function (response) {
-                    processError(response);
+                    processError(response, translate('Last sync failed: '));
                     $scope.syncState.set(syncState.DEFAULT);
                 });
             }

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

@@ -21,6 +21,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsCont
         $scope.working = false;
 
         $scope.nutupaneParams = { id: $scope.$stateParams.hostId };
+        $scope.controllerName = 'katello_host_available_module_streams';
 
         $scope.moduleStreamsNutupane = new Nutupane(HostModuleStream, $scope.nutupaneParams);
 

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

@@ -17,6 +17,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalled
     ['$scope', '$timeout', '$window', 'HostPackage', 'translate', 'Nutupane', 'BastionConfig',
     function ($scope, $timeout, $window, HostPackage, translate, Nutupane, BastionConfig) {
         var packagesNutupane;
+        $scope.controllerName = 'katello_host_installed_packages';
 
         $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;

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

@@ -23,6 +23,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostTracesController'
 
         tracesNutupane = new Nutupane(HostTraces, params, 'get', {'disableAutoLoad': true});
         tracesNutupane.primaryOnly = true;
+        $scope.controllerName = 'katello_host_tracers';
         $scope.table = tracesNutupane.table;
         $scope.table.tracesFilterTerm = "";
         $scope.table.tracesCompare = function (item) {

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

@@ -60,7 +60,7 @@
         <div class="form-group">
           <button class="btn btn-default" type="button"
                   translate
-                  ng-disabled="!katelloAgentPresent || working"
+                  ng-disabled="remoteExecutionByDefault || !katelloAgentPresent || working"
                   ng-click="updateAll()">
             Update All Packages
           </button>

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

@@ -49,7 +49,7 @@
         <button class="btn btn-default"
                 type="button"
                 translate
-                ng-disabled="working || !katelloAgentPresent"
+                ng-disabled="remoteExecutionByDefault || working || !katelloAgentPresent"
                 ng-click="updateAll()">
           Update All Packages
         </button>

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

@@ -169,5 +169,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
             nutupane.invalidate();
             ContentHostsModalHelper.openTracesModal();
         };
+
+        $scope.isDebEnabled = function(hostOS) {
+            return _.isString(hostOS) && hostOS.match(/Debian|Ubuntu/) !== null;
+        };
+
+        $scope.isRpmEnabled = function(hostOS) {
+            return !$scope.isDebEnabled(hostOS);
+        };
     }]
 );

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

@@ -14,13 +14,14 @@
  * @requires deleteHostOnUnregister
  * @requires ContentHostsHelper
  * @requires simpleContentAccessEnabled
+ * @requires isManifestImported
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled',
-    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled) {
+    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled', 'isManifestImported',
+    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled, isManifestImported) {
         $scope.menuExpander = MenuExpander;
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
@@ -36,6 +37,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
 
         $scope.purposeAddonsCount = 0;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
+        $scope.isManifestImported = isManifestImported;
 
         $scope.panel = {
             error: false,

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

@@ -112,7 +112,7 @@
               <span class="aligned-errata-count" errata-counts="host.content_facet_attributes.errata_counts"></span>
             </a>
 
-            <span ng-if="host.content_facet_attributes.upgradable_package_count > 0">
+            <span ng-if="isRpmEnabled(host.operatingsystem_name)">
               <a ui-sref="content-host.packages.applicable({hostId: host.id})">
               <span class="aligned-errata-count">
                 <span class="errata-count"
@@ -126,7 +126,7 @@
               </span>
               </a>
             </span>
-            <span ng-if="host.content_facet_attributes.upgradable_deb_count > 0">
+            <span ng-if="isDebEnabled(host.operatingsystem_name)">
               <a ui-sref="content-host.debs.applicable({hostId: host.id})">
               <span class="aligned-errata-count">
                 <span class="errata-count"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js

@@ -35,6 +35,11 @@
                 resource: 'Repository',
                 params: {'content_type': 'yum'},
                 display: 'Yum Repositories'
+            }, {
+                state: 'deb-repositories',
+                resource: 'Repository',
+                params: {'content_type': 'deb'},
+                display: 'Deb Repositories'
             }, {
                 state: 'errata',
                 resource: 'Erratum',
@@ -55,6 +60,11 @@
                 resource: 'ModuleStream',
                 display: translate('Module Streams'),
                 repositoryType: 'yum'
+            }, {
+                state: 'debs',
+                resource: 'Deb',
+                display: translate('Deb Packages'),
+                repositoryType: 'deb'
             }
         ];
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-deb-repositories.html

@@ -0,0 +1,26 @@
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+  </span>
+
+  <span data-block="no-rows-message" ng-bind="getNoRowsMessage()"></span>
+  <span data-block="no-search-results-message" ng-bind="getZeroResultsMessage()"></span>
+
+  <table data-block="table" class="table table-striped table-bordered">
+    <thead>
+      <tr bst-table-head>
+        <th bst-table-column translate>Name</th>
+        <th bst-table-column translate>Product</th>
+        <th bst-table-column translate>Content View</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <tr bst-table-row ng-repeat="repository in table.rows">
+        <td bst-table-cell>{{ repository.name }}</td>
+        <td bst-table-cell>{{ repository.product.name }}</td>
+        <td bst-table-cell>{{ repository.content_view.name }}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-debs.html

@@ -0,0 +1,27 @@
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+    <select class="form-control" ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
+  </div>
+
+  <span data-block="no-rows-message" ng-bind="getNoRowsMessage()"></span>
+  <span data-block="no-search-results-message" ng-bind="getZeroResultsMessage()"></span>
+
+  <table data-block="table" class="table table-striped table-bordered">
+    <thead>
+      <tr bst-table-head>
+        <th bst-table-column translate>Name</th>
+        <th bst-table-column translate>Version</th>
+        <th bst-table-column translate>Architecture</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <tr bst-table-row ng-repeat="deb in table.rows">
+        <td bst-table-cell>{{ deb.name }}</td>
+        <td bst-table-cell>{{ deb.version }}</td>
+        <td bst-table-cell>{{ deb.architecture }}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.controller.js

@@ -27,6 +27,7 @@ angular.module('Bastion.environments').controller('EnvironmentsController',
 
             var nutupane = new Nutupane(Environment, params);
             $scope.table = nutupane.table;
+            $scope.loading = true;
 
             PathsService.getActualPaths().then(function (data) {
                 $scope.library = data.library;

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

@@ -86,6 +86,28 @@ angular.module('Bastion.environments').config(['$stateProvider', function ($stat
             parent: 'environment.details'
         }
     })
+    .state('environment.deb-repositories', {
+        url: '/deb-repositories?contentViewId',
+        reloadOnSearch: false,
+        permission: 'view_lifecycle_environments',
+        controller: 'EnvironmentContentController',
+        templateUrl: 'environments/details/views/environment-deb-repositories.html',
+        ncyBreadcrumb: {
+            label: '{{ "Deb Repositories" | translate }}',
+            parent: 'environment.details'
+        }
+    })
+    .state('environment.debs', {
+        url: '/debs?repositoryId&contentViewId',
+        reloadOnSearch: false,
+        permission: 'view_lifecycle_environments',
+        controller: 'EnvironmentContentController',
+        templateUrl: 'environments/details/views/environment-debs.html',
+        ncyBreadcrumb: {
+            label: '{{ "Deb Packages" | translate }}',
+            parent: 'environment.details'
+        }
+    })
     .state('environment.module-streams', {
         url: '/module-streams?repositoryId&contentViewId',
         reloadOnSearch: false,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html

@@ -21,30 +21,36 @@
   <section class="row">
     <div class="col-sm-12">
       <div ng-hide="denied('view_lifecycle_environments', library)">
-        <table class="table table-bordered info-blocks">
+        <table class="table table-bordered info-blocks" ng-hide="loading">
           <tbody>
             <tr>
               <td class="info-block-head"><a ui-sref="environment.details({environmentId: library.id})" translate>Library</a></td>
               <td class="info-block" translate>Content Views <div>{{ library.counts.content_views || 0 }}</div></td>
               <td class="info-block" translate>Products <div>{{ library.counts.products || 0 }}</div></td>
-              <td class="info-block" ng-hide="library.counts.yum_repositories == 0" translate>
+              <td class="info-block" ng-show="library.counts.yum_repositories > 0" translate>
                 Yum Repositories <div>{{ library.counts.yum_repositories || 0 }}</div>
               </td>
-              <td class="info-block" ng-hide="library.counts.ostree_repositories == 0" translate>
+              <td class="info-block" ng-show="library.counts.ostree_repositories > 0" translate>
                 OSTree Repositories <div>{{ library.counts.ostree_repositories || 0 }}</div>
               </td>
-              <td class="info-block" ng-hide="library.counts.docker_repositories == 0" translate>
+              <td class="info-block" ng-show="library.counts.docker_repositories > 0" translate>
+	      <td class="info-block" ng-show="library.counts.deb_repositories > 0" translate>
+                Deb Repositories <div>{{ library.counts.deb_repositories || 0 }}</div>
+              </td>
                 Docker Repositories <div>{{ library.counts.docker_repositories || 0 }}</div>
               </td>
-              <td class="info-block" ng-hide="library.counts.packages == 0" translate>
+              <td class="info-block" ng-show="library.counts.packages > 0" translate>
                 Packages <div>{{ library.counts.packages || 0 }}</div>
               </td>
-              <td class="info-block" ng-hide="library.counts.errata.total == 0" translate>
+              <td class="info-block" ng-show="library.counts.errata.total > 0" translate>
                 Errata <div>{{ library.counts.errata.total || 0 }}</div>
               </td>
-              <td class="info-block" ng-hide="library.counts.module_streams == 0"  translate>
+              <td class="info-block" ng-show="library.counts.module_streams > 0"  translate>
                 Module Streams <div>{{ library.counts.module_streams || 0 }}</div>
               </td>
+	      <td class="info-block" ng-show="library.counts.debs > 0" translate>
+                Deb Packages <div>{{ library.counts.debs || 0 }}</div>
+              </td>
             </tr>
           </tbody>
         </table>