katello 3.14.1 → 3.15.0.rc1

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

@@ -7,7 +7,7 @@ module Actions
           def plan(repository, smart_proxy, options)
             sequence do
               action_output = plan_action(Actions::Pulp3::Repository::Sync, repository, smart_proxy, options).output
-              version_output = plan_action(Pulp3::Repository::SaveVersion, repository, action_output[:pulp_tasks]).output
+              version_output = plan_action(Pulp3::Repository::SaveVersion, repository, tasks: action_output[:pulp_tasks]).output
               plan_action(Pulp3::Orchestration::Repository::GenerateMetadata, repository, smart_proxy, :contents_changed => version_output[:contents_changed])
               plan_self(:subaction_output => version_output)
             end

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

@@ -15,7 +15,7 @@ module Actions
                 content_unit_href = content_list.results.first.pulp_href
               end
               action_output = plan_action(Pulp3::Repository::ImportUpload, content_unit_href, repository, smart_proxy).output
-              plan_action(Pulp3::Repository::SaveVersion, repository, action_output[:pulp_tasks]).output
+              plan_action(Pulp3::Repository::SaveVersion, repository, tasks: action_output[:pulp_tasks]).output
             end
           end
         end

data/app/lib/actions/pulp3/orphan_cleanup/delete_orphan_distributions.rb

@@ -0,0 +1,16 @@
+module Actions
+  module Pulp3
+    module OrphanCleanup
+      class DeleteOrphanDistributions < Pulp3::AbstractAsyncTask
+        def plan(smart_proxy)
+          plan_self(:smart_proxy_id => smart_proxy.id)
+        end
+
+        def invoke_external_task
+          smart_proxy_service = ::Katello::Pulp3::SmartProxyRepository.instance_for_type(smart_proxy)
+          smart_proxy_service.delete_orphan_distributions
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/pulp3/orphan_cleanup/delete_orphan_remotes.rb

@@ -0,0 +1,16 @@
+module Actions
+  module Pulp3
+    module OrphanCleanup
+      class DeleteOrphanRemotes < Pulp3::AbstractAsyncTask
+        def plan(smart_proxy)
+          plan_self(:smart_proxy_id => smart_proxy.id)
+        end
+
+        def invoke_external_task
+          smart_proxy_service = ::Katello::Pulp3::SmartProxyRepository.instance_for_type(smart_proxy)
+          smart_proxy_service.delete_orphan_remotes
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/pulp3/orphan_cleanup/delete_orphan_repository_versions.rb

@@ -7,12 +7,7 @@ module Actions
         end
 
         def run
-          smart_proxy = SmartProxy.find(input[:smart_proxy_id])
-          if smart_proxy.pulp_mirror?
-            output[:pulp_tasks] = ::Katello::Pulp3::Repository.delete_orphan_repository_versions_for_mirror(smart_proxy)
-          else
-            output[:pulp_tasks] = ::Katello::Pulp3::Repository.delete_orphan_repository_versions(smart_proxy)
-          end
+          output[:pulp_tasks] = ::Katello::Pulp3::SmartProxyRepository.instance_for_type(smart_proxy).delete_orphan_repository_versions
         end
       end
     end

data/app/lib/actions/pulp3/orphan_cleanup/remove_orphans.rb

@@ -0,0 +1,15 @@
+module Actions
+  module Pulp3
+    module OrphanCleanup
+      class RemoveOrphans < Pulp3::AbstractAsyncTask
+        def plan(smart_proxy)
+          plan_self(:smart_proxy_id => smart_proxy.id)
+        end
+
+        def invoke_external_task
+          output[:pulp_tasks] = ::Katello::Pulp3::Api::Core.new(smart_proxy).delete_orphans
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/pulp3/orphan_cleanup/remove_unneeded_repos.rb

@@ -7,8 +7,8 @@ module Actions
         end
 
         def invoke_external_task
