katello 4.0.3 → 4.1.0.rc1

data/app/services/katello/candlepin/message_handler.rb

@@ -2,10 +2,12 @@ module Katello
   module Candlepin
     class MessageHandler
       # Service to handle parsing the messages we receive from candlepin
-      attr_accessor :message
+      attr_reader :subscription_facet, :message, :pool
 
       def initialize(message)
         @message = message
+        @subscription_facet = ::Katello::Host::SubscriptionFacet.find_by_uuid(consumer_uuid) if consumer_uuid
+        @pool = ::Katello::Pool.find_by_cp_id(pool_id) if pool_id
       end
 
       def subject
@@ -20,6 +22,10 @@ module Katello
         @event_data ||= (data = content['eventData']) ? JSON.parse(data) : {}
       end
 
+      def entity_id
+        content['entityId']
+      end
+
       def target_name
         content['targetName']
       end
@@ -51,18 +57,9 @@ module Katello
         end
       end
 
-      def pool
-        Katello::Pool.find_by(:cp_id => pool_id)
-      end
-
-      def subscription_facet
-        return nil if self.consumer_uuid.nil?
-        ::Katello::Host::SubscriptionFacet.where(uuid: self.consumer_uuid).first
-      end
-
       def create_pool_on_host
-        return if self.subscription_facet.nil?
-        old_host_ids = pool.subscription_facets.pluck(:host_id)
+        return if self.subscription_facet.nil? || pool.nil?
+        old_host_ids = subscription_facet_host_ids
         ::Katello::SubscriptionFacetPool.where(subscription_facet_id: self.subscription_facet.id,
                                                pool_id: pool.id).first_or_create
         pool.import_audit_record(old_host_ids)
@@ -70,7 +67,7 @@ module Katello
 
       def remove_pool_from_host
         return if self.subscription_facet.nil? || pool.nil?
-        old_host_ids = pool.subscription_facets.pluck(:host_id)
+        old_host_ids = subscription_facet_host_ids
         ::Katello::SubscriptionFacetPool.where(subscription_facet_id: self.subscription_facet.id,
                                                pool_id: pool.id).destroy_all
         pool.import_audit_record(old_host_ids)
@@ -80,13 +77,19 @@ module Katello
         if pool
           ::Katello::EventQueue.push_event(::Katello::Events::ImportPool::EVENT_TYPE, pool.id)
         else
-          ::Katello::Pool.import_pool(pool_id, index_hosts)
+          begin
+            ::Katello::Pool.import_pool(pool_id, index_hosts)
+          rescue ActiveRecord::RecordInvalid
+            # if we hit this block it's likely that the pool's subscription, product are being created
+            # as a result of manifest import/refresh or custom product creation
+            Rails.logger.warn("Unable to import pool. It will likely be created by another process.")
+          end
         end
       end
 
       def delete_pool
         if Katello::Pool.where(:cp_id => pool_id).destroy_all.any?
-          Rails.logger.info "deleted pool #{pool_id} from Katello"
+          Rails.logger.info "Deleted Katello::Pool with cp_id=#{pool_id}"
         end
       end
 
@@ -119,6 +122,12 @@ module Katello
 
         org.simple_content_access?(cached: false)
       end
+
+      private
+
+      def subscription_facet_host_ids
+        ::Katello::SubscriptionFacetPool.where(pool_id: pool_id).joins(:subscription_facet).pluck(:host_id)
+      end
     end
   end
 end

data/app/services/katello/content_view_manager.rb

@@ -0,0 +1,24 @@
+module Katello
+  class ContentViewManager
+    def self.add_version_to_environment(content_view_version:, environment:)
+      content_view = content_view_version.content_view
+      if (cve = content_view.content_view_environment(environment))
+        content_view_version.content_view_environments << cve
+      else
+        cve = content_view.add_environment(environment, content_view_version)
+      end
+      cve
+    end
+
+    def self.create_candlepin_environment(content_view_environment:)
+      unless content_view_environment.exists_in_candlepin?
+        ::Katello::Resources::Candlepin::Environment.create(
+          content_view_environment.content_view.organization.label,
+          content_view_environment.cp_id,
+          content_view_environment.label,
+          content_view_environment.content_view.description.try(:truncate, 255)
+        )
+      end
+    end
+  end
+end

data/app/services/katello/event_monitor/poller_thread.rb

@@ -51,29 +51,34 @@ module Katello
       end
 
       def run_event(event)
-        @logger.debug("event_queue_event: type=#{event.event_type}, object_id=#{event.object_id}")
+        Katello::Logging.time("katello event handled") do |data|
+          data[:type] = event.event_type
+          data[:object_id] = event.object_id
+          data[:expired] = false
+          data[:rescheduled] = false
 
-        event_instance = nil
-        begin
-          ::User.as_anonymous_admin do
-            event_instance = ::Katello::EventQueue.create_instance(event)
-            event_instance.run
-          end
-        rescue => e
-          @failed_count += 1
-          @logger.error("event_queue_error: type=#{event.event_type}, object_id=#{event.object_id}")
-          @logger.error(e.message)
-          @logger.error(e.backtrace.join("\n"))
-        ensure
-          if event_instance.try(:retry)
-            result = ::Katello::EventQueue.reschedule_event(event)
-            if result == :expired
-              @logger.warn("event_queue_event_expired: type=#{event.event_type} object_id=#{event.object_id}")
-            elsif !result.nil?
-              @logger.warn("event_queue_rescheduled: type=#{event.event_type} object_id=#{event.object_id}")
+          event_instance = nil
+          begin
+            ::User.as_anonymous_admin do
+              event_instance = ::Katello::EventQueue.create_instance(event)
+              event_instance.run
+            end
+          rescue => e
+            @failed_count += 1
+            @logger.error("event_queue_error: type=#{event.event_type}, object_id=#{event.object_id}")
+            @logger.error(e.message)
+            @logger.error(e.backtrace.join("\n"))
+          ensure
+            if event_instance.try(:retry)
+              result = ::Katello::EventQueue.reschedule_event(event)
+              if result == :expired
+                @logger.warn("event_queue_event_expired: type=#{event.event_type} object_id=#{event.object_id}")
+              elsif !result.nil?
+                @logger.warn("event_queue_rescheduled: type=#{event.event_type} object_id=#{event.object_id}")
+              end
             end
+            ::Katello::EventQueue.clear_events(event.event_type, event.object_id, event.created_at)
           end
-          ::Katello::EventQueue.clear_events(event.event_type, event.object_id, event.created_at)
         end
       end
 

data/app/services/katello/managed_content_medium_provider.rb

@@ -30,5 +30,9 @@ module Katello
     def kickstart_repo
       @kickstart_repo ||= entity.try(:content_facet).try(:kickstart_repository) || entity.try(:kickstart_repository)
     end
+
+    def architecture_name
+      kickstart_repo.try(:distribution_arch)
+    end
   end
 end

data/app/services/katello/organization_creator.rb

@@ -0,0 +1,120 @@
+module Katello
+  class OrganizationCreator
+    attr_reader :library_view, :library_environment, :library_cvv, :content_view_environment, :anonymous_provider, :redhat_provider
+
+    def self.seed_all_organizations!
+      User.as_anonymous_admin do
+        Organization.not_created_in_katello.each do |org|
+          self.new(org).seed!
+        end
+      end
+    end
+
+    def self.create_all_organizations!
+      Katello::Ping.ping!(services: [:candlepin])
+
+      User.as_anonymous_admin do
+        Organization.not_created_in_katello.each do |org|
+          creator = self.new(org)
+          creator.create!
+        end
+      end
+    end
+
+    def initialize(organization)
+      @organization = organization
+    end
+
+    def seed!
+      ActiveRecord::Base.transaction do
+        @organization.setup_label_from_name
+        @organization.save!
+
+        create_library_environment
+        create_library_view
+        create_library_cvv
+        create_content_view_environment
+        create_anonymous_provider
+        create_redhat_provider
+      end
+    end
+
+    def create!
+      ActiveRecord::Base.transaction do
+        seed!
+
+        create_backend_objects!
+
+        @organization.created_in_katello = true
+        @organization.save!
+      end
+    end
+
+    def create_backend_objects!
+      Katello::Ping.ping!(services: [:candlepin])
+
+      if needs_candlepin_organization?
+        ::Katello::Resources::Candlepin::Owner.create(@organization.label, @organization.name)
+      end
+
+      ::Katello::ContentViewManager.create_candlepin_environment(
+        content_view_environment: @content_view_environment
+      )
+
+      @organization.debug_cert # trigger creation
+    end
+
+    def needs_candlepin_organization?
+      !@organization.candlepin_owner_exists?
+    end
+
+    private
+
+    def create_content_view_environment
+      @content_view_environment ||= ::Katello::ContentViewManager.add_version_to_environment(
+        content_view_version: @library_cvv,
+        environment: @library_environment
+      )
+    end
+
+    def create_library_environment
+      @library_environment = Katello::KTEnvironment.where(
+        :name => "Library",
+        :label => "Library",
+        :library => true,
+        :organization => @organization
+      ).first_or_create!
+    end
+
+    def create_library_view
+      @library_view = Katello::ContentView.where(
+        default: true,
+        name: 'Default Organization View',
+        organization: @organization
+      ).first_or_create!
+    end
+
+    def create_library_cvv
+      @library_cvv = Katello::ContentViewVersion.where(
+        content_view: @library_view,
+        major: 1
+      ).first_or_create!
+    end
+
+    def create_redhat_provider
+      @redhat_provider = Katello::Provider.where(
+        :name => "Red Hat",
+        :provider_type => Katello::Provider::REDHAT,
+        organization: @organization
+      ).first_or_create!
+    end
+
+    def create_anonymous_provider
+      @anonymous_provider = Katello::Provider.where(
+        :name => Katello::Provider::ANONYMOUS,
+        :provider_type => Katello::Provider::ANONYMOUS,
+        organization: @organization
+      ).first_or_create!
+    end
+  end
+end

data/app/services/katello/product_content_finder.rb

@@ -18,7 +18,7 @@ module Katello
       if match_environment
         environment = consumable.lifecycle_environment
         view = consumable.content_view
-        return [] unless environment && view
+        return ProductContent.none unless environment && view
         version = ContentViewVersion.in_environment(environment).where(:content_view_id => view).first
       end
 
@@ -30,6 +30,10 @@ module Katello
       consumable.organization.enabled_product_content_for(roots)
     end
 
+    def self.wrap_with_overrides(product_contents:, overrides:)
+      product_contents.map { |pc| ProductContentPresenter.new(pc, overrides) }
+    end
+
     def presenter_with_overrides(overrides)
       product_content.map { |pc| ProductContentPresenter.new(pc, overrides) }
     end

data/app/services/katello/pulp/pulp_content_unit.rb

@@ -46,7 +46,7 @@ module Katello
         Katello.pulp_server.extensions.send(self.name.demodulize.underscore)
       end
 
-      def self.pulp_units_batch_all(unit_ids = nil, page_size = SETTINGS[:katello][:pulp][:bulk_load_size])
+      def self.pulp_units_batch_all(unit_ids = nil, page_size = Setting[:bulk_load_size])
         fields = self.const_get(:PULP_INDEXED_FIELDS) if self.constants.include?(:PULP_INDEXED_FIELDS)
         criteria = {:limit => page_size, :skip => 0}
         criteria[:fields] = fields if fields
@@ -58,7 +58,7 @@ module Katello
       end
 
       def self.pulp_units_batch_for_repo(repository, options = {})
-        page_size = options.fetch(:page_size, SETTINGS[:katello][:pulp][:bulk_load_size])
+        page_size = options.fetch(:page_size, Setting[:bulk_load_size])
 
         fields = self.const_get(:PULP_INDEXED_FIELDS) if self.constants.include?(:PULP_INDEXED_FIELDS)
         criteria = {:type_ids => [const_get(:CONTENT_TYPE)], :limit => page_size, :skip => 0}
@@ -69,7 +69,7 @@ module Katello
         end
       end
 
-      def self.pulp_units_batch(criteria, page_size = SETTINGS[:katello][:pulp][:bulk_load_size], &block)
+      def self.pulp_units_batch(criteria, page_size = Setting[:bulk_load_size], &block)
         response = {}
         Enumerator.new do |yielder|
           loop do
@@ -84,7 +84,7 @@ module Katello
       def self.fetch_all
         count = 0
         results = []
-        sub_list = fetch(0, SETTINGS[:katello][:pulp][:bulk_load_size])
+        sub_list = fetch(0, Setting[:bulk_load_size])
 
         until sub_list.empty? #we can't know how many there are, so we have to keep looping until we get nothing
           count += sub_list.count
@@ -95,14 +95,14 @@ module Katello
             results.concat(sub_list)
           end
 
-          sub_list = fetch(count, SETTINGS[:katello][:pulp][:bulk_load_size])
+          sub_list = fetch(count, Setting[:bulk_load_size])
         end
         results
       end
 
       def self.fetch_by_uuids(uuids)
         results = []
-        uuids.each_slice(SETTINGS[:katello][:pulp][:bulk_load_size]) do |sub_list|
+        uuids.each_slice(Setting[:bulk_load_size]) do |sub_list|
           fetched = fetch(0, sub_list.length, sub_list)
           if block_given?
             value = yield(fetched)

data/app/services/katello/pulp/smart_proxy_repository.rb

@@ -17,8 +17,7 @@ module Katello
 
       def current_repositories(environment_id = nil, content_view_id = nil)
         yum_repos = current_yum_repos(environment_id, content_view_id) || []
-        puppet_envs = current_puppet_environments(environment_id, content_view_id) || []
-        yum_repos + puppet_envs
+        yum_repos
       end
 
       def current_yum_repos(environment_id = nil, content_view_id = nil)
@@ -32,22 +31,12 @@ module Katello
         katello_repos.where(:pulp_id => pulp_repo_ids)
       end
 
-      def current_puppet_environments(environment_id = nil, content_view_id = nil)
-        puppet_repos = Katello::ContentViewPuppetEnvironment.all
-        puppet_repos = puppet_repos.where(:environment_id => environment_id) if environment_id
-        puppet_repos = puppet_repos.in_content_view(content_view_id) if content_view_id
-
-        pulp_repos = self.smart_proxy.pulp_api.extensions.repository.search_by_repository_ids(puppet_repos.pluck(:pulp_id))
-
-        puppet_repos.where(:pulp_id => pulp_repos.map { |pulp_repo| pulp_repo['id'] })
-      end
-
       def orphaned_repos
         @smart_proxy.pulp_repositories.map { |x| x["id"] } - repos_available_to_capsule.map { |x| x.pulp_id }
       end
 
       def repos_available_to_capsule
-        yum_repos_available_to_capsule + puppet_environments_available_to_capsule
+        yum_repos_available_to_capsule
       end
 
       def yum_repos_available_to_capsule
@@ -55,10 +44,6 @@ module Katello
         yum_repos.find_all { |repo| repo.node_syncable? }
       end
 
-      def puppet_environments_available_to_capsule
-        Katello::ContentViewPuppetEnvironment.in_environment(@smart_proxy.lifecycle_environments)
-      end
-
       def delete_orphaned_repos
         orphaned_repos.map { |repo| self.smart_proxy.pulp_api.extensions.repository.delete(repo) }.compact
       end

data/app/services/katello/pulp3/api/ansible_collection.rb

@@ -21,11 +21,19 @@ module Katello
         end
 
         def self.repository_sync_url_class
-          PulpAnsibleClient::RepositorySyncURL
+          PulpAnsibleClient::AnsibleRepositorySyncURL
+        end
+
+        def self.copy_class
+          PulpAnsibleClient::Copy
+        end
+
+        def self.add_remove_content_class
+          PulpAnsibleClient::RepositoryAddRemoveContent
         end
 
         def api_client
-          PulpAnsibleClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpAnsibleClient::Configuration))
+          api_client_class(PulpAnsibleClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpAnsibleClient::Configuration)))
         end
 
         def repositories_api
@@ -43,6 +51,10 @@ module Katello
         def distributions_api
           PulpAnsibleClient::DistributionsAnsibleApi.new(api_client)
         end
+
+        def copy_api
+          PulpAnsibleClient::AnsibleCopyApi.new(api_client)
+        end
       end
     end
   end

data/app/services/katello/pulp3/api/apt.rb

@@ -29,7 +29,7 @@ module Katello
         end
 
         def api_client
-          PulpDebClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpDebClient::Configuration))
+          api_client_class(PulpDebClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpDebClient::Configuration)))
         end
 
         def repositories_api

data/app/services/katello/pulp3/api/content_guard.rb

@@ -4,10 +4,6 @@ module Katello
   module Pulp3
     module Api
       class ContentGuard < Core
-        def default_name
-          'RHSMCertGuard'
-        end
-
         def self.client_module
           PulpCertguardClient
         end
@@ -17,56 +13,26 @@ module Katello
         end
 
         def api_client
-          PulpCertguardClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpCertguardClient::Configuration))
+          api_client_class(PulpCertguardClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpCertguardClient::Configuration)))
         end
 
         def rhsm_api_client
           PulpCertguardClient::ContentguardsRhsmApi.new(api_client)
         end
 
