katello 4.7.0.rc2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 681115c601daa1728c23ca2aa5f2995c3997f8aebd24d48f465119a9daea07fe
-  data.tar.gz: f83059ee941668d27e4ada30accf702b86f37fd20e475ffa0580fdea0fa01261
+  metadata.gz: 9591a00d0a788cc99232254d98eae3ea86ae4417e5e9203c38ef6d230cb64368
+  data.tar.gz: f912dcb619734ad43190add1ae7ea5a789805f2b6a5396fb0c00ac1171a32194
 SHA512:
-  metadata.gz: 98206f5b247a2e33f31fe908d0294ac239334106118493c4c6f4749461960975043e560724e788d5ae922d334f0ee151deaa7ded09eb9df79ef4931e52509278
-  data.tar.gz: 5f1528fa18239ddc42e4880b9877a81a75149a8e2c1a37242284e29ba8f6c808752d76c4afceea5b2b988f62df559ec5f3535e125e6a7465c11174ac69c71a09
+  metadata.gz: 28100053e3c9ff53029ceff9529565d8b29360236748be2ad1643fa9dbccf4f570cc5ce65d3395fdd0a057c1074505f9858fd542ce57a5f958b1ee2ee2deede3
+  data.tar.gz: bb5cf4097c1706dcea35275dc1a5f93cc3fe99587b569295af1a7c302e2b03155076ea027217ea5ecaf5201459e9fa50de9f11adb9891fc4077f864eafcc98dc

data/app/controllers/katello/api/v2/products_bulk_actions_controller.rb

@@ -34,7 +34,7 @@ module Katello
       syncable_products = @products.syncable
       syncable_roots = RootRepository.where(:product_id => syncable_products).has_url
 
-      syncable_roots = syncable_roots.yum_type if skip_metadata_check || validate_contents
+      syncable_roots = syncable_roots.skipable_metadata_check if skip_metadata_check || validate_contents
       syncable_roots = syncable_roots.where.not(:download_policy => ::Katello::RootRepository::DOWNLOAD_ON_DEMAND) if validate_contents
 
       syncable_repositories = Katello::Repository.where(:root_id => syncable_roots).in_default_view

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -346,7 +346,7 @@ module Katello
     param :id, :number, :required => true, :desc => N_("repository ID")
     param :source_url, String, :desc => N_("temporarily override feed URL for sync"), :required => false
     param :incremental, :bool, :desc => N_("perform an incremental import"), :required => false
-    param :skip_metadata_check, :bool, :desc => N_("Force sync even if no upstream changes are detected. Only used with yum repositories."), :required => false
+    param :skip_metadata_check, :bool, :desc => N_("Force sync even if no upstream changes are detected. Only used with yum or deb repositories."), :required => false
     param :validate_contents, :bool, :desc => N_("Force a sync and validate the checksums of all content. Only used with yum repositories."), :required => false
     def sync
       sync_options = {

data/app/controllers/katello/api/v2/repository_sets_controller.rb

@@ -38,12 +38,11 @@ module Katello
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(Katello::ProductContent)
     def index
-      collection = scoped_search(index_relation, :name, :asc, :resource_class => Katello::ProductContent)
+      collection = scoped_search(index_relation, :name, :asc, :resource_class => Katello::ProductContent, :custom_sort => ->(relation) { custom_sort_results(relation) })
       pcf = ProductContentFinder.wrap_with_overrides(
         product_contents: collection[:results],
-        overrides: @consumable&.content_overrides,
-        status: params[:status])
-      collection[:results] = custom_sort_results(pcf)
+        overrides: @consumable&.content_overrides)
+      collection[:results] = pcf
       respond(:collection => collection)
     end
 
@@ -154,7 +153,13 @@ module Katello
           :match_subscription => !content_access_mode_all,
           :match_environment => content_access_mode_env,
           :consumable => @consumable)
-      relation.merge(content_finder.product_content)
+      unfiltered = relation.merge(content_finder.product_content)
+      return unfiltered unless params[:status]
+      filtered_ids = ProductContentFinder.wrap_with_overrides(
+        product_contents: unfiltered,
+        overrides: @consumable&.content_overrides,
+        status: params[:status]).map(&:id).uniq
+      unfiltered.where(id: filtered_ids)
     end
 
     def find_product_content
@@ -236,18 +241,24 @@ module Katello
               else
                 0
               end
-      Rails.logger.debug [pc.product_name, pc.enabled_content_override, "Id: #{pc.id}", "Score: #{score}"]
       score
     end
 
