katello 4.7.4 → 4.8.0.rc1

data/app/services/katello/registration_manager.rb

@@ -4,10 +4,6 @@ module Katello
       private :new
       delegate :propose_existing_hostname, :new_host_from_facts, to: Katello::Host::SubscriptionFacet
 
-      def determine_organization(content_view_environment, activation_key)
-        content_view_environment.try(:environment).try(:organization) || activation_key.try(:organization)
-      end
-
       def determine_host_dmi_uuid(rhsm_params)
         host_uuid = rhsm_params.dig(:facts, 'dmi.system.uuid')
 
@@ -18,17 +14,17 @@ module Katello
         [host_uuid, false]
       end
 
-      def process_registration(rhsm_params, content_view_environment, activation_keys = [])
+      def process_registration(rhsm_params, content_view_environments, activation_keys = [])
         host_name = propose_existing_hostname(rhsm_params[:facts])
         host_uuid, host_uuid_overridden = determine_host_dmi_uuid(rhsm_params)
 
         rhsm_params[:facts]['dmi.system.uuid'] = host_uuid # ensure we find & validate against a potentially overridden UUID
 
-        organization = determine_organization(content_view_environment, activation_keys.first)
+        organization = validate_content_view_environment_org(content_view_environments, activation_keys.first)
 
         hosts = find_existing_hosts(host_name, host_uuid)
 
-        validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden)
+        validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden: host_uuid_overridden)
 
         host = hosts.first || new_host_from_facts(
           rhsm_params[:facts],
@@ -37,7 +33,7 @@ module Katello
         )
         host.organization = organization unless host.organization
 
-        register_host(host, rhsm_params, content_view_environment, activation_keys)
+        register_host(host, rhsm_params, content_view_environments, activation_keys)
 
         if host_uuid_overridden
           host.subscription_facet.update_dmi_uuid_override(host_uuid)
@@ -71,7 +67,19 @@ module Katello
         query
       end
 
-      def validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden = false)
+      def validate_content_view_environment_org(content_view_environments, activation_key)
+        orgs = Set.new([activation_key&.organization])
+        content_view_environments&.each do |cve|
+          orgs << cve&.environment&.organization
+        end
+        orgs.delete(nil)
+        if orgs.size != 1
+          registration_error(_("Content view environments and activation key must all belong to the same organization"))
+        end
+        orgs.first
+      end
+
+      def validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden: false)
         return if hosts.empty?
 
         hosts = hosts.where(organization_id: [organization.id, nil])
@@ -135,40 +143,42 @@ module Katello
           remove_host_artifacts(host)
         elsif organization_destroy
           host.content_facet.try(:destroy!)
-          remove_host_artifacts(host, false)
+          remove_host_artifacts(host, clear_content_facet: false)
         else
           host.content_facet.try(:destroy!)
           destroy_host_record(host.id)
         end
       end
 
-      def register_host(host, consumer_params, content_view_environment, activation_keys = [])
+      def register_host(host, consumer_params, content_view_environments, activation_keys = []) # rubocop:disable Metrics/MethodLength
         new_host = host.new_record?
-
         unless new_host
           host.save!
           unregister_host(host, :unregistering => true)
           host.reload
         end
 
-        unless activation_keys.empty?
-          content_view_environment ||= lookup_content_view_environment(activation_keys)
+        if activation_keys.present?
+          if content_view_environments.blank?
+            content_view_environments = [lookup_content_view_environment(activation_keys)]
+          end
           set_host_collections(host, activation_keys)
         end
-        fail _('Content View and Environment not set for registration.') if content_view_environment.nil?
+        fail _('Content view and environment not set for registration.') if content_view_environments.blank?
 
         host.save! #the host is in foreman db at this point
 
         host_uuid = get_uuid(consumer_params)
         consumer_params[:uuid] = host_uuid
-        host.content_facet = populate_content_facet(host, content_view_environment, host_uuid)
+        host.content_facet = populate_content_facet(host, content_view_environments, host_uuid)
+        host.content_facet.cves_changed = false # prevent backend_update_needed from triggering an update on a nonexistent consumer
         host.subscription_facet = populate_subscription_facet(host, activation_keys, consumer_params, host_uuid)
         host.save! # the host has content and subscription facets at this point
         create_initial_subscription_status(host)
 
         User.as_anonymous_admin do
           begin
-            create_in_candlepin(host, content_view_environment, consumer_params, activation_keys)
+            create_in_candlepin(host, content_view_environments, consumer_params, activation_keys)
           rescue StandardError => e
             # we can't call CP here since something bad already happened. Just clean up our DB as best as we can.
             host.subscription_facet.try(:destroy!)
@@ -185,8 +195,7 @@ module Katello
         User.as_anonymous_admin do
           ping_results = Katello::Ping.ping
         end
-        candlepin_ok = ping_results[:services][:candlepin][:status] == "ok"
-        candlepin_ok
+        ping_results[:services][:candlepin][:status] == "ok"
       end
 
       private
@@ -199,6 +208,11 @@ module Katello
       end
 
       def get_uuid(params)
+        if params.key?(:uuid)
+          Rails.logger.info "assigning existing uuid #{params[:uuid]}"
+        else
+          Rails.logger.info "generating new uuid"
+        end
         params.key?(:uuid) ? params[:uuid] : SecureRandom.uuid
       end
 
@@ -211,11 +225,17 @@ module Katello
         host.subscription_facet.update_subscription_status(::Katello::SubscriptionStatus::UNKNOWN)
       end
 
-      def create_in_candlepin(host, content_view_environment, consumer_params, activation_keys)
+      def create_in_candlepin(host, content_view_environments, consumer_params, activation_keys)
         # if CP fails, nothing to clean up yet w.r.t. backend services
-        cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environment.cp_id, consumer_params, activation_keys.map(&:cp_name))
+        cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environments.map(&:cp_id), consumer_params, activation_keys.map(&:cp_name), host.organization)
         ::Katello::Host::SubscriptionFacet.update_facts(host, consumer_params[:facts]) unless consumer_params[:facts].blank?
-        cp_create[:uuid]
+        uuid = cp_create[:uuid]
+        if uuid.present? && uuid != host.subscription_facet.uuid
+          Rails.logger.info(_("Candlepin returned different consumer uuid than requested (%s), updating uuid in subscription_facet.") % uuid)
+          host.subscription_facet.uuid = uuid
+          host.subscription_facet.save!
+        end
+        uuid
       end
 
       def finalize_registration(host)
@@ -271,10 +291,9 @@ module Katello
         end
       end
 
-      def populate_content_facet(host, content_view_environment, uuid)
+      def populate_content_facet(host, content_view_environments, uuid)
         content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
-        content_facet.content_view = content_view_environment.content_view
-        content_facet.lifecycle_environment = content_view_environment.environment
+        content_facet.content_view_environments = content_view_environments
         content_facet.uuid = uuid
         content_facet.save!
         content_facet
@@ -291,11 +310,12 @@ module Katello
         subscription_facet
       end
 
-      def remove_host_artifacts(host, clear_content_facet = true)
+      def remove_host_artifacts(host, clear_content_facet: true)
         if host.content_facet && clear_content_facet
           host.content_facet.bound_repositories = []
           host.content_facet.applicable_errata = []
           host.content_facet.uuid = nil
+          host.content_facet.content_view_environments = []
           host.content_facet.save!
           host.content_facet.calculate_and_import_applicability
         end

data/app/services/katello/repository_type.rb

@@ -72,12 +72,7 @@ module Katello
     end
 
     def content_types_to_index
-      if SmartProxy.pulp_primary&.pulp3_repository_type_support?(self)
-        # type.index being false supersedes type.index_on_pulp3 being true
-        @content_types.select { |type| type.index && type.index_on_pulp3 }
-      else
-        @content_types.select { |type| type.index }
-      end
+      @content_types.select { |type| type.index }
     end
 
     def default_managed_content_type(label = nil)
@@ -146,7 +141,7 @@ module Katello
 
     class ContentType
       attr_accessor :model_class, :priority, :pulp3_service_class, :index, :uploadable, :removable, :mutable,
-                    :primary_content, :index_on_pulp3, :generic_browser, :content_type, :repository_import_on_upload,
+                    :primary_content, :generic_browser, :content_type, :repository_import_on_upload,
                     :test_upload_path
 
       def initialize(options)
@@ -155,7 +150,6 @@ module Katello
         self.priority = options[:priority] || 99
         self.pulp3_service_class = options[:pulp3_service_class]
         self.index = options[:index].nil? ? true : options[:index]
