katello 4.3.0.rc1 → 4.3.0.rc4

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

@@ -108,17 +108,6 @@ angular.module('Bastion.environments').config(['$stateProvider', function ($stat
             parent: 'environment.details'
         }
     })
-    .state('environment.ostree', {
-        url: '/ostree?repositoryId&contentViewId',
-        reloadOnSearch: false,
-        permission: 'view_lifecycle_environments',
-        controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-ostree.html',
-        ncyBreadcrumb: {
-            label: '{{ "OSTree Branches" | translate }}',
-            parent: 'environment.details'
-        }
-    })
     .state('environment.content-views', {
         url: '/content-views',
         reloadOnSearch: false,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/fenced-pages.service.js

@@ -22,8 +22,7 @@ angular.module('Bastion.organizations').service('FencedPages', ['$state',
             'subscriptions',
             'sync-plans',
             'files',
-            'debs',
-            'ostree-branches'
+            'debs'
         ];
 
         function getRootPath(path) {

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

@@ -4,6 +4,7 @@
  *
  * @requires $scope
  * @requires $location
+ * @requires $uibModal
  * @requires Notification
  * @requires translate
  * @requires ApiErrorHandler
@@ -18,8 +19,8 @@
  *   Provides the functionality for manipulating repositories attached to a product.
  */
 angular.module('Bastion.products').controller('ProductRepositoriesController',
-    ['$scope', '$state', '$location', 'Notification', 'translate', 'ApiErrorHandler', 'Product', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane', 'RepositoryTypesService',
-    function ($scope, $state, $location, Notification, translate, ApiErrorHandler, Product, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane, RepositoryTypesService) {
+    ['$scope', '$state', '$location', '$uibModal', 'Notification', 'translate', 'ApiErrorHandler', 'Product', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane', 'RepositoryTypesService',
+    function ($scope, $state, $location, $uibModal, Notification, translate, ApiErrorHandler, Product, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane, RepositoryTypesService) {
         var repositoriesNutupane = new Nutupane(Repository, {
             'product_id': $scope.$stateParams.productId,
             'search': $location.search().search || "",
@@ -82,6 +83,17 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             });
         };
 
+        $scope.openReclaimSpaceModal = function () {
+            $uibModal.open({
+                templateUrl: 'products/details/repositories/views/product-repositories-reclaim-space-modal.html',
+                controller: 'ProductRepositoriesReclaimSpaceModalController',
+                size: 'lg',
+                resolve: {
+                    reclaimParams: getParams()
+                }
+            });
+        };
+
         $scope.genericContentTypesFor = function(contentTypeLabel) {
             return RepositoryTypesService.genericContentTypes(contentTypeLabel);
         };

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

@@ -10,7 +10,6 @@
  * @requires CurrentOrganization
  * @requires Checksum
  * @requires DownloadPolicy
- * @requires OstreeUpstreamSyncPolicy
  * @requires Architecture
  * @requires HttpProxyPolicy
  * @requires OSVersions
@@ -20,8 +19,8 @@
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService',
-        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService) {
+    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService',
+        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService) {
             $scope.organization = CurrentOrganization;
 
             $scope.progress = {uploading: false};
@@ -199,7 +198,6 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
-            $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 
             $scope.checksumTypeDisplay = function (checksum) {
                 return Checksum.checksumType(checksum);

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

@@ -1,13 +1,3 @@
-/**
- * @ngdoc object
- * @name  Bastion.repositories.controller:OstreeUpstreamSyncPolicyFilter
- *
- * @requires translate
- * @requires OstreeUpstreamSyncPolicy
- * @requires YumContentUnits
- * @requires HttpProxyPolicy
-**/
-
 angular.module('Bastion.components.formatters').filter('upstreamPasswordFilter', [function () {
     return function (displayValue, repository) {
         if (repository["upstream_auth_exists"]) {

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

@@ -0,0 +1,36 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.repositories.controller:RepositoryDetailsReclaimSpaceModalController
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires translate
+ * @requires Notification
+ * @requires Repository
+ * @requires $uibModalInstance
+ * @requires reclaimParams
+ *
+ * @description
+ *   A controller for the modal that warns about reclaiming on demand repository space
+ */
+angular.module('Bastion.repositories').controller('RepositoryDetailsReclaimSpaceModalController',
+    ['$scope', '$state', 'translate', 'Notification', 'Repository', '$uibModalInstance', 'reclaimParams',
+        function ($scope, $state, translate, Notification, Repository, $uibModalInstance, reclaimParams) {
+            var errorHandler = function errorHandler(response) {
+                angular.forEach(response.data.errors, function (error) {
+                    Notification.setErrorMessage(error);
+                });
+            };
+
+            $scope.ok = function () {
+                Repository.reclaimSpace({id: reclaimParams.repository.id}, function (task) {
+                    $state.go('product.repository.tasks.details', {taskId: task.id});
+                }, errorHandler);
+                $uibModalInstance.close();
+            };
+
+            $scope.cancel = function () {
+                $uibModalInstance.dismiss('cancel');
+            };
+        }]
+);

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

@@ -1,11 +1,12 @@
 (function () {
-    function RepositoryDetailsController($scope, $state, translate, Repository, Product, ApiErrorHandler, Notification) {
+    function RepositoryDetailsController($scope, $state, $uibModal, translate, Repository, Product, ApiErrorHandler, Notification) {
         /**
          * @ngdoc object
          * @name  Bastion.repositories.controller:RepositoryDetailsController
          *
          * @requires $scope
          * @requires $state
+         * @requires $uibModal
          * @requires translate
          * @requires Repository
          * @requires ApiErrorHandler
@@ -89,6 +90,19 @@
             }, errorHandler);
         };
 
+        $scope.openReclaimSpaceModal = function (repository) {
+            $uibModal.open({
+                templateUrl: 'products/details/repositories/details/views/repository-details-reclaim-space-modal.html',
+                controller: 'RepositoryDetailsReclaimSpaceModalController',
+                size: 'lg',
+                resolve: {
+                    reclaimParams: function() {
+                        return { repository: repository };
+                    }
+                }
+            });
+        };
+
         $scope.republishRepository = function (repository) {
             Repository.republish({id: repository.id}, function (task) {
                 $state.go('product.repository.tasks.details', {taskId: task.id});
@@ -132,5 +146,5 @@
 
     angular.module('Bastion.repositories').controller('RepositoryDetailsController', RepositoryDetailsController);
 
-    RepositoryDetailsController.$inject = ['$scope', '$state', 'translate', 'Repository', 'Product', 'ApiErrorHandler', 'Notification'];
+    RepositoryDetailsController.$inject = ['$scope', '$state', '$uibModal', 'translate', 'Repository', 'Product', 'ApiErrorHandler', 'Notification'];
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details-reclaim-space-modal.html

@@ -0,0 +1,18 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Reclaim Space</h4>
+  <div data-block="modal-body">
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+    <span translate>
+      Warning: reclaiming space for an "On Demand" repository will delete all cached content units.  Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
+    </span>
+  </div>
+  <span data-block="modal-confirm-button">
+    <button class="btn btn-primary" ng-click="ok()">
+      <span translate>Reclaim Space</span>
+    </button>
+  </span>
+</div>

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

@@ -38,6 +38,19 @@
           </a>
         </li>
 
+        <li role="menuitem" ng-hide="hideSyncButton(repository, false)" ng-class="{disabled: disableSyncLink()}">
+          <a ng-click="openReclaimSpaceModal(repository)" disable-link="disableSyncLink()" translate>
+            Reclaim Space
+          </a>
+
+          <span class="disabled" ng-show="syncInProgress(repository.last_sync)" translate>
+            Cannot clean Repository, a sync is already in progress.
+          </span>
+
+          <span class="disabled" ng-show="denied('sync_products', product)" translate>
+            Cannot clean Repository without the proper permissions.
+          </span>
+        </li>
         <li role="menuitem" ng-hide="syncInProgress(repository.last_sync) || denied('edit_products', product)">
           <span class="disabled" ng-show="syncInProgress(repository.last_sync)" translate>
             Cannot republish Repository, a sync is already in progress.

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

@@ -262,7 +262,7 @@
       <dd translate>Yes</dd>
 
       <span ng-hide="repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
-        <dt translate>Publish via HTTP</dt>
+        <dt translate>Unprotected</dt>
         <dd bst-edit-checkbox="repository.unprotected"
             formatter="booleanToYesNo"
             on-save="save(repository)"

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

@@ -14,7 +14,6 @@
  * @requires BastionConfig
  * @requires Checksum
  * @requires DownloadPolicy
- * @requires OstreeUpstreamSyncPolicy
  * @requires Architecture
  * @requires RepositoryTypesService
  * @requires OSVersions
@@ -24,8 +23,8 @@
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
-        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
+    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
+        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
 
             function success() {
                 Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -63,8 +62,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
             $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
                 'checksum_type': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true,
-                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
-                'ostree_upstream_sync_policy': 'latest'});
+                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null});
 
             $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
                 $scope.page.loading = false;
@@ -78,7 +76,6 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
-            $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 
             $scope.$watch('repository.name', function () {
                 if ($scope.repositoryForm && $scope.repositoryForm.name) {

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

@@ -332,8 +332,11 @@
       <div class="checkbox" ng-hide="repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
         <label>
           <input id="unprotected" name="unprotected" ng-model="repository.unprotected" type="checkbox"/>
-          <span translate>Publish via HTTP</span>
+          <span translate>Unprotected</span>
         </label>
+        <p class="help-block" translate>
+          Do not require a subscription entitlement certificate for accessing this repository.
+        </p>
       </div>
 
       <div bst-form-group label="{{ 'GPG Key' | translate }}" ng-show="repository.content_type === 'yum' || repository.content_type === 'deb'">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/os-versions.service.js

@@ -14,6 +14,7 @@ angular
         this.getOSVersionsOptions = function () {
             return [
                 { name: 'No restriction', id: '' },
+                { name: 'Red Hat Enterprise Linux 9 ', id: 'rhel-9' },
                 { name: 'Red Hat Enterprise Linux 8 ', id: 'rhel-8' },
                 { name: 'Red Hat Enterprise Linux 7 ', id: 'rhel-7' },
                 { name: 'Red Hat Enterprise Linux 6 ', id: 'rhel-6' }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/product-repositories-reclaim-space-modal.controller.js

@@ -0,0 +1,35 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.repositories.controller:ProductRepositoriesReclaimSpaceModalController
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires translate
+ * @requires Notification
+ * @requires RepositoryBulkAction
+ * @requires $uibModalInstance
+ * @requires reclaimParams
+ *
+ * @description
+ *   A controller for the modal that warns about reclaiming on demand repository space
+ */
+angular.module('Bastion.repositories').controller('ProductRepositoriesReclaimSpaceModalController',
+    ['$scope', '$state', 'translate', 'Notification', 'RepositoryBulkAction', '$uibModalInstance', 'reclaimParams',
+        function ($scope, $state, translate, Notification, RepositoryBulkAction, $uibModalInstance, reclaimParams) {
+            $scope.ok = function () {
+                RepositoryBulkAction.reclaimSpaceFromRepositories(reclaimParams, function (task) {
+                    $state.go('product.tasks.details', {taskId: task.id});
+                },
+                function (response) {
+                    angular.forEach(response.data.errors, function (error) {
+                        Notification.setErrorMessage(error);
+                    });
+                });
+                $uibModalInstance.close();
+            };
+
+            $scope.cancel = function () {
+                $uibModalInstance.dismiss('cancel');
+            };
+        }]
+);

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

@@ -126,15 +126,6 @@
                 parent: 'product.repository.info'
             }
         })
-        .state('product.repository.manage-content.ostree-branches', {
-            url: '/ostree_branches',
-            permission: 'view_products',
-            templateUrl: 'products/details/repositories/details/views/repository-manage-ostree-branches.html',
-            ncyBreadcrumb: {
-                label: "{{'OSTree Branches' | translate }}",
-                parent: 'product.repository.info'
-            }
-        })
         .state('product.repository.manage-content.module-streams', {
             url: '/module_streams',
             permission: 'view_products',

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

@@ -18,6 +18,7 @@ angular.module('Bastion.repositories').factory('Repository',
                 update: { method: 'PUT' },
                 sync: { method: 'POST', params: { action: 'sync' } },
                 verifyChecksum: { method: 'POST', params: { action: 'verify_checksum' }},
+                reclaimSpace: { method: 'POST', params: { action: 'reclaim_space' }},
                 removePackages: { method: 'PUT', params: { action: 'remove_packages'}},
                 removeContent: { method: 'PUT', params: { action: 'remove_content'}},
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
@@ -47,7 +48,8 @@ angular.module('Bastion.repositories').factory('RepositoryBulkAction',
             {'organization_id': CurrentOrganization},
             {
                 removeRepositories: {method: 'PUT', params: {action: 'destroy'}},
-                syncRepositories: {method: 'POST', params: {action: 'sync'}}
+                syncRepositories: {method: 'POST', params: {action: 'sync'}},
+                reclaimSpaceFromRepositories: {method: 'POST', params: {action: 'reclaim_space'}}
             }
         );
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories-reclaim-space-modal.html

@@ -0,0 +1,18 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Reclaim Space</h4>
+  <div data-block="modal-body">
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+    <span translate>
+      Warning: reclaiming space for an "On Demand" repository will delete all cached content units.  Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
+    </span>
+  </div>
+  <span data-block="modal-confirm-button">
+    <button class="btn btn-primary" ng-click="ok()">
+      <span translate>Reclaim Space</span>
+    </button>
+  </span>
+</div>

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

@@ -28,6 +28,13 @@
       </span>
     </button>
 
+    <button type="button" class="btn btn-default"
+            ng-click="openReclaimSpaceModal()"
+            ng-hide="denied('sync_products', product)"
+            ng-disabled="syncInProgress || table.numSelected == 0">
+      <span translate>Reclaim Space</span>
+    </button>
+
     <div bst-modal="removeSelectedRepositories()" model="table">
       <div data-block="modal-header"
            translate
@@ -156,14 +163,6 @@
               </div>
             </span>
 
-            <span ng-show="repository.content_type == 'ostree'">
-              <div>
-                <span translate>
-                  {{ repository.content_counts.ostree_branch || 0 }} OSTree Branches
-                </span>
-              </div>
-            </span>
-
             <span ng-show="repository.content_type == 'file'">
               <div>
                 <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/pulp-primary/pulp-primary.controller.js

@@ -0,0 +1,35 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.pulp-primary.controller:PulpPrimaryController
+ *
+ * @requires $scope
+ * @requires $urlMatcherFactory
+ * @requires $location
+ * @requires PulpPrimary
+ * @requires Notification
+ *
+ * @description
+ *   Provides the functionality for the pulp primary page.
+ */
+angular.module('Bastion.pulp-primary').controller('PulpPrimaryController',
+    ['$scope', '$urlMatcherFactory', '$location', 'PulpPrimary', 'Notification',
+    function ($scope, $urlMatcherFactory, $location, PulpPrimary, Notification) {
+
+        var urlMatcher = $urlMatcherFactory.compile("/smart_proxies/:capsuleId");
+        var capsuleId = urlMatcher.exec($location.path()).capsuleId;
+
+        var errorHandler = function errorHandler(response) {
+            angular.forEach(response.data.errors, function (error) {
+                Notification.setErrorMessage(error);
+            });
+        };
+
+        $scope.smartProxyId = capsuleId;
+
+        $scope.reclaimSpace = function () {
+            PulpPrimary.reclaimSpace({id: capsuleId}, function () {
+                Notification.setSuccessMessage("Space reclamation task started in the background.");
+            }, errorHandler);
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/pulp-primary/pulp-primary.factory.js

@@ -0,0 +1,18 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.pulp-primary.factory:PulpPrimary
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for pulp primary.
+ */
+angular.module('Bastion.pulp-primary').factory('PulpPrimary',
+    ['BastionResource', function (BastionResource) {
+
+        return BastionResource('katello/api/capsules/:id/content/:action', {id: '@id'}, {
+          reclaimSpace: {method: 'post', isArray: false, params: {action: 'reclaim_space'}}
+        });
+
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/pulp-primary/pulp-primary.module.js

@@ -0,0 +1,14 @@
+/**
+ * @ngdoc module
+ * @name  Bastion.pulp-primary
+ *
+ * @description
+ *   Module for Pulp Primary Smart Proxy related functionality.
+ */
+angular.module('Bastion.pulp-primary', [
+    'ngResource',
+    'ui.router',
+    'Bastion',
+    'Bastion.i18n',
+    'Bastion.components'
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/pulp-primary/pulp-primary.routes.js

@@ -0,0 +1,16 @@
+/**
+* @ngdoc object
+* @name Bastion.pulp-primary.config
+*
+* @requires $stateProvider
+* @requires $urlRouterProvider
+*
+* @description
+*   Used for systems level configuration such as setting up the ui state machine.
+*/
+angular.module('Bastion.pulp-primary').config(['$stateProvider', '$urlRouterProvider', function ($stateProvider, $urlRouterProvider) {
+    //Catch the url to prevent the router to perform redirect.
+    $urlRouterProvider.when('/smart_proxies/:proxyId', [function () {
+        return true;
+    }]);
+}]);

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -29,7 +29,6 @@ module BastionKatello
           debs
           docker_tags
           files
-          ostree_branches
           errata
           packages
           lifecycle_environments

data/lib/katello/permission_creator.rb

@@ -53,7 +53,7 @@ module Katello
       @plugin.permission :manage_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:add_lifecycle_environment, :remove_lifecycle_environment,
-                                                                :sync, :cancel_sync],
+                                                                :sync, :reclaim_space, :cancel_sync],
                            'katello/api/v2/capsules' => [:index, :show]
                          },
                          :resource_type => 'SmartProxy'
@@ -254,7 +254,6 @@ module Katello
                                                             :compare,
                                                             :repositories],
                            'katello/api/v2/file_units' => [:index, :show, :auto_complete_search, :compare],
-                           'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare, :auto_complete_name],
                            'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
@@ -291,7 +290,7 @@ module Katello
       @plugin.permission :edit_products,
                          {
                            'katello/api/v2/products' => [:update],
-                           'katello/api/v2/repositories' => [:create, :update, :remove_content, :import_uploads, :upload_content, :republish, :verify_checksum],
+                           'katello/api/v2/repositories' => [:create, :update, :remove_content, :import_uploads, :upload_content, :republish, :verify_checksum, :reclaim_space],
                            '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],
@@ -314,7 +313,7 @@ module Katello
                            'katello/api/v2/products' => [:sync],
                            'katello/api/v2/repositories' => [:sync],
                            'katello/api/v2/products_bulk_actions' => [:sync_products],
-                           'katello/api/v2/repositories_bulk_actions' => [:sync_repositories],
+                           'katello/api/v2/repositories_bulk_actions' => [:sync_repositories, :reclaim_space_from_repositories],
                            'katello/api/v2/sync' => [:index],
                            'katello/sync_management' => [:index, :sync_status, :product_status, :sync, :destroy]
                          },

data/lib/katello/plugin.rb

@@ -121,16 +121,6 @@ Foreman::Plugin.register :katello do
          :turbolinks => false,
          :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::FILE_TYPE) }
 
-    menu :top_menu,
-         :ostree_branches,
-         :caption => N_('OSTree Branches'),
-         :url => '/ostree_branches',
-         :url_hash => {:controller => 'katello/api/v2/ostree_branches',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false,
-         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::OSTREE_TYPE) }
-
     menu :top_menu,
          :packages,
          :caption => N_('Packages'),
@@ -256,6 +246,10 @@ Foreman::Plugin.register :katello do
       :name => _("Content Sync"),
       :partial => "foreman/smart_proxies/content_sync",
       :onlyif => proc { |proxy| proxy.pulp_mirror? }
+    context.add_pagelet :details_content,
+      :name => _("Reclaim Space"),
+      :partial => "foreman/smart_proxies/reclaim_space",
+      :onlyif => proc { |proxy| proxy.pulp_primary? }
   end
 
   ::Katello::HostStatusManager::STATUSES.each do |status_class|

data/lib/katello/repository_types/ostree.rb

@@ -25,7 +25,9 @@ Katello::RepositoryTypeManager.register('ostree') do
                        pulp3_api: PulpOstreeClient::ContentRefsApi,
                        pulp3_service_class: Katello::Pulp3::GenericContentUnit,
                        model_name: lambda { |pulp_unit| pulp_unit["name"] },
-                       model_version: lambda { |pulp_unit| pulp_unit["version"] }
+                       model_version: lambda { |pulp_unit| pulp_unit["checksum"] },
+                       uploadable: true,
+                       repository_import_on_upload: true
 
   import_attribute :ref, :content_type => 'ostree_ref',
                         :api_param => :ostree_ref,

data/lib/katello/tasks/reset.rake

@@ -15,9 +15,9 @@ namespace :katello do
       system("sudo runuser - postgres -c 'createdb pulpcore'")
 
       Dir.chdir("/tmp") 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")
+        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' pulpcore-manager 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' python3-django-admin reset-admin-password --password password")
+        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager reset-admin-password --password password")
       end
 
       SERVICES.each { |s| system(service_start.gsub("%s", s)) }

data/lib/katello/tasks/upgrades/4.3/fix_url_auth.rake

@@ -0,0 +1,25 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.3' do
+      desc "change urls with username and password in the url to use basic auth parameters in pulp3"
+      task :fix_url_auth => ["environment"] do
+        User.current = User.anonymous_admin
+
+        Katello::Repository.all.each do |repo|
+          upstream_url = repo.root.url
+          uri = URI(repo.root.url)
+          if uri.userinfo
+            user, password = uri.userinfo.split(':')
+            upstream_url.slice!(uri.userinfo + "@")
+            repo_params = {
+              upstream_username: user,
+              upstream_password: password,
+              url: upstream_url
+            }
+            ForemanTasks.sync_task(Actions::Katello::Repository::Update, repo.root, repo_params)
+          end
+        end
+      end
+    end
+  end
+end