katello 4.7.6 → 4.8.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -3,8 +3,8 @@
 This organization has Simple Content Access enabled.  Hosts are not required to have subscriptions attached to access repositories.
   </span>
 </div>
-<div id="non-sca-banner" bst-alert="warning" ng-if="isManifestImported && !simpleContentAccessEnabled">
+<div id="non-sca-banner" bst-alert="warning" ng-if="!simpleContentAccessEnabled">
   <span translate>
-This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Legacy subscription management is deprecated and will be removed in a future version.
+This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in a future version.
   </span>
 </div>

data/lib/katello/engine.rb

@@ -146,7 +146,6 @@ module Katello
         )
       end
 
-      Katello::EventDaemon::Runner.initialize
       Katello::EventDaemon::Runner.register_service(:candlepin_events, Katello::CandlepinEventListener)
       Katello::EventDaemon::Runner.register_service(:katello_events, Katello::EventMonitor::PollerThread)
       Katello::EventDaemon::Runner.register_service(:katello_agent_events, Katello::EventDaemon::Services::AgentEventReceiver) if ::Katello.with_katello_agent?
@@ -175,6 +174,7 @@ module Katello
 
       #Controller extensions
       ::HostsController.include Katello::Concerns::HostsControllerExtensions
+      ::HostsController.include Katello::Concerns::ContentFacetHostsControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
 
@@ -212,6 +212,7 @@ module Katello
 
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
+      ::Api::V2::HostsController.include Katello::Concerns::ContentFacetHostsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
       ::Api::V2::RegistrationController.include ::Foreman::Controller::SmartProxyAuth

data/lib/katello/permission_creator.rb

@@ -284,8 +284,7 @@ module Katello
                          :finder_scope => :readable
       @plugin.permission :create_products,
                          {
-                           'katello/api/v2/products' => [:create],
-                           'katello/api/v2/package_groups' => [:create]
+                           'katello/api/v2/products' => [:create]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :editable
@@ -305,8 +304,7 @@ module Katello
                            'katello/api/v2/products' => [:destroy],
                            'katello/api/v2/repositories' => [:destroy],
                            'katello/api/v2/products_bulk_actions' => [:destroy_products],
-                           'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories],
-                           'katello/api/v2/package_groups' => [:destroy]
+                           'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :deletable

data/lib/katello/permissions/registry_permissions.rb

@@ -8,13 +8,13 @@ Foreman::AccessControl.permission(:create_personal_access_tokens).actions.concat
   'katello/api/registry/registry_proxies/catalog',
   'katello/api/registry/registry_proxies/tags_list',
   'katello/api/registry/registry_proxies/pull_manifest',
-  'katello/api/registry/registry_proxies/push_manifest',
+  #'katello/api/registry/registry_proxies/push_manifest',
   'katello/api/registry/registry_proxies/pull_blob',
   'katello/api/registry/registry_proxies/check_blob',
-  'katello/api/registry/registry_proxies/start_upload_blob',
-  'katello/api/registry/registry_proxies/upload_blob',
-  'katello/api/registry/registry_proxies/chunk_upload_blob',
-  'katello/api/registry/registry_proxies/finish_upload_blob',
+  #'katello/api/registry/registry_proxies/start_upload_blob',
+  #'katello/api/registry/registry_proxies/upload_blob',
+  #'katello/api/registry/registry_proxies/chunk_upload_blob',
+  #'katello/api/registry/registry_proxies/finish_upload_blob',
   'katello/api/registry/registry_proxies/status_upload_blob',
   'katello/api/registry/registry_proxies/cancel_upload_blob'
 ]

data/lib/katello/plugin.rb

@@ -278,9 +278,9 @@ Foreman::Plugin.register :katello do
       use_pagelet :hosts_table_column_header, :os_title
       use_pagelet :hosts_table_column_content, :os_title
       add_pagelet :hosts_table_column_header, key: :lifecycle_environment, label: _('Lifecycle environment'), sortable: true, class: common_th_class, width: '10%'
