katello 4.7.4 → 4.8.0.rc2

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/migrate/20230203141353_set_new_acs_verify_ssl_default.rb

@@ -0,0 +1,5 @@
+class SetNewAcsVerifySslDefault < ActiveRecord::Migration[6.1]
+  def change
+    change_column_default(:katello_alternate_content_sources, :verify_ssl, nil)
+  end
+end

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

@@ -7,6 +7,8 @@ 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'},
+    {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'}
   ]
 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>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -30,6 +30,16 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 $scope.applyingErrata = false;
             }
 
+            function formatBulkHostIds() {
+                var result = IncrementalUpdate.getBulkContentHosts();
+                return angular.toJson({
+                    included: {
+                        ids: result.included.ids,
+                        search: result.included.search
+                    }
+                });
+            }
+
             $scope.applyingErrata = false;
 
             $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
@@ -37,7 +47,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             $scope.errataActionFormValues = {
                 authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
                 errata: IncrementalUpdate.getErrataIds().join(','),
-                bulkHostIds: angular.toJson({ included: { ids: IncrementalUpdate.getBulkContentHosts().included.ids }}),
+                bulkHostIds: formatBulkHostIds(),
                 customize: false
             };
 
@@ -109,7 +119,6 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
 
             applyErrata = function () {
                 var params = IncrementalUpdate.getBulkContentHosts(), error;
-
                 $scope.applyingErrata = true;
 
                 params['content_type'] = 'errata';
@@ -122,7 +131,6 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                     });
                     $scope.applyingErrata = false;
                 };
-
                 HostBulkAction.installContent(params, transitionToTask, error);
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-hosts-list.html

@@ -14,7 +14,7 @@
   </div>
 
   <span data-block="no-rows-message" translate>
-    You currently don't have any Hosts in this Host Group, you can add Content Hosts after selecting the 'Add' tab.
+    You currently don't have any Hosts in this Host Collection, you can add Content Hosts after selecting the 'Add' tab.
   </span>
 
   <span data-block="no-search-results-message" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -986,6 +986,10 @@ msgstr ""
 msgid "Changing default settings requires subscription-manager version 1.10 or newer to be installed on this host."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+msgid "Changing download policy to \"On Demand\" will also clear the checksum type if set. The repository will use the upstream checksum type to verify downloads."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid ""
 "Changing the Content View will not affect the Content Host until its next checkin.\n"
@@ -2652,7 +2656,7 @@ msgid ""
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html
-msgid "One or more RPMs are not showing up in the local repository even though they exist in the upstream repository."
+msgid "One or more packages are not showing up in the local repository even though they exist in the upstream repository."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html
@@ -3556,7 +3560,7 @@ msgid "Select Content View"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html
-msgid "Selecting \"Complete Sync\" will cause only Yum repositories of the selected product to be synced."
+msgid "Selecting \"Complete Sync\" will cause only yum/deb repositories of the selected product to be synced."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
@@ -3839,7 +3843,7 @@ msgid "Sync Enabled"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html
-msgid "Sync even if the upstream metadata appears to have no change. This option is only relevant for yum repositories and will take longer than an optimized sync. Choose this option if:"
+msgid "Sync even if the upstream metadata appears to have no change. This option is only relevant for yum/deb repositories and will take longer than an optimized sync. Choose this option if:"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/partials/sync-status.html
@@ -4646,7 +4650,7 @@ msgid "You currently don't have any Host Collections, you can add Host Collectio
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-hosts-list.html
-msgid "You currently don't have any Hosts in this Host Group, you can add Content Hosts after selecting the 'Add' tab."
+msgid "You currently don't have any Hosts in this Host Collection, you can add Content Hosts after selecting the 'Add' tab."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-products.html