-          smart_proxy_service = ::Katello::Pulp3::SmartProxyRepository.new(smart_proxy)
-          smart_proxy_service.delete_orphaned_repositories_for_mirror_proxies
+          smart_proxy_service = ::Katello::Pulp3::SmartProxyRepository.instance_for_type(smart_proxy)
+          smart_proxy_service.delete_orphan_repositories
         end
       end
     end

data/app/lib/actions/pulp3/repository/create.rb

@@ -8,7 +8,7 @@ module Actions
 
         def run
           repo = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repo.backend_service(smart_proxy).create
+          output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.create
         end
       end
     end

data/app/lib/actions/pulp3/repository/create_publication.rb

@@ -12,7 +12,7 @@ module Actions
 
         def invoke_external_task
           repository = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repository.backend_service(smart_proxy).create_publication
+          output[:response] = repository.backend_service(smart_proxy).with_mirror_adapter.create_publication
         end
       end
     end

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

@@ -15,6 +15,7 @@ module Actions
             ret << _("Total tasks: ") + ": #{finished_units}/#{total_units}"
             ret << "--------------------------------"
             progress_reports = sync_task.try(:[], 'progress_reports') || []
+            progress_reports = progress_reports.sort_by { |pr| pr.try(:[], 'message') }
             progress_reports.each do |pr|
               done = pr.try(:[], 'done')
               total = pr.try(:[], 'total') || pr.try(:[], 'done')

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

@@ -7,7 +7,9 @@ module Actions
 
         def plan(repository, smart_proxy, options = {})
           sequence do
-            action = plan_self(:repository_id => repository.id, :smart_proxy_id => smart_proxy.id, :contents_changed => options[:contents_changed])
+            options = {:repository_id => repository.id, :smart_proxy_id => smart_proxy.id}
+            options[:contents_changed] if options.key?(:contents_changed)
+            action = plan_self(options)
             plan_action(SaveDistributionReferences, repository, smart_proxy,
                         action.output, :contents_changed => options[:contents_changed])
           end
@@ -15,7 +17,7 @@ module Actions
 
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repo.backend_service(smart_proxy).refresh_distributions
+          output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions
         end
       end
     end

data/app/lib/actions/pulp3/repository/save_version.rb

@@ -2,20 +2,24 @@ module Actions
   module Pulp3
     module Repository
       class SaveVersion < Pulp3::Abstract
-        def plan(repository, tasks)
-          plan_self(:repository_id => repository.id, :tasks => tasks)
+        def plan(repository, options)
+          plan_self(:repository_id => repository.id, :tasks => options[:tasks], :repository_details => options[:repository_details])
         end
 
         def run
-          version_href = input[:tasks].last[:created_resources].first
           repo = ::Katello::Repository.find(input[:repository_id])
-          repo_version = repo.backend_service(::SmartProxy.pulp_master).lookup_version version_href
 
-          content_summary = repo_version.content_summary
-          first_version = (repo_version.number == 1)
-          output[:contents_changed] = first_version || !(content_summary.added.empty? && content_summary.removed.empty?)
-          if version_href && output[:contents_changed]
+          if input[:tasks]
+            version_href = input[:tasks].last[:created_resources].first
+          elsif input[:repository_details]
+            version_href = input[:repository_details][:latest_version_href]
+          end
+
+          if version_href
             repo.update_attributes(:version_href => version_href)
+            output[:contents_changed] = true
+          else
+            output[:contents_changed] = false
           end
         end
       end

data/app/lib/actions/pulp3/repository/upload_file.rb

@@ -9,8 +9,8 @@ module Actions
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
           repo_backend_service = repo.backend_service(smart_proxy)
-          upload_class = repo_backend_service.upload_class
-          uploads_api = repo_backend_service.uploads_api
+          upload_class = repo_backend_service.core_api.upload_class
+          uploads_api = repo_backend_service.core_api.uploads_api
           offset = 0
           response = nil
           File.open(input[:file], "rb") do |file|

data/app/lib/katello/api/v2/rendering.rb

@@ -12,6 +12,7 @@ module Katello
         end
 
         def respond_for_create(options = {})
+          options[:status] ||= 201
           try_specific_resource_template(options[:template] || params[:action], params[:action], options)
         end
 

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -7,7 +7,7 @@ module Katello
         def allowed_helpers
           super + [:errata, :host_subscriptions, :host_applicable_errata_ids, :host_applicable_errata_filtered,
                    :host_latest_applicable_rpm_version, :load_pools, :load_errata_applications, :host_content_facet,
-                   :host_sla, :host_products, :sub_name, :sub_sku, :registered_through]
+                   :host_sla, :host_products, :sub_name, :sub_sku, :registered_through, :last_checkin]
         end
       end
 
@@ -65,6 +65,10 @@ module Katello
         load_resource(klass: Pool.readable, search: search, permission: nil, includes: includes)
       end
 
+      def last_checkin(host)
+        host&.subscription_facet&.last_checkin
+      end
+
       # rubocop:disable Metrics/MethodLength
       def load_errata_applications(filter_errata_type: nil, include_last_reboot: 'yes', since: nil, up_to: nil, status: nil)
         result = []

data/app/lib/katello/http_resource.rb

@@ -15,7 +15,8 @@ module Katello
       end
     end
 
-    class_attribute :consumer_secret, :consumer_key, :ca_cert_file, :prefix, :site, :default_headers
+    class_attribute :consumer_secret, :consumer_key, :ca_cert_file, :prefix, :site, :default_headers,
+                    :ssl_client_cert, :ssl_client_key
 
     attr_reader :json
 
@@ -190,6 +191,8 @@ module Katello
           :timeout => SETTINGS[:katello][:rest_client_timeout]
         }
         options[:ssl_ca_file] = self.ca_cert_file unless self.ca_cert_file.nil?
+        options[:ssl_client_cert] = self.ssl_client_cert unless self.ssl_client_cert.nil?
+        options[:ssl_client_key] = self.ssl_client_key unless self.ssl_client_key.nil?
 
         RestClient::Resource.new(url, options)
       end

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

@@ -12,7 +12,9 @@ module Katello
 
         def self.get(path, headers = {:accept => :json})
           logger.debug "Sending GET request to Registry: #{path}"
-          client = RegistryResource.load_class.rest_client(Net::HTTP::Get, :get, path)
+          resource = RegistryResource.load_class
+          joined_path = resource.prefix.chomp("/") + path
+          client = resource.rest_client(Net::HTTP::Get, :get, joined_path)
           client.get(headers)
         end
       end
@@ -26,7 +28,10 @@ module Katello
 
             # Pulp 3 has its own registry
             if pulp_master && pulp_master.pulp3_repository_type_support?(::Katello::Repository::DOCKER_TYPE)
-              registry_url = pulp_master.setting('Pulp3', 'content_app_url')
+              uri = URI(pulp_master.setting(SmartProxy::PULP3_FEATURE, 'content_app_url'))
+              uri.path = "/pulpcore_registry/"
+              registry_url = uri.to_s
+
               # Assume the registry uses the same CA as the Smart Proxy
               ca_cert_file = Setting[:ssl_ca_file]
             elsif container_config
@@ -39,6 +44,8 @@ module Katello
             uri = URI.parse(registry_url)
             self.prefix = uri.path
             self.site = "#{uri.scheme}://#{uri.host}:#{uri.port}"
+            self.ssl_client_cert = ::Cert::Certs.ssl_client_cert
+            self.ssl_client_key = ::Cert::Certs.ssl_client_key
             self.ca_cert_file = ca_cert_file
             self
           end

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

@@ -38,6 +38,7 @@ module Katello
         scoped_search :relation => :content_facet, :on => :lifecycle_environment_id, :rename => :lifecycle_environment_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
         scoped_search :relation => :applicable_errata, :on => :errata_id, :rename => :applicable_errata, :complete_value => true, :ext_method => :find_by_applicable_errata, :only_explicit => true
         scoped_search :relation => :applicable_errata, :on => :errata_id, :rename => :installable_errata, :complete_value => true, :ext_method => :find_by_installable_errata, :only_explicit => true