-      add_pagelet :hosts_table_column_content, key: :lifecycle_environment, class: common_td_class, callback: ->(host) { host.content_facet_attributes&.lifecycle_environment&.name }
+      add_pagelet :hosts_table_column_content, key: :lifecycle_environment, class: common_td_class, callback: ->(host) { host.content_facet&.single_lifecycle_environment&.name }
       add_pagelet :hosts_table_column_header, key: :content_view, label: _('Content view'), sortable: true, class: common_th_class, width: '10%'
-      add_pagelet :hosts_table_column_content, key: :content_view, class: common_td_class, callback: ->(host) { host.content_facet_attributes&.content_view&.name }
+      add_pagelet :hosts_table_column_content, key: :content_view, class: common_td_class, callback: ->(host) { host.content_facet&.single_content_view&.name }
       add_pagelet :hosts_table_column_header, key: :registered_at, label: _('Registered'), sortable: true, class: common_th_class, width: '10%'
       add_pagelet :hosts_table_column_content, key: :registered_at, class: common_td_class, callback: ->(host) { host_registered_time(host) }
       add_pagelet :hosts_table_column_header, key: :last_checkin, label: _('Last checkin'), sortable: true, class: common_th_class, width: '10%'
@@ -346,6 +346,7 @@ Foreman::Plugin.register :katello do
       }]
       download_policies = proc { hashify_parameters(::Katello::RootRepository::DOWNLOAD_POLICIES) }
       proxy_download_policies = proc { hashify_parameters(::SmartProxy::DOWNLOAD_POLICIES) }
+      export_formats = proc { hashify_parameters(::Katello::Pulp3::ContentViewVersion::Export::FORMATS) }
 
       def hashify_parameters(parameters)
         Hash[parameters.map { |p| [p, p] }]
@@ -356,6 +357,12 @@ Foreman::Plugin.register :katello do
         templates.each_with_object({}) { |tmpl, hash| hash[tmpl.name] = tmpl.name }
       end
 
+      setting 'allow_multiple_content_views',
+        type: :boolean,
+        default: false,
+        full_name: N_('Allow multiple content views'),
+        description: N_("Allow a host to be registered to multiple content view environments with 'subscription-manager register --environments'.") # TODO: update this description when AKs support this setting as well
+
       setting 'content_default_http_proxy',
         type: :string,
         default: nil,
@@ -468,8 +475,8 @@ Foreman::Plugin.register :katello do
       setting 'errata_status_installable',
         type: :boolean,
         default: false,
-        full_name: N_('Installable errata from content view'),
-        description: N_("Calculate errata host status based only on errata in a host's content view and lifecycle environment")
+        full_name: N_('Generate errata status from directly-installable content'),
+        description: N_("If true, only errata that can be installed without an incremental update will affect the host's errata status.")
 
       setting 'restrict_composite_view',
         type: :boolean,
@@ -522,12 +529,6 @@ Foreman::Plugin.register :katello do
         description: N_("Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')"),
         collection: proxy_download_policies
 
-      setting 'pulp_docker_registry_port',
-        type: :integer,
-        default: 5000,
-        full_name: N_('Pulp Docker registry port'),
-        description: N_("The port used by Pulp Crane to provide Docker Registries")
-
       setting 'pulp_export_destination',
         type: :string,
         default: "/var/lib/pulp/katello-export",
@@ -540,6 +541,13 @@ Foreman::Plugin.register :katello do
         full_name: N_('Pulp 3 export destination filepath'),
         description: N_("On-disk location for pulp 3 exported repositories")
 
+      setting 'default_export_format',
+        type: :string,
+        default: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE,
+        full_name: N_('Default export format'),
+        description: N_("Default export format for content-exports(either 'syncable' or 'importable')"),
+        collection: export_formats
+
       setting 'sync_total_timeout',
         type: :integer,
         default: 3600,
@@ -723,14 +731,14 @@ Foreman::Plugin.register :katello do
 
   add_controller_action_scope('HostsController', :index) do |base_scope|
     base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet)
-      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+      .preload(:subscription_facet)
+      .preload(content_facet: [:bound_repositories])
   end
 
   add_controller_action_scope('Api::V2::HostsController', :index) do |base_scope|
     base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet)
-      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+      .preload(:subscription_facet)
+      .preload(content_facet: [:bound_repositories])
   end
 
   register_info_provider Katello::Host::InfoProvider

data/lib/katello/repository_types/README.md

@@ -1,23 +1,52 @@
 # Registering a new repository type
 
-Full example:
+# Full example:
 
 ```ruby
-
 Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
-  service_class Katello::Pulp::Repository::Yum
+  pulp3_service_class Katello::Pulp3::Repository::Yum
+  pulp3_api_class Katello::Pulp3::Api::Yum
+  pulp3_plugin 'rpm'
   prevent_unneeded_metadata_publish
 
-  content_type Katello::Rpm, :priority => 1, :pulp2_service_class => ::Katello::Pulp::Rpm
-  content_type Katello::Erratum, :priority => 2, :pulp2_service_class => ::Katello::Pulp::Erratum
-  content_type Katello::ModuleStream, :priority => 3, :pulp2_service_class => ::Katello::Pulp::ModuleStream
-  content_type Katello::PackageGroup, :pulp2_service_class => ::Katello::Pulp::PackageGroup
-  content_type Katello::YumMetadataFile, :pulp2_service_class => ::Katello::Pulp::YumMetadataFile
-  content_type Katello::Srpm, :pulp2_service_class => ::Katello::Pulp::Srpm
+  client_module_class PulpRpmClient
+  api_class PulpRpmClient::ApiClient
+  remote_class PulpRpmClient::RpmRpmRemote
+  remotes_api_class PulpRpmClient::RemotesRpmApi
+  repository_versions_api_class PulpRpmClient::RepositoriesRpmVersionsApi
+  repositories_api_class PulpRpmClient::RepositoriesRpmApi
+  configuration_class PulpRpmClient::Configuration
+  distributions_api_class PulpRpmClient::DistributionsRpmApi
+  distribution_class PulpRpmClient::RpmRpmDistribution
+  publication_class PulpRpmClient::RpmRpmPublication
+  publications_api_class PulpRpmClient::PublicationsRpmApi
+  repo_sync_url_class PulpRpmClient::RpmRepositorySyncURL
+
+  default_managed_content_type Katello::Rpm::CONTENT_TYPE
+  content_type Katello::Rpm,
+    priority: 1,
+    pulp3_service_class: ::Katello::Pulp3::Rpm,
+    primary_content: true,
+    removable: true,
+    uploadable: true
+  content_type Katello::ModuleStream,
+    priority: 2,
+    pulp3_service_class: ::Katello::Pulp3::ModuleStream
+  content_type Katello::Erratum, priority: 3,
+    pulp3_service_class: ::Katello::Pulp3::Erratum,
+    primary_content: true, mutable: true
+  content_type Katello::PackageGroup,
+    pulp3_service_class: ::Katello::Pulp3::PackageGroup
+  content_type Katello::Srpm,
+    pulp3_service_class: ::Katello::Pulp3::Srpm,
+    removable: true, uploadable: true
+  content_type Katello::Distribution, priority: 4,
+    pulp3_service_class: ::Katello::Pulp3::Distribution,
+    index: false
+  content_type Katello::PackageCategory, priority: 4, index: false
 
   index_additional_data { |repo, target_repo = nil| repo.import_distribution_data(target_repo) }
 end
-
 ```
 
 ## DSL breakdown
@@ -28,24 +57,44 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
 ```
 This declares the the repository type, specifying a type identifier (e.g. 'yum')
 
-### Service class
+### Service class and friends
 
 ```ruby
-  service_class Katello::Pulp::Repository::Yum
+  pulp3_service_class Katello::Pulp3::Repository::Yum
+  pulp3_api_class Katello::Pulp3::Api::Yum
+  pulp3_plugin 'rpm'
+  ...
 ```
 
-Identifies the service class that is used to interface with pulp 2 and includes methods for creating and updating the type of repository
- 
+Identifies the service class that is used to interface with Pulp and includes methods for creating and updating the type of repository. Also notes the location of the main API class and the name of the corresponding Pulp plugin.
+There are a number of other classes that need to be defined, so follow the [full example](full-example) above to ensure that the new type has
+all the neccessary information.
+
  ### Content Type
- 
+
 ```ruby
-  content_type Katello::Rpm, :priority => 1, :pulp2_service_class => ::Katello::Pulp::Rpm
+  default_managed_content_type Katello::Rpm::CONTENT_TYPE
+  content_type Katello::Rpm,
+    priority: 1,
+    pulp3_service_class: ::Katello::Pulp3::Rpm,
+    primary_content: true,
+    removable: true,
+    uploadable: true
 ```
 
-Defines a content type to be used by the repository.  The first argument is the Active Record model class representing the content type.  This should extend the `Katello::Concerns::PulpDatabaseUnit` class.
+The `default_managed_content_type` method sets the Rpm content type as the default content type, which
+the repository type will act upon when another content type is not explicitly declared. For example, a yum upload
+will assume that the uploaded content is of Rpm type unless otherwise specified.
+
+The `content_type` method defines a content type to be used by the repository.  The first argument is the Active Record model class representing the content type.  This should extend the `Katello::Concerns::PulpDatabaseUnit` class.
 The second argument is an options hash that includes:
 * priority - The ordering used when indexing or performing other operations (1 is highest, defaults to 99)
-* pulp2_service_class - The service class representing this content type in pulp 2
+* pulp3_service_class - The service class representing this content type
+* primary_content - The indexing of this content type is recorded for display after syncing
+* removable - Content units of this type can be deleted from a repository
+* uploadable - Content units of this type can be uploaded to a repository
+* index - Content units of this type will be indexed
+
 
 ### Additional custom indexing
 
@@ -61,4 +110,72 @@ Provides a block that will be executed after other repository indexing completes
 prevent_unneeded_metadata_publish
 ```
 
-This option declares that this content type supports the CheckMatchingContent middleware where by repositories are not actually republished in pulp if no content changes.
+This option declares that this content type supports the CheckMatchingContent middleware, which removes the need to republish repositories in Pulp when content doesn't change.
+
+### Generic content types
+
+For content types that are simple enough to support it, the "generic content type" framework can be used.
+If no special models are required to support the new content type, the only information that needs to be added
+about the type would be what exists in the repository type definition.
+The `generic_content_type` and `generic_remote_option` methods exist to define all other attributes that are needed to
+create a generic type.
+To create a generic content type, follow the Python type as an example:
+
+```ruby
+Katello::RepositoryTypeManager.register('python') do
+  allow_creation_by_user true
+  pulp3_service_class Katello::Pulp3::Repository::Generic
+  pulp3_api_class Katello::Pulp3::Api::Generic
+  pulp3_plugin 'python'
+
+  client_module_class PulpPythonClient
+  api_class PulpPythonClient::ApiClient
+  configuration_class PulpPythonClient::Configuration
+  remote_class PulpPythonClient::PythonPythonRemote
+  remotes_api_class PulpPythonClient::RemotesPythonApi
+  repositories_api_class PulpPythonClient::RepositoriesPythonApi
+  repository_versions_api_class PulpPythonClient::RepositoriesPythonVersionsApi
+  distributions_api_class PulpPythonClient::DistributionsPypiApi
+  distribution_class PulpPythonClient::PythonPythonDistribution
+  publication_class PulpPythonClient::PythonPythonPublication
+  publications_api_class PulpPythonClient::PublicationsPypiApi
+  repo_sync_url_class PulpPythonClient::RepositorySyncURL
+
+  generic_remote_option :includes, title: N_("Includes"), type: Array, input_type: "textarea", delimiter: "\\n", default: [],
+                        description: N_("Python packages to include from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0. Leave empty to include every package.")
+
+  generic_remote_option :excludes, title: N_("Excludes"), type: Array, input_type: "textarea", delimiter: "\\n", default: [],
+                        description: N_("Python packages to exclude from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0.")
+
+  generic_remote_option :package_types, title: N_("Package Types"), type: Array, input_type: "text", delimiter: ",", default: [],
+                        description: N_("Package types to sync for Python content, separated by comma. Leave empty to get every package type. Package types are: bdist_dmg, bdist_dumb, bdist_egg, bdist_msi, bdist_rpm, bdist_wheel, bdist_wininst, sdist.")
+
+  url_description N_("URL of a PyPI content source such as https://pypi.org.")
+
+  generic_content_type 'python_package',
+                       pluralized_name: "Python Packages",
+                       model_class: Katello::GenericContentUnit,
+                       pulp3_api: PulpPythonClient::ContentPackagesApi,
+                       pulp3_model: PulpPythonClient::PythonPythonPackageContent,
+                       pulp3_service_class: Katello::Pulp3::GenericContentUnit,
+                       model_name: lambda { |pulp_unit| pulp_unit["name"] },
+                       model_version: lambda { |pulp_unit| pulp_unit["version"] },
+                       model_filename: lambda { |pulp_unit| pulp_unit["filename"] },
+                       model_additional_metadata: lambda { |pulp_unit|
+                         {
+                           "package_type": pulp_unit["packagetype"],
+                           "sha256": pulp_unit["sha256"]
+                         }
+                       },
+                       removable: true,
+                       uploadable: true,
+                       duplicates_allowed: false,
+                       filename_key: :filename,
+                       generic_browser: true,
+                       test_upload_path: 'test/fixtures/files/shelf_reader-0.1-py2-none-any.whl'
+  default_managed_content_type :python_package
+
+  test_url 'https://fixtures.pulpproject.org/python-pypi/'
+  test_url_root_options generic_remote_options: {includes: ['celery']}.to_json
+end
+```

data/lib/katello/repository_types/deb.rb

@@ -1,5 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
-  service_class Katello::Pulp::Repository::Deb
   pulp3_service_class Katello::Pulp3::Repository::Apt
   pulp3_api_class Katello::Pulp3::Api::Apt
   pulp3_plugin 'deb'

data/lib/katello/repository_types/docker.rb

@@ -1,5 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
-  service_class Katello::Pulp::Repository::Docker
   default_managed_content_type Katello::DockerManifest::CONTENT_TYPE
   pulp3_service_class Katello::Pulp3::Repository::Docker
   pulp3_api_class Katello::Pulp3::Api::Docker

data/lib/katello/repository_types/file.rb

@@ -1,6 +1,5 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   allow_creation_by_user true
-  service_class Katello::Pulp::Repository::File
   pulp3_service_class Katello::Pulp3::Repository::File
   pulp3_api_class Katello::Pulp3::Api::File
   pulp3_plugin 'file'

data/lib/katello/repository_types/yum.rb

@@ -1,5 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
-  service_class Katello::Pulp::Repository::Yum
   pulp3_service_class Katello::Pulp3::Repository::Yum
   pulp3_api_class Katello::Pulp3::Api::Yum
   pulp3_plugin 'rpm'
@@ -33,9 +32,6 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
     :primary_content => true, :mutable => true
   content_type Katello::PackageGroup,
     :pulp3_service_class => ::Katello::Pulp3::PackageGroup
-  content_type Katello::YumMetadataFile,
-    :pulp3_service_class => ::Katello::Pulp3::YumMetadataFile,
-    :index_on_pulp3 => false
   content_type Katello::Srpm,
     :pulp3_service_class => ::Katello::Pulp3::Srpm,
     :removable => true, :uploadable => true

data/lib/katello/tasks/clean_candlepin_orphaned_products.rake

@@ -0,0 +1,38 @@
+namespace :katello do
+  desc "Removes custom products (and their associated pools and subscriptions) from Candlepin that are not in Katello"
+  task :clean_candlepin_orphaned_products => ["dynflow:client", "environment"] do
+    User.current = User.anonymous_admin #set a user for orchestration
+
+    deleted_products_counts = {}
+    Organization.all.each do |org|
+      print "Cleaning Candlepin orphaned custom products for organization #{org.name}\n"
+
+      cp_products = Katello::Resources::Candlepin::Product.all(org.label)
+      cp_products = cp_products.select { |prod| Katello::Glue::Candlepin::Product.engineering_product_id?(prod['id']) }
+      cp_product_ids = cp_products.map { |cp_product| cp_product['id'] }
+
+      katello_product_ids = Katello::Product.where(:organization_id => org.id).pluck(:cp_id)
+      orphaned_cp_product_ids = cp_product_ids - katello_product_ids
+      orphaned_cp_product_ids.each do |cp_product_id|
+        print "Deleting Candlepin orphaned custom product #{cp_product_id} (and its associated pools and subscriptions)\n"
+        ForemanTasks.sync_task(
+          ::Actions::Candlepin::Product::DeletePools,
+          cp_id: cp_product_id, organization_label: org.label)
+
+        ForemanTasks.sync_task(
+          ::Actions::Candlepin::Product::DeleteSubscriptions,
+          cp_id: cp_product_id, organization_label: org.label)
+
+        ForemanTasks.sync_task(
+          ::Actions::Candlepin::Product::Destroy,
+          owner: org.label, cp_id: cp_product_id)
+      end
+
+      deleted_products_counts[org.name] = orphaned_cp_product_ids.length
+    end
+
+    deleted_products_counts.each do |org_name, deleted_products_count|
+      print "Deleted #{deleted_products_count} Candlepin orphaned custom products for organization #{org_name}\n"
+    end
+  end
+end

data/lib/katello/tasks/clean_orphaned_facets.rb

@@ -0,0 +1,20 @@
+namespace :katello do
+  desc "Remove orphaned and unneeded content/subscription facets."
+  task :clean_orphaned_facets => ["environment"] do
+    User.current = User.anonymous_admin
+    remove_orphan_facets
+  end
+
+  def remove_orphan_facets
+    ::Katello::Host::ContentFacet.select { |c| c.host.nil? }&.each do |content_facet|
+      Rails.logger.info "Deleting content facet with id: #{content_facet.id}\n"
+      content_facet.destroy
+    end
+    Katello::Host::SubscriptionFacet.select { |s| s.host.nil? }&.each do |subscription_facet|
+      Rails.logger.info "Deleting subscription facet with id: #{subscription_facet.id}\n"
+      subscription_facet.destroy
+    end
+  rescue RuntimeError => e
+    Rails.logger.error "Task failed: #{e}"
+  end
+end

data/lib/katello/tasks/reimport.rake

@@ -14,7 +14,6 @@ namespace :katello do
   desc "Reimports information from backend systems"
   task :reimport => ["dynflow:client", "katello:check_ping"] do
     User.current = User.anonymous_admin #set a user for orchestration
-    Dir.glob(Katello::Engine.root.to_s + '/app/models/katello/*.rb').each { |file| require file }
 
     models = [
       Katello::Subscription,
@@ -32,7 +31,7 @@ namespace :katello do
       ack_key.import_pools
     end
 
-    print "Importing Linked Repositories"
+    print "Importing Linked Repositories\n"
     Katello::Repository.linked_repositories.each(&:index_content)
   end
 end

data/lib/katello/tasks/repository.rake

@@ -3,27 +3,6 @@ namespace :katello do
     ENV['COMMIT'] == 'true' || ENV['FOREMAN_UPGRADE'] == '1'
   end
 
-  desc "Check for repositories that have not been published since their last sync, and republish if they have."
-  task :publish_unpublished_repositories => ["dynflow:client", "check_ping"] do
-    needing_publish = []
-    Organization.find_each do |org|
-      if org.default_content_view && !org.default_content_view.versions.empty?
-        org.default_content_view.versions.first.repositories.joins(:root)
-          .where.not(katello_root_repositories: { url: nil }).find_each do |repo|
-          if repo.needs_metadata_publish?
-            Rails.logger.error("Repository metadata for #{repo.name} (#{repo.id}) is out of date, regenerating.")
-            needing_publish << repo.id
-          end
-        rescue => e
-          puts "Failed to check repository #{repo.id}: #{e}"
-        end
-      end
-    end
-    if needing_publish.any?
-      ForemanTasks.async_task(::Actions::Katello::Repository::BulkMetadataGenerate, Katello::Repository.where(:id => needing_publish))
-    end
-  end
-
   desc "Regnerate metadata for all repositories. Specify CONTENT_VIEW=name and LIFECYCLE_ENVIRONMENT=name to narrow repositories."
   task :regenerate_repo_metadata => ["dynflow:client", "check_ping"] do
     User.current = User.anonymous_api_admin
@@ -108,7 +87,7 @@ namespace :katello do
       return false unless backend_service&.repository_reference&.repository_href
       backend_service.api.repositories_api.read(backend_service.repository_reference.repository_href)
     else
-      Katello.pulp_server.extensions.repository.retrieve(repo.pulp_id)
+      false
     end
     true
   rescue StandardError => e

data/lib/katello/tasks/reset.rake

@@ -13,6 +13,7 @@ namespace :katello do
       system("sudo systemctl stop 'pulpcore-worker@*' --all")
       system("sudo runuser - postgres -c 'dropdb pulpcore'")
       system("sudo runuser - postgres -c 'createdb pulpcore'")
+      system("sudo runuser - postgres -c \"psql -d pulpcore -c 'create extension hstore'\"")
 
       Dir.chdir("/tmp") do
         fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager migrate --no-input")

data/lib/katello/tasks/upgrades/4.8/fix_incorrect_providers.rake

@@ -0,0 +1,29 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.8' do
+      desc "Fix custom products incorrectly assigned a Red Hat provider"
+      task :fix_incorrect_providers => ["dynflow:client", "environment"] do
+        User.current = User.anonymous_admin #set a user for orchestration
+
+        print "Fixing incorrect providers\n"
+        incorrect_provider_count = 0
+        error_msgs = []
+        Katello::Product.redhat.includes(:organization).each do |product|
+          if ::Katello::Glue::Candlepin::Product.custom_product_id?(product.cp_id)
+            print "Fixing provider for #{product.name}\n"
+            incorrect_provider_count += 1
+            product.provider = product.organization.anonymous_provider
+            product.save!
+          end
+        end
+
+        print "Fixed #{incorrect_provider_count} incorrect providers\n"
+        if error_msgs.any?
+          print "Errors while fixing providers: #{error_msgs.join("\n")}\n"
+        end
+
+        Rake::Task['katello:clean_candlepin_orphaned_products'].invoke
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.7.6".freeze
+  VERSION = "4.8.0.rc1".freeze
 end

data/lib/katello.rb

@@ -10,7 +10,6 @@ require "rest_client"
 require "anemone"
 require "securerandom"
 
-require "runcible"
 require "deface"
 
 require "securerandom"
@@ -26,8 +25,4 @@ require "monkeys/anemone"
 module Katello
   require "katello/version"
   require "katello/engine"
-
-  def self.pulp_server
-    Katello::Pulp::Server.config(::SmartProxy.pulp_primary.url + '/pulp/api/v2/', User.remote_user)
-  end
 end