-        self.index_on_pulp3 = options[:index_on_pulp3].nil? ? true : options[:index_on_pulp3]
         self.uploadable = options[:uploadable] || false
         self.removable = options[:removable] || false
         self.primary_content = options[:primary_content] || false
@@ -176,7 +170,7 @@ module Katello
           generic: false,
           removable: removable,
           uploadable: uploadable,
-          indexed: index && index_on_pulp3
+          indexed: index
         }
       end
 

data/app/services/katello/simple_package.rb

@@ -0,0 +1,22 @@
+module Katello
+  class SimplePackage
+    # {"epoch", "name", "arch", "version", "vendor", "release"}
+    attr_accessor :vendor, :arch, :epoch, :version, :release, :name
+
+    def initialize(params = {})
+      params.each_pair { |k, v| instance_variable_set("@#{k}", v) unless v.nil? }
+    end
+
+    def nvra
+      "#{@name}-#{@version}-#{@release}.#{@arch}"
+    end
+
+    def nvrea
+      if epoch.nil? || epoch.to_s == "0"
+        nvra
+      else
+        "#{@name}-#{@epoch}:#{@version}-#{@release}.#{@arch}"
+      end
+    end
+  end
+end

data/app/views/foreman/smart_proxies/_content_sync.html.erb

@@ -56,6 +56,7 @@
         <a ng-click="reclaimSpace()" ng-hide="syncStatus.download_policy != 'on_demand'">
           <span translate><strong>Reclaim Space</strong></span>
           <p translate> Delete cached content units from an "On Demand" Smart Proxy.</p>
+          <p translate> Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.</p>
         </a>
       </li>
     </ul>

data/app/views/foreman/smart_proxies/_reclaim_space.html.erb

@@ -3,6 +3,7 @@
   <p translate>
     <strong>Warning</strong>: reclaiming space will delete all cached content units in "On Demand" repositories on this Smart Proxy.<br>
     Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
+    Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.
   </p>
   <div class="button">
     <button class="btn btn-default" type="button" id="reclaimSpaceButton" ng-click="reclaimSpace()" translate>

data/app/views/katello/api/v2/content_facet/base.json.rabl

@@ -10,11 +10,32 @@ attributes :applicable_rpm_count => :applicable_package_count
 attributes :upgradable_rpm_count => :upgradable_package_count
 attributes :applicable_module_stream_count, :upgradable_module_stream_count
 
-child :content_view => :content_view do
+node :content_view do |content_facet|
+  content_view = content_facet.single_content_view
+  if content_view.present?
+    {
+      :id => content_view.id,
+      :name => content_view.name,
+      :composite => content_view.composite?
+    }
+  end
+end
+
+node :lifecycle_environment do |content_facet|
+  lifecycle_environment = content_facet.single_lifecycle_environment
+  if lifecycle_environment.present?
+    {
+      :id => lifecycle_environment.id,
+      :name => lifecycle_environment.name
+    }
+  end
+end
+
+child :content_views => :content_views do
   attributes :id, :name, :composite
 end
 
-child :lifecycle_environment => :lifecycle_environment do
+child :lifecycle_environments => :lifecycle_environments do
   attributes :id, :name
 end
 

data/app/views/katello/api/v2/content_facet/show.json.rabl

@@ -2,20 +2,23 @@ child :content_facet => :content_facet_attributes do
   extends 'katello/api/v2/content_facet/base'
 
   node do |content_facet|
-    version = content_facet.content_view_version
-    {
-      :content_view_version => version.version,
-      :content_view_version_id => version.id,
-      :content_view_version_latest => version.latest?
-    }
+    content_facet.single_content_view # just so Rails gives a warning and we remember to fix this
+    version = content_facet.content_view_environments.first&.content_view_version
+    if version.present?
+      {
+        :content_view_version => version.version,
+        :content_view_version_id => version.id,
+        :content_view_version_latest => version.latest?
+      }
+    end
   end
 
   node :content_view_default? do |content_facet|
-    content_facet.content_view.default?
+    content_facet.single_content_view&.default? || false
   end
 
   node :lifecycle_environment_library? do |content_facet|
-    content_facet.lifecycle_environment.library?
+    content_facet.single_lifecycle_environment&.library? || false
   end
 
   node :katello_agent_installed do |content_facet|

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -44,7 +44,7 @@ node :environments do |cv|
       label: env.label,
       name: env.label,
       activation_keys: cv&.activation_keys&.in_environment(env)&.ids,
-      hosts: cv&.hosts&.in_environment(env)&.ids,
+      hosts: cv&.hosts&.in_environments([env])&.ids,
       permissions: {readable: env.readable?}
     }
   end

data/app/views/katello/api/v2/hosts/base.json.rabl

@@ -1,7 +1,27 @@
 object @resource
 
 @resource ||= @object
+@facet = @resource.content_facet
 
 attributes :id, :name, :description
-attributes :content_view, :content_view_id
-attributes :lifecycle_environment => :environment
+if @facet
+  node :content_view do
+    content_view = @facet&.single_content_view
+    if content_view.present?
+      {
+        :id => content_view.id,
+        :name => content_view.name,
+        :composite => content_view.composite?
+      }
+    end
+  end
+  node :lifecycle_environment do
+    lifecycle_environment = @facet&.single_lifecycle_environment
+    if lifecycle_environment.present?
+      {
+        :id => lifecycle_environment.id,
+        :name => lifecycle_environment.name
+      }
+    end
+  end
+end

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -8,7 +8,7 @@
 
 <% env_select_id = using_hostgroups_page? ? :hostgroup_lifecycle_environment_id : :host_lifecycle_environment_id %>
 <% env_select_name =  using_hostgroups_page? ? 'hostgroup[lifecycle_environment_id]' : 'host[content_facet_attributes][lifecycle_environment_id]' %>
-<% env_select_attr = using_hostgroups_page? ? 'lifecycle_environment' : 'content_facet.lifecycle_environment' %>
+<% env_select_attr = using_hostgroups_page? ? 'lifecycle_environment' : 'content_facet.single_lifecycle_environment' %>
 
 <%= field(f, env_select_attr, {:label => _("Lifecycle Environment")}) do
   if using_hostgroups_page?
@@ -21,7 +21,7 @@ end %>
 
 <% cv_select_id =  using_hostgroups_page? ? :hostgroup_content_view_id : :host_content_view_id %>
 <% cv_select_name =  using_hostgroups_page? ? 'hostgroup[content_view_id]' : 'host[content_facet_attributes][content_view_id]' %>
-<% cv_select_attr = using_hostgroups_page? ? 'content_view' : 'content_facet.content_view' %>
+<% cv_select_attr = using_hostgroups_page? ? 'content_view' : 'content_facet.single_content_view' %>
 <%= field(f, cv_select_attr, {:label => _("Content View")}) do
   if using_hostgroups_page?
     select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path},

data/config/initializers/monkeys.rb

@@ -2,5 +2,3 @@
 require 'monkeys/anemone'
 require 'monkeys/ar_postgres_evr_t'
 require 'monkeys/fx_sqlite_skip'
-require 'monkeys/fix_pulp_container_path'
-require 'monkeys/fix_deb_optimized_sync'

data/config/routes/api/registry.rb

@@ -10,15 +10,16 @@ Katello::Engine.routes.draw do
       match '/v2/token' => 'registry_proxies#token', :via => :get
       match '/v2/token' => 'registry_proxies#token', :via => :post
       match '/v2/*repository/manifests/:tag' => 'registry_proxies#pull_manifest', :via => :get
-      match '/v2/*repository/manifests/:tag' => 'registry_proxies#push_manifest', :via => :put
+      # Push-related routes are disabled until there is support for pushing to Pulp 3.
+      # match '/v2/*repository/manifests/:tag' => 'registry_proxies#push_manifest', :via => :put
       match '/v2/*repository/blobs/:digest' => 'registry_proxies#pull_blob', :via => :get
       match '/v2/*repository/blobs/:digest' => 'registry_proxies#check_blob', :via => :head
-      match '/v2/*repository/blobs/uploads' => 'registry_proxies#start_upload_blob', :via => :post
-      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#chunk_upload_blob', :via => :post
-      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#finish_upload_blob', :via => :put
-      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#upload_blob', :via => :patch
-      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#status_upload_blob', :via => :get
-      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#cancel_upload_blob', :via => :delete
+      # match '/v2/*repository/blobs/uploads' => 'registry_proxies#start_upload_blob', :via => :post
+      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#chunk_upload_blob', :via => :post
+      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#finish_upload_blob', :via => :put
+      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#upload_blob', :via => :patch
+      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#status_upload_blob', :via => :get
+      # match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#cancel_upload_blob', :via => :delete
       match '/v2/_catalog' => 'registry_proxies#catalog', :via => :get
       match '/v2/*repository/tags/list' => 'registry_proxies#tags_list', :via => :get
       match '/v2' => 'registry_proxies#ping', :via => :get

