katello 3.18.2 → 3.18.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb532cdaf1e25293105ac236fca987d75fb73d336c9a7c48f6d9d5e196b3eee6
-  data.tar.gz: 71581e670f4b0bd9811aaa529ef8fe515a958e9bd9d7a558b6bbda8aa6efdeba
+  metadata.gz: 9c5ad1aaf8a0bb032cc1ffd42c4c070c77cc538044396af1cd40db8d00132e58
+  data.tar.gz: fd418dbd20507da2ca47e937df543ccf1f5a2c8d254f17623aec03f0d5d2767b
 SHA512:
-  metadata.gz: 0630ee6e3a5e8c5ee653a499611bd1e647b62d6d291619c398cd32af95bdf3ef4e2b3b3097f13d53cfc35313d56e1e1a6cd64db1b040ed7775824bc199bbadc7
-  data.tar.gz: 1c6b2912fd5438dcbbcff04c152f45e2cc003535a3ebc8c84fbca5574b5b2e2ccc32684f9a4e61048f9c6f81432eb882a31faf54aba3b7512b5df3bfede1f37c
+  metadata.gz: b21464bd7f2341093cb31c47a6ee1792d508b8d16f6c9f47db4e8cffb3bc737f02aa1150e50cc05352c668db37eadc5fe708cd0d2705010fbd0072f46b887877
+  data.tar.gz: b67b69add02fae0357308a8301ac689814f2e32d835b5270c421d94cf46f6068b6398cd18cbb7da55913106deac0be816668939c605e7bf20d0a671740039402

data/app/lib/actions/katello/repository/sync.rb

@@ -72,7 +72,11 @@ module Actions
               end
               plan_self(:id => repo.id, :sync_result => output, :skip_metadata_check => skip_metadata_check, :validate_contents => validate_contents,
                         :contents_changed => contents_changed)
-              plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed) if generate_applicability
+
+              if generate_applicability && !SETTINGS[:katello][:katello_applicability]
+                plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed)
+              end
+
               plan_action(Katello::Repository::SyncHook, :id => repo.id)
             end
           end

data/app/lib/katello/util/pulpcore_content_filters.rb

@@ -8,7 +8,7 @@ module Katello
       def filter_package_groups_by_pulp_href(package_groups, package_pulp_hrefs)
         rpms = Katello::Rpm.where(:pulp_id => package_pulp_hrefs)
         package_groups.reject do |package_group|
-          (package_group.package_names & rpms.pluck(:name)).empty?
+          (package_group.package_names - rpms.pluck(:name)).any?
         end
       end
 

data/app/models/katello/host/content_facet.rb

@@ -31,43 +31,21 @@ module Katello
       validates :host, :presence => true, :allow_blank => false
       validates_with Validators::ContentViewEnvironmentValidator
 
-      def bindable_types
-        [
-          {
-            type: Repository::DEB_TYPE,
-            matcher: '/pulp/deb/',
-            paths: []
-          },
-          {
-            type: Repository::YUM_TYPE,
-            matcher: '/pulp/repos/',
-            paths: []
-          }
-        ]
-      end
-
       def update_repositories_by_paths(paths)
-        bindable_paths = bindable_types
+        prefixes = %w(/pulp/deb/ /pulp/repos/ /pulp/content/)
         relative_paths = []
 
-        # paths == ["/pulp/repos/Default_Organization/Library/custom/Test_product/test2",
-        # "/pulp/repos/Default_Organization/Library/custom/Test_product/My_repo"]
-        paths.each do |absolute_path|
-          bindable_paths.each do |supported|
-            relative_path = absolute_path.gsub(supported[:matcher], '') # remove e.g. '/pulp/repos/' from beginning of string
-            relative_paths << relative_path unless relative_path == absolute_path
-            if absolute_path.starts_with?(supported[:matcher])
-              supported[:paths] << relative_path
-              break
-            end
+        # paths == ["/pulp/repos/Default_Organization/Library/custom/Test_product/test2"]
+        paths.each do |path|
+          if (prefix = prefixes.find { |pre| path.start_with?(pre) })
+            relative_paths << path.gsub(prefix, '')
+          else
+            Rails.logger.warn("System #{self.host.name} (#{self.host.id}) requested binding to repo with unknown prefix. #{path}")
           end
         end
 
-        repos = bindable_paths.flat_map do |supported|
-          repos = Repository.joins(:root).where(RootRepository.table_name => {content_type: supported[:type]}, relative_path: supported[:paths])
-          relative_paths -= repos.pluck(:relative_path) # remove relative paths that match our repos
-          repos
-        end
+        repos = Repository.where(relative_path: relative_paths)
+        relative_paths -= repos.pluck(:relative_path) # remove relative paths that match our repos
 
         # Any leftover relative paths do not match the repos we've just retrieved from the db,
         # so we should log warnings about them.

data/app/models/katello/ping.rb

@@ -23,25 +23,18 @@ module Katello
         services
       end
 
-      # Calls "status" services in all backend engines.
       def ping(services: nil, capsule_id: nil)
-        services ||= self.services(capsule_id)
-        result = {}
-        services.each { |service| result[service] = {} }
+        ping_services_for_capsule(services, capsule_id)
+      end
 
-        ping_pulp3_without_auth(result[:pulp3], capsule_id) if result.include?(:pulp3)
-        ping_pulp_without_auth(result[:pulp], capsule_id) if result.include?(:pulp)
-        ping_candlepin_without_auth(result[:candlepin]) if result.include?(:candlepin)
+      def ping!(services: nil, capsule_id: nil)
+        result = ping_services_for_capsule(services, capsule_id)
 
-        ping_pulp_with_auth(result[:pulp_auth], result[:pulp][:status]) if result.include?(:pulp_auth)
-        ping_candlepin_with_auth(result[:candlepin_auth]) if result.include?(:candlepin_auth)
-        ping_foreman_tasks(result[:foreman_tasks]) if result.include?(:foreman_tasks)
-        ping_katello_events(result[:katello_events]) if result.include?(:katello_events)
-        ping_candlepin_events(result[:candlepin_events]) if result.include?(:candlepin_events)
+        if result[:status] != OK_RETURN_CODE
+          failed_names = failed_services(result).keys
+          fail("The following services have not been started or are reporting errors: #{failed_names.join(', ')}")
+        end
 
-        # set overall status result code
-        result = {:services => result}
-        result[:status] = result[:services].each_value.any? { |v| v[:status] == FAIL_RETURN_CODE } ? FAIL_RETURN_CODE : OK_RETURN_CODE
         result
       end
 
@@ -221,6 +214,33 @@ module Katello
 
       private
 
+      def failed_services(result)
+        result[:services].reject do |_name, details|
+          details[:status] != OK_RETURN_CODE
+        end
+      end
+
+      def ping_services_for_capsule(services, capsule_id)
+        services ||= self.services(capsule_id)
+        result = {}
+        services.each { |service| result[service] = {} }
+
+        ping_pulp3_without_auth(result[:pulp3], capsule_id) if result.include?(:pulp3)
+        ping_pulp_without_auth(result[:pulp], capsule_id) if result.include?(:pulp)
+        ping_candlepin_without_auth(result[:candlepin]) if result.include?(:candlepin)
+
+        ping_pulp_with_auth(result[:pulp_auth], result[:pulp][:status]) if result.include?(:pulp_auth)
+        ping_candlepin_with_auth(result[:candlepin_auth]) if result.include?(:candlepin_auth)
+        ping_foreman_tasks(result[:foreman_tasks]) if result.include?(:foreman_tasks)
+        ping_katello_events(result[:katello_events]) if result.include?(:katello_events)
+        ping_candlepin_events(result[:candlepin_events]) if result.include?(:candlepin_events)
+
+        # set overall status result code
+        result = {:services => result}
+        result[:status] = result[:services].each_value.any? { |v| v[:status] == FAIL_RETURN_CODE } ? FAIL_RETURN_CODE : OK_RETURN_CODE
+        result
+      end
+
       def fetch_proxy(capsule_id)
         capsule_id ? SmartProxy.unscoped.find(capsule_id) : SmartProxy.pulp_primary
       end

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

@@ -111,6 +111,8 @@ module Katello
         content_types.each do |content_type|
           if Migration::CORRUPTABLE_CONTENT_TYPES.include?(content_type.model_class)
             content_type.model_class.ignored_missing_migrated_content.destroy_all
+          elsif content_type.model_class == Katello::Erratum
+            Katello::RepositoryErratum.where(:erratum_pulp3_href => nil).delete_all
           else
             content_type.model_class.unmigrated_content.destroy_all
           end

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

@@ -111,6 +111,10 @@ module Katello
         backend_data['rpm_license']
       end
 
+      def parse_filename(path)
+        File.split(path).last unless path.blank?
+      end
+
       def update_model(model)
         custom_json = {}
         custom_json['modular'] = backend_data['is_modular']
@@ -119,7 +123,7 @@ module Katello
           each { |field| custom_json[field] = backend_data[field] }
         custom_json['release_sortable'] = Util::Package.sortable_version(backend_data['release'])
         custom_json['version_sortable'] = Util::Package.sortable_version(backend_data['version'])
-        custom_json['filename'] = backend_data['location_href']
+        custom_json['filename'] = parse_filename(backend_data['location_href']) #location_href is the relative path of the rpm in the upstream repo
         custom_json['checksum'] = backend_data['pkgId']
         custom_json['sourcerpm'] = backend_data['rpm_sourcerpm']
         model.assign_attributes(custom_json)

data/lib/katello/tasks/pulp3_migration.rake

@@ -1,6 +1,9 @@
 namespace :katello do
   desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
-  task :pulp3_migration => ["dynflow:client", "check_ping"] do
+  task :pulp3_migration => ["dynflow:client"] do
+    services = [:candlepin, :foreman_tasks, :pulp3, :pulp, :pulp_auth]
+    Katello::Ping.ping!(services: services)
+
     puts "Starting task."
     SmartProxy.pulp_primary.refresh
 
@@ -8,6 +11,7 @@ namespace :katello do
     wait = ::Foreman::Cast.to_bool(ENV['wait'] || 'true')
     preserve_output = ::Foreman::Cast.to_bool(ENV['preserve_output'])
 
+    User.current = User.anonymous_api_admin
     task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, SmartProxy.pulp_primary, reimport_all: reimport_all)
 
     if wait

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.18.2".freeze
+  VERSION = "3.18.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.18.2
+  version: 3.18.2.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails