katello 3.16.0.rc5 → 3.16.1.2

data/app/services/katello/pulp3/repository_mirror.rb

@@ -11,6 +11,11 @@ module Katello
         @repo_service = repository_service
       end
 
+      def content_guard_href
+        content_guard_api = ::Katello::Pulp3::Api::ContentGuard.new(smart_proxy)
+        content_guard_api.list&.results&.first&.pulp_href
+      end
+
       def backend_object_name
         #Create repos in pulp3 instance with the name as this repo's pulp_id
         repo.pulp_id
@@ -78,6 +83,7 @@ module Katello
           base_path: path,
           name: "#{backend_object_name}"
         }
+        ret[:content_guard] = repo.unprotected ? nil : content_guard_href
         ret[:publication] = options[:publication] if options.key? :publication
         ret[:repository_version] = options[:repository_version] if options.key? :repository_version
         ret
@@ -85,10 +91,9 @@ module Katello
 
       def remote_options
         base_options = common_remote_options
+        base_options.merge(url: remote_feed_url)
         if (type_specific_options = repo_service.try(:mirror_remote_options))
           base_options.merge(type_specific_options)
-        else
-          base_options.merge(url: remote_feed_url)
         end
       end
 

data/app/services/katello/pulp3/smart_proxy_mirror_repository.rb

@@ -10,7 +10,7 @@ module Katello
         repo_map = {}
 
         smart_proxy_helper = ::Katello::SmartProxyHelper.new(smart_proxy)
-        katello_pulp_ids = smart_proxy_helper.repos_available_to_capsule.map(&:pulp_id)
+        katello_pulp_ids = smart_proxy_helper.combined_repos_available_to_capsule.map(&:pulp_id)
         pulp3_enabled_repo_types.each do |repo_type|
           api = repo_type.pulp3_service_class.api(smart_proxy)
           repo_map[api] = api.list_all.reject { |capsule_repo| katello_pulp_ids.include? capsule_repo.name }

data/app/services/katello/pulp3/task.rb

@@ -0,0 +1,100 @@
+module Katello
+  module Pulp3
+    class Task
+      # A call report Looks like:  {"task":"/pulp/api/v3/tasks/5/"}
+      # {
+      #    "pulp_href":"/pulp/api/v3/tasks/4/",
+      #    "pulp_created":"2019-02-21T19:50:40.476767Z",
+      #    "job_id":"d0359658-d926-47a2-b430-1b2092b3bd86",
+      #    "state":"completed",
+      #    "name":"pulp_file.app.tasks.publishing.publish",
+      #    "started_at":"2019-02-21T19:50:40.556002Z",
+      #    "finished_at":"2019-02-21T19:50:40.618397Z",
+      #    "non_fatal_errors":[
+      #
+      #    ],
+      #    "error":null,
+      #    "worker":"/pulp/api/v3/workers/1/",
+      #    "parent":null,
+      #    "spawned_tasks":[
+      #
+      #    ],
+      #    "progress_reports":[
+      #
+      #    ],
+      #    "created_resources":[
+      #       "/pulp/api/v3/publications/1/"
+      #    ]
+      # }
+
+      WAITING = 'waiting'.freeze
+      SKIPPED = 'skipped'.freeze
+      RUNNING = 'running'.freeze
+      COMPLETED = 'completed'.freeze
+      FAILED = 'failed'.freeze
+      CANCELED = 'canceled'.freeze
+
+      FINISHED_STATES = [COMPLETED, FAILED, CANCELED, SKIPPED].freeze
+
+      #needed for serialization in dynflow
+
+      delegate :[], :key?, :dig, :to_hash, :to => :task_data
+
+      def initialize(smart_proxy, data)
+        @smart_proxy = smart_proxy
+        if (href = data['task'])
+          @href = href
+        else
+          @pulp_data = data.with_indifferent_access
+          @href = @pulp_data['pulp_href']
+          Rails.logger.error("Got empty pulp_href on #{@pulp_data}") if @href.nil?
+        end
+      end
+
+      def task_data(force_refresh = false)
+        @pulp_data = nil if force_refresh
+        @pulp_data ||= tasks_api.read(@href).as_json.with_indifferent_access
+      end
+
+      def tasks_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
+      end
+
+      def task_group_href
+        task_data[:task_group]
+      end
+
+      def done?
+        task_data[:finish_time] || FINISHED_STATES.include?(task_data[:state])
+      end
+
+      def poll
+        task_data(true)
+        self
+      end
+
+      def started?
+        task_data[:start_time]
+      end
+
+      def error
+        if task_data[:state] == CANCELED
+          self.new(_("Task canceled"))
+        elsif task_data[:state] == FAILED
+          if task_data[:error][:description].blank?
+            _("Pulp task error")
+          else
+            task_data[:error][:description]
+          end
+        end
+      end
+
+      def cancel
+        data = PulpcoreClient::Task.new(state: 'canceled')
+        tasks_api.tasks_cancel(pulp_task['pulp_href'], data)
+        #the main task may have completed, so cancel spawned tasks too
+        task_data['spawned_tasks']&.each { |spawned| tasks_api.tasks_cancel(spawned['pulp_href'], data) }
+      end
+    end
+  end
+end

data/app/services/katello/pulp3/task_group.rb

@@ -0,0 +1,79 @@
+module Katello
+  module Pulp3
+    class TaskGroup
+      WAITING = 'waiting'.freeze
+      SKIPPED = 'skipped'.freeze
+      RUNNING = 'running'.freeze
+      COMPLETED = 'completed'.freeze
+      CANCELLED = 'canceled'.freeze
+      FAILED = 'failed'.freeze
+
+      IN_PROGRESS_STATES = [WAITING, RUNNING].freeze
+
+      #needed for serialization in dynflow
+      delegate :to_hash, :to => :task_group_data
+      delegate :dig, :to => :task_group_data
+
+      attr_accessor :href
+
+      # A call report Looks like:  {"task":"/pulp/api/v3/tasks/5/"}
+      #{
+      # "pulp_href":"/pulp/api/v3/task-groups/d9841aaa-8a47-4e31-9018-10e4430766bf/",
+      #     "description":"Migration Sub-tasks",
+      #     "waiting":0,
+      #     "skipped":0,
+      #     "running":0,
+      #     "completed":0,
+      #     "canceled":0,
+      #     "failed":1
+      # }
+
+      def self.new_from_href(smart_proxy, href)
+        group = self.new(smart_proxy, {'pulp_href' => href})
+        group.clear_task_group_data
+        group
+      end
+
+      def initialize(smart_proxy, data)
+        @smart_proxy = smart_proxy
+        @pulp_data = data.with_indifferent_access
+        @href = @pulp_data['pulp_href']
+        Rails.logger.error("Got empty pulp_href on #{@pulp_data}") if @href.nil?
+      end
+
+      def task_group_data
+        @pulp_data ||= tasks_groups_api.read(@href).as_json.with_indifferent_access
+      end
+
+      def tasks_groups_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy).task_groups_api
+      end
+
+      def done?
+        task_group_data['all_tasks_dispatched'] = true && IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
+      end
+
+      def poll
+        clear_task_group_data
+        task_group_data
+      end
+
+      def clear_task_group_data
+        @pulp_data = nil
+      end
+
+      def started?
+        [SKIPPED, RUNNING, COMPLETED, CANCELLED, FAILED].any? { |state| task_group_data[state] }
+      end
+
+      def error
+        if task_group_data[FAILED] > 0
+          "#{task_group_data[FAILED]} subtask(s) failed for task group #{@href}."
+        end
+      end
+
+      def cancel
+      end
+    end
+  end
+end

data/app/services/katello/smart_proxy_helper.rb

@@ -13,34 +13,31 @@ module Katello
       @smart_proxy.pulp_master?
     end
 
-    def repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
-      ret = []
-      if repository
-        environment = repository.environment
-        ret = [repository]
-      else
-        yum_repos = fetch_repos_available_to_capsule(environment, content_view) || []
-        puppet_envs = fetch_puppet_environments_available_to_capsule(environment, content_view) || []
-        ret = yum_repos + puppet_envs
-      end
+    def lifecycle_environment_check(environment = nil, repository = nil)
+      environment = repository.environment if repository
 
       if environment && !self.smart_proxy.lifecycle_environments.include?(environment)
         fail _("Lifecycle environment '%{environment}' is not attached to this capsule.") % { :environment => environment.name }
       end
-
-      ret
     end
 
-    private
+    def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
+      lifecycle_environment_check(environment, repository)
+      if repository
+        [repository]
+      else
+        repositories_available_to_capsule(environment, content_view) + puppet_environments_available_to_capsule(environment, content_view)
+      end
+    end
 
-    def fetch_repos_available_to_capsule(environments = nil, content_view = nil)
+    def repositories_available_to_capsule(environments, content_view)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
       yum_repos = Katello::Repository.in_environment(environments)
       yum_repos = yum_repos.in_content_views([content_view]) if content_view
-      yum_repos.select(&:node_syncable?)
+      yum_repos.smart_proxy_syncable
     end
 
-    def fetch_puppet_environments_available_to_capsule(environments = nil, content_view = nil)
+    def puppet_environments_available_to_capsule(environments, content_view)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
       puppet_environments = Katello::ContentViewPuppetEnvironment.in_environment(environments)
       puppet_environments = puppet_environments.in_content_view(content_view) if content_view

data/app/views/katello/api/v2/content_view_filters/base.json.rabl

@@ -17,6 +17,10 @@ if @resource.respond_to?(:package_rules)
   attributes :original_packages
 end
 
+if @resource.respond_to?(:module_stream_rules)
+  attributes :original_module_streams
+end
+
 node :rules do |filter|
   if filter.respond_to?(:package_rules)
     filter.package_rules.map do |rule|

data/config/routes/api/rhsm.rb

@@ -21,6 +21,7 @@ Katello::Engine.routes.draw do
       match '/owners/:organization_id/environments' => 'candlepin_proxies#rhsm_index', :via => :get
       match '/owners/:organization_id/pools' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_pools_path
       match '/owners/:organization_id/servicelevels' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_servicelevels_path
+      match '/owners/:organization_id/system_purpose' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_system_purpose_path
       match '/environments/:environment_id/consumers' => 'candlepin_proxies#consumer_create', :via => :post
       match '/consumers/:id' => 'candlepin_proxies#consumer_show', :via => :get
       match '/consumers/:id' => 'candlepin_proxies#regenerate_identity_certificates', :via => :post

data/config/routes/api/v2.rb

@@ -392,6 +392,7 @@ Katello::Engine.routes.draw do
             put :remove_docker_manifests, :action => :remove_content
             put :remove_content
             post :sync
+            post :verify_checksum
             post :export
             post :upload_content
             put :import_uploads
@@ -421,6 +422,7 @@ Katello::Engine.routes.draw do
           collection do
             match '/bulk/destroy' => 'products_bulk_actions#destroy_products', :via => :put
             match '/bulk/sync' => 'products_bulk_actions#sync_products', :via => :put
+            match '/bulk/verify_checksum' => 'products_bulk_actions#verify_checksum_products', :via => :put
             match '/bulk/sync_plan' => 'products_bulk_actions#update_sync_plans', :via => :put
             match '/bulk/http_proxy' => 'products_bulk_actions#update_http_proxy', :via => :put
           end

data/db/migrate/20200709021250_add_original_modules_to_content_view_module_stream_filter.rb

@@ -0,0 +1,5 @@
+class AddOriginalModulesToContentViewModuleStreamFilter < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_content_view_filters, :original_module_streams, :boolean, :default => false, :null => false
+  end
+end

data/db/migrate/20200721142707_remove_duplicate_katello_pools_index.rb

@@ -0,0 +1,5 @@
+class RemoveDuplicateKatelloPoolsIndex < ActiveRecord::Migration[6.0]
+  def change
+    remove_index :katello_pools, name: 'index_pools_on_cp_id'
+  end
+end

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

@@ -10,21 +10,9 @@
 */
 angular.module('Bastion.capsule-content').config(['$stateProvider', '$urlRouterProvider', function ($stateProvider, $urlRouterProvider) {
     //Catch the url to prevent the router to perform redirect.
-    $urlRouterProvider.when('/smart_proxies/:proxyId', ['$match', '$stateParams', function ($match, $stateParams) {
-        $stateParams.pageName = 'smart_proxies/detail';
+    $urlRouterProvider.when('/smart_proxies/:proxyId', [function () {
         return true;
     }]);
-
-    // Add rule to redirect links on the smart proxy detail page.
-    // Changing state doesn't work there since there's no <ui-view> element there
-    $urlRouterProvider.rule(function ($injector, $location) {
-        var $stateParams = $injector.get('$stateParams'),
-            $window = $injector.get('$window');
-
-        if ($stateParams.pageName === 'smart_proxies/detail') {
-            $window.location.href = $location.path();
-        }
-    });
 }]);
 
 /**

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-details.controller.js

@@ -3,19 +3,32 @@
  * @name  Bastion.content-views.controller:FilterDetailsController
  *
  * @requires $scope
+ * @requires $q
+ * @requires translate
+ * @requires Notification
  * @requires Filter
  *
  * @description
  *   Handles fetching a filter.
  */
 angular.module('Bastion.content-views').controller('FilterDetailsController',
-    ['$scope', 'Filter', function ($scope, Filter) {
-
+    ['$scope', '$q', 'translate', 'Notification', 'Filter', function ($scope, $q, translate, Notification, Filter) {
         $scope.filter = Filter.get({'content_view_id': $scope.$stateParams.contentViewId, filterId: $scope.$stateParams.filterId});
 
         $scope.updateFilter = function (filter) {
-            filter.$update();
-        };
+            var deferred = $q.defer();
 
+            filter.$update(function (response) {
+                deferred.resolve(response);
+                Notification.setSuccessMessage(translate('Filter Updated - ' + $scope.filter.name));
+            }, function (response) {
+                deferred.reject(response);
+                angular.forEach(response.data.errors, function (errorMessage) {
+                    Notification.setErrorMessage(translate("An error occurred saving the Filter: ") + errorMessage);
+                });
+            });
+
+            return deferred.promise;
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/module-stream-filter-details.html

@@ -1,4 +1,21 @@
 <div data-extend-template="layouts/partials/table.html">
+  <div data-block="filters">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox"
+               ng-model="filter.original_module_streams"
+               ng-change="updateFilter(filter)"/>
+
+            <span ng-show="filter.inclusion" translate>
+              Include all Module Streams with no errata.
+            </span>
+
+            <span ng-show="!filter.inclusion" translate>
+              Exclude all Module Streams with no errata.
+            </span>
+      </label>
+    </div>
+  </div>
 
   <div data-block="list-actions">
     <button type="button" class="btn btn-primary"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/product-bulk-action.factory.js

@@ -13,6 +13,7 @@ angular.module('Bastion.products').factory('ProductBulkAction',
         return BastionResource('katello/api/v2/products/bulk/:action', {}, {
             removeProducts: {method: 'PUT', params: {action: 'destroy'}},
             syncProducts: {method: 'PUT', params: {action: 'sync'}},
+            verifyChecksumProducts: {method: 'PUT', params: {action: 'verify_checksum'}},
             updateProductSyncPlan: {method: 'PUT', params: {action: 'sync_plan'}},
             updateProductHttpProxy: {method: 'PUT', params: {action: 'http_proxy'}}
         });

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

@@ -70,6 +70,12 @@
             }, errorHandler);
         };
 
+        $scope.verifyChecksum = function (repository) {
+            Repository.verifyChecksum({id: repository.id}, function (task) {
+                $state.go('product.repository.tasks.details', {taskId: task.id});
+            }, errorHandler);
+        };
+
         $scope.republishRepository = function (repository) {
             Repository.republish({id: repository.id}, function (task) {
                 $state.go('product.repository.tasks.details', {taskId: task.id});

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

@@ -32,6 +32,12 @@
           </a>
         </li>
 
+        <li role="menuitem" ng-hide="hideSyncButton(repository, true)" ng-class="{disabled: disableSyncLink()}">
+          <a ng-click="verifyChecksum(repository)" disable-link="disableSyncLink()" translate>
+            Verify Content Checksum
+          </a>
+        </li>
+
         <li role="menuitem" ng-hide="syncInProgress(repository.last_sync) || denied('edit_products', product)">
           <a ng-click="republishRepository(repository)" translate>
             Republish Repository Metadata
@@ -90,4 +96,4 @@
   <div data-block="content">
     <section ui-view></section>
   </div>
-</div>
+</div>