katello 3.16.0.rc5 → 3.16.0.rc5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0972a0ce2e400210de115168dd9b0119d5d738eacc73f4854406df2abf853e5
-  data.tar.gz: 102cafbfe169374c46933f8a11487ba06d36c029b08fb88cb2857bd9cc0faa59
+  metadata.gz: 9c713303404ad8912ded54dd3d110d6ef3f8e1ed9500f55abf1f31f2180d08a2
+  data.tar.gz: 07eb7edbe97e87b35d0ebd26eb90c0da64a8eddb69d4435333a546eaa82d298b
 SHA512:
-  metadata.gz: 2ffe9b0201453156e10c992b0363feba8079d47b7be06e263b7f9fb9ae333569684532712a7eafe60ea0ae790ee7e512128a0b39051c6c07c5af11c3bb37ad3e
-  data.tar.gz: d30abd4cef90402f90122b412451c5dbdafc11da644363e176623f8f37d6f27e5774783c31cd1b6dd9791f208f8177913eae86fc3b4b087de725bb4501c8828f
+  metadata.gz: 67508f99358a420af1f1fbdb332e427bec5ee59092c69f05790029be0d14b624f6306dc351c550f02671819add178da8ae92938aeb2f66a262bebbd287cbad66
+  data.tar.gz: 5267fc924abe8504b4688481792f964adab5b530f2110e3bb8954717fef6a6d691635f0c64d9f2a56b7bf311620df1b5cde767e9e9d2894ad454d134552f9425

data/app/controllers/katello/api/v2/content_view_filters_controller.rb

@@ -37,6 +37,8 @@ module Katello
     param :type, String, :desc => N_("type of filter (e.g. rpm, package_group, erratum, docker, modulemd)"), :required => true
     param :original_packages, :bool, :desc => N_("add all packages without errata to the included/excluded list. " \
                                                        "(package filter only)")
+    param :original_module_streams, :bool, :desc => N_("add all module streams without errata to the included/excluded list. " \
+                                                       "(module stream filter only)")
     param :inclusion, :bool, :desc => N_("specifies if content should be included or excluded, default: inclusion=false")
     param :repository_ids, Array, :desc => N_("list of repository ids")
     param :description, String, :desc => N_("description of the filter")
@@ -60,6 +62,8 @@ module Katello
     param :name, String, :desc => N_("new name for the filter")
     param :original_packages, :bool, :desc => N_("add all packages without errata to the included/excluded list. " \
                                                        "(package filter only)")
+    param :original_module_streams, :bool, :desc => N_("add all module streams without errata to the included/excluded list. " \
+                                                       "(module stream filter only)")
     param :inclusion, :bool, :desc => N_("specifies if content should be included or excluded, default: inclusion=false")
     param :repository_ids, Array, :desc => N_("list of repository ids")
     param :description, String, :desc => N_("description of the filter"), :required => false
@@ -95,7 +99,7 @@ module Katello
     end
 
     def filter_params
-      params.require(:content_view_filter).permit(:name, :inclusion, :original_packages, :description, :repository_ids => [])
+      params.require(:content_view_filter).permit(:name, :inclusion, :original_packages, :original_module_streams, :description, :repository_ids => [])
     end
   end
 end

data/app/lib/actions/katello/host/attach_subscriptions.rb

@@ -8,12 +8,16 @@ module Actions
 
         def plan(host, pools_with_quantities_params)
           action_subject(host)
+
+          subscription_facet = host.subscription_facet
+          fail _("Register host '%s' before attaching subscriptions") % host.name unless subscription_facet
+
           sequence do
             pool_ids = []
             pools_with_quantities = pools_with_quantities_params.map do |pool_with_quantity|
               ::Katello::PoolWithQuantities.fetch(pool_with_quantity)
             end
-            existing_pool_ids = host.subscription_facet.candlepin_consumer.pool_ids
+            existing_pool_ids = subscription_facet.candlepin_consumer.pool_ids
             pools_with_quantities.each do |pool_with_quantities|
               unless existing_pool_ids.include?(pool_with_quantities.pool.cp_id.to_s)
                 pool_ids << pool_with_quantities.pool.id

data/app/lib/actions/katello/sync_plan/run.rb

@@ -19,7 +19,7 @@ module Actions
             syncable_products = sync_plan.products.syncable
             syncable_roots = ::Katello::RootRepository.where(:product_id => syncable_products).has_url
 
-            plan_action(::Actions::BulkAction, ::Actions::Katello::Repository::Sync, syncable_roots.map(&:library_instance)) unless syncable_roots.empty?
+            plan_action(::Actions::BulkAction, ::Actions::Katello::Repository::Sync, syncable_roots.map(&:library_instance).compact) unless syncable_roots.empty?
             plan_self(:sync_plan_name => sync_plan.name)
           end
         end

data/app/lib/actions/pulp3/repository/presenters/content_unit_presenter.rb

@@ -12,7 +12,7 @@ module Actions
           def humanized_details
             ret = []
             ret << _("Cancelled.") if cancelled?
-            ret << _("Total tasks: ") + ": #{finished_units}/#{total_units}"
+            ret << _("Total steps: ") + "#{finished_units}/#{total_units}"
             ret << "--------------------------------"
             progress_reports = sync_task.try(:[], 'progress_reports') || []
             progress_reports = progress_reports.sort_by { |pr| pr.try(:[], 'message') }

data/app/models/katello/content_view_filter.rb

@@ -182,6 +182,10 @@ module Katello
       fail "setting original_packages not supported for #{self.class.name}"
     end
 
+    def original_module_streams=(_include_original)
+      fail "setting original_module_streams not supported for #{self.class.name}"
+    end
+
     protected
 
     def validate_repos

data/app/models/katello/content_view_module_stream_filter.rb

@@ -6,9 +6,17 @@ module Katello
 
     validates_lengths_from_database
 
-    def generate_clauses(_repo)
-      return if module_stream_rules.blank?
-      module_stream_rules.map(&:module_stream_id)
+    def generate_clauses(repo)
+      rules = module_stream_rules || []
+      ids = rules.map(&:module_stream_id)
+      if self.original_module_streams
+        ids.concat(repo.module_streams_without_errata.map(&:id))
+      end
+      ids
+    end
+
+    def original_module_streams=(value)
+      self[:original_module_streams] = value
     end
   end
 end

data/app/models/katello/repository.rb

@@ -469,6 +469,17 @@ module Katello
       end
     end
 
+    def module_streams_without_errata
+      module_stream_errata = Katello::ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata})
+                              .where("#{RepositoryErratum.table_name}.repository_id" => self.id)
+                              .pluck("#{Katello::ModuleStreamErratumPackage.table_name}.module_stream_id")
+      if module_stream_errata.any?
+        self.module_streams.where("#{ModuleStream.table_name}.id NOT in (?)", module_stream_errata)
+      else
+        self.module_streams
+      end
+    end
+
     def self.with_errata(errata)
       joins(:repository_errata).where("#{Katello::RepositoryErratum.table_name}.erratum_id" => errata)
     end

data/app/presenters/katello/sync_status_presenter.rb

@@ -19,6 +19,8 @@ module Katello
     def sync_progress
       return {:state => nil} unless @repo
       return empty_task(@repo) unless @task
+      display_output = @task.humanized[:output]
+      display_output = display_output.split("\n")[0] if (display_output && @repo.version_href)
       {
         :id => @repo.id,
         :product_id => @repo.product.id,
@@ -29,8 +31,8 @@ module Katello
         :start_time => format_date(@task.started_at),
         :finish_time => format_date(@task.ended_at),
         :duration => format_duration(@task.ended_at, @task.started_at),
-        :display_size => @task.humanized[:output],
-        :size => @task.humanized[:output],
+        :display_size => display_output,
+        :size => display_output,
         :is_running => @task.pending && @task.state != 'paused',
         :error_details => @task.errors
       }

data/app/services/katello/pulp/repository/yum.rb

@@ -246,7 +246,8 @@ module Katello
             remove = clause_gen.remove_clause
             remove_clauses = {filters: {unit: remove}} if remove
           else
-            copy_clauses = {}
+            non_modular_rpms = ::Katello::Rpm.in_repositories(repo).non_modular.pluck(:filename)
+            copy_clauses = non_modular_rpms.blank? ? nil : {filters: {unit: ContentViewPackageFilter.generate_rpm_clauses(non_modular_rpms)}}
             remove_clauses = nil
           end
 

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

@@ -35,11 +35,15 @@ module Katello
       end
 
       def pulp2_content_api
-        Pulp2to3MigrationClient::Pulp2contentApi.new(api_client)
+        Pulp2to3MigrationClient::Pulp2ContentApi.new(api_client)
+      rescue NameError
+        Pulp2to3MigrationClient::Pulp2contentApi.new(api_client) #backwards compatible
       end
 
       def pulp2_repositories_api
-        Pulp2to3MigrationClient::Pulp2repositoriesApi.new(api_client)
+        Pulp2to3MigrationClient::Pulp2RepositoriesApi.new(api_client)
+      rescue NameError
+        Pulp2to3MigrationClient::Pulp2repositoriesApi.new(api_client) #backwards compatible
       end
 
       def create_and_run_migrations

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/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/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.rc5".freeze
+  VERSION = "3.16.0.rc5.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.16.0.rc5
+  version: 3.16.0.rc5.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -261,7 +261,7 @@ dependencies:
         version: '0.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.2.0b15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -271,7 +271,7 @@ dependencies:
         version: '0.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.2.0b15
 - !ruby/object:Gem::Dependency
   name: pulp_container_client
   requirement: !ruby/object:Gem::Requirement
@@ -1988,6 +1988,8 @@ files:
 - db/migrate/20200506163345_add_applicability_indicesto_katello_host_available_module_streams.rb
 - db/migrate/20200511204005_create_katello_host_queue_elements.rb
 - db/migrate/20200526200422_encrypt_root_repository_upstream_password.rb
+- db/migrate/20200709021250_add_original_modules_to_content_view_module_stream_filter.rb
+- db/migrate/20200721142707_remove_duplicate_katello_pools_index.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4342,6 +4344,7 @@ files:
 - lib/katello/tasks/receptor/extract_orgs.rake
 - lib/katello/tasks/regenerate_ueber_certs.rake
 - lib/katello/tasks/reimport.rake
+- lib/katello/tasks/reports.rake
 - lib/katello/tasks/repository.rake
 - lib/katello/tasks/reset.rake
 - lib/katello/tasks/rubocop.rake