katello 3.16.0.rc3.1 → 3.16.0

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/ui_notifications/subscriptions/manifest_expired_warning.rb

@@ -7,14 +7,11 @@ module Katello
         CDN_PATH = '/content/dist/rhel/server/7/listing'.freeze
 
         def self.deliver!(orgs = ::Organization.all)
+          return if Setting[:content_disconnected]
+
           orgs.each do |org|
-            next unless redhat_connected?(org)
-            content = org.contents.find_by(:label => CONTENT_LABEL)
-            product = content&.products&.find { |p| p.key }
-            if content && product && product.pools.any?
-              if got_403? { product.cdn_resource.get(CDN_PATH) }
-                new(org).deliver!
-              end
+            if cdn_inaccessible?(org) || upstream_inaccessible?(org)
+              new(org).deliver!
             end
           end
         rescue StandardError => e
@@ -47,6 +44,14 @@ module Katello
           @blueprint ||= NotificationBlueprint.find_by(name: 'manifest_expired_warning')
         end
 
+        def self.cdn_inaccessible?(org)
+          content = org.contents.find_by(:label => CONTENT_LABEL)
+          product = content&.products&.find { |p| p.key }
+          if content && product && product.pools.any?
+            return got_403? { product.cdn_resource.get(CDN_PATH) }
+          end
+        end
+
         def self.got_403?
           yield
           false
@@ -54,8 +59,15 @@ module Katello
           true
         end
 
+        def self.upstream_inaccessible?(org)
+          return unless org.manifest_imported?
+
+          checker = Katello::UpstreamConnectionChecker.new(org)
+          !checker.can_connect?
+        end
+
         def self.redhat_connected?(org)
-          org.redhat_provider.repository_url.include?(CDN_HOSTNAME) && !Setting[:content_disconnected]
+          org.redhat_provider.repository_url.include?(CDN_HOSTNAME)
         end
       end
     end

data/app/services/katello/upstream_connection_checker.rb

@@ -0,0 +1,48 @@
+module Katello
+  class UpstreamConnectionChecker
+    POSSIBLE_EXCEPTIONS = [
+      Katello::Errors::DisconnectedMode,
+      Katello::Errors::ManifestExpired,
+      Katello::Errors::UpstreamConsumerGone,
+      Katello::Errors::NoManifestImported
+    ].freeze
+
+    def initialize(organization)
+      @organization = organization
+    end
+
+    def can_connect?
+      assert_connection
+    rescue StandardError => e
+      if POSSIBLE_EXCEPTIONS.include?(e.class)
+        false
+      else
+        raise e
+      end
+    end
+
+    def assert_connection
+      assert_connected
+      assert_unexpired_manifest
+      assert_can_upstream_ping
+
+      true
+    end
+
+    private
+
+    def assert_connected
+      fail Katello::Errors::DisconnectedMode if Setting[:content_disconnected]
+    end
+
+    def assert_can_upstream_ping
+      ::Organization.as_org(@organization) do
+        Katello::Resources::Candlepin::UpstreamConsumer.ping
+      end
+    end
+
+    def assert_unexpired_manifest
+      fail Katello::Errors::ManifestExpired if @organization.manifest_expired?
+    end
+  end
+end

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/app/views/katello/api/v2/srpms/backend.json.rabl

@@ -0,0 +1,11 @@
+attributes :description
+attributes :license, :buildhost, :vendor, :relativepath
+attributes :children, :checksumtype, :size, :url, :build_time, :summary, :group, :requires, :provides, :files
+
+node :human_readable_size do |package|
+  number_to_human_size(package.size) if package.size
+end
+
+node :build_time_utc do |package|
+  Time.at(package.build_time).to_datetime if package.build_time
+end

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

@@ -0,0 +1,5 @@
+object @resource
+
+attributes :id, :pulp_id, :name, :filename
+attributes :created_at, :updated, :version, :arch, :release
+attributes :epoch, :checksum, :summary, :nvra

data/app/views/katello/api/v2/srpms/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/srpms/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/srpms/index.json.rabl

@@ -3,5 +3,5 @@ object false
 extends "katello/api/v2/common/metadata"
 
 child @collection[:results] => :results do
-  extends 'katello/api/v2/srpms/show'
+  extends 'katello/api/v2/srpms/base'
 end

data/app/views/katello/api/v2/srpms/show.json.rabl

@@ -1,5 +1,5 @@
 object @resource
 
-attributes :id, :pulp_id, :name, :filename
-attributes :created_at, :updated, :version, :arch, :release
-attributes :epoch, :checksum, :summary, :nvra
+extends "katello/api/v2/srpms/base"
+extends "katello/api/v2/srpms/backend",
+  :object => SmartProxy.pulp_master!.content_service("srpm").new(@resource.pulp_id)

data/config/routes/api/v2.rb

@@ -349,10 +349,12 @@ Katello::Engine.routes.draw do
               put :refresh_manifest
             end
           end
+
           api_resources :upstream_subscriptions, only: [:index, :create] do
             collection do
               delete :destroy
               put :update
+              get :ping
             end
           end
         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/db/seeds.d/109-katello-notification-blueprints.rb

@@ -22,7 +22,7 @@ blueprints = [
   {
     group: N_('Subscriptions'),
     name: 'manifest_expired_warning',
-    message: N_('The manifest imported within Organization %{subject} is no longer valid.  Attempted CDN access returned Forbidden.  Refreshing the manifest may resolve this issue.'),
+    message: N_('The manifest imported within Organization %{subject} is no longer valid. Please import a new manifest.'),
     level: 'warning'
   },
   {

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/errata/errata.routes.js

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.errata').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('errata', {
-        url: '/errata',
+        url: '/errata?repositoryId',
         permission: ['view_products', 'view_content_views'],
         views: {
           '@': {

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -67,4 +67,8 @@
 
 .popover-large {
   max-width: 100%;
+}
+
+.uib-increment, .uib-decrement {
+  text-align: center;
 }

data/lib/katello/engine.rb

@@ -154,7 +154,6 @@ module Katello
 
       # Lib Extensions
       ::Foreman::Renderer::Scope::Variables::Base.include Katello::Concerns::RendererExtensions
-      ::Foreman::Renderer::Scope::Base.include Katello::Concerns::BaseTemplateScopeExtensions
 
       # Model extensions
       ::Environment.include Katello::Concerns::EnvironmentExtensions

data/lib/katello/permission_creator.rb

@@ -367,7 +367,7 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :manage_subscription_allocations,
                          {
-                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update]
+                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping]
                          },
                          :resource_type => 'Katello::Subscription'
     end

data/lib/katello/plugin.rb

@@ -220,6 +220,8 @@ Foreman::Plugin.register :katello do
 
   allowed_template_helpers :subscription_manager_configuration_url, :repository_url
   extend_template_helpers Katello::KatelloUrlsHelper
+  extend_template_helpers Katello::Concerns::BaseTemplateScopeExtensions
+
   register_global_js_file 'fills'
 
   search_path_override("Katello") do |resource|

data/lib/katello/tasks/reports.rake

@@ -0,0 +1,16 @@
+load "#{Rails.root}/lib/tasks/reports.rake"
+
+#define this task since its not in foreman 2.1
+namespace :dynflow do
+  desc <<~END_DESC
+    Sets up the environment to act as a Dynflow client. By acting as a client, it still send tasks to be processed, but it cannot execute tasks.
+  END_DESC
+  task :client do
+    dynflow = ::Rails.application.dynflow
+    dynflow.config.remote = true
+    dynflow.initialize!
+  end
+end
+
+#Katello reports can generate a foreman task, so mark the task as a dynflow client
+["reports:daily", "reports:weekly", "reports:monthly"].each { |task| Rake::Task[task].enhance ["dynflow:client"] }

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.16.0.rc3.1".freeze
+  VERSION = "3.16.0".freeze
 end

data/package.json

@@ -29,8 +29,8 @@
     "@storybook/storybook-deployer": "^2.0.0",
     "@testing-library/jest-dom": "^5.3.0",
     "@testing-library/react": "^10.0.2",
-    "@theforeman/builder": "^4.2.0",
-    "@theforeman/vendor-dev": "^4.2.0",
+    "@theforeman/builder": "4.3.0",
+    "@theforeman/vendor-dev": "4.3.0",
     "axios-mock-adapter": "^1.10.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
@@ -56,8 +56,8 @@
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0"
   },
-  "_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman",
   "dependencies": {
+    "@theforeman/vendor-core": "4.3.0",
     "@patternfly/react-icons": "^3.15.15",
     "@patternfly/react-tokens": "^2.8.13",
     "angular": "1.7.9",