-    def custom_sort_results(product_content_finder)
-      if params[:sort_by] == 'enabled_by_default' && params[:sort_order] == 'desc'
-        product_content_finder.sort { |pca, pcb| sort_score(pca) <=> sort_score(pcb) }.reverse!
-      elsif params[:sort_by] == 'enabled_by_default'
-        product_content_finder.sort { |pca, pcb| sort_score(pca) <=> sort_score(pcb) }
-      else
-        product_content_finder
-      end
+    def custom_sort_results(unsorted_relation)
+      return unsorted_relation unless params[:sort_by] == 'enabled_by_default'
+      product_content_finder = ProductContentFinder.wrap_with_overrides(
+        product_contents: unsorted_relation,
+        overrides: @consumable&.content_overrides,
+        status: params[:status])
+      sorted_pcps = if params[:sort_by] == 'enabled_by_default' && params[:sort_order] == 'desc'
+                      product_content_finder.sort { |pca, pcb| sort_score(pca) <=> sort_score(pcb) }.reverse!
+                    elsif params[:sort_by] == 'enabled_by_default'
+                      product_content_finder.sort { |pca, pcb| sort_score(pca) <=> sort_score(pcb) }
+                    else
+                      product_content_finder
+                    end
+      sort_order = sorted_pcps.map(&:id)
+      unsorted_relation.reorder(Arel.sql("array_position('{#{sort_order.join(',')}}'::int[], #{Katello::ProductContent.table_name}.id)"))
     end
   end
 end

data/app/lib/actions/katello/repository/sync.rb

@@ -21,7 +21,7 @@ module Actions
 
           source_url = options.fetch(:source_url, nil)
           validate_contents = options.fetch(:validate_contents, false)
-          skip_metadata_check = options.fetch(:skip_metadata_check, false) || (validate_contents && repo.yum?)
+          skip_metadata_check = options.fetch(:skip_metadata_check, false) || (validate_contents && (repo.yum? || repo.deb?))
           generate_applicability =  options.fetch(:generate_applicability, repo.yum? || repo.deb?)
 
           validate_repo!(repo: repo,
@@ -34,7 +34,7 @@ module Actions
           pulp_sync_options[:download_policy] = ::Katello::RootRepository::DOWNLOAD_ON_DEMAND if validate_contents && repo.yum?
 
           #pulp3 options
-          pulp_sync_options[:optimize] = false if skip_metadata_check && repo.yum?
+          pulp_sync_options[:optimize] = false if skip_metadata_check && (repo.yum? || repo.deb?)
 
           sequence do
             if validate_contents
@@ -85,7 +85,7 @@ module Actions
         def validate_repo!(repo:, source_url:, validate_contents:, skip_metadata_check:, skip_candlepin_check:)
           fail ::Katello::Errors::InvalidActionOptionError, _("Unable to sync repo. This repository does not have a feed url.") if repo.url.blank? && source_url.blank?
           fail ::Katello::Errors::InvalidActionOptionError, _("Cannot validate contents on non-yum/deb repositories.") if validate_contents && !repo.yum? && !repo.deb?
-          fail ::Katello::Errors::InvalidActionOptionError, _("Cannot skip metadata check on non-yum repositories.") if skip_metadata_check && !repo.yum?
+          fail ::Katello::Errors::InvalidActionOptionError, _("Cannot skip metadata check on non-yum/deb repositories.") if skip_metadata_check && !repo.yum? && !repo.deb?
           ::Katello::Util::CandlepinRepositoryChecker.check_repository_for_sync!(repo) if repo.yum? && !skip_candlepin_check
         end
 

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

@@ -24,6 +24,7 @@ module Actions
                   copy_actions = []
                   #since we're creating a new version from the first repo, start copying at the 2nd
                   source_repositories[1..-1].each do |source_repo|
+                    # TODO: In a future refactor, can :copy_all be utilized?  Filters should not be needed in this code segment.
                     copy_actions << plan_action(Actions::Pulp3::Repository::CopyContent, source_repo, smart_proxy, target_repo,
                                                 filter_ids: filter_ids, solve_dependencies: solve_dependencies,
                                                 rpm_filenames: rpm_filenames, remove_all: false)

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

@@ -92,7 +92,7 @@ module Katello
             cert_store = OpenSSL::X509::Store.new
             cert_store.add_file(ca_file) if ca_file
 
-            if proxy&.cacert
+            if proxy&.cacert&.present?
               Foreman::Util.add_ca_bundle_to_store(proxy.cacert, cert_store)
             end
             RestClient::Resource.new(url,

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

@@ -49,7 +49,7 @@ module Katello
             @cert_store.add_file(options[:ssl_ca_file])
           end
 
-          if @cert_store && proxy&.cacert
+          if @cert_store && proxy&.cacert&.present?
             Foreman::Util.add_ca_bundle_to_store(proxy.cacert, @cert_store)
           end
 

data/app/models/katello/root_repository.rb

@@ -21,6 +21,7 @@ module Katello
     CHECKSUM_TYPES = %w(sha1 sha256).freeze
 
     SUBSCRIBABLE_TYPES = [Repository::YUM_TYPE, Repository::OSTREE_TYPE, Repository::DEB_TYPE].freeze
+    SKIPABLE_METADATA_TYPES = [Repository::YUM_TYPE, Repository::DEB_TYPE].freeze
 
     CONTENT_ATTRIBUTE_RESTRICTIONS = {
       :download_policy => [Repository::YUM_TYPE, Repository::DEB_TYPE, Repository::DOCKER_TYPE]
@@ -101,6 +102,7 @@ module Katello
       :message => _("must be one of the following: %s") % HTTP_PROXY_POLICIES.join(', ')
     }
     scope :subscribable, -> { where(content_type: RootRepository::SUBSCRIBABLE_TYPES) }
+    scope :skipable_metadata_check, -> { where(content_type: RootRepository::SKIPABLE_METADATA_TYPES) }
     scope :has_url, -> { where.not(:url => nil) }
     scope :with_repository_attribute, ->(attr, value) { joins(:repositories).where("#{Katello::Repository.table_name}.#{attr}" => value) }
     scope :in_content_view_version, ->(version) { with_repository_attribute(:content_view_version_id, version) }
@@ -225,6 +227,8 @@ module Katello
         errors.add(:ignorable_content, N_("Invalid value specified for ignorable content."))
       elsif ignorable_content.any? { |item| !IGNORABLE_CONTENT_UNIT_TYPES.include?(item) }
         errors.add(:ignorable_content, N_("Invalid value specified for ignorable content. Permissible values %s") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
+      elsif self.mirroring_policy == MIRRORING_POLICY_COMPLETE
+        errors.add(:ignorable_content, N_("Ignore SRPMs can not be set in combination with 'Complete Mirroring' mirroring policy."))
       end
     end
 

data/app/services/katello/pulp3/repository/apt.rb

@@ -24,6 +24,12 @@ module Katello
           common_remote_options.merge(deb_remote_options)
         end
 
+        def sync_url_params(sync_options)
+          params = super
+          params[:optimize] = sync_options[:optimize] if sync_options.key?(:optimize)
+          params
+        end
+
         def mirror_remote_options
           super.merge(
             {

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

@@ -210,7 +210,8 @@ module Katello
               tasks << add_content(slice, first_slice)
               first_slice = false
             end
-          else
+          # If we're merging composite cv repositories, don't clear out the Pulp repository.
+          elsif remove_all
             tasks << remove_all_content
           end
           tasks

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

@@ -200,7 +200,7 @@ module Katello
 
       def sync_url_params(_sync_options)
         params = {remote: repo.remote_href, mirror: repo.root.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_CONTENT}
-        params[:skip_types] = skip_types if skip_types
+        params[:skip_types] = skip_types if (skip_types && repo.root.mirroring_policy != Katello::RootRepository::MIRRORING_POLICY_COMPLETE)
         params
       end
 
@@ -447,7 +447,7 @@ module Katello
       end
 
       def append_proxy_cacert(options)
-        if root.http_proxy&.cacert && options.key?(:cacert)
+        if root.http_proxy&.cacert&.present? && options.key?(:cacert)
           options[:cacert] += "\n#{root.http_proxy&.cacert}"
         end
         options

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

@@ -132,6 +132,7 @@ module Katello
         sync_params = repo_service.sync_url_params(options)
         sync_params[:remote] = remote_href
         if repo.yum?
+          sync_params.delete(:skip_types) if sync_params[:skip_types]
           sync_params[:sync_policy] = 'mirror_complete'
         else
           sync_params.delete(:sync_policy)

data/config/initializers/monkeys.rb

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

data/db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb

@@ -0,0 +1,5 @@
+class UpdateIgnoreSrpmToFalseForMirrorComplete < ActiveRecord::Migration[6.1]
+  def change
+    Katello::RootRepository.yum_type.where(mirroring_policy: 'mirror_complete', ignorable_content: ['srpm']).update_all(ignorable_content: [])
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html

@@ -12,7 +12,7 @@
 
     <div class="help-block">
       <span translate>
-        Selecting "Complete Sync" will cause only Yum repositories of the selected product to be synced.
+        Selecting "Complete Sync" will cause only yum/deb repositories of the selected product to be synced.
       </span>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html

@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <div class="radio" ng-hide="repository.content_type === 'deb'">
+  <div class="radio">
     <label>
       <input type="radio" ng-model="syncType" value="skipMetadataCheck" />
       <span translate>
@@ -21,10 +21,10 @@
     </label>
     <div class="help-block">
       <span translate>
-        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:
+        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:
       </span>
       <ul class="list-aligned">
-        <li translate>One or more RPMs are not showing up in the local repository even though they exist in the upstream repository.</li>
+        <li translate>One or more packages are not showing up in the local repository even though they exist in the upstream repository.</li>
       </ul>
     </div>
-  </div>
+  </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js

@@ -169,7 +169,7 @@
         })
         .state('product.repository.tasks.index', {
             url: '/tasks',
-            permission: 'view_repositories',
+            permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-tasks.html',
             ncyBreadcrumb: {
                 label: "{{'Tasks' | translate }}",
@@ -178,7 +178,7 @@
         })
         .state('product.repository.tasks.details', {
             url: '/tasks/:taskId',
-            permission: 'view_repositories',
+            permission: 'view_products',
             controller: 'TaskDetailsController',
             templateUrl: 'tasks/views/task-details.html',
             ncyBreadcrumb: {

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.7.0.rc2".freeze
+  VERSION = "4.7.0".freeze
 end

data/lib/monkeys/fix_deb_optimized_sync.rb

@@ -0,0 +1,35 @@
+require 'pulp_deb_client'
+PulpDebClient::AptRepositorySyncURL.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    unless attributes.is_a?(Hash)
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpDebClient::AptRepositorySyncURL` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) do |(k, v), h|
+      unless self.class.attribute_map.key?(k.to_sym)
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpDebClient::AptRepositorySyncURL`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    end
+
+    if attributes.key?(:remote)
+      self.remote = attributes[:remote]
+    end
+
+    if attributes.key?(:mirror)
+      self.mirror = attributes[:mirror]
+    else
+      self.mirror = false
+    end
+
+    if attributes.key?(:optimize)
+      self.optimize = attributes[:optimize]
+      # Monkey-patch here. Rest of the initializer is copied from the gem code.
+      #else
+      #  self.optimize = true
+    end
+  end
+end

data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js

@@ -1132,7 +1132,7 @@ test('Can apply errata in bulk via customized remote execution', async (done) =>
   expect(viaRexAction).toBeInTheDocument();
   expect(viaRexAction).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20%5E%20(${errata})`,
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20%5E%20(${errata})`,
   );
 
   viaRexAction.click();
@@ -1248,7 +1248,7 @@ test('Can apply a single erratum to the host via customized remote execution', a
   viaRexAction.click();
   expect(viaRexAction).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20=%20${errataId}`,
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20=%20${errataId}`,
   );
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/moduleStreamsTab.test.js

@@ -208,8 +208,8 @@ test('Can provide dropdown actions with redirects on Module Streams with customi
   await patientlyWaitFor(() => expect(getByLabelText('customize-checkbox-3')).toBeInTheDocument());
   fireEvent.click(getByLabelText('customize-checkbox-3'));
   await patientlyWaitFor(() => expect(getByText('Enable')).toBeInTheDocument());
-  expect(getByText('Enable')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&host_ids=name%20%5E%20(test-host)&inputs%5Baction%5D=enable&inputs%5Bmodule_spec%5D=walrus:2.4');
-  expect(getByText('Install')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&host_ids=name%20%5E%20(test-host)&inputs%5Baction%5D=install&inputs%5Bmodule_spec%5D=walrus:2.4');
+  expect(getByText('Enable')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&search=name%20%5E%20(test-host)&inputs%5Baction%5D=enable&inputs%5Bmodule_spec%5D=walrus:2.4');
+  expect(getByText('Install')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&search=name%20%5E%20(test-host)&inputs%5Baction%5D=install&inputs%5Bmodule_spec%5D=walrus:2.4');
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
   act(done);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packageInstallModal.test.js

@@ -310,7 +310,7 @@ test('Can install a package via customized remote execution', async (done) => {
   expect(customizedRexOption).toBeInTheDocument();
   expect(customizedRexOption).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL}&host_ids=name%20%5E%20(test-host)&inputs%5Bpackage%5D=duck,cheetah`,
+    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL}&search=name%20%5E%20(test-host)&inputs%5Bpackage%5D=duck,cheetah`,
   );
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
@@ -348,7 +348,7 @@ test('Uses package_install_by_search_query template when in select all mode', as
   expect(customizedRexOption).toBeInTheDocument();
   expect(customizedRexOption).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL_BY_SEARCH}&host_ids=name%20%5E%20(test-host)&inputs%5BPackage%20search%20query%5D=id%20!%5E%20(32376)`,
+    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL_BY_SEARCH}&search=name%20%5E%20(test-host)&inputs%5BPackage%20search%20query%5D=id%20!%5E%20(32376)`,
   );
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -261,7 +261,7 @@ test('Can upgrade a package via customized remote execution', async (done) => {
   expect(rexAction).toBeInTheDocument();
   expect(rexAction).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostname})&inputs%5Bpackage%5D=${packageName}`,
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostname})&inputs%5Bpackage%5D=${packageName}`,
   );
 
   fireEvent.click(rexAction);
@@ -338,7 +338,7 @@ test('Can bulk upgrade via customized remote execution', async (done) => {
   const feature = REX_FEATURES.KATELLO_PACKAGES_UPDATE_BY_SEARCH;
   const packages = `${firstPackage.id},${secondPackage.id}`;
   const job =
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostname})&inputs%5BPackages%20search%20query%5D=id%20%5E%20(${packages})&inputs%5BSelected%20update%20versions%5D=%5B%5D`;
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostname})&inputs%5BPackages%20search%20query%5D=id%20%5E%20(${packages})&inputs%5BSelected%20update%20versions%5D=%5B%5D`;
 
   getByRole('checkbox', { name: 'Select row 0' }).click();
   expect(getByLabelText('Select row 0').checked).toEqual(true);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js

@@ -298,7 +298,7 @@ describe('With tracer installed', () => {
     });
     expect(viaCustomizedRexAction).toHaveAttribute(
       'href',
-      `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BTraces%20search%20query%5D=id%20=%20${firstTrace.id}`,
+      `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostName})&inputs%5BTraces%20search%20query%5D=id%20=%20${firstTrace.id}`,
     );
 
     assertNockRequest(autocompleteScope);
@@ -331,7 +331,7 @@ describe('With tracer installed', () => {
     expect(viaCustomizedRexAction).toBeInTheDocument();
     expect(viaCustomizedRexAction).toHaveAttribute(
       'href',
-      `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BTraces%20search%20query%5D=id%20%5E%20(${firstTrace.id})`,
+      `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostName})&inputs%5BTraces%20search%20query%5D=id%20%5E%20(${firstTrace.id})`,
     );
 
     assertNockRequest(autocompleteScope);
@@ -430,7 +430,7 @@ describe('Without tracer installed', () => {
     expect(enableTracesModalLink)
       .toHaveAttribute(
         'href',
-        `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5Bpackage%5D=katello-host-tools-tracer`,
+        `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostName})&inputs%5Bpackage%5D=katello-host-tools-tracer`,
       );
     enableTracesModalLink.click();
     expect(enableTracesModalLink).toHaveClass('pf-m-in-progress');

data/webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js

@@ -10,7 +10,7 @@ export const createJob = ({
   const inputParams = Object.keys(inputs).map(key => `inputs[${key}]=${inputs[key]}`);
   const params = [
     `feature=${feature}`,
-    `host_ids=name ^ (${hostname})`,
+    `search=name ^ (${hostname})`,
     ...inputParams,
   ];
   const urlQuery = encodeURI(params.join('&'));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.7.0.rc2
+  version: 4.7.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2234,6 +2234,7 @@ files:
 - db/migrate/20220730033504_update_custom_cdn.rb
 - db/migrate/20220920173656_add_http_proxy_to_smart_proxy.rb
 - db/migrate/20220920180858_remove_http_proxy_from_katello_alternate_content_sources.rb
+- db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4479,8 +4480,9 @@ files:
 - lib/katello/version.rb
 - lib/monkeys/anemone.rb
 - lib/monkeys/ar_postgres_evr_t.rb
+- lib/monkeys/fix_deb_optimized_sync.rb
+- lib/monkeys/fix_pulp_container_path.rb
 - lib/monkeys/fx_sqlite_skip.rb
-- lib/monkeys/try_pulp_container_path.rb
 - lib/proxy_api/container_gateway.rb
 - lib/proxy_api/pulp.rb
 - lib/proxy_api/pulp_node.rb
@@ -5435,11 +5437,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman