katello 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86442b066cfb028bec4edcd99bc079e29675037545b33af48336a8e176ffc43d
-  data.tar.gz: 9cbab83302f8791feafc1912bc7c81ea31d4d08169d1f554cfc1361f995941e2
+  metadata.gz: 3cdba19f418c59dd75998081c306267defc02548958e1c48b38db4db29f2c633
+  data.tar.gz: 96f3ff300309604144e935295d3d8f859f757a694cde91768f773a63dfde1106
 SHA512:
-  metadata.gz: e4c1529274b2d229ac784ccdad9f3c9b90b67f92df7eca9d8228e79e675bbcfb9766c33b4af3bbad3b87524c4cee1cdb13e607cd9a39f5d3aa5d865d032bee02
-  data.tar.gz: 62a2813d45436694cce0f721d26d0ec2782f112e9154cfa051ed650b4aa2d86dd4624708a835f03adca3b65280ccbabccfa3d83d506224e8616eeedb6d8aec4c
+  metadata.gz: e793a484c717492274ee01345a14ccefb4ddad648a0db9b3615232a9b329f8681c1208ccabc21e382d7343bd5a812703db1a9840f59fe895bce42637a125c67f
+  data.tar.gz: f9a960acb16529071412b353e79c392cb0c79d8cb4f5f001d67b8ddc64056c80d8e9fd51ead49fce0d8f04918063ee95f31856608ddcef013eb22a70cb827f20

data/app/lib/actions/katello/capsule_content/refresh_repos.rb

@@ -40,7 +40,7 @@ module Actions
             pulp_repo = repo.backend_service(smart_proxy)
             if !current_repos_on_capsule_ids.include?(repo.id)
               pulp_repo.create_mirror_entities
-            elsif pulp_repo.mirror_needs_updates?
+            else
               tasks += pulp_repo.refresh_mirror_entities
             end
           end

data/app/lib/actions/katello/capsule_content/sync_capsule.rb

@@ -4,7 +4,7 @@ module Actions
       class SyncCapsule < ::Actions::EntryAction
         include Actions::Katello::PulpSelector
         def plan(smart_proxy, options = {})
-          plan_self(:smart_proxy_id => smart_proxy.id, :options => options)
+          plan_self(:smart_proxy_id => smart_proxy.id)
           action_subject(smart_proxy)
           environment = options[:environment]
           content_view = options[:content_view]

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

@@ -13,7 +13,7 @@ module Actions
             unit_type_id = SmartProxy.pulp_primary.content_service(content_type)::CONTENT_TYPE
           end
           generate_metadata = options.fetch(:generate_metadata, true)
-          plan_action(Katello::Repository::MetadataGenerate, repository, :dependency => import_upload_task) if generate_metadata
+          plan_action(Katello::Repository::MetadataGenerate, repository, :dependency => import_upload_task, :force_publication => true) if generate_metadata
 
           recent_range = 5.minutes.ago.utc.iso8601
           plan_action(Katello::Repository::FilteredIndexContent,

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

@@ -41,7 +41,7 @@ module Actions
                 import_upload.output
               end
             end
-            plan_action(Katello::Repository::MetadataGenerate, repository) if generate_metadata
+            plan_action(Katello::Repository::MetadataGenerate, repository, force_publication: true) if generate_metadata
             plan_action(Actions::Katello::Applicability::Repository::Regenerate, :repo_ids => [repository.id]) if generate_applicability
             plan_self(repository_id: repository.id, sync_capsule: sync_capsule, upload_results: upload_results)
           end

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

@@ -7,9 +7,11 @@ module Actions
           source_repository ||= repository.target_repository if repository.link?
           smart_proxy = options.fetch(:smart_proxy, SmartProxy.pulp_primary)
           matching_content = options.fetch(:matching_content, false)
+          force_publication = options.fetch(:force_publication, false)
 
           plan_action(Pulp3::Orchestration::Repository::GenerateMetadata,
                         repository, smart_proxy,
+                        :force_publication => force_publication,
                         :source_repository => source_repository,
                         :matching_content => matching_content)
         end

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

@@ -42,7 +42,7 @@ module Actions
 
         def create_sub_plans
           trigger(Actions::Katello::Repository::MetadataGenerate,
-                  ::Katello::Repository.find(input[:repository][:id]))
+                  ::Katello::Repository.find(input[:repository][:id]), :force_publication => true)
         end
 
         def resource_locks

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

@@ -18,7 +18,6 @@ module Actions
         #   of Katello and we just need to finish the rest of the orchestration
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         def plan(repo, options = {})
           action_subject(repo)
 
@@ -54,7 +53,6 @@ module Actions
               plan_action(Katello::Repository::FetchPxeFiles, :id => repo.id)
               plan_action(Katello::Repository::CorrectChecksum, repo)
               concurrence do
-                plan_action(Katello::Repository::MetadataGenerate, repo, :force => true) if skip_metadata_check && repo.yum?
                 plan_action(Katello::Repository::ErrataMail, repo, nil, contents_changed)
                 plan_action(Actions::Katello::Applicability::Repository::Regenerate, :repo_ids => [repo.id]) if generate_applicability
               end

data/app/lib/actions/pulp3/capsule_content/generate_metadata.rb

@@ -6,30 +6,26 @@ module Actions
         def plan(repository, smart_proxy, options = {})
           options[:contents_changed] = (options && options.key?(:contents_changed)) ? options[:contents_changed] : true
           sequence do
-            if !::Katello::RepositoryTypeManager.find(repository.content_type).pulp3_skip_publication
-              action_output = plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id,
-                                 :options => options).output
-              plan_action(RefreshDistribution, repository, smart_proxy,
-                            :tasks => action_output,
-                            :use_repository_version => false,
-                            :contents_changed => options[:contents_changed])
-            else
-              plan_action(RefreshDistribution, repository, smart_proxy,
-                            :use_repository_version => true,
-                            :contents_changed => options[:contents_changed])
+            unless repository.repository_type.pulp3_skip_publication
+              plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id,
+                         :options => options).output
             end
+            plan_action(RefreshDistribution, repository, smart_proxy,
+                          :contents_changed => options[:contents_changed])
           end
         end
 
         def invoke_external_task
-          if input[:options][:sync_task_output] &&
-              ::Katello::Pulp3::Task.publication_href(input[:options][:sync_task_output]).present?
-            return input[:options][:sync_task_output]
-          end
-
           repository = ::Katello::Repository.find(input[:repository_id])
-          smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
-          output[:response] = repository.backend_service(smart_proxy).with_mirror_adapter.create_publication
+          backend = repository.backend_service(smart_proxy).with_mirror_adapter
+          #yum repositories use metadata mirroring always, so we should never
+          # regenerate metadata on proxies.  but if there is no publication,
+          # it means the repo was likely empty and syncing didn't generate one
+          if repository.yum? && backend.publication_href.present?
+            []
+          else
+            backend.create_publication
+          end
         end
       end
     end

data/app/lib/actions/pulp3/capsule_content/refresh_distribution.rb

@@ -13,18 +13,8 @@ module Actions
 
         def invoke_external_task
           smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
-          options = input[:options]
-          tasks = options[:tasks]
           repo = ::Katello::Repository.find(input[:repository_id])
-          if options[:use_repository_version]
-            repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:use_repository_version => true)
-          elsif tasks && tasks[:pulp_tasks] && tasks[:pulp_tasks].first
-            if (publication_href = ::Katello::Pulp3::Task.publication_href(tasks[:pulp_tasks]))
-              repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions(:publication => publication_href)
-            else
-              fail "Unable to refresh distribution for repo #{repository.id}, could not find a publication_href"
-            end
-          end
+          repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions
         end
       end
     end

data/app/lib/actions/pulp3/orchestration/repository/generate_metadata.rb

@@ -4,13 +4,15 @@ module Actions
       module Repository
         class GenerateMetadata < Pulp3::Abstract
           def plan(repository, smart_proxy, options = {})
+            force_publication = options.fetch(:force_publication, repository.publication_href.nil?)
+
             options[:contents_changed] = (options && options.key?(:contents_changed)) ? options[:contents_changed] : true
             publication_content_type = !::Katello::RepositoryTypeManager.find(repository.content_type).pulp3_skip_publication
 
             sequence do
               if options[:source_repository] && publication_content_type
                 plan_self(source_repository_id: options[:source_repository].id, target_repository_id: repository.id, smart_proxy_id: smart_proxy.id)
-              elsif publication_content_type
+              elsif publication_content_type && (force_publication || repository.publication_href.nil? || !repository.using_mirrored_metadata?)
                 plan_action(Actions::Pulp3::Repository::CreatePublication, repository, smart_proxy, options)
               end
               plan_action(Actions::Pulp3::ContentGuard::Refresh, smart_proxy) unless repository.unprotected

data/app/lib/actions/pulp3/orchestration/repository/sync.rb

@@ -11,7 +11,14 @@ module Actions
 
               force_fetch_version = true if options[:optimize] == false
               version_output = plan_action(Pulp3::Repository::SaveVersion, repository, tasks: action_output[:pulp_tasks], :force_fetch_version => force_fetch_version).output
-              plan_action(Pulp3::Orchestration::Repository::GenerateMetadata, repository, smart_proxy, :contents_changed => version_output[:contents_changed], :skip_publication_creation => version_output[:publication_provided])
+
+              #force contents_changed to true if we're doing a 'force' sync
+              if options[:optimize] == false
+                contents_changed = true
+              else
+                contents_changed = version_output[:contents_changed]
+              end
+              plan_action(Pulp3::Orchestration::Repository::GenerateMetadata, repository, smart_proxy, :contents_changed => contents_changed, :skip_publication_creation => version_output[:publication_provided])
               plan_self(:subaction_output => version_output)
             end
           end

data/app/lib/katello/resources/registry.rb

@@ -32,7 +32,7 @@ module Katello
             self.prefix = "/pulpcore_registry/"
             self.site = "#{uri.scheme}://#{uri.host}:#{uri.port}"
             self.ca_cert_file = Setting[:ssl_ca_file]
-            pulp_primary.pulp3_ssl_configuration(self)
+            pulp_primary.pulp3_ssl_configuration(self, :net_http)
 
             self
           end

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -108,7 +108,7 @@ module Katello
         self.host_statuses.where(type: ::Katello::HostStatusManager::STATUSES.map(&:name)).each do |status|
           status.refresh!
         end
-        refresh_global_status!
+        refresh_global_status
       end
 
       def queue_refresh_content_host_status

data/app/models/katello/concerns/pulp_database_unit.rb

@@ -190,7 +190,7 @@ module Katello
                 service.update_model(model, repository.repository_type, generic_content_type)
               elsif self == ::Katello::Erratum
                 # Errata will change pulp_hrefs if the upstream repo updates them
-                erratum_updated_ids << service.update_model(model)
+                erratum_updated_ids << service.update_model(model, repository)
               else
                 service.update_model(model)
               end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -184,17 +184,17 @@ module Katello
         end
       end
 
-      def pulp3_ssl_configuration(config)
-        legacy_pulp_cert = !self.setting(PULP3_FEATURE, 'client_authentication')&.include?('client_certificates')
+      def pulp3_ssl_configuration(config, connection_adapter = Faraday.default_adapter)
+        legacy_pulp_cert = !self.setting(PULP3_FEATURE, 'client_authentication')&.include?('client_certificate')
 
-        if Faraday.default_adapter == :excon
+        if connection_adapter == :excon
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename(use_admin_as_cn_cert: legacy_pulp_cert)
           config.ssl_client_key = ::Cert::Certs.ssl_client_key_filename(use_admin_as_cn_cert: legacy_pulp_cert)
-        elsif Faraday.default_adapter == :net_http
+        elsif connection_adapter == :net_http
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert(use_admin_as_cn_cert: legacy_pulp_cert)
           config.ssl_client_key = ::Cert::Certs.ssl_client_key(use_admin_as_cn_cert: legacy_pulp_cert)
         else
-          fail "Unexpected faraday default_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
+          fail "Unexpected connection_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
         end
       end
 

data/app/models/katello/ping.rb

@@ -195,10 +195,7 @@ module Katello
         end
 
         workers = json["online_workers"] || []
-
-        unless workers.count > 1
-          fail _("Not all necessary pulp workers running at %s.") % url
-        end
+        fail _("No pulpcore workers are running at %s.") % url if workers.empty?
 
         json
       end

data/app/models/katello/repository.rb

@@ -289,6 +289,10 @@ module Katello
       ::Katello::Resources::CDN::CdnResource.ca_file if ::Katello::Resources::CDN::CdnResource.redhat_cdn?(url)
     end
 
+    def using_mirrored_metadata?
+      self.yum? && self.library_instance? && self.mirror_on_sync
+    end
+
     def archive?
       self.environment.nil?
     end

data/app/services/katello/organization_creator.rb

@@ -16,7 +16,7 @@ module Katello
       User.as_anonymous_admin do
         Organization.not_created_in_katello.each do |org|
           creator = self.new(org)
-          creator.create!
+          creator.create!(raise_validation_errors: false)
         end
       end
     end
@@ -28,7 +28,9 @@ module Katello
     def seed!
       ActiveRecord::Base.transaction do
         @organization.setup_label_from_name
-        @organization.save!
+
+        # existing validation errors are not resolvable here, so don't validatate
+        @organization.save(validate: false)
 
         create_library_environment
         create_library_view
@@ -39,14 +41,19 @@ module Katello
       end
     end
 
-    def create!
+    def create!(raise_validation_errors: true)
       ActiveRecord::Base.transaction do
         seed!
 
         create_backend_objects!
 
         @organization.created_in_katello = true
-        @organization.save!
+
+        begin
+          @organization.save!
+        rescue => e
+          raise e if raise_validation_errors
+        end
       end
     end
 

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

@@ -26,7 +26,7 @@ module Katello
       end
 
       # rubocop:disable Metrics/AbcSize
-      def update_model(model)
+      def update_model(model, repository = nil)
         updated = false
         keys = %w(title id severity issued_date type description reboot_suggested solution updated_date summary)
         custom_json = backend_data.slice(*keys)
@@ -55,6 +55,14 @@ module Katello
         update_packages(model, backend_data['pkglist']) unless backend_data['pkglist'].blank?
         update_modules(model, backend_data['pkglist']) unless backend_data['pkglist'].blank?
 
+        if !updated && repository.present?
+          backend_identifier = backend_data.dig(self.class.backend_unit_identifier)
+          if Katello::RepositoryErratum.where(repository_id: repository.id, erratum_id: model.id).where.not(erratum_pulp3_href: backend_identifier).any?
+            # Pulp has created a new record for this erratum because it has been updated so we need to update repo association too
+            updated = true
+          end
+        end
+
         return model.id if updated
       end
       # rubocop:enable Metrics/AbcSize

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

@@ -163,10 +163,6 @@ module Katello
         RepositoryMirror.new(self).refresh_entities
       end
 
-      def mirror_needs_updates?
-        RepositoryMirror.new(self).needs_updates?
-      end
-
       def refresh_if_needed
         tasks = []
         tasks << update_remote #always update remote

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

@@ -74,6 +74,10 @@ module Katello
         fetch_repository.latest_version_href
       end
 
+      def publication_href
+        api.publications_api.list(:repository_version => version_href).results.first&.pulp_href
+      end
+
       def create_version(options = {})
         api.repository_versions_api.create(repository_href, options)
       end
@@ -158,11 +162,17 @@ module Katello
         end
       end
 
-      def refresh_distributions(options = {})
+      def refresh_distributions(_options = {})
         path = repo_service.relative_path
         dist_params = {}
-        dist_params[:publication] = options[:publication] if options[:publication]
-        dist_params[:repository_version] = version_href if options[:use_repository_version]
+        if repo_service.repo.repository_type.pulp3_skip_publication
+          dist_params[:repository_version] = version_href
+          fail "could not lookup a version_href for repo #{repo_service.repo.id}" if version_href.nil?
+        else
+          dist_params[:publication] = publication_href
+          fail "Could not lookup a publication_href for repo #{repo_service.repo.id}" if publication_href.nil?
+        end
+
         dist_options = distribution_options(path, dist_params)
         dist_options.delete(:content_guard) if repo_service.repo.content_type == "docker"
         if (distro = repo_service.lookup_distributions(base_path: path).first) ||

data/db/migrate/20210331180353_katello_pool_organization_id_not_nullable.rb

@@ -1,6 +1,8 @@
 class KatelloPoolOrganizationIdNotNullable < ActiveRecord::Migration[6.0]
   def up
     ::Katello::Pool.where(organization_id: nil).destroy_all
+    ::Katello::Pool.where(subscription_id: nil).destroy_all
+
     change_column :katello_pools, :organization_id, :integer, null: false
     change_column :katello_pools, :subscription_id, :integer, null: false
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.2.1".freeze
+  VERSION = "4.2.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails