katello 4.3.0.rc4 → 4.4.0.rc2

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

@@ -21,6 +21,7 @@ angular.module('Bastion.packages').controller('PackagesController',
         var nutupane, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
+            'repository_id': $location.search().repositoryId || null,
             'paged': true
         };
 

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

@@ -19,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', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService',
-        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService) {
+    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService', 'MirroringPolicy',
+        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService, MirroringPolicy) {
             $scope.organization = CurrentOrganization;
 
             $scope.progress = {uploading: false};
@@ -108,20 +108,31 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
                 if ($scope.genericRemoteOptions && $scope.genericRemoteOptions !== []) {
                     $scope.genericRemoteOptions.forEach(function(option) {
-                       if (option.type === "Array" && option.value) {
-                           repository[option.name] = option.value.split(option.delimiter);
+                       if (option.type === "Array") {
+                           repository[option.name] = option.value ? option.value.split(option.delimiter) : [];
                        } else {
                            repository[option.name] = option.value;
                        }
                    });
                 }
 
-                if (!_.isEmpty(repository.commaTagsWhitelist)) {
-                    repository["docker_tags_whitelist"] = repository.commaTagsWhitelist.split(",").map(function(tag) {
+                if (!_.isEmpty(repository.commaIncludeTags)) {
+                    repository["include_tags"] = repository.commaIncludeTags.split(",").map(function(tag) {
                         return tag.trim();
+                    }).filter(function(el) {
+                        return el;
                     });
                 } else {
-                    repository["docker_tags_whitelist"] = [];
+                    repository["include_tags"] = [];
+                }
+                if (!_.isEmpty(repository.commaExcludeTags)) {
+                    repository["exclude_tags"] = repository.commaExcludeTags.split(",").map(function(tag) {
+                        return tag.trim();
+                    }).filter(function(el) {
+                        return el;
+                    });
+                } else {
+                    repository["exclude_tags"] = [];
                 }
                 /* eslint-disable camelcase */
 
@@ -134,10 +145,15 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 repository.$update(function (response) {
                     deferred.resolve(response);
                     $scope.repository.ignore_srpms = $scope.repository.ignorable_content && $scope.repository.ignorable_content.includes("srpm");
-                    if (!_.isEmpty(response["docker_tags_whitelist"])) {
-                        repository.commaTagsWhitelist = repository["docker_tags_whitelist"].join(", ");
+                    if (!_.isEmpty(response["include_tags"])) {
+                        repository.commaIncludeTags = repository["include_tags"].join(", ");
                     } else {
-                        repository.commaTagsWhitelist = null;
+                        repository.commaIncludeTags = null;
+                    }
+                    if (!_.isEmpty(response["exclude_tags"])) {
+                        repository.commaExcludeTags = repository["exclude_tags"].join(", ");
+                    } else {
+                        repository.commaExcludeTags = null;
                     }
                     Notification.setSuccessMessage(translate('Repository Saved.'));
                 }, function (response) {
@@ -198,6 +214,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
+            $scope.mirroringPolicies = MirroringPolicy.mirroringPolicies;
 
             $scope.checksumTypeDisplay = function (checksum) {
                 return Checksum.checksumType(checksum);
@@ -207,6 +224,8 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 return DownloadPolicy.downloadPolicyName(downloadPolicy);
             };
 
+            $scope.mirroringPolicyDisplay = MirroringPolicy.mirroringPolicyName;
+
             $scope.clearUpstreamAuth = function () {
                 $scope.repository['upstream_password'] = null;
                 $scope.repository['upstream_auth_exists'] = false;

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

@@ -13,7 +13,6 @@
  * @requires DockerManifest
  * @requires DockerManifestList
  * @requires DockerTag
- * @requires OstreeBranch
  * @requires File
  * @requires Deb
  * @requires ModuleStream
@@ -25,8 +24,8 @@
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection', 'GenericContent', 'RepositoryTypesService',
-    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream, AnsibleCollection, GenericContent, RepositoryTypesService) {
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection', 'GenericContent', 'RepositoryTypesService',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, File, Deb, ModuleStream, AnsibleCollection, GenericContent, RepositoryTypesService) {
         var contentTypes, nutupaneParams;
 
         function success(response, selected) {

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

@@ -53,10 +53,15 @@
             'product_id': $scope.$stateParams.productId,
             'id': $scope.$stateParams.repositoryId
         }, function () {
-            if (!_.isEmpty($scope.repository["docker_tags_whitelist"])) {
-                $scope.repository.commaTagsWhitelist = $scope.repository["docker_tags_whitelist"].join(", ");
+            if (!_.isEmpty($scope.repository["include_tags"])) {
+                $scope.repository.commaIncludeTags = $scope.repository["include_tags"].join(", ");
             } else {
-                $scope.repository.commaTagsWhitelist = "";
+                $scope.repository.commaIncludeTags = "";
+            }
+            if (!_.isEmpty($scope.repository["exclude_tags"])) {
+                $scope.repository.commaExcludeTags = $scope.repository["exclude_tags"].join(", ");
+            } else {
+                $scope.repository.commaExcludeTags = "";
             }
             $scope.page.loading = false;
             $scope.repositoryWrapper.repository = $scope.repository;

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

@@ -28,31 +28,37 @@
     </dl>
 
     <div class="divider"></div>
+
+    <div ng-show="repository.content_type === 'yum'" >
+      <h4 translate>Publishing Settings</h4>
+
+      <dl class="dl-horizontal dl-horizontal-left">
+          <dt>
+            <span translate>Restrict to architecture</span>
+            <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected architecture.' | translate }}"></i>
+          </dt>
+          <dd bst-edit-select="repository.arch==='noarch'?'No restriction':repository.arch"
+              selector="repository.arch"
+              options="architectures()"
+              on-save="save(repository)">
+          </dd>
+
+          <dt>
+            <span translate>Restrict to <br />OS version</span>
+            <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected OS version.' | translate }}"></i>
+          </dt>
+          <dd bst-edit-select="repository.os_versions.length ? formatOSVersions() : 'No restriction'"
+              selector="selectedOSVersion"
+              options="osVersionsOptions()"
+              on-save="save(repository)">
+          </dd>
+      </dl>
+      <div class="divider"></div>
+    </div>
+
     <h4 translate>Sync Settings</h4>
-    <dl class="dl-horizontal dl-horizontal-left">
-      <span ng-show="repository.content_type === 'yum'" >
-        <dt>
-          <span translate>Restrict to architecture</span>
-          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected architecture.' | translate }}"></i>
-        </dt>
-        <dd bst-edit-select="repository.arch==='noarch'?'No restriction':repository.arch"
-            selector="repository.arch"
-            options="architectures()"
-            on-save="save(repository)">
-        </dd>
-      </span>
 
-      <span ng-show="repository.content_type === 'yum'" >
-        <dt>
-          <span translate>Restrict to <br />OS version</span>
-          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected OS version.' | translate }}"></i>
-        </dt>
-        <dd bst-edit-select="repository.os_versions.length ? formatOSVersions() : 'No restriction'"
-            selector="selectedOSVersion"
-            options="osVersionsOptions()"
-            on-save="save(repository)">
-        </dd>
-      </span>
+    <dl class="dl-horizontal dl-horizontal-left">
 
       <dt ng-show="repository.content_type !== 'docker'" translate>Upstream URL</dt>
       <dt ng-show="repository.content_type === 'docker'" translate>Registry URL</dt>
@@ -194,16 +200,8 @@
             on-save="save(repository)">
         </dd>
       </span>
-      <span ng-hide="repository.content_type === 'ostree'">
-        <dt translate>Mirror on Sync</dt>
-        <dd bst-edit-checkbox="repository.mirror_on_sync"
-            formatter="booleanToYesNo"
-            on-save="save(repository)"
-            readonly="denied('edit_products', product)">
-        </dd>
-      </span>
 
-      <span ng-show="repository.content_type === 'yum' && repository.mirror_on_sync === false">
+      <span ng-show="repository.content_type === 'yum' && repository.mirroring_policy === 'additive'">
         <dt translate>Retain package versions</dt>
         <dd bst-edit-number="repository.retain_package_versions_count"
             on-save="save(repository)"
@@ -312,7 +310,7 @@
           options="certs()"
           on-save="save(repository)">
       </dd>
-      <span ng-if="repository.content_type == 'yum' || repository.content_type == 'deb'">
+      <span ng-if="repository.content_type == 'yum' || repository.content_type == 'deb' || repository.content_type == 'docker'">
         <dt translate>Download Policy</dt>
         <dd bst-edit-select="downloadPolicyDisplay(repository.download_policy)"
             readonly="denied('edit_products', product)"
@@ -322,9 +320,25 @@
             on-save="save(repository)">
         </dd>
       </span>
+      <span>
+        <dt translate>Mirroring Policy</dt>
+
+        <dd bst-edit-select="mirroringPolicyDisplay(repository.mirroring_policy, repository.content_type)"
+            readonly="denied('edit_products', product)"
+            selector="repository.mirroring_policy"
+            options="mirroringPolicies(repository.content_type)"
+            options-format="id as name for (id, name) in options"
+            on-save="save(repository)">
+        </dd>
+      </span>
       <span ng-if="repository.content_type == 'docker'">
-        <dt translate>Limit Sync Tags</dt>
-        <dd bst-edit-text="repository.commaTagsWhitelist"
+        <dt translate>Include Tags</dt>
+        <dd bst-edit-text="repository.commaIncludeTags"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+        <dt translate>Exclude Tags</dt>
+        <dd bst-edit-text="repository.commaExcludeTags"
             on-save="save(repository)"
             readonly="denied('edit_products', product)">
         </dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/mirroring-policy.service.js

@@ -0,0 +1,30 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.repository.service:mirroringPolicy
+ *
+ * @requires translate
+ *
+ * @description
+ *   Provides a mirroringPolicy for repositories
+ */
+angular.module('Bastion.repositories').service('MirroringPolicy',
+    ['translate', function (translate) {
+
+        this.defaultMirroringPolicy = 'additive';
+
+        this.mirroringPolicies = function(repoType) {
+            var policies = {
+                'additive': translate('Additive'),
+                'mirror_content_only': translate('Content Only')
+            };
+            if (repoType === 'yum') {
+                policies['mirror_complete'] = translate('Complete Mirroring');
+            }
+            return policies;
+        };
+
+        this.mirroringPolicyName = function (policy, repoType) {
+            return this.mirroringPolicies(repoType)[policy];
+        };
+    }]
+);

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

@@ -17,14 +17,15 @@
  * @requires Architecture
  * @requires RepositoryTypesService
  * @requires OSVersions
- * #requires HttpProxyPolicy
+ * @requires HttpProxyPolicy
+ * @requires MirroringPolicy
  *
  * @description
  *   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', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
-        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
+    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'MirroringPolicy',
+        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions, MirroringPolicy) {
 
             function success() {
                 Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -61,8 +62,9 @@ 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});
+                'checksum_type': null, 'verify_ssl_on_sync': true,
+                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
+                'mirroring_policy': MirroringPolicy.defaultMirroringPolicy, 'include_tags': '', 'exclude_tags': '*-source'});
 
             $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
                 $scope.page.loading = false;
@@ -77,6 +79,8 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
 
+            $scope.mirroringPolicies = MirroringPolicy.mirroringPolicies;
+
             $scope.$watch('repository.name', function () {
                 if ($scope.repositoryForm && $scope.repositoryForm.name) {
                     $scope.repositoryForm.name.$setValidity('server', true);
@@ -134,7 +138,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                         repository.ignorable_content = [];
                     }
                 }
-                if (repository.content_type !== 'yum' && repository.content_type !== 'deb' ) {
+                if (repository.content_type !== 'yum' && repository.content_type !== 'deb' && repository.content_type !== 'docker') {
                     repository['download_policy'] = '';
                 }
                 if (repository.arch === 'No restriction') {
@@ -156,6 +160,25 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                         }
                     });
                 }
+                if (!Array.isArray(repository.include_tags)) {
+                    if (!_.isEmpty(repository.include_tags)) {
+                        repository["include_tags"] = repository.include_tags.split(",").map(function(tag) {
+                            return tag.trim();
+                        });
+                    } else {
+                        repository["include_tags"] = [];
+                    }
+                }
+
+                if (!Array.isArray(repository.exclude_tags)) {
+                    if (!_.isEmpty(repository.exclude_tags)) {
+                        repository["exclude_tags"] = repository.exclude_tags.split(",").map(function(tag) {
+                            return tag.trim();
+                        });
+                    } else {
+                        repository["exclude_tags"] = [];
+                    }
+                }
                 repository.$save(success, error);
             };
 

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

@@ -39,29 +39,33 @@
         </select>
       </div>
 
-      <div bst-form-group label="{{ 'Restrict to Architecture' | translate }}" ng-show="repository.content_type === 'yum'">
+    </div>
+
+    <div ng-show="repository.content_type === 'yum'">
+      <h4 translate> Publishing Settings </h4>
+      <div bst-form-group label="{{ 'Restrict to Architecture' | translate }}">
         <select id="architecture_restricted"
                 name="architecture_restricted"
                 ng-model="repository.arch"
                 ng-options="arch.id as arch.name for arch in architecture">
         </select>
+        <p class="help-block" translate>
+          The repository will be enabled by default on content hosts with the selected architecture.
+        </p>
       </div>
 
-      <div
-        bst-form-group label="{{ 'Restrict to OS version' | translate }}"
-        ng-if="repository.content_type === 'yum'"
-      >
-       <select id="os_versions"
-               name="os_versions"
-               ng-model="repository.os_versions"
-               ng-options="tag as tag.name for tag in osVersionsOptions track by tag.id">
-       </select>
-       <p class="help-block" translate>
-         The repository will be enabled by default on content hosts with the selected OS version.
-       </p>
+      <div bst-form-group label="{{ 'Restrict to OS version' | translate }}">
+        <select id="os_versions"
+                name="os_versions"
+                ng-model="repository.os_versions"
+                ng-options="tag as tag.name for tag in osVersionsOptions track by tag.id">
+        </select>
+        <p class="help-block" translate>
+          The repository will be enabled by default on content hosts with the selected OS version.
+        </p>
       </div>
-
     </div>
+
     <div ng-show="repository.content_type !== undefined">
       <h4 translate> Sync Settings </h4>
       <div bst-form-group label="{{ 'Upstream URL' | translate }} ">
@@ -259,7 +263,7 @@
         </div>
       </div>
 
-      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb'">
+      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'docker'">
         <select id="download_policy"
                 name="download_policy"
                 ng-model="repository.download_policy"
@@ -272,18 +276,39 @@
         </p>
       </div>
 
-      <div class="checkbox" ng-hide="repository.content_type === 'ostree'">
-        <label>
-          <input id="mirror_on_sync" name="mirror_on_sync" ng-model="repository.mirror_on_sync" type="checkbox"/>
-          <span translate>Mirror on Sync</span>
-        </label>
+      <div bst-form-group label="{{ 'Mirroring Policy' | translate }}">
+        <select id="mirroring_policy"
+                name="mirroring_policy"
+                ng-model="repository.mirroring_policy"
+                ng-options="id as name for (id, name) in mirroringPolicies(repository.content_type)">
+        </select>
 
-        <p class="help-block" translate>
-          Selecting this option will result in contents that are no longer part of the upstream repository being removed during synchronization.
+        <p class="help-block">
+          <ul>
+        <li translate><b>Additive:</b> new content available during sync will be added to the repository, and no content will be removed. </li>
+            <li translate><b>Mirror Content Only</b>: any new content available during sync will be added to the repository and any content removed from the upstream repository will be removed from the local repository.</li>
+            <li translate ng-show="repository.content_type == 'yum'"><b>Mirror Complete</b>: a sync behaves exactly like "Mirror Content Only", but also mirrors metadata as well.  This is the fastest method, and preserves repository signatures, but is only supported by yum and not by all upstream repositories.</li>
+          </ul>
+        </p>
+      </div>
+
+      <div bst-form-group label="{{ 'Include Tags' | translate }}" ng-if="(repository.content_type === 'docker')">
+        <input id="include_tags" name="include_tags" ng-model="repository.include_tags" type="text"/>
+
+        <p class="help-block">
+          <span translate>A comma-separated list of container image tags to include when syncing.</span><br />
+        </p>
+      </div>
+
+      <div bst-form-group label="{{ 'Exclude Tags' | translate }}" ng-if="(repository.content_type === 'docker')">
+        <input id="exclude_tags" name="exclude_tags" ng-model="repository.exclude_tags" type="text"/>
+
+        <p class="help-block">
+          <span translate>A comma-separated list of container image tags to exclude when syncing. Source images are excluded by default because they are often large and unwanted.</span><br />
         </p>
       </div>
 
-      <div bst-form-group label="{{ 'Retain package versions' | translate }}" ng-if="(repository.content_type === 'yum' && repository.mirror_on_sync === false)">
+      <div bst-form-group label="{{ 'Retain package versions' | translate }}" ng-if="(repository.content_type === 'yum' && repository.mirroring_policy === 'additive')">
         <input id="retain_package_versions_count" name="retain_package_versions_count" ng-model="repository.retain_package_versions_count" type="number"/>
 
         <p class="help-block">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js

@@ -4,8 +4,6 @@
  *
  * @requires $scope
  * @requires $q
- * @requires $timeout
- * @requires $http
  * @requires Notification
  * @requires Task
  * @requires Organization
@@ -18,8 +16,8 @@
  *   Provides the functionality for the repo discovery action pane.
  */
 angular.module('Bastion.products').controller('DiscoveryController',
-    ['$scope', '$q', '$timeout', '$http', '$filter', 'Notification', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'ContainerRegistries', 'translate',
-    function ($scope, $q, $timeout, $http, $filter, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, ContainerRegistries, translate) {
+    ['$scope', '$q', '$filter', 'Notification', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'ContainerRegistries', 'translate',
+    function ($scope, $q, $filter, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, ContainerRegistries, translate) {
         var transformRows, setDiscoveryDetails;
 
         $scope.discovery = {
@@ -37,6 +35,9 @@ angular.module('Bastion.products').controller('DiscoveryController',
             {id: "docker", name: "Container Images"}
         ];
         $scope.hideSwitcher = true;
+
+        // scope.table may have been set when clicking in from products
+        // otherwise set a simple table since there is no BastionResource here
         if (!$scope.table) {
             $scope.table = {
                 rows: [],

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

@@ -42,13 +42,14 @@ angular.module('Bastion.products').config(['$stateProvider', function ($statePro
     });
 
     $stateProvider.state("product-discovery", {
-        abstract: true,
         url: '/products/discovery',
-        controller: 'DiscoveryController',
-        templateUrl: 'products/discovery/views/discovery-base.html'
+        templateUrl: 'products/discovery/views/discovery-base.html',
+        permission: 'edit_products',
+        redirectTo: 'product-discovery.scan'
     })
     .state("product-discovery.scan", {
         url: '/scan',
+        controller: 'DiscoveryController',
         permission: 'edit_products',
         templateUrl: 'products/discovery/views/discovery.html',
         ncyBreadcrumb: {

data/lib/katello/engine.rb

@@ -226,6 +226,10 @@ module Katello
       ::AuditSearch::ClassMethods.prepend Katello::Concerns::AuditSearch
       ::Widget.singleton_class.prepend Katello::Concerns::WidgetExtensions::ClassMethods
 
+      if ::Katello.with_remote_execution?
+        ::RemoteExecutionProxySelector.prepend Katello::Concerns::RemoteExecutionProxySelectorExtensions
+      end
+
       load 'katello/repository_types.rb'
       load 'katello/scheduled_jobs.rb'
 

data/lib/katello/permission_creator.rb

@@ -124,7 +124,7 @@ module Katello
                          :finder_scope => :editable
       @plugin.permission :destroy_content_views,
                          {
-                           'katello/api/v2/content_views' => [:destroy, :remove],
+                           'katello/api/v2/content_views' => [:destroy, :remove, :bulk_delete_versions],
                            'katello/api/v2/content_view_versions' => [:destroy]
                          },
                          :resource_type => 'Katello::ContentView',

data/lib/katello/permissions/host_permissions.rb

@@ -29,6 +29,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/traces',
   'katello/api/v2/hosts_bulk_actions/resolve_traces',
   'katello/api/v2/hosts_bulk_actions/system_purpose',
+  'katello/api/v2/hosts_bulk_actions/change_content_source',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
   'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',
@@ -36,7 +37,8 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/hypervisors_heartbeat',
-  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile'
+  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile',
+  'hosts/change_content_source_data'
 ]
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [

data/lib/katello/plugin.rb

@@ -199,6 +199,9 @@ Foreman::Plugin.register :katello do
 
   register_global_js_file 'global'
 
+  register_graphql_query_field :host_collection, '::Types::HostCollection', :record_field
+  register_graphql_query_field :host_collections, '::Types::HostCollection', :collection_field
+
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"
   end
@@ -296,16 +299,21 @@ Foreman::Plugin.register :katello do
 
   describe_host do
     overview_buttons_provider :content_host_overview_button
+    multiple_actions_provider :hosts_change_content_source
   end
 
   if Katello.with_remote_execution?
     RemoteExecutionFeature.register(:katello_package_install, N_("Katello: Install Package"), :description => N_("Install package via Katello interface"), :provided_inputs => ['package'])
+    RemoteExecutionFeature.register(:katello_package_install_by_search, N_("Katello: Install packages by search query"), :description => N_("Install packages via Katello interface"), :provided_inputs => ['Package search query'])
     RemoteExecutionFeature.register(:katello_package_update, N_("Katello: Update Package"), :description => N_("Update package via Katello interface"), :provided_inputs => ['package'])
+    RemoteExecutionFeature.register(:katello_packages_update_by_search, N_("Katello: Update Packages by search query"), :description => N_("Update packages via Katello interface"), :provided_inputs => ['Package search query'])
     RemoteExecutionFeature.register(:katello_package_remove, N_("Katello: Remove Package"), :description => N_("Remove package via Katello interface"), :provided_inputs => ['package'])
+    RemoteExecutionFeature.register(:katello_packages_remove_by_search, N_("Katello: Remove Packages by search query"), :description => N_("Remove packages via Katello interface"), :provided_inputs => ['Package search query'])
     RemoteExecutionFeature.register(:katello_group_install, N_("Katello: Install Package Group"), :description => N_("Install package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_update, N_("Katello: Update Package Group"), :description => N_("Update package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_errata_install, N_("Katello: Install Errata"), :description => N_("Install errata via Katello interface"), :provided_inputs => ['errata'])
+    RemoteExecutionFeature.register(:katello_errata_install_by_search, N_("Katello: Install errata by search query"), :description => N_("Install errata using scoped search query"), :provided_inputs => ['Errata search query'])
     RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
     RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
     RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
@@ -336,7 +344,7 @@ Foreman::Plugin.register :katello do
 
   register_info_provider Katello::Host::InfoProvider
 
-  medium_providers.register(Katello::ManagedContentMediumProvider)
+  medium_providers_registry.register(Katello::ManagedContentMediumProvider)
 
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles

data/lib/katello/repository_types/deb.rb

@@ -20,7 +20,6 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
 
   default_managed_content_type Katello::Deb::CONTENT_TYPE
   content_type Katello::Deb,
-    :pulp2_service_class => ::Katello::Pulp::Deb,
     :pulp3_service_class => ::Katello::Pulp3::Deb,
     :removable => true,
     :uploadable => true

data/lib/katello/repository_types/docker.rb

@@ -19,24 +19,24 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   distribution_class PulpContainerClient::ContainerContainerDistribution
   repo_sync_url_class PulpContainerClient::RepositorySyncURL
 
+  index_additional_data do |repo|
+    Katello::DockerMetaTag.import_meta_tags([repo])
+  end
+
   content_type Katello::DockerManifest,
                :priority => 1,
-               :pulp2_service_class => ::Katello::Pulp::DockerManifest,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifest,
                :removable => true,
                :uploadable => true
   content_type Katello::DockerManifestList,
                :priority => 2,
-               :pulp2_service_class => ::Katello::Pulp::DockerManifestList,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifestList
   content_type Katello::DockerTag,
                :priority => 3,
-               :pulp2_service_class => ::Katello::Pulp::DockerTag,
                :pulp3_service_class => ::Katello::Pulp3::DockerTag,
                :primary_content => true
   content_type Katello::DockerBlob,
                :priority => 4,
-               :pulp2_service_class => ::Katello::Pulp::DockerBlob,
                :pulp3_service_class => ::Katello::Pulp3::DockerBlob,
                :index => false
 end