data/config/routes/api/v2.rb

@@ -274,8 +274,6 @@ Katello::Engine.routes.draw do
         api_resources :package_groups, :only => [:index, :show] do
           collection do
             get :auto_complete_search
-            post :create
-            delete :destroy
             get :compare
           end
         end

data/config/routes.rb

@@ -47,4 +47,7 @@ Katello::Engine.routes.draw do
   match '/organization_select' => 'react#index', :via => [:get]
 
   get '/change_host_content_source', to: 'react#index'
+  constraints(id: /[^\/]+/) do
+    get 'new/hosts/:id/content', to: redirect('new/hosts/%{id}#/Content')
+  end
 end

data/db/migrate/20200429153103_installed_package_bad_nvrea.rb

@@ -1,7 +1,7 @@
 class InstalledPackageBadNvrea < ActiveRecord::Migration[5.2]
   def up
     Katello::InstalledPackage.where(:epoch => "0").find_each do |pkg|
-      simple = Katello::Pulp::SimplePackage.new(pkg.attributes)
+      simple = Katello::SimplePackage.new(pkg.attributes)
       if pkg.nvrea != simple.nvrea
         pkg.update_column(:nvrea, simple.nvrea)
       end

data/db/migrate/20220228173251_remove_drpm_from_ignorable_content.rb

@@ -1,12 +1,16 @@
 class RemoveDrpmFromIgnorableContent < ActiveRecord::Migration[6.0]
   def up
-    Katello::RootRepository.select { |r| r&.ignorable_content&.include? "drpm" }.each do |root|
-      root.ignorable_content = root.ignorable_content - ["drpm"]
+    Katello::RootRepository.select { |r| !r&.ignorable_content&.blank? }.each do |root|
+      if root&.ignorable_content&.include?("srpm")
+        root.ignorable_content = ["srpm"]
+      else
+        root.ignorable_content = []
+      end
       root.save!
     end
   end
 
   def down
-    fail ActiveRecord::IrreversibleMigration
+    #noop
   end
 end

data/db/migrate/20220419193414_content_settings_to_dsl_category.rb

@@ -1,5 +1,5 @@
 class ContentSettingsToDslCategory < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::Content').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::Content').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/db/migrate/20220929204746_add_content_view_environment_content_facet.rb

@@ -0,0 +1,52 @@
+class AddContentViewEnvironmentContentFacet < ActiveRecord::Migration[6.1]
+  class FakeContentFacet < ApplicationRecord
+    self.table_name = 'katello_content_facets'
+  end
+
+  def up
+    create_table :katello_content_view_environment_content_facets do |t|
+      t.references :content_view_environment, :null => false, :index => false, :foreign_key => { :to_table => 'katello_content_view_environments' }
+      t.references :content_facet, :null => false, :index => false, :foreign_key => { :to_table => 'katello_content_facets' }
+    end
+    FakeContentFacet.all.each do |content_facet|
+      cve_id = ::Katello::KTEnvironment.find(content_facet.lifecycle_environment_id)
+          .content_view_environments
+          .find_by(content_view_id: content_facet.content_view_id)
+          .id
+      unless ::Katello::ContentViewEnvironmentContentFacet.create(
+        content_facet_id: content_facet.id,
+        content_view_environment_id: cve_id
+      )
+        Rails.logger.warn "Failed to create ContentViewEnvironmentContentFacet for content_facet #{content_facet.id}"
+      end
+    end
+
+    remove_column :katello_content_facets, :content_view_id
+    remove_column :katello_content_facets, :lifecycle_environment_id
+  end
+
+  def down
+    add_column :katello_content_facets, :content_view_id, :integer, :index => true
+    add_column :katello_content_facets, :lifecycle_environment_id, :integer, :index => true
+
+    add_foreign_key "katello_content_facets", "katello_content_views",
+                    :name => "katello_content_facets_content_view_id", :column => "content_view_id"
+
+    add_foreign_key "katello_content_facets", "katello_environments",
+                    :name => "katello_content_facets_life_environment_id", :column => "lifecycle_environment_id"
+
+    ::Katello::Host::ContentFacet.reset_column_information
+
+    ::Katello::ContentViewEnvironmentContentFacet.all.each do |cvecf|
+      content_facet = cvecf.content_facet
+      content_facet.content_view_id = cvecf.content_view_environment.content_view_id
+      content_facet.lifecycle_environment_id = cvecf.content_view_environment.environment_id
+      content_facet.save(validate: false)
+    end
+
+    change_column :katello_content_facets, :content_view_id, :integer, :null => false
+    change_column :katello_content_facets, :lifecycle_environment_id, :integer, :null => false
+
+    drop_table :katello_content_view_environment_content_facets
+  end
+end

data/db/migrate/20221123212341_remove_pulp_docker_registry_port_setting.rb

@@ -0,0 +1,5 @@
+class RemovePulpDockerRegistryPortSetting < ActiveRecord::Migration[6.1]
+  def change
+    Setting.where(name: 'pulp_docker_registry_port').destroy_all
+  end
+end

data/db/migrate/20230119003859_ensure_repo_username_password_nil_not_blank.rb

@@ -2,7 +2,7 @@ class EnsureRepoUsernamePasswordNilNotBlank < ActiveRecord::Migration[6.1]
   def change
     ::Katello::Repository.library.each do |repo|
       if repo.upstream_username == '' && repo.upstream_password == ''
-        repo.root.update(upstream_username: nil, upstream_password: nil)
+        repo.update(upstream_username: nil, upstream_password: nil)
       end
     end
   end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -7,6 +7,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:4.1:fix_invalid_pools'},
     {:name => 'katello:upgrades:4.1:reupdate_content_import_export_perms'},
     {:name => 'katello:upgrades:4.2:remove_checksum_values'},
-    {:name => 'katello:upgrades:4.4:publish_import_cvvs'}
+    {:name => 'katello:upgrades:4.4:publish_import_cvvs'},
+    {:name => 'katello:upgrades:4.8:fix_incorrect_providers'}
   ]
 end

data/engines/bastion/app/assets/stylesheets/bastion/bastion.scss

@@ -157,6 +157,10 @@
       margin-bottom: 20px;
     }
   }
+  [bst-bookmark] li a{
+    white-space: break-spaces;
+    overflow-wrap: anywhere;
+  }
 }
 
 .modal.fade.in {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js

@@ -12,20 +12,18 @@
  * @requires Notification
  * @requires ApiErrorHandler
  * @requires simpleContentAccessEnabled
- * @requires isManifestImported
  *
  * @description
  *   Provides the functionality for the activation key details action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler', 'simpleContentAccessEnabled', 'isManifestImported',
-    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler, simpleContentAccessEnabled, isManifestImported) {
+    ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler', 'simpleContentAccessEnabled',
+    function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler, simpleContentAccessEnabled) {
         $scope.defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
         $scope.defaultUsages = ['Production', 'Development/Test', 'Disaster Recovery'];
 
         $scope.purposeAddonsCount = 0;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
-        $scope.isManifestImported = isManifestImported;
 
         $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
             $scope.purposeAddonsCount += org.system_purposes.addons.length;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js

@@ -119,7 +119,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
 
         $scope.installErrataViaRemoteExecution = function(customize) {
             var errataIds = $scope.selectedErrataIds();
-
             $scope.errataActionFormValues.bulkErrataIds = angular.toJson(errataIds);
 
             $scope.errataActionFormValues.remoteAction = 'errata_install';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js

@@ -14,14 +14,13 @@
  * @requires deleteHostOnUnregister
  * @requires ContentHostsHelper
  * @requires simpleContentAccessEnabled
- * @requires isManifestImported
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled', 'isManifestImported',
-    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled, isManifestImported) {
+    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled',
+    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled) {
         $scope.menuExpander = MenuExpander;
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
@@ -37,7 +36,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
 
         $scope.purposeAddonsCount = 0;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
-        $scope.isManifestImported = isManifestImported;
 
         $scope.panel = {
             error: false,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -100,7 +100,8 @@
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
             <span ng-switch="newHostDetailsUI">
-              <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.name }}</a>
+              <a ng-switch-when="true" ng-if="host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}/content">{{ host.name }}</a>
+              <a ng-switch-when="true" ng-if="!host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}">{{ host.name}}</a>
               <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
             </span>
           </td>