-        def ca_cert
-          Cert::Certs.candlepin_client_ca_cert
-        end
-
-        def refresh
-          found = list(name: default_name).results.first
-          if found && found.ca_certificate != ca_cert
-            partial_update(found.pulp_href)
-          else
-            found = create
-          end
-          persist_if_needed(found.pulp_href)
-        end
-
-        def persist_if_needed(href)
-          return if self.smart_proxy.pulp_mirror?
-          Katello::Util::Support.active_record_retry do
-            found = Katello::Pulp3::ContentGuard.find_by(:name => default_name)
-            if found
-              found.update(pulp_href: href)
-            else
-              Katello::Pulp3::ContentGuard.create(name: default_name, pulp_href: href)
-            end
-          end
-        end
-
-        def create(name = default_name)
-          data = PulpCertguardClient::CertguardRHSMCertGuard.new(name: name, ca_certificate: ca_cert)
+        def create(name = "RHSMCertGuard", ca_certificate = Cert::Certs.ca_cert)
+          data = PulpCertguardClient::CertguardRHSMCertGuard.new(name: name, ca_certificate: ca_certificate)
           rhsm_api_client.create(data)
         rescue self.class.api_exception_class => e
-          if (found = list&.results&.first) #check for possible race condition
-            found
-          else
-            raise e
-          end
+          raise e unless list&.results&.first
         end
 
         def list(options = {})
           rhsm_api_client.list options
         end
 
-        def partial_update(href)
-          data = PulpCertguardClient::CertguardRHSMCertGuard.new(ca_certificate: ca_cert)
+        def partial_update(href, ca_certificate = Cert::Certs.ca_cert)
+          data = PulpCertguardClient::CertguardRHSMCertGuard.new(ca_certificate: ca_certificate)
           rhsm_api_client.partial_update(href, data)
         end
 

data/app/services/katello/pulp3/api/core.rb

@@ -58,6 +58,20 @@ module Katello
           fail NotImplementedError
         end
 
+        def self.ignore_409_exception(*)
+          yield
+        rescue => e
+          raise e unless e&.code == 409
+          nil
+        end
+
+        def cancel_task(task_href)
+          data = PulpcoreClient::TaskResponse.new(state: 'canceled')
+          self.class.ignore_409_exception do
+            tasks_api.tasks_cancel(task_href, data)
+          end
+        end
+
         def exporter_api
           PulpcoreClient::ExportersPulpApi.new(core_api_client)
         end
@@ -66,6 +80,10 @@ module Katello
           PulpcoreClient::ImportersPulpApi.new(core_api_client)
         end
 
+        def importer_check_api
+          PulpcoreClient::ImportersCoreImportCheckApi.new(core_api_client)
+        end
+
         def export_api
           PulpcoreClient::ExportersCoreExportsApi.new(core_api_client)
         end
@@ -79,7 +97,14 @@ module Katello
         end
 
         def core_api_client
-          PulpcoreClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpcoreClient::Configuration))
+          client = PulpcoreClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpcoreClient::Configuration))
+          api_client_class(client)
+        end
+
+        def api_client_class(client)
+          request_id = ::Logging.mdc['request']
+          client.default_headers['Correlation-ID'] = request_id if request_id
+          client
         end
 
         def uploads_api
@@ -171,7 +196,7 @@ module Katello
         end
 
         def self.fetch_from_list
-          page_size = SETTINGS[:katello][:pulp][:bulk_load_size]
+          page_size = Setting[:bulk_load_size]
           page_opts = { "offset" => 0, limit: page_size }
           response = {}
 

data/app/services/katello/pulp3/api/docker.rb

@@ -37,7 +37,7 @@ module Katello
         end
 
         def api_client
-          PulpContainerClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpContainerClient::Configuration))
+          api_client_class(PulpContainerClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpContainerClient::Configuration)))
         end
 
         def repositories_api

data/app/services/katello/pulp3/api/file.rb

@@ -28,8 +28,12 @@ module Katello
           PulpFileClient::RepositorySyncURL
         end
 
+        def self.add_remove_content_class
+          PulpFileClient::RepositoryAddRemoveContent
+        end
+
         def api_client
-          PulpFileClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpFileClient::Configuration))
+          api_client_class(PulpFileClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpFileClient::Configuration)))
         end
 
         def repositories_api

data/app/services/katello/pulp3/api/yum.rb

@@ -32,8 +32,16 @@ module Katello
           PulpRpmClient::RpmPackageGroup
         end
 
+        def self.copy_class
+          PulpRpmClient::Copy
+        end
+
+        def self.add_remove_content_class
+          PulpRpmClient::RepositoryAddRemoveContent
+        end
+
         def api_client
-          PulpRpmClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpRpmClient::Configuration))
+          api_client_class(PulpRpmClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpRpmClient::Configuration)))
         end
 
         def repositories_api