katello 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bebacc5b4b127cfadaeb424ce9f04aa6e2ba132a0d8d959d8456bd393418abf
-  data.tar.gz: 473b94c0aec5d6b73a174f334edf1f9079d42c53d16ef0ab60cc939af0e0e4b0
+  metadata.gz: f1a33ac3431921424a7d17bcd6f90afbb0f0ed372e6c7873ea1b2afa35cde5d2
+  data.tar.gz: 864c45929eea0df21199da1bafc4598f504887578c8c7fa860e3d03729fcf0aa
 SHA512:
-  metadata.gz: 000e85ae93b95be282c88d10eec6f364526cfdb9e377de7b56d82a8df882e8390c40690b4d7b0740c24196fa10d20d166b48779f3422699e7a970bfb1722cdc2
-  data.tar.gz: 23a1e59f555ddbe334a98d6937aa64de3d46b1bc6b8fb33a61166e317792686fae9f30af480d0037226eebf6d341769a15acd1972d7bb05d20696ab6af1fb9dc
+  metadata.gz: 938cb19362f4c5add3bd334c4889a95462a2c3f071a2d3764a43c59bfeac6bef1bb036f99b0d168dbf10953664e7fc5f8623f6b4a0a09021be7e9f1931b8be64
+  data.tar.gz: bb12015598a2ac15cfbd0aad5f9a18d7c86142c8157e73cf134a22b93470d0da64c977c59fb74fb2819ad5e2c15b8f77f0b1283d0b9a674205bd1e0f6ac9dc89

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

@@ -648,7 +648,8 @@ module Katello
 
     def generic_remote_options_hash(repo_params)
       generic_remote_options = {}
-      RepositoryTypeManager.generic_remote_options(content_type: repo_params[:content_type]).each do |option|
+      content_type = @repository&.content_type || repo_params[:content_type]
+      RepositoryTypeManager.generic_remote_options(content_type: content_type).each do |option|
         generic_remote_options[option.name] = repo_params[option.name]
       end
       generic_remote_options

data/app/controllers/katello/remote_execution_controller.rb

@@ -47,11 +47,12 @@ module Katello
       end
 
       def inputs
-        if feature_name == 'katello_errata_install'
-          { "Errata Search Query" => "errata_id ^ (#{errata_inputs.join(',')})" }
-        elsif feature_name == 'katello_service_restart'
+        case feature_name
+        when 'katello_errata_install'
+          { :errata => errata_inputs }
+        when 'katello_service_restart'
           { :helper => params[:name] }
-        elsif feature_name == 'katello_module_stream_action'
+        when 'katello_module_stream_action'
           fail HttpErrors::NotFound, _('module streams not found') if params[:module_spec].blank?
           fail HttpErrors::NotFound, _('actions not found') if params[:module_stream_action].blank?
           inputs = { :module_spec => params[:module_spec], :action => params[:module_stream_action] }

data/app/lib/actions/katello/content_view/publish.rb

@@ -200,6 +200,11 @@ module Actions
                 plan_action(Katello::Repository::IndexContent, id: id, full_index: true)
               end
             end
+            concurrence do
+              version.importable_repositories.each do |repo|
+                plan_action(::Actions::Katello::Repository::MetadataGenerate, repo)
+              end
+            end
             plan_action(::Actions::Pulp3::Orchestration::ContentViewVersion::CopyVersionUnitsToLibrary, version)
           end
         end

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -72,6 +72,18 @@ module Actions
 
                 unless extended_repo_mapping.empty? || unit_map.values.flatten.empty?
                   sequence do
+                    # Pre-copy content if dest_repo is a soft copy of its library instance.
+                    # Don't use extended_repo_mapping because the source repositories are library instances.
+                    # We want the old CV snapshot repositories here so as to not pull in excess new content.
+                    separated_repo_map[:pulp3_yum_multicopy].each do |source_repos, dest_repo|
+                      if dest_repo.soft_copy_of_library?
+                        source_repos.each do |source_repo|
+                          # remove_all flag is set to cover the case of incrementally updating more than once with different content.
+                          # Without it, content from the previous incremental update will be copied as well due to how Pulp repo versions work.
+                          plan_action(Pulp3::Repository::CopyContent, source_repo, SmartProxy.pulp_primary, dest_repo, copy_all: true, remove_all: true)
+                        end
+                      end
+                    end
                     copy_action_outputs << plan_action(Pulp3::Repository::MultiCopyUnits, extended_repo_mapping, unit_map,
                                                        dependency_solving: dep_solve).output
                     repos_to_clone.each do |source_repos|
@@ -125,10 +137,12 @@ module Actions
             source_library_repo = source_repos.first.library_instance? ? source_repos.first : source_repos.first.library_instance
 
             source_repos = [source_library_repo]
-            if old_version_repo.version_href
-              base_version = old_version_repo.version_href.split("/")[-1].to_i
-            else
+            if old_version_repo.version_href.nil?
               base_version = 0
+            elsif old_version_repo.soft_copy_of_library?
+              base_version = nil
+            else
+              base_version = old_version_repo.version_href.split("/")[-1].to_i
             end
 
             pulp3_repo_mapping[source_repos.map(&:id)] = { dest_repo: dest_repo.id, base_version: base_version }

data/app/lib/actions/pulp3/content_view_version/import.rb

@@ -19,6 +19,13 @@ module Actions
             metadata: input[:metadata]
           ).create_import(input[:importer_data][:pulp_href])
         end
+
+        def rescue_strategy_for_self
+          # There are various reasons the importing fails, not all of them are
+          # fatal: when fail on import, we continue with the task ending up
+          # in the warning state, but not locking further imports
+          Dynflow::Action::Rescue::Skip
+        end
       end
     end
   end

data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb

@@ -15,17 +15,19 @@ module Actions
                 metadata: metadata
               ).output
 
-              import_output = plan_action(
+              plan_action(
                 ::Actions::Pulp3::ContentViewVersion::Import,
                 content_view_version_id: content_view_version.id,
                 smart_proxy_id: smart_proxy.id,
                 importer_data: importer_output[:importer_data],
                 path: path,
                 metadata: metadata
-              ).output
-
-              plan_action(Actions::Pulp3::Repository::SaveVersions, content_view_version.importable_repositories.pluck(:id),
-                          tasks: import_output[:pulp_tasks])
+              )
+              concurrence do
+                content_view_version.importable_repositories.each do |repo|
+                  plan_action(Actions::Pulp3::Repository::SaveVersion, repo)
+                end
+              end
               plan_action(
                 ::Actions::Pulp3::ContentViewVersion::CreateImportHistory,
                 content_view_version_id: content_view_version.id,

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

@@ -13,7 +13,7 @@ module Actions
           target = ::Katello::Repository.find(input[:target_repository_id] || input[:target_repository])
           service = target.backend_service(smart_proxy)
           output[:pulp_tasks] = if input[:copy_all]
-                                  service.copy_all(source, mirror: input[:mirror] || false)
+                                  service.copy_all(source, input)
                                 else
                                   service.copy_content_for_source(source, input)
                                 end

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

@@ -27,6 +27,7 @@ module Actions
               []
             else
               output[:pulp_tasks] = [content_backend_service.content_api_create(relative_path: input[:options][:file_name],
+                                                                                repository_id: repository.id,
                                                                                 artifact: artifact_href,
                                                                                 content_type: content_type)]
             end

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

@@ -184,7 +184,7 @@ module Katello
         def net_http_class
           if proxy
             uri = URI(proxy.url) #Net::HTTP::Proxy ignores port as part of the url
-            Net::HTTP::Proxy("#{uri.host}#{uri.path}", uri.port, proxy.username, proxy.password)
+            Net::HTTP::Proxy("#{uri.host}", uri.port, proxy.username, proxy.password)
           else
             Net::HTTP
           end

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

@@ -190,7 +190,7 @@ module Katello
                 service.update_model(model, generic_content_type)
               elsif self == ::Katello::Erratum
                 # Errata will change pulp_hrefs if the upstream repo updates them
-                erratum_updated_ids << service.update_model(model)
+                erratum_updated_ids << service.update_model(model, repository)
               else
                 service.update_model(model)
               end

data/app/models/katello/docker_meta_tag.rb

@@ -153,7 +153,7 @@ module Katello
         end
 
         unless params_to_query_for_delete.empty?
-          RepositoryDockerMetaTag.where(:docker_meta_tag => DockerMetaTag.where(params_to_query_for_delete.join(" OR "))).delete_all
+          RepositoryDockerMetaTag.where(:repository_id => repo.id).where(:docker_meta_tag => DockerMetaTag.where(params_to_query_for_delete.join(" OR "))).delete_all
         end
 
         metatags = []

data/app/models/katello/repository.rb

@@ -285,6 +285,11 @@ module Katello
       ::Katello::Resources::CDN::CdnResource.ca_file if ::Katello::Resources::CDN::CdnResource.redhat_cdn?(url)
     end
 
+    def soft_copy_of_library?
+      return false if self.version_href.nil?
+      self.version_href.starts_with?(self.library_instance.backend_service(SmartProxy.pulp_primary).repository_reference.repository_href)
+    end
+
     def archive?
       self.environment.nil?
     end

data/app/services/cert/rhsm_client.rb

@@ -10,7 +10,7 @@ module Cert
     end
 
     def uuid
-      drop_cn_prefix_from_subject(@cert.subject.to_s)
+      @uuid ||= @cert.subject.to_a.detect { |name, _, _| name == 'CN' }&.second
     end
 
     private
@@ -26,10 +26,6 @@ module Cert
       end
     end
 
-    def drop_cn_prefix_from_subject(subject_string)
-      subject_string.sub(/\/CN=/i, '')
-    end
-
     def strip_cert(cert)
       cert = cert.to_s.gsub("-----BEGIN CERTIFICATE-----", "").gsub("-----END CERTIFICATE-----", "")
       cert.delete!(' ')

data/app/services/katello/pulp3/content_view_version/import.rb

@@ -121,11 +121,20 @@ module Katello
                         }
           end
 
+          fail _("Content View label not provided.") if metadata[:label].blank?
+
           cv = ::Katello::ContentView.find_by(label: metadata[:label],
-                                              organization: organization,
-                                              import_only: true)
+                                              organization: organization)
           if cv.blank?
             ::Katello::ContentView.create!(metadata.merge(organization: organization, import_only: true))
+          elsif !cv.import_only?
+            msg = _("Unable to import in to Content View specified in the metadata - '%{name}'. "\
+                     "The 'import_only' attribute for the content view is set to false. "\
+                     "To mark this Content View as importable, have your system administrator"\
+                     " run the following command on the server. "\
+                        % { name: cv.name })
+            command = "foreman-rake katello:set_content_view_import_only ID=#{cv.id}"
+            fail msg + "\n" + command
           else
             cv.update!(description: cv_metadata[:description]) if cv.description != metadata[:description]
             cv

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

@@ -26,7 +26,7 @@ module Katello
       end
 
       # rubocop:disable Metrics/AbcSize
-      def update_model(model)
+      def update_model(model, repository = nil)
         updated = false
         keys = %w(title id severity issued_date type description reboot_suggested solution updated_date summary)
         custom_json = backend_data.slice(*keys)
@@ -55,6 +55,14 @@ module Katello
         update_packages(model, backend_data['pkglist']) unless backend_data['pkglist'].blank?
         update_modules(model, backend_data['pkglist']) unless backend_data['pkglist'].blank?
 
+        if !updated && repository.present?
+          backend_identifier = backend_data.dig(self.class.backend_unit_identifier)
+          if Katello::RepositoryErratum.where(repository_id: repository.id, erratum_id: model.id).where.not(erratum_pulp3_href: backend_identifier).any?
+            # Pulp has created a new record for this erratum because it has been updated so we need to update repo association too
+            updated = true
+          end
+        end
+
         return model.id if updated
       end
       # rubocop:enable Metrics/AbcSize

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

@@ -13,7 +13,8 @@ module Katello
       end
 
       def self.content_api(repository_type, content_type)
-        repository_type.content_types.find { |type| type.content_type == content_type }.pulp3_api.new(repository_type.pulp3_api_class.new(SmartProxy.pulp_primary!, repository_type).api_client)
+        label = content_type.is_a?(String) ? content_type : content_type.label
+        repository_type.content_types.find { |type| type.content_type == label }.pulp3_api.new(repository_type.pulp3_api_class.new(SmartProxy.pulp_primary!, repository_type).api_client)
       end
 
       def update_model(model, content_type)

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

@@ -116,30 +116,28 @@ module Katello
         content_unit_list page_opts
       end
 
-      # rubocop:disable Lint/UselessAssignment
       def self.find_duplicate_unit(repository, unit_type_id, file, checksum)
-        filter_label = 'sha256'
+        filter_label = :sha256
         if unit_type_id == 'ostree_ref'
-          filter_label = 'checksum'
+          filter_label = :checksum
         end
         content_backend_service = SmartProxy.pulp_primary.content_service(unit_type_id)
         duplicates_allowed = ::Katello::RepositoryTypeManager.find_content_type(unit_type_id).try(:duplicates_allowed)
         if repository.generic? && duplicates_allowed
           filename_key = ::Katello::RepositoryTypeManager.find_content_type(unit_type_id).filename_key
           duplicate_sha_path_content_list = content_backend_service.content_api(repository.repository_type, unit_type_id).list(
-            filter_label: checksum,
+            filter_label => checksum,
             filename_key => file[:filename])
         elsif repository.generic?
           duplicate_sha_path_content_list = content_backend_service.content_api(repository.repository_type, unit_type_id).list(
-            filter_label: checksum)
+            filter_label => checksum)
         else
           duplicate_sha_path_content_list = content_backend_service.content_api.list(
-            filter_label: checksum,
+            filter_label => checksum,
             "relative_path": file[:filename])
         end
         duplicate_sha_path_content_list
       end
-      # rubocop:enable Lint/UselessAssignment
     end
   end
 end

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

@@ -95,6 +95,7 @@ module Katello
           "/pulp/content/#{repo.relative_path}/".sub('//', '/')
         end
 
+        # rubocop:disable Metrics/MethodLength
         def multi_copy_units(repo_id_map, dependency_solving)
           tasks = []
 
@@ -107,14 +108,20 @@ module Katello
               dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_primary).repository_reference.repository_href
               content_unit_hrefs = dest_repo_id_map[:content_unit_hrefs]
               # Not needed during incremental update due to dest_base_version
+              # -> Unless incrementally updating a CV repo that is a soft copy of its library instance.
+              # -> I.e. no filters and not an incremental version.
               unless dest_repo_id_map[:base_version]
                 source_repo_for_package_envs = ::Katello::Repository.find(source_repo_ids.first)
                 unless source_repo_for_package_envs.library_instance?
                   source_repo_for_package_envs = source_repo_for_package_envs.library_instance
                 end
                 package_env_hrefs = packageenvironments({ :repository_version => source_repo_for_package_envs.version_href }).map(&:pulp_href).sort
-                tasks << remove_all_content_from_repo(dest_repo_href)
-                tasks << add_content_for_repo(dest_repo_href, package_env_hrefs) unless package_env_hrefs.empty?
+                # Don't perform extra content actions if the repo is a soft copy of its library instance.
+                # Taken care of by the IncrementalUpdate action.
+                unless dest_repo.soft_copy_of_library?
+                  tasks << remove_all_content_from_repo(dest_repo_href)
+                  tasks << add_content_for_repo(dest_repo_href, package_env_hrefs) unless package_env_hrefs.empty?
+                end
               end
               source_repo_ids.each do |source_repo_id|
                 source_repo_version = ::Katello::Repository.find(source_repo_id).version_href
@@ -129,6 +136,7 @@ module Katello
           end
           tasks.flatten
         end
+        # rubocop:enable Metrics/MethodLength
 
         def copy_api_data_dup(data)
           data_dup = PulpRpmClient::Copy.new

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

@@ -330,19 +330,26 @@ module Katello
         tasks
       end
 
-      def copy_all(source_repository, mirror: false)
-        if mirror
+      def copy_all(source_repository, options = {})
+        tasks = []
+        if options[:remove_all]
+          tasks << api.repositories_api.modify(repository_reference.repository_href, remove_content_units: ['*'])
+        end
+
+        if options[:mirror]
           data = api.class.add_remove_content_class.new(
                     base_version: source_repository.version_href)
 
-          [api.repositories_api.modify(repository_reference.repository_href, data)]
+          tasks << api.repositories_api.modify(repository_reference.repository_href, data)
+          tasks
         elsif api.respond_to? :copy_api
           data = api.class.copy_class.new
           data.config = [{
             source_repo_version: source_repository.version_href,
             dest_repo: repository_reference.repository_href
           }]
-          [api.copy_api.copy_content(data)]
+          tasks << api.copy_api.copy_content(data)
+          tasks
         else
           copy_content_for_source(source_repository)
         end

data/app/views/foreman/job_templates/install_errata.erb

@@ -2,25 +2,22 @@
 kind: job_template
 name: Install Errata - Katello SSH Default
 job_category: Katello
-description_format: 'Install errata %{Errata search query}'
+description_format: 'Install errata %{errata}'
 feature: katello_errata_install
 provider_type: SSH
 template_inputs:
-- name: Errata search query
-  description: Filter criteria for errata to be installed.
+- name: errata
+  description: A comma-separated list of errata to install
   input_type: user
-  required: false
+  required: true
 foreign_input_sets:
 - template: Package Action - SSH Default
   exclude: action,package
 %>
-
 <% if @host.operatingsystem.family == 'Suse' -%>
     <% advisories = input(:errata).split(',').join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'install -n -t patch', :package => advisories) %>
 <% else %>
-    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
-
-    <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>
+    <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'update-minimal', :package => advisories) %>
-<% end %>
+<% end %>

data/app/views/foreman/job_templates/install_errata_by_search_query.erb

@@ -0,0 +1,26 @@
+<%#
+kind: job_template
+name: Install errata by search query - Katello SSH Default
+job_category: Katello
+description_format: 'Install errata %{Errata search query}'
+feature: katello_errata_install_by_search
+provider_type: SSH
+template_inputs:
+- name: Errata search query
+  description: Filter criteria for errata to be installed.
+  input_type: user
+  required: false
+foreign_input_sets:
+- template: Package Action - SSH Default
+  exclude: action,package
+%>
+
+<% if @host.operatingsystem.family == 'Suse' -%>
+    <% advisories = @host.advisory_ids(search: input("Errata search query")).join(' ') %>
+    <%= render_template('Package Action - SSH Default', :action => 'install -n -t patch', :package => advisories) %>
+<% else %>
+    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
+
+    <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>
+    <%= render_template('Package Action - SSH Default', :action => 'update-minimal', :package => advisories) %>
+<% end %>

data/db/migrate/20211019192121_create_cdn_configuration.katello.rb

@@ -1,4 +1,8 @@
 class CreateCdnConfiguration < ActiveRecord::Migration[6.0]
+  class FakeCdnConfiguration < Katello::Model
+    self.table_name = 'katello_cdn_configurations'
+  end
+
   def up
     create_table :katello_cdn_configurations do |t|
       t.integer :organization_id
@@ -14,17 +18,22 @@ class CreateCdnConfiguration < ActiveRecord::Migration[6.0]
     add_foreign_key :katello_cdn_configurations, :taxonomies, name: 'katello_cdn_configurations_organization_id', column: :organization_id
     add_foreign_key :katello_cdn_configurations, :katello_content_credentials, name: 'katello_cdn_configurations_ssl_ca_credential_id', column: :ssl_ca_credential_id
 
+    FakeCdnConfiguration.reset_column_information
+
     ::Organization.all.each do |org|
-      Katello::CdnConfiguration.where(
-        organization: org,
+      FakeCdnConfiguration.where(
+        organization_id: org.id,
         url: org.redhat_provider.repository_url || ::Katello::Resources::CDN::CdnResource.redhat_cdn_url
       ).first_or_create!
     end
 
     remove_column :katello_providers, :repository_url
+    ::Katello::Provider.reset_column_information
   end
 
   def down
+    add_column :katello_providers, :repository_url, :string
+    ::Katello::Provider.reset_column_information
     drop_table :katello_cdn_configurations
   end
 end

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

@@ -6,6 +6,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:4.1:sync_noarch_content'},
     {: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.2:remove_checksum_values'},
+    {:name => 'katello:upgrades:4.4:publish_import_cvvs'}
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.controller.js

@@ -21,6 +21,7 @@ angular.module('Bastion.packages').controller('PackagesController',
         var nutupane, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
+            'repository_id': $location.search().repositoryId || null,
             'paged': true
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js

@@ -13,7 +13,6 @@
  * @requires DockerManifest
  * @requires DockerManifestList
  * @requires DockerTag
- * @requires OstreeBranch
  * @requires File
  * @requires Deb
  * @requires ModuleStream
@@ -25,8 +24,8 @@
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection', 'GenericContent', 'RepositoryTypesService',
-    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream, AnsibleCollection, GenericContent, RepositoryTypesService) {
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection', 'GenericContent', 'RepositoryTypesService',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, File, Deb, ModuleStream, AnsibleCollection, GenericContent, RepositoryTypesService) {
         var contentTypes, nutupaneParams;
 
         function success(response, selected) {

data/lib/katello/plugin.rb

@@ -309,6 +309,7 @@ Foreman::Plugin.register :katello do
     RemoteExecutionFeature.register(:katello_group_update, N_("Katello: Update Package Group"), :description => N_("Update package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_errata_install, N_("Katello: Install Errata"), :description => N_("Install errata via Katello interface"), :provided_inputs => ['errata'])
+    RemoteExecutionFeature.register(:katello_errata_install_by_search, N_("Katello: Install errata by search query"), :description => N_("Install errata using scoped search query"), :provided_inputs => ['Errata search query'])
     RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
     RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
     RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),

data/lib/katello/repository_types/ostree.rb

@@ -21,12 +21,14 @@ Katello::RepositoryTypeManager.register('ostree') do
   url_description N_("URL of an OSTree repository.")
 
   generic_content_type 'ostree_ref',
+                       pluralized_name: "OSTree Refs",
                        model_class: Katello::GenericContentUnit,
                        pulp3_api: PulpOstreeClient::ContentRefsApi,
                        pulp3_service_class: Katello::Pulp3::GenericContentUnit,
                        model_name: lambda { |pulp_unit| pulp_unit["name"] },
                        model_version: lambda { |pulp_unit| pulp_unit["checksum"] },
                        uploadable: true,
+                       generic_browser: true,
                        repository_import_on_upload: true
 
   import_attribute :ref, :content_type => 'ostree_ref',

data/lib/katello/tasks/content_view_import_only.rake

@@ -0,0 +1,34 @@
+namespace :katello do
+  desc <<-DESCRIPTION
+  Marks a content view import only or otherwise. Only 'import_only' Content Views can import content via import/export process.
+  Options:
+    ID - ID of the content view that will be marked import
+    VALUE - If true the provided content view will be marked as import_only. This is the default.
+            If false the import_only flag of provided content view will be reset.
+  DESCRIPTION
+
+  task :set_content_view_import_only => ["environment"] do
+    def fetch_content_view
+      if ENV['ID'].blank?
+        fail 'Content view `ID` required.'
+      end
+      ::Katello::ContentView.find_by(id: ENV['ID'])
+    end
+
+    def mark_import_only(value: true)
+      User.current = User.anonymous_admin
+      content_view = fetch_content_view
+      fail('Composite content views cannot be marked import_only. Check the content view id.') if content_view.composite?
+      fail('Default Organization View cannot be marked import_only. Check the content view id.') if content_view.default?
+      content_view.import_only = value
+      if content_view.save(validate: false)
+        $stdout.print("Content View '#{content_view.name}'s import_only value updated to #{content_view.import_only} ")
+      else
+        $stderr.print("Unable to set the content view import_only to #{value}. Check the content view id.")
+        $stderr.print(content_view.errors.inspect)
+      end
+    end
+    value = ENV['VALUE'].blank? || ::Foreman::Cast.to_bool(ENV['VALUE'])
+    mark_import_only(value: value)
+  end
+end

data/lib/katello/tasks/upgrades/4.4/publish_import_cvvs.rake

@@ -0,0 +1,17 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.4' do
+      desc "Republish imported CVs that aren't published"
+      task :publish_import_cvvs => ["environment"] do
+        ::ForemanTasks.dynflow.config.remote = true
+        ::ForemanTasks.dynflow.initialize!
+
+        User.current = User.anonymous_admin
+
+        Katello::Repository.in_content_views(Katello::ContentView.where(:import_only => true)).where(:publication_href => nil).pluck(:content_view_version_id).uniq.each do |cvv_id|
+          ForemanTasks.async_task(Actions::Katello::ContentViewVersion::RepublishRepositories, ::Katello::ContentViewVersion.find(cvv_id))
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.3.0".freeze
+  VERSION = "4.3.1".freeze
 end

data/webpack/components/WithOrganization/withOrganization.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-indent */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';

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

@@ -38,7 +38,7 @@ const katelloHostErrataInstallParams = ({
 }) => baseParams({
   hostname,
   inputs: { [ERRATA_SEARCH_QUERY]: search },
-  feature: REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL,
+  feature: REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL_BY_SEARCH,
 });
 
 export const installPackage = ({ hostname, packageName }) => post({
@@ -75,7 +75,7 @@ export const installErrata = ({
     hostname, search,
   }),
   handleSuccess: response => renderTaskStartedToast({
-    humanized: { action: `Install Errata on ${hostname}` },
+    humanized: { action: `Install errata on ${hostname}` },
     id: response?.data?.dynflow_task?.id,
   }),
   errorToast: error => errorToast(error),