katello 3.14.1 → 3.15.0.rc1

data/app/models/katello/content_view_version.rb

@@ -62,6 +62,7 @@ module Katello
 
     scoped_search :on => :content_view_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :major, :rename => :version, :complete_value => true, :ext_method => :find_by_version
+    serialize :content_counts
 
     def self.find_by_version(_key, operator, value)
       conditions = ""
@@ -160,7 +161,7 @@ module Katello
     end
 
     def promote_puppet_environment?
-      puppet_module_count > 0 || self.content_view.force_puppet_environment?
+      (!content_counts.blank? && content_counts.dig(PuppetModule::CONTENT_TYPE) > 0) || self.content_view.force_puppet_environment?
     end
 
     def archived_repos
@@ -257,50 +258,10 @@ module Katello
       Katello::Srpm.in_repositories(self.repositories)
     end
 
-    def srpm_count
-      Katello::Srpm.in_repositories(self.repositories.archived).count
-    end
-
-    def puppet_module_count
-      puppet_modules.count
-    end
-
-    def package_count
-      Katello::Rpm.in_repositories(self.repositories.archived).count
-    end
-
     def module_streams
       ModuleStream.in_repositories(archived_repos)
     end
 
-    def module_stream_count
-      Katello::ModuleStream.in_repositories(self.repositories.archived).count
-    end
-
-    def file_count
-      Katello::FileUnit.in_repositories(self.repositories.archived).count
-    end
-
-    def ostree_branch_count
-      ostree_branches.count
-    end
-
-    def docker_manifest_list_count
-      repositories.archived.docker_type.inject(0) do |sum, repo|
-        sum + repo.docker_manifest_lists.count
-      end
-    end
-
-    def docker_manifest_count
-      repositories.archived.docker_type.inject(0) do |sum, repo|
-        sum + repo.docker_manifests.count
-      end
-    end
-
-    def docker_tag_count
-      docker_tags.count
-    end
-
     def docker_tags
       # Don't count tags from non-archived repos; this causes count errors
       ::Katello::DockerMetaTag.where(:id => RepositoryDockerMetaTag.where(:repository_id => repositories.archived.docker_type).select(:docker_meta_tag_id))
@@ -310,10 +271,6 @@ module Katello
       Katello::Deb.in_repositories(self.repositories.archived)
     end
 
-    def deb_count
-      debs.count
-    end
-
     def errata(errata_type = nil)
       errata = Erratum.in_repositories(archived_repos)
       errata = errata.of_type(errata_type) if errata_type
@@ -348,8 +305,24 @@ module Katello
       PackageGroup.in_repositories(archived_repos)
     end
 
-    def package_group_count
-      package_groups.count
+    def update_content_counts!
+      self.content_counts = {}
+      RepositoryTypeManager.indexable_content_types.map(&:model_class).each do |content_type|
+        if content_type::CONTENT_TYPE == DockerTag::CONTENT_TYPE
+          content_counts[DockerTag::CONTENT_TYPE] = docker_tags.count
+        else
+          content_counts[content_type::CONTENT_TYPE] = content_type.in_repositories(self.repositories.archived).count
+        end
+      end
+      save!
+    end
+
+    def content_counts_map
+      return {} if content_counts.blank?
+      counts = Hash[content_counts.map { |key, value| ["#{key}_count", value] }]
+      counts.merge("module_stream_count" => counts["modulemd_count"],
+                   "package_count" => counts["rpm_count"],
+                   "ostree_branch_count" => counts["ostree_count"])
     end
 
     def check_ready_to_promote!(to_env)

data/app/models/katello/glue/candlepin/owner.rb

@@ -35,6 +35,10 @@ module Katello
         self.owner_details['contentAccessMode']
       end
 
+      def golden_ticket?
+        content_access_mode == "org_environment"
+      end
+
       def generate_debug_cert
         Resources::Candlepin::Owner.generate_ueber_cert(label)
       end

data/app/models/katello/glue/candlepin/product.rb

@@ -101,13 +101,19 @@ module Katello
 
       def import_custom_subscription
         fail _("Cannot import a custom subscription from a redhat product.") if self.redhat?
-        sub = nil
-        ::Katello::Util::Support.active_record_retry do
-          sub = ::Katello::Subscription.where(:cp_id => self.cp_id, :organization_id => self.organization.id).first_or_create
+        User.as_anonymous_admin do
+          sub = nil
+          ::Katello::Util::Support.active_record_retry do
+            sub = ::Katello::Subscription.where(:cp_id => self.cp_id, :organization_id => self.organization.id).first_or_create
+          end
+          unless sub.persisted?
+            message = _("Subscription was not persisted - %{error_message}") % {:error_message => sub.errors.full_messages.join("; ")}
+            fail HttpErrors::UnprocessableEntity, message
+          end
+          sub.import_data
+          pools = ::Katello::Resources::Candlepin::Product.pools(self.organization.label, self.cp_id)
+          pools.each { |pool_json| ::Katello::Pool.import_pool(pool_json['id']) }
         end
-        sub.import_data
-        pools = ::Katello::Resources::Candlepin::Product.pools(self.organization.label, self.cp_id)
-        pools.each { |pool_json| ::Katello::Pool.import_pool(pool_json['id']) }
       end
     end
   end

data/app/models/katello/glue/pulp/repos.rb

@@ -76,9 +76,12 @@ module Katello
         summary
       end
 
+      def last_sync_audit
+        Audited::Audit.where(:auditable_id => self.repositories, :auditable_type => Katello::Repository.name).order(:created_at).last
+      end
+
       def last_sync
-        task = last_repo_sync_task
-        task.nil? ? nil : task.started_at.to_s
+        last_repo_sync_task&.started_at&.to_s || last_sync_audit&.created_at&.to_s
       end
 
       def last_repo_sync_task
@@ -97,7 +100,7 @@ module Katello
       def last_repo_sync_task_group
         if last_repo_sync_task
           started_after = last_repo_sync_task.started_at - 30.seconds
-          last_repo_sync_tasks.where("#{ForemanTasks::Task::DynflowTask.table_name}.started_at > '%s'", started_after).uniq
+          last_repo_sync_tasks.where("#{ForemanTasks::Task::DynflowTask.table_name}.started_at > '%s'", started_after.utc).uniq
         else
           []
         end

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

@@ -41,11 +41,6 @@ module Katello
         host_facts["virt::host_type"] || host_facts["hypervisor::type"]
       end
 
-      def dmi_system_uuid
-        host_facts = self.host.facts
-        host_facts["dmi::system::uuid"]
-      end
-
       def update_from_consumer_attributes(consumer_params)
         import_database_attributes(consumer_params)
         self.facts = consumer_params['facts'] unless consumer_params['facts'].blank?
@@ -56,6 +51,10 @@ module Katello
         update_hypervisor(consumer_params)
         update_guests(consumer_params)
 
+        if consumer_params['facts']
+          self.dmi_uuid = consumer_params['facts']['dmi.system.uuid']
+        end
+
         self.autoheal = consumer_params['autoheal'] unless consumer_params['autoheal'].blank?
         self.service_level = consumer_params['serviceLevel'] unless consumer_params['serviceLevel'].nil?
         self.registered_at = consumer_params['created'] unless consumer_params['created'].blank?

data/app/models/katello/ping.rb

@@ -71,7 +71,7 @@ module Katello
 
       def ping_pulp3_without_auth(service_result, capsule_id)
         exception_watch(service_result) do
-          Katello::Ping.pulp3_without_auth(fetch_proxy(capsule_id).pulp3_url("api/v3"))
+          Katello::Ping.pulp3_without_auth(fetch_proxy(capsule_id).pulp3_url)
         end
       end
 
@@ -193,10 +193,9 @@ module Katello
         end
 
         workers = json["online_workers"] || []
-        resource_manager_exists = workers.any? { |worker| worker["name"].include?("resource-manager@") }
-        reservered_resource_worker_exists = workers.any? { |worker| worker["name"] =~ /reserved-resource-worker-./ }
+        resource_manager_exists = workers.any? { |worker| worker["name"].include?("resource-manager") }
 
-        unless resource_manager_exists && reservered_resource_worker_exists
+        unless resource_manager_exists && workers.count > 1
           fail _("Not all necessary pulp workers running at %s.") % url
         end
 

data/app/models/katello/pool.rb

@@ -101,7 +101,7 @@ module Katello
     end
 
     class Jail < ::Safemode::Jail
-      allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date
+      allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date, :organization
     end
   end
 end

data/app/models/katello/pulp3/distribution_reference.rb

@@ -1,7 +1,7 @@
 module Katello
   module Pulp3
     class DistributionReference < Katello::Model
-      belongs_to :root_repository, :class_name => 'Katello::RootRepository'
+      belongs_to :repository, :class_name => 'Katello::Repository'
     end
   end
 end

data/app/models/katello/repository.rb

@@ -1,6 +1,8 @@
 module Katello
   # rubocop:disable Metrics/ClassLength
   class Repository < Katello::Model
+    audited
+
     #pulp uses pulp id to sync with 'yum_distributor' on the end
     PULP_ID_MAX_LENGTH = 220
 
