katello 3.6.0.1.rc2 → 3.7.0.rc1

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

@@ -30,7 +30,7 @@ angular.module('Bastion.products').controller('DiscoveryController',
 
         $scope.contentTypes = [
             {id: "yum", name: "Yum Repositories"},
-            {id: "docker", name: "Docker Images"}
+            {id: "docker", name: "Container Images"}
         ];
 
         if (!$scope.table) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html

@@ -42,10 +42,10 @@
     </div>
 
 
-    <div bst-form-group ng-show="createRepoChoices.newProduct === 'true' && gpgKeys.length !== 0"
+    <div bst-form-group ng-show="createRepoChoices.newProduct === 'true' && contentCredentials.length !== 0"
          label="{{ 'GPG Key' | translate }}">
-      <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
-              ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys"/>
+      <select class="form-control" ng-model="createRepoChoices.product.content_credential_id"
+              ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials"/>
     </div>
 
     <h4 translate>Repository Options</h4>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/product-form.controller.js

@@ -6,7 +6,7 @@
  * @requires $q
  * @requires $uibModal
  * @requires Product
- * @requires GPGKey
+ * @requires ContentCredential
  * @requires SyncPlan
  * @requires FormUtils
  *
@@ -17,12 +17,12 @@
  *   within the table.
  */
 angular.module('Bastion.products').controller('ProductFormController',
-    ['$scope', '$q', '$uibModal', 'Product', 'GPGKey', 'SyncPlan', 'FormUtils', 'Notification',
-    function ($scope, $q, $uibModal, Product, GPGKey, SyncPlan, FormUtils, Notification) {
+    ['$scope', '$q', '$uibModal', 'Product', 'ContentCredential', 'SyncPlan', 'FormUtils', 'Notification',
+    function ($scope, $q, $uibModal, Product, ContentCredential, SyncPlan, FormUtils, Notification) {
 
-        function fetchGpgKeys() {
-            return GPGKey.queryUnpaged(function (gpgKeys) {
-                $scope.gpgKeys = gpgKeys.results;
+        function fetchContentCredentials() {
+            return ContentCredential.queryUnpaged(function (contentCredentials) {
+                $scope.contentCredentials = contentCredentials.results;
             });
         }
 
@@ -61,7 +61,7 @@ angular.module('Bastion.products').controller('ProductFormController',
             product.$save(success, error);
         };
 
-        $q.all([fetchSyncPlans().$promise, fetchGpgKeys().$promise]).finally(function () {
+        $q.all([fetchSyncPlans().$promise, fetchContentCredentials().$promise]).finally(function () {
             $scope.page.loading = false;
         });
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/views/product-new-form.html

@@ -22,7 +22,34 @@
       <select id="gpg_key_id"
               name="gpg_key_id"
               ng-model="product.gpg_key_id"
-              ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys">
+              ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'gpg_key' }">
+        <option value=""></option>
+      </select>
+    </div>
+
+    <div bst-form-group label="{{ 'SSL CA Cert' | translate }}">
+      <select id="ssl_ca_cert_id"
+              name="ssl_ca_cert_id"
+              ng-model="product.ssl_ca_cert_id"
+              ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'cert' }">
+        <option value=""></option>
+      </select>
+    </div>
+
+    <div bst-form-group label="{{ 'SSL Client Cert' | translate }}">
+      <select id="ssl_client_cert_id"
+              name="ssl_client_cert_id"
+              ng-model="product.ssl_client_cert_id"
+              ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'cert' }">
+        <option value=""></option>
+      </select>
+    </div>
+
+    <div bst-form-group label="{{ 'SSL Client Key' | translate }}">
+      <select id="ssl_client_key_id"
+              name="ssl_client_key_id"
+              ng-model="product.ssl_client_key_id"
+              ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'cert' }">
         <option value=""></option>
       </select>
     </div>
@@ -54,4 +81,4 @@
     </div>
 
   </form>
-</div>
+</div>

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

@@ -21,7 +21,7 @@
 angular.module('Bastion.products').controller('ProductsController',
     ['$scope', '$state', '$sce', '$location', '$uibModal', 'translate', 'Nutupane', 'Product', 'ProductBulkAction', 'CurrentOrganization', 'Notification',
     function ($scope, $state, $sce, $location, $uibModal, translate, Nutupane, Product, ProductBulkAction, CurrentOrganization, Notification) {
-        var nutupane, taskUrl, taskLink, getBulkParams, bulkError, params;
+        var nutupane, nutupaneParams, taskUrl, taskLink, getBulkParams, bulkError, params;
 
         getBulkParams = function () {
             return {
@@ -47,10 +47,16 @@ angular.module('Bastion.products').controller('ProductsController',
             'paged': true
         };
 
-        nutupane = new Nutupane(Product, params);
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+        $scope.disableRepoDiscovery = true;
+        nutupane = new Nutupane(Product, params, undefined, nutupaneParams);
         $scope.controllerName = 'katello_products';
         nutupane.masterOnly = true;
-
+        nutupane.refresh().then(function () {
+            $scope.disableRepoDiscovery = false;
+        });
         $scope.table = nutupane.table;
 
         $scope.$on('productDelete', function (event, taskId) {

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

@@ -10,7 +10,7 @@ angular.module('Bastion.products', [
     'ui.router',
     'Bastion',
     'Bastion.components',
-    'Bastion.gpg-keys',
+    'Bastion.content-credentials',
     'Bastion.architectures',
     'Bastion.i18n',
     'Bastion.sync-plans',

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

@@ -17,7 +17,8 @@
     <button type="button" class="btn btn-default"
             ng-click="goToDiscoveries()"
             bst-feature-flag="custom_products"
-            ng-show="permitted('edit_products')">
+            ng-show="permitted('edit_products')"
+            ng-disabled = "disableRepoDiscovery">
       <span translate>Repo Discovery</span>
     </button>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js

@@ -53,6 +53,6 @@ angular.module('Bastion.subscriptions').controller('SubscriptionDetailsControlle
             return "";
         };
 
-        $scope.virtWhoToolTip = translate("If the virt-who field is Yes then the subscription requires the use of virt-who. Learn how to configure and use this tool in the <a href=\"https://access.redhat.com/documentation/en/red-hat-satellite/6.2/single/virtual-instances-guide/\">Virtual Instances Guide</a>.");
+        $scope.virtWhoToolTip = translate("If the virt-who field is Yes then the subscription requires the use of virt-who. Learn how to configure and use this tool at the <a href=\"https://access.redhat.com/articles/subscription-management-satellite-6\" target=\"_blank\">Subscription Management Home Page</a>.");
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-import.controller.js

@@ -7,15 +7,16 @@
  * @requires translate
  * @requires CurrentOrganization
  * @requires Organization
- * @requires Subscription
  * @requires Task
+ * @requires Subscription
+ * @requires contentDisconnected
  *
  * @description
  *   Controls the import of a manifest.
  */
 angular.module('Bastion.subscriptions').controller('ManifestImportController',
-    ['$scope', '$q', 'translate', 'CurrentOrganization', 'Organization', 'Task', 'Subscription', 'Notification',
-    function ($scope, $q, translate, CurrentOrganization, Organization, Task, Subscription, Notification) {
+    ['$scope', '$q', 'translate', 'CurrentOrganization', 'Organization', 'Task', 'Subscription', 'Notification', 'contentDisconnected',
+    function ($scope, $q, translate, CurrentOrganization, Organization, Task, Subscription, Notification, contentDisconnected) {
 
         function buildManifestLink(upstream) {
             var url = upstream.webUrl,
@@ -248,5 +249,13 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
                 $scope.showHistoryMoreLink = $scope.isTruncated($scope.statuses, results);
             });
         });
+
+        $scope.manifestRefreshDisabled = function () {
+            return $scope.isTaskPending() ||
+                 !$scope.upstream ||
+                 !$scope.upstream.idCert ||
+                 !$scope.upstream.idCert.cert ||
+                 contentDisconnected;
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-delete-modal.html

@@ -16,4 +16,4 @@
         <span translate>Delete Manifest</span>
     </button>
   </span>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html

@@ -43,7 +43,7 @@
          <span bst-modal="deleteManifest()" template-url="subscriptions/manifest/views/manifest-delete-modal.html"></span>
           <span translate>Delete Manifest</span>
       </button>
-      <button type="button" class="btn btn-default" ng-disabled="isTaskPending() || upstream.idCert == undefined || upstream.idCert.cert == undefined"
+      <button type="button" class="btn btn-default" ng-disabled="manifestRefreshDisabled()"
         ng-click="refreshManifest()">
           <span translate>Refresh Manifest</span>
       </button>
@@ -78,7 +78,7 @@
 
   <div bst-alert="info" ng-if="details.virt_who">
     <span translate>
-      The uploaded manifest contains subscriptions that require the use of virt-who. Learn how to configure and use this tool in the <a href="https://access.redhat.com/documentation/en/red-hat-satellite/6.2/single/virtual-instances-guide/">Virtual Instances Guide</a>.
+      The uploaded manifest contains subscriptions that require the use of virt-who. Learn how to configure and use this tool at the <a href="https://access.redhat.com/articles/subscription-management-satellite-6" target="_blank">Subscription Management Home Page</a>.
     </span>
   </div>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task.factory.js

@@ -19,15 +19,12 @@
  */
 
 angular.module('Bastion.tasks').factory('Task',
-    ['BastionResource', '$timeout', '$log', '$q', 'CurrentOrganization',
-    function (BastionResource, $timeout, $log, $q, CurrentOrganization) {
+    ['BastionResource', '$timeout', '$log', '$q',
+    function (BastionResource, $timeout, $log, $q) {
         var bulkSearchRunning = false, searchIdGenerator = 0,
             searchParamsById = {}, callbackById = {}, pollCount = 0, maxPollInterval = 10000;
 
-        var resource = BastionResource('katello/api/v2/tasks/:id/:action',
-            {id: '@id', 'organization_id': CurrentOrganization}, {});
-
-        var foremanTasksResource = BastionResource('foreman_tasks/api/tasks/:id/:action',
+        var resource = BastionResource('foreman_tasks/api/tasks/:id/:action',
             {},
             {
                 bulkSearch: {method: 'POST', isArray: true, params: { action: 'bulk_search'}}
@@ -65,7 +62,7 @@ angular.module('Bastion.tasks').factory('Task',
                 bulkSearchRunning = false;
                 return;
             }
-            foremanTasksResource.bulkSearch(bulkSearchParams(), function (response) {
+            resource.bulkSearch(bulkSearchParams(), function (response) {
                 try {
                     _.each(response, function (tasksSearch) {
                         var searchId = tasksSearch['search_params']['search_id'];

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks-nutupane.factory.js

@@ -14,8 +14,13 @@ angular.module('Bastion.tasks').factory('TasksNutupane',
     ['Task', 'Nutupane', function (Task, Nutupane) {
         var TasksNutupane = function () {
             var self = this;
+            var nutupaneParams = {
+                'disableAutoLoad': true
+            };
+
 
-            Nutupane.call(self, Task, {});
+            Nutupane.call(self, Task, {}, undefined, nutupaneParams);
+            self.table.working = true;
 
             self.existingTasks = {};
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks-table.directive.js

@@ -79,9 +79,12 @@ angular.module('Bastion.tasks').directive('tasksTable',
                     }
                 });
 
-                scope.$watch('all', function () {
-                    scope.tasksNutupane.registerSearch({ 'type': 'all',
-                                                         'active_only': scope.activeOnly });
+                scope.$watch('all', function (all) {
+                    if (all) {
+                        scope.tasksNutupane.registerSearch({ 'type': 'all',
+                                                            'active_only': scope.activeOnly });
+
+                    }
                 });
 
                 element.bind('$destroy', function () {

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

@@ -18,6 +18,7 @@ module BastionKatello
         :stylesheet => 'bastion_katello/bastion_katello',
         :pages => %w(
           activation_keys
+          content_credentials
           content_hosts
           content_views
           debs
@@ -26,7 +27,6 @@ module BastionKatello
           ostree_branches
           errata
           packages
-          gpg_keys
           lifecycle_environments
           products
           puppet_modules

data/lib/katello/apipie/validators.rb

@@ -13,42 +13,6 @@ end
 module Katello
   module Apipie
     module Validators
-      class UndefValidator < ::Apipie::Validator::BaseValidator
-        def validate(_value)
-          true
-        end
-
-        def self.build(param_description, argument, _options, _block)
-          if argument == :undef
-            self.new(param_description)
-          end
-        end
-
-        def description
-          nil
-        end
-      end
-
-      class NumberValidator < ::Apipie::Validator::BaseValidator
-        def validate(value)
-          value.to_s =~ /^(0|[1-9]\d*)$/
-        end
-
-        def self.build(param_description, argument, _options, _block)
-          if argument == :number
-            self.new(param_description)
-          end
-        end
-
-        def error
-          "Parameter #{param_name} expecting to be a number, got: #{@error_value}"
-        end
-
-        def description
-          "number."
-        end
-      end
-
       class IdentifierValidator < ::Apipie::Validator::BaseValidator
         def validate(value)
           value = value.to_s
@@ -69,26 +33,6 @@ module Katello
           "string from 2 to 128 characters containing only alphanumeric characters, space, '_', '-' with no leading or trailing space.."
         end
       end
-
-      class BooleanValidator < ::Apipie::Validator::BaseValidator
-        def validate(value)
-          %w(true false True False).include?(value.to_s)
-        end
-
-        def self.build(param_description, argument, _options, _block)
-          if argument == :bool
-            self.new(param_description)
-          end
-        end
-
-        def error
-          "Parameter #{param_name} expecting to be a boolean value, got: #{@error_value}"
-        end
-
-        def description
-          "boolean"
-        end
-      end
     end
   end
 end

data/lib/katello/engine.rb

@@ -11,7 +11,7 @@ module Katello
       )
     end
 
-    initializer 'katello.mount_engine', :after => :build_middleware_stack do |app|
+    initializer 'katello.mount_engine', :before => :sooner_routes_load, :after => :build_middleware_stack do |app|
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/mount_engine.rb"
     end
 
@@ -48,47 +48,6 @@ module Katello
       require_dependency File.expand_path('../../../app/models/setting/content.rb', __FILE__) if (Setting.table_exists? rescue(false))
     end
 
-    initializer 'katello.configure_assets', :group => :all do
-      def find_assets(args = {})
-        type = args.fetch(:type, nil)
-        vendor = args.fetch(:vendor, false)
-
-        if vendor
-          asset_dir = "#{Katello::Engine.root}/vendor/assets/#{type}/"
-        else
-          asset_dir = "#{Katello::Engine.root}/app/assets/#{type}/"
-        end
-
-        asset_paths = Dir[File.join(asset_dir, '**', '*')].reject { |file| File.directory?(file) }
-        asset_paths.each { |file| file.slice!(asset_dir) }
-
-        asset_paths
-      end
-
-      javascripts = find_assets(:type => 'javascripts')
-      images = find_assets(:type => 'images')
-      vendor_images = find_assets(:type => 'images', :vendor => true)
-
-      precompile = [
-        'katello/katello.css',
-        'katello/containers/container.css',
-        'bastion_katello/bastion_katello.css',
-        'bastion_katello/bastion_katello.js',
-        /bastion_katello\S+.(?:svg|eot|woff|ttf)$/
-      ]
-
-      precompile.concat(javascripts)
-      precompile.concat(images)
-      precompile.concat(vendor_images)
-
-      SETTINGS[:katello] = {} unless SETTINGS.key?(:katello)
-      SETTINGS[:katello][:assets] = {:precompile => precompile}
-    end
-
-    initializer 'katello.assets.precompile', :after => 'katello.configure_assets' do |app|
-      app.config.assets.precompile += SETTINGS[:katello][:assets][:precompile]
-    end
-
     initializer "katello.apipie" do
       Apipie.configuration.checksum_path += ['/katello/api/']
       require 'katello/apipie/validators'
@@ -141,7 +100,7 @@ module Katello
       app.config.autoload_paths += Dir["#{config.root}/app/views/foreman"]
     end
 
-    initializer "katello.paths" do |app|
+    initializer "katello.paths", :before => :sooner_routes_load do |app|
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/api/v2.rb"
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/api/rhsm.rb"
       app.routes_reloader.paths.unshift("#{Katello::Engine.root}/config/routes/overrides.rb")
@@ -279,4 +238,8 @@ module Katello
   def self.with_remote_execution?
     (RemoteExecutionFeature rescue false) ? true : false
   end
+
+  def self.with_ansible?
+    (ForemanAnsible rescue false) ? true : false
+  end
 end

data/lib/katello/permission_creator.rb

@@ -9,6 +9,7 @@ module Katello
       capsule_content_permissions
       content_view_permissions
       gpg_key_permissions
+      content_credential_permissions
       host_collections_permissions
       lifecycle_environment_permissions
       product_permissions
@@ -165,6 +166,29 @@ module Katello
                          :resource_type => 'Katello::GpgKey'
     end
 
+    def content_credential_permissions
+      @plugin.permission :view_content_credentials,
+                         {
+                           'katello/api/v2/content_credentials' => [:index, :show, :content, :auto_complete_search]
+                         },
+                         :resource_type => 'Katello::GpgKey'
+      @plugin.permission :create_content_credentials,
+                         {
+                           'katello/api/v2/content_credentials' => [:create]
+                         },
+                         :resource_type => 'Katello::GpgKey'
+      @plugin.permission :edit_content_credentials,
+                         {
+                           'katello/api/v2/content_credentials' => [:update, :set_content]
+                         },
+                         :resource_type => 'Katello::GpgKey'
+      @plugin.permission :destroy_content_credentials,
+                         {
+                           'katello/api/v2/content_credentials' => [:destroy]
+                         },
+                         :resource_type => 'Katello::GpgKey'
+    end
+
     def host_collections_permissions
       @plugin.permission :view_host_collections,
                          {
@@ -297,11 +321,11 @@ module Katello
                          :resource_type => 'Katello::Product'
     end
 
-    def subscription_permissions
+    def subscription_permissions # rubocop:disable Metrics/MethodLength
       @plugin.permission :view_subscriptions,
                          {
                            'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search],
-                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories]
+                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search]
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :attach_subscriptions,
@@ -316,8 +340,6 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :import_manifest,
                          {
-                           'katello/products' => [:available_repositories, :toggle_repository],
-                           'katello/providers' => [:redhat_provider, :redhat_provider_tab],
                            'katello/api/v2/subscriptions' => [:upload, :refresh_manifest],
                            'katello/api/v2/repository_sets' => [:enable, :disable]
                          },
@@ -327,6 +349,11 @@ module Katello
                            'katello/api/v2/subscriptions' => [:delete_manifest]
                          },
                          :resource_type => 'Katello::Subscription'
+      @plugin.permission :manage_subscription_allocations,
+                         {
+                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update]
+                         },
+                         :resource_type => 'Katello::Subscription'
     end
 
     def sync_plan_permissions