+        scoped_search :relation => :applicable_errata, :on => :issued, :rename => :applicable_errata_issued, :complete_value => true, :only_explicit => true
         scoped_search :relation => :applicable_rpms, :on => :nvra, :rename => :applicable_rpms, :complete_value => true, :ext_method => :find_by_applicable_rpms, :only_explicit => true
         scoped_search :relation => :applicable_rpms, :on => :nvra, :rename => :upgradable_rpms, :complete_value => true, :ext_method => :find_by_installable_rpms, :only_explicit => true
         scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source

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

@@ -221,11 +221,11 @@ module Katello
           # doesn't provide much benefit for the frustration it creates.
           self.save(validate: false)
         end
-
-        class Jail < ::Safemode::Jail
-          allow :name, :label
-        end
       end
     end
   end
 end
+
+class ::Organization::Jail < ::Safemode::Jail
+  allow :label
+end

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

@@ -15,7 +15,7 @@ module Katello
         end
       end
 
-      PULP3_FEATURE = "Pulp3".freeze
+      PULP3_FEATURE = "Pulpcore".freeze
       PULP_FEATURE = "Pulp".freeze
       PULP_NODE_FEATURE = "Pulp Node".freeze
 
@@ -120,8 +120,8 @@ module Katello
           uri = pulp3_uri!
           config.host = uri.host
           config.scheme = uri.scheme
-          config.username = 'admin'
-          config.password = 'password'
+          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
+          config.ssl_client_key = ::Cert::Certs.ssl_client_key
           config.debugging = true
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
         end
@@ -152,10 +152,15 @@ module Katello
         end
       end
 
-      def pulp3_repository_type_support?(repository_type)
+      def pulp3_repository_type_support?(repository_type, check_pulp2_preferred = true)
         repository_type_obj = repository_type.is_a?(String) ? Katello::RepositoryTypeManager.repository_types[repository_type] : repository_type
         fail "Cannot find repository type #{repository_type}, is it enabled?" unless repository_type_obj
-        repository_type_obj.pulp3_plugin.present? && pulp3_enabled? && self.capabilities(PULP3_FEATURE).try(:include?, repository_type_obj.pulp3_plugin) && !pulp2_preferred_for_type?(repository_type_obj.id)
+
+        pulp3_supported = repository_type_obj.pulp3_plugin.present? &&
+                          pulp3_enabled? &&
+                          self.capabilities(PULP3_FEATURE).try(:include?, repository_type_obj.pulp3_plugin)
+
+        check_pulp2_preferred ? pulp3_supported && !pulp2_preferred_for_type?(repository_type_obj.id) : pulp3_supported
       end
 
       def pulp3_content_support?(content_type)
@@ -177,7 +182,7 @@ module Katello
         pulp3_uri!.host
       end
 
-      def pulp3_url(path = nil)
+      def pulp3_url(path = '/pulp/api/v3/')
         pulp_url = self.setting(PULP3_FEATURE, 'pulp_url')
         path.blank? ? pulp_url : "#{pulp_url.sub(%r|/$|, '')}/#{path.sub(%r|^/|, '')}"
       end
@@ -190,6 +195,27 @@ module Katello
         self.has_feature? PULP_FEATURE
       end
 
+      def supported_pulp_types
+        supported_map = {
+          pulp2: { supported_types: [] },
+          pulp3: { supported_types: [], overriden_to_pulp2: [] }
+        }
+
+        ::Katello::RepositoryTypeManager.repository_types.keys.each do |type|
+          if pulp3_repository_type_support?(type, false)
+            if pulp2_preferred_for_type?(type)
+              supported_map[:pulp3][:overriden_to_pulp2] << type
+            else
+              supported_map[:pulp3][:supported_types] << type
+            end
+          else
+            supported_map[:pulp2][:supported_types] << type
+          end
+        end
+
+        supported_map
+      end
+
       #deprecated methods
       alias_method :pulp_node, :pulp_api
       alias_method :default_capsule?, :pulp_master?