@@ -19,6 +21,8 @@ module Katello
     include ERB::Util
     include ::ScopedSearchExtensions
 
+    AUDIT_SYNC_ACTION = 'sync'.freeze
+
     DEB_TYPE = 'deb'.freeze
     YUM_TYPE = 'yum'.freeze
     FILE_TYPE = 'file'.freeze
@@ -99,6 +103,8 @@ module Katello
     has_many :filters, :through => :repository_content_view_filters
 
     belongs_to :content_view_version, :inverse_of => :repositories, :class_name => "Katello::ContentViewVersion"
+    has_many :distribution_references, :class_name => 'Katello::Pulp3::DistributionReference', :foreign_key => :repository_id,
+             :dependent => :destroy, :inverse_of => :repository
 
     validates_with Validators::ContainerImageNameValidator, :attributes => :container_repository_name, :allow_blank => false, :if => :docker?
     validates :container_repository_name, :if => :docker?, :uniqueness => {message: ->(object, _data) do
@@ -189,6 +195,10 @@ module Katello
       end
     end
 
+    def audit_sync
+      write_audit(action: AUDIT_SYNC_ACTION, comment: _('Successfully synchronized.'), audited_changes: {})
+    end
+
     def set_pulp_id
       return if self.pulp_id
 
@@ -460,6 +470,10 @@ module Katello
       clone
     end
 
+    def latest_sync_audit
+      self.audits.where(:action => AUDIT_SYNC_ACTION).order(:created_at).last
+    end
+
     def cancel_dynflow_sync
       if latest_dynflow_sync
         plan = latest_dynflow_sync.execution_plan

data/app/models/katello/root_repository.rb

@@ -42,8 +42,6 @@ module Katello
 
     has_many :repository_references, :class_name => 'Katello::Pulp3::RepositoryReference', :foreign_key => :root_repository_id,
              :dependent => :destroy, :inverse_of => :root_repository
-    has_many :distribution_references, :class_name => 'Katello::Pulp3::DistributionReference', :foreign_key => :root_repository_id,
-             :dependent => :destroy, :inverse_of => :root_repository
 
     before_validation :update_ostree_upstream_sync_policy
 

data/app/models/katello/subscription_status.rb

@@ -1,5 +1,6 @@
 module Katello
   class SubscriptionStatus < HostStatus::Status
+    DISABLED = 5
     UNSUBSCRIBED_HYPERVISOR = 4
     UNKNOWN = 3
     INVALID = 2
@@ -20,6 +21,8 @@ module Katello
         N_("Unentitled")
       when UNSUBSCRIBED_HYPERVISOR
         N_("Unsubscribed hypervisor")
+      when DISABLED
+        N_("Disabled")
       else
         N_("Unknown subscription status")
       end
@@ -29,6 +32,8 @@ module Katello
       case status
       when INVALID
         ::HostStatus::Global::ERROR
+      when DISABLED
+        ::HostStatus::Global::OK
       when VALID
         ::HostStatus::Global::OK
       else
@@ -43,6 +48,8 @@ module Katello
       status = status_override || Katello::Candlepin::Consumer.new(host.subscription_facet.uuid, host.organization.label).entitlement_status
 
       case status
+      when Katello::Candlepin::Consumer::ENTITLEMENTS_DISABLED
+        DISABLED
       when Katello::Candlepin::Consumer::ENTITLEMENTS_VALID
         VALID
       when Katello::Candlepin::Consumer::ENTITLEMENTS_PARTIAL

data/app/models/setting/content.rb

@@ -2,6 +2,8 @@ class Setting::Content < Setting
   #rubocop:disable Metrics/MethodLength
   #rubocop:disable Metrics/AbcSize
 
+  validate :content_default_http_proxy, if: proc { |s| s.name == 'content_default_http_proxy' }
+
   after_save :add_organizations_and_locations_if_global_http_proxy
 
   def self.hashify_parameters(parameters)
@@ -22,7 +24,7 @@ class Setting::Content < Setting
 
     [
       self.set('content_default_http_proxy', N_("Default HTTP Proxy for syncing content"),
-                      nil, N_('Default http proxy'),
+                      nil, N_('Default HTTP proxy'),
                       nil,
                       collection: proc { http_proxy_select }, include_blank: N_("no global default")
               ),
@@ -114,8 +116,6 @@ class Setting::Content < Setting
                N_('Default Location where new Puppet content will be put upon Content View publish'),
                nil, N_('Default Location Puppet content'), nil,
                :collection => proc { Hash[Location.unscoped.all.map { |loc| [loc[:title], loc[:title]] }] }),
-      self.set('host_update_lock', N_("Allow multiple concurrent Actions::Katello::Host::Update calls for one host to be processed at the same time."),
-               false, N_('Concurrent Actions::Katello::Host::Update allowed')),
       self.set('expire_soon_days', N_('The number of days remaining in a subscription before you will be reminded about renewing it.'),
                120, N_('Expire soon days')),
       self.set('content_view_solve_dependencies',
@@ -160,6 +160,13 @@ class Setting::Content < Setting
       end
     end
   end
+
+  def content_default_http_proxy
+    proxy = HttpProxy.where(name: value).first
+    return if proxy || value.blank?
+
+    errors.add(:base, _('There is no such HTTP proxy'))
+  end
 end
 
 # If the database is not migrated yet, the system will not be able to load

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

@@ -6,6 +6,7 @@ module Katello
       ENTITLEMENTS_VALID = 'valid'.freeze
       ENTITLEMENTS_PARTIAL = 'partial'.freeze
       ENTITLEMENTS_INVALID = 'invalid'.freeze
+      ENTITLEMENTS_DISABLED = 'disabled'.freeze
 
       SYSTEM = "system".freeze
       HYPERVISOR = "hypervisor".freeze

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

@@ -214,7 +214,7 @@ module Katello
       end
 
       def refresh_mirror_entities
-        refresh
+        refresh_if_needed
       end
 
       def update_or_associate_importer

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

@@ -2,6 +2,8 @@ module Katello
   module Pulp
     class Repository
       class Deb < ::Katello::Pulp::Repository
+        REPOSITORY_TYPE = 'deb'.freeze
+
         def generate_master_importer
           config = {
             feed: root.url,

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

@@ -2,6 +2,8 @@ module Katello
   module Pulp
     class Repository
       class Docker < ::Katello::Pulp::Repository
+        REPOSITORY_TYPE = 'docker'.freeze
+
         def unit_type_id(uploads = [])
           uploads.pluck('digest').any? ? 'docker_tag' : super
         end

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

@@ -2,6 +2,8 @@ module Katello
   module Pulp
     class Repository
       class File < ::Katello::Pulp::Repository
+        REPOSITORY_TYPE = 'iso'.freeze
+
         def unit_keys(uploads)
           uploads.map do |upload|
             upload.except('id', 'content_unit_id')

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

@@ -2,6 +2,8 @@ module Katello
   module Pulp
     class Repository
       class Yum < ::Katello::Pulp::Repository
+        REPOSITORY_TYPE = 'yum'.freeze
+
         def generate_master_importer
           config = {
             download_policy: root.download_policy,
@@ -51,11 +53,13 @@ module Katello
           distributors
         end
 
-        def distributors_to_publish(_options)
-          if repo.clone && !repo.master? && smart_proxy.pulp_master?
-            source_service = repo.target_repository.backend_service(smart_proxy)
+        def distributors_to_publish(options)
+          source_repo_id = options[:source_repository]&.fetch(:id)
+          if (source_repo_id || !repo.master?) && smart_proxy.pulp_master?
+            source_repository = source_repo_id ? ::Katello::Repository.find(source_repo_id) : repo.target_repository
+            source_service = source_repository.backend_service(smart_proxy)
             source_distributor_id = source_service.lookup_distributor_id(Runcible::Models::YumDistributor.type_id)
-            {Runcible::Models::YumCloneDistributor => {source_repo_id: repo.target_repository.pulp_id,
+            {Runcible::Models::YumCloneDistributor => {source_repo_id: source_repository.pulp_id,
                                                        source_distributor_id: source_distributor_id}}
           else
             {Runcible::Models::YumDistributor => {}}
@@ -171,7 +175,7 @@ module Katello
           task = nil
           repo.remove_partial_errata! do |errata_to_delete|
             task = repo.unassociate_by_filter(::Katello::ContentViewErratumFilter::CONTENT_TYPE,
-                                                "id" => { "$in" => errata_to_delete.map(&:errata_id) })
+                                                "id" => { "$in" => errata_to_delete.map(&:errata_id).sort })
           end
           task
         end

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

@@ -4,7 +4,7 @@ module Katello
       include LazyAccessor
 
       def self.content_api
-        PulpAnsibleClient::ContentCollectionVersionsApi.new(Katello::Pulp3::Repository::AnsibleCollection.api_client(SmartProxy.pulp_master!))
+        PulpAnsibleClient::ContentCollectionVersionsApi.new(Katello::Pulp3::Api::AnsibleCollection.new(SmartProxy.pulp_master!).api_client)
       end
 
       def self.ids_for_repository(repo_id)