@@ -273,7 +299,7 @@ module Katello
       end
 
       def ping_pulp3
-        ::Katello::Ping.pulp3_without_auth(self.pulp3_url("api/v3"))
+        ::Katello::Ping.pulp3_without_auth(self.pulp3_url)
       rescue Errno::EHOSTUNREACH, Errno::ECONNREFUSED, RestClient::Exception => error
         raise ::Katello::Errors::CapsuleCannotBeReached, _("%s is unreachable. %s" % [self.name, error])
       end

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

@@ -15,21 +15,10 @@ module Katello
           :partial => Katello::SubscriptionStatus::PARTIAL,
           :invalid => Katello::SubscriptionStatus::INVALID,
           :unknown => Katello::SubscriptionStatus::UNKNOWN,
+          :disabled => Katello::SubscriptionStatus::DISABLED,
           :unsubscribed_hypervisor => Katello::SubscriptionStatus::UNSUBSCRIBED_HYPERVISOR
         }.freeze
 
-        prepend ForemanTasks::Concerns::ActionTriggering
-
-        module Prepended
-          def update_action
-            if subscription_facet.try(:backend_update_needed?)
-              ::Actions::Katello::Host::Update
-            end
-          end
-        end
-
-        prepend Prepended
-
         accepts_nested_attributes_for :subscription_facet, :update_only => true, :reject_if => lambda { |attrs| attrs.values.compact.empty? }
 
         has_many :activation_keys, :through => :subscription_facet
@@ -70,6 +59,39 @@ module Katello
         scoped_search :on => :purpose_role, :rename => :role, :relation => :subscription_facet, :complete_value => true
         scoped_search :on => :purpose_usage, :rename => :usage, :relation => :subscription_facet, :complete_value => true
         scoped_search :on => :name, :rename => :addon, :relation => :purpose_addons, :complete_value => true, :ext_method => :find_by_purpose_addon
+        before_update :update_candlepin_associations, if: -> { subscription_facet.try(:backend_update_needed?) }
+      end
+
+      def update_candlepin_associations(consumer_params = nil)
+        content_facet.save! if content_facet
+
+        auto_attach_enabled_via_checkin = consumer_params.try(:[], 'autoheal')
+
+        if subscription_facet
+          consumer_params ||= subscription_facet.consumer_attributes
+
+          host_uuid = consumer_params.dig(:facts, 'dmi.system.uuid')
+          if ::Katello::Host::SubscriptionFacet.override_dmi_uuid?(host_uuid)
+            # if host reported a dmi uuid to treat as a duplicate, override it with the stored host param
+            override_value = subscription_facet.dmi_uuid_override&.value
+            override_value ||= subscription_facet.update_dmi_uuid_override&.value
+            consumer_params[:facts]['dmi.system.uuid'] = override_value
+          end
+          ::Katello::Resources::Candlepin::Consumer.update(subscription_facet.uuid, consumer_params)
+
+          if auto_attach_enabled_via_checkin
+            ::Katello::Resources::Candlepin::Consumer.refresh_entitlements(subscription_facet.uuid)
+          end
+
+          if consumer_params.try(:[], :facts)
+            ::Katello::Host::SubscriptionFacet.update_facts(self, consumer_params[:facts])
+          end
+
+          unless consumer_params.blank?
+            subscription_facet.update_from_consumer_attributes(consumer_params)
+            subscription_facet.save!
+          end
+        end
       end
 
       module ClassMethods

data/app/models/katello/content_view_docker_filter.rb

@@ -27,7 +27,7 @@ module Katello
         manifest_tags.concat(query_manifests(repo, rule))
       end
 
-      manifest_tags
+      manifest_tags.sort
     end
 
     protected