katello 4.18.0.rc2 → 4.18.1

data/app/assets/javascripts/katello/locale/zh_TW/katello.js

@@ -3,10 +3,10 @@
   "locale_data": {
     "katello": {
       "": {
-        "Project-Id-Version": "katello 4.18.0.pre.master",
+        "Project-Id-Version": "katello 4.18.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2017-12-19 20:14+0000",
-        "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2024",
+        "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2025",
         "Language-Team": "Chinese (Taiwan) (https://app.transifex.com/foreman/teams/114/zh_TW/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -1002,9 +1002,6 @@
       "Back": [
         "上一步"
       ],
-      "Backend System Status": [
-        "後端系統狀態"
-      ],
       "Base URL": [
         ""
       ],
@@ -1299,7 +1296,7 @@
       "Cannot incrementally export from a filtered and a non-filtered content view version. The exported content view version '%{content_view} %{current}'  cannot be incrementally updated from version '%{from}.'.  Please do a full export.": [
         ""
       ],
-      "Cannot incrementally export from a incrementally exported version and a regular version or vice-versa.  The exported Content View Version '%{content_view} %{current}' cannot be incrementally exported from version '%{from}.' Please do a full export.": [
+      "Cannot incrementally export from a incrementally updated version and a regular version or vice-versa.  The exported Content View Version '%{content_view} %{current}' cannot be incrementally exported from version '%{from}.' Please do a full export.": [
         ""
       ],
       "Cannot install errata: No errata found for search term '%s'": [
@@ -1476,9 +1473,6 @@
       "Completed pulp task protection days": [
         ""
       ],
-      "Component": [
-        "元件"
-      ],
       "Component Content View": [
         ""
       ],
@@ -2832,6 +2826,12 @@
       "Export failed: One or more repositories needs to be synced (with Immediate download policy.)": [
         ""
       ],
+      "Export format must be specified for library exports.": [
+        ""
+      ],
+      "Export format must be specified for non-incremental repository exports.": [
+        ""
+      ],
       "Export formats.Choose syncable if the exported content needs to be in a yum format. This option is only available for %{syncable_repos} repositories. Choose importable if the importing server uses the same version  and exported content needs to be one of %{importable_repos} repositories.": [
         ""
       ],
@@ -3018,6 +3018,9 @@
       "Flatpak remote updated": [
         ""
       ],
+      "Flatpak repositories cannot be mirrored into Red Hat products. Please select a custom product.": [
+        ""
+      ],
       "Force": [
         ""
       ],
@@ -3316,7 +3319,7 @@
         "如何排序結果的順序（比方說 ASC 從下到上）"
       ],
       "ID": [
-        ""
+        "ID"
       ],
       "ID of a HTTP Proxy": [
         ""
@@ -6051,6 +6054,9 @@
       "Registry name pattern will result in invalid container image name of member repositories": [
         ""
       ],
+      "Registry token expiration time": [
+        ""
+      ],
       "Related composite content views": [
         ""
       ],
@@ -6432,7 +6438,7 @@
       "Return only errata of a particular severity (None, Low, Moderate, Important, Critical)": [
         ""
       ],
-      "Return only errata of a particular type (security, bugfix, enhancement)": [
+      "Return only errata of a particular type (security, bugfix, enhancement, other)": [
         ""
       ],
       "Return only packages of a particular status (upgradable or up-to-date)": [
@@ -7683,6 +7689,9 @@
       "The promotion of %{content_view} to <b>%{environment}</b> has completed.  %{count} needed errata are installable on your hosts.": [
         "推送 %{content_view} 至 <b>%{environment}</b> 的程序已完成。您的主機可安裝 %{count} 個必要的勘誤。"
       ],
+      "The provided incremental export format '%{provided}' must match the previous export's format '%{previous}'. Consider using 'from_history_id' to point to a matching export.": [
+        ""
+      ],
       "The repository is already enabled": [
         "軟體庫已啟用"
       ],
@@ -7920,6 +7929,9 @@
       "Time in minutes before content that is not contained within a repository and has not been accessed is considered orphaned.": [
         ""
       ],
+      "Time in minutes before registry access tokens expire.": [
+        ""
+      ],
       "Time to expire yum metadata in seconds. Only relevant for custom yum repositories.": [
         ""
       ],
@@ -8100,6 +8112,12 @@
       "Unable to detect puppet path": [
         ""
       ],
+      "Unable to find a base content view to use for incremental export using the provided parameters:%{params}": [
+        ""
+      ],
+      "Unable to find a base content view to use for incremental export. Please run a complete export instead.": [
+        ""
+      ],
       "Unable to find a content view with ID %s": [
         ""
       ],
@@ -8115,12 +8133,6 @@
       "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. ": [
         ""
       ],
-      "Unable to incrementally export. Do a Full Export on the library content before updating from the latest increment.": [
-        ""
-      ],
-      "Unable to incrementally export. Do a Full Export on the repository content.": [
-        ""
-      ],
       "Unable to reassign activation_keys. Please check activation_key_content_view_id and activation_key_environment_id.": [
         "無法重新指定 activation_keys。請檢查 activation_key_content_view_id 與 activation_key_environment_id。"
       ],
@@ -8187,6 +8199,12 @@
       "Unknown errata status": [
         "未知的勘誤狀態"
       ],
+      "Unknown library export format '%s'.": [
+        ""
+      ],
+      "Unknown repository export format '%s'.": [
+        ""
+      ],
       "Unknown traces status": [
         ""
       ],

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -517,11 +517,11 @@ module Katello
         PersonalAccessToken.transaction do
           personal_token = PersonalAccessToken.where(user_id: User.current.id, name: 'registry').first
           if personal_token.nil?
-            personal_token = PersonalAccessToken.new(user: User.current, name: 'registry', expires_at: 6.minutes.from_now)
+            personal_token = PersonalAccessToken.new(user: User.current, name: 'registry', expires_at: Setting['registry_token_expiration_minutes'].minutes.from_now)
             personal_token.generate_token
             personal_token.save!
           else
-            personal_token.expires_at = 6.minutes.from_now
+            personal_token.expires_at = Setting['registry_token_expiration_minutes'].minutes.from_now
             personal_token.save!
           end
         rescue ActiveRecord::RecordInvalid
@@ -574,7 +574,11 @@ module Katello
       return yield
     rescue RestClient::Exception => exception
       if [301, 302, 307].include?(exception.response.code)
-        redirect_to exception.response.headers[:location]
+        # Handle aliased hostname on original request
+        redirect_location = URI(exception.response.headers[:location])
+        redirect_location.host = request.host if request.host.present?
+
+        redirect_to redirect_location.to_s, allow_other_host: true
         nil
       else
         raise exception

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

@@ -1,11 +1,12 @@
 module Katello
   class Api::V2::ContentExportIncrementalsController < Api::V2::ExportsController
-    before_action :find_exportable_organization, :only => [:library]
-    before_action :find_exportable_content_view_version, :only => [:version]
-    before_action :find_exportable_repository, :only => [:repository]
-    before_action :find_library_export_view, :only => [:library]
-    before_action :find_repository_export_view, :only => [:repository]
-    before_action :find_history, :only => [:version, :library, :repository]
+    before_action :find_exportable_content_view_version, :only => [:version]                        # determines @view
+    before_action :find_exportable_organization, :only => [:library]                                # determines @organization
+    before_action :find_library_export_view, :only => [:library]                                    # determines @view from @organization
+    before_action :find_exportable_repository, :only => [:repository]                               # finds @repository
+    before_action :find_repository_export_view, :only => [:repository]                              # determines @view from @repository
+    before_action :find_incremental_history, :only => [:version, :library, :repository]             # determines @history from @view
+    before_action :determine_export_format_from_history, :only => [:version, :library, :repository] # determines @export_format from @history
 
     def_param_group :incremental do
       param :from_history_id, :number, :desc => N_("Export history identifier used for incremental export. "\
@@ -43,24 +44,95 @@ module Katello
     private
 
     def find_library_export_view
-      @view = ::Katello::Pulp3::ContentViewVersion::Export.find_library_export_view(destination_server: params[:destination_server],
-                                                                organization: @organization,
-                                                                format: find_export_format,
-                                                                create_by_default: false)
-      if @view.blank?
-        msg = _("Unable to incrementally export. Do a Full Export on the library content "\
-                "before updating from the latest increment.")
-        fail HttpErrors::BadRequest, msg
+      if params[:from_history_id].present?
+        find_incremental_history_from_id
+        @view = @history&.content_view_version&.content_view
+      else
+        # Determine format for finding existing view
+        format = params[:format] || ::Katello::Pulp3::ContentViewVersion::Export::UNDEFINED
+
+        # Try to find existing views based on format
+        views = []
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
+          importable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: params[:destination_server],
+            organization: @organization,
+            name: ::Katello::ContentView::EXPORT_LIBRARY,
+            generated_for: :library_export
+          )
+          views << importable_view if importable_view
+        end
+
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE
+          syncable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: params[:destination_server],
+            organization: @organization,
+            name: "#{::Katello::ContentView::EXPORT_LIBRARY}-SYNCABLE",
+            generated_for: :library_export_syncable
+          )
+          views << syncable_view if syncable_view
+        end
+
+        @view = views.compact.max_by(&:updated_at)
       end
+      check_for_blank_view
     end
 
     def find_repository_export_view
-      @view = ::Katello::Pulp3::ContentViewVersion::Export.find_repository_export_view(
-                                                                repository: @repository,
-                                                                create_by_default: false,
-                                                                format: find_export_format)
+      if params[:from_history_id].present?
+        find_incremental_history_from_id
+        @view = @history&.content_view_version&.content_view
+      else
+        # Determine format for finding existing view
+        format = params[:format] || ::Katello::Pulp3::ContentViewVersion::Export::UNDEFINED
+
+        # Try to find existing views based on format
+        views = []
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
+          importable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: nil,
+            organization: @repository.organization,
+            name: "Export-#{@repository.label}-#{@repository.library_instance_or_self.id}",
+            generated_for: :repository_export
+          )
+          views << importable_view if importable_view
+        end
+
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE
+          syncable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: nil,
+            organization: @repository.organization,
+            name: "Export-SYNCABLE-#{@repository.label}-#{@repository.library_instance_or_self.id}",
+            generated_for: :repository_export_syncable
+          )
+          views << syncable_view if syncable_view
+        end
+
+        @view = views.compact.max_by(&:updated_at)
+      end
+      check_for_blank_view
+    end
+
+    def check_for_blank_view
       if @view.blank?
-        msg = _("Unable to incrementally export. Do a Full Export on the repository content.")
+        valid_params = ""
+        valid_params << " 'from_history_id':#{params[:from_history_id]}" if params[:from_history_id].present?
+        valid_params << " 'format':#{params[:format]}" if params[:format].present?
+        if valid_params.blank?
+          msg = _("Unable to find a base content view to use for incremental export. Please run a complete export instead.")
+        else
+          msg = _("Unable to find a base content view to use for incremental export using the provided parameters:%{params}") % { params: valid_params }
+        end
+        fail HttpErrors::BadRequest, msg
+      end
+    end
+
+    def determine_export_format_from_history
+      @export_format = @history.metadata[:format]
+
+      if params[:format].present? && @export_format != params[:format]
+        msg = _("The provided incremental export format '%{provided}' must match the previous export's format '%{previous}'. "\
+          "Consider using 'from_history_id' to point to a matching export.") % { provided: params[:format], previous: @export_format }
         fail HttpErrors::BadRequest, msg
       end
     end

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

@@ -55,8 +55,8 @@ module Katello
           collection = collection.applicable_to_hosts(hosts)
         end
       end
-      date_type = params[:date_type].present? ? params[:date_type] : ContentViewErratumFilterRule::UPDATED
-      unless ContentViewErratumFilterRule::DATE_TYPES.include?(date_type)
+      @date_type = params[:date_type].present? ? params[:date_type] : ContentViewErratumFilterRule::UPDATED
+      unless ContentViewErratumFilterRule::DATE_TYPES.include?(@date_type)
         msg = _("Invalid params provided - date_type must be one of %s" % ContentViewErratumFilterRule::DATE_TYPES.join(","))
         fail HttpErrors::UnprocessableEntity, msg
       end
@@ -65,8 +65,8 @@ module Katello
     end
 
     def custom_index_relation_handle_type_and_time(collection)
-      collection = collection.where("#{date_type} >= ?", params[:start_date]) if params[:start_date]
-      collection = collection.where("#{date_type} <= ?", params[:end_date]) if params[:end_date]
+      collection = collection.where("#{@date_type} >= ?", params[:start_date]) if params[:start_date]
+      collection = collection.where("#{@date_type} <= ?", params[:end_date]) if params[:end_date]
       if params[:types]
         include_other = params[:types]&.include?('other')
         params[:types]&.delete('other')

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

@@ -75,7 +75,9 @@ module Katello
     end
 
     def find_export_format
-      if params[:format]
+      if @export_format.present?
+        @export_format
+      elsif params[:format]
         unless ::Katello::Pulp3::ContentViewVersion::Export::FORMATS.include?(params[:format])
           fail HttpErrors::UnprocessableEntity, _('Invalid export format provided. Format must be one of  %s ') %
                                             ::Katello::Pulp3::ContentViewVersion::Export::FORMATS.join(',')
@@ -113,14 +115,11 @@ module Katello
       end
     end
 
-    def find_history
+    def find_incremental_history
       if params[:from_history_id].present?
-        @history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id])
-        if @history.blank?
-          throw_resource_not_found(name: 'export history',
-                                   id: params[:from_history_id])
-        end
+        find_incremental_history_from_id
       else
+        # Use the latest export
         @history = ::Katello::ContentViewVersionExportHistory.
                       latest(@view, destination_server: params[:destination_server])
         if @history.blank?
@@ -129,5 +128,13 @@ module Katello
         end
       end
     end
+
+    def find_incremental_history_from_id
+      @history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id])
+      if @history.blank?
+        throw_resource_not_found(name: 'export history',
+                                  id: params[:from_history_id])
+      end
+    end
   end
 end

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

@@ -56,6 +56,7 @@ module Katello
     param :product_name, String, :desc => N_("Name of the product to mirror the remote repository to")
     param :organization_id, :number, :desc => N_("organization identifier")
     def mirror
+      validate_product_for_mirroring
       task = async_task(::Actions::Katello::Flatpak::MirrorRemoteRepository, @flatpak_remote_repository, @product)
       respond_for_async :resource => task
     end
@@ -94,5 +95,13 @@ module Katello
     def rejected_autocomplete_items
       ['flatpak_remote_id', 'flatpak_remote']
     end
+
+    private
+
+    def validate_product_for_mirroring
+      return unless @product&.redhat?
+      msg = _("Flatpak repositories cannot be mirrored into Red Hat products. Please select a custom product.")
+      fail HttpErrors::UnprocessableEntity, msg
+    end
   end
 end

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

@@ -7,6 +7,7 @@ module Katello
       bugfix: Katello::Erratum::BUGZILLA, # ['bugfix', 'recommended']
       security: Katello::Erratum::SECURITY, # ['security']
       enhancement: Katello::Erratum::ENHANCEMENT, # ['enhancement', 'optional']
+      other: 'other', # any type not in the above categories
     }.freeze
 
     before_action :find_host, only: :index
@@ -15,6 +16,8 @@ module Katello
     before_action :find_environment, only: :index
     before_action :find_content_view, only: :index
 
+    after_action :strip_errata_type, only: :auto_complete_search
+
     resource_description do
       api_version 'v2'
       api_base_url "/api"
@@ -41,7 +44,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Content View"), :required => false
     param :environment_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Environment"), :required => false
     param :include_applicable, :bool, :desc => N_("Return errata that are applicable to this host. Defaults to false)"), :required => false
-    param :type, String, :desc => N_("Return only errata of a particular type (security, bugfix, enhancement)"), :required => false
+    param :type, String, :desc => N_("Return only errata of a particular type (security, bugfix, enhancement, other)"), :required => false
     param :severity, String, :desc => N_("Return only errata of a particular severity (None, Low, Moderate, Important, Critical)"), :required => false
     param_group :search, Api::V2::ApiController
     def index
@@ -89,7 +92,12 @@ module Katello
         relation = @host.content_facet.installable_errata(@environment, @content_view)
       end
       if params[:type].present?
-        relation = relation.where(:errata_type => TYPES_FROM_PARAMS[params[:type].to_sym])
+        type_param = params[:type].to_sym
+        if type_param == :other
+          relation = relation.where.not(:errata_type => [Katello::Erratum::SECURITY, Katello::Erratum::BUGZILLA, Katello::Erratum::ENHANCEMENT].flatten)
+        elsif TYPES_FROM_PARAMS[type_param].present?
+          relation = relation.where(:errata_type => TYPES_FROM_PARAMS[type_param])
+        end
       end
       if params[:severity].present?
         params[:severity] = ['None', ''] if params[:severity] == 'None'
@@ -142,6 +150,20 @@ module Katello
       end
     end
 
+    def strip_errata_type
+      return if response.body.blank?
+
+      begin
+        items = JSON.parse(response.body)
+      rescue JSON::ParserError
+        return
+      end
+
+      filtered = items.reject { |h| h['part'].to_s.strip == 'errata_type' }
+
+      response.body = filtered.to_json
+    end
+
     def validate_index_params!
       if (params[:content_view_id] && params[:environment_id].nil?) || (params[:environment_id] && params[:content_view_id].nil?)
         fail _("Either both parameters 'content_view_id' and 'environment_id' should be specified or neither should be specified")

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

@@ -4,16 +4,22 @@ module Katello
 
     include Api::V2::Rendering
     include ForemanTasks::Triggers
-
-    before_action :local_find_taxonomy, :only => %w(repo_discover cancel_repo_discover
-                                                    download_debug_certificate cdn_configuration
-                                                    redhat_provider update releases)
+    LOCAL_FIND_TAXONOMY_ACTIONS = %w(repo_discover cancel_repo_discover download_debug_certificate
+                                     cdn_configuration redhat_provider update releases).freeze
+    before_action :local_find_taxonomy, :only => LOCAL_FIND_TAXONOMY_ACTIONS
 
     resource_description do
       api_version 'v2'
       api_base_url "/katello/api"
     end
 
+    def self.before_find_taxonomy_actions
+      # used by RH Cloud to delay the execution of local_find_taxonomy
+      skip_before_action :local_find_taxonomy, :only => LOCAL_FIND_TAXONOMY_ACTIONS
+      yield
+      before_action :local_find_taxonomy, :only => LOCAL_FIND_TAXONOMY_ACTIONS
+    end
+
     def_param_group :resource do
       param :organization, Hash, :required => true, :action_aware => true do
         param :name, String, :required => true

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

@@ -1,7 +1,7 @@
 module Katello
   class Api::V2::RepositoriesController < Api::V2::ApiController # rubocop:disable Metrics/ClassLength
     include Katello::Concerns::FilteredAutoCompleteSearch
-
+    INDEX_ACTIONS = [:index, :auto_complete_search].freeze
     generic_repo_wrap_params = []
     RepositoryTypeManager.generic_remote_options(defined_only: true).each do |option|
       generic_repo_wrap_params << option.name
@@ -16,8 +16,8 @@ module Katello
     CONTENT_CREDENTIAL_SSL_CLIENT_CERT_TYPE = "ssl_client_cert".freeze
     CONTENT_CREDENTIAL_SSL_CLIENT_KEY_TYPE = "ssl_client_key".freeze
 
-    before_action :find_optional_organization, :only => [:index, :auto_complete_search]
-    before_action :find_product, :only => [:index, :auto_complete_search]
+    before_action :find_optional_organization, :only => INDEX_ACTIONS
+    before_action :find_product, :only => INDEX_ACTIONS
     before_action :find_product_for_create, :only => [:create]
     before_action :find_organization_from_product, :only => [:create]
     before_action :find_unauthorized_katello_resource, :only => [:gpg_key_content]
@@ -35,6 +35,15 @@ module Katello
     skip_before_action :authorize, :only => [:gpg_key_content]
     skip_before_action :check_media_type, :only => [:upload_content]
 
+    def self.before_index_actions
+      # used by RH Cloud to delay the execution of find_optional_organization and find_product
+      skip_before_action :find_optional_organization, :only => INDEX_ACTIONS
+      skip_before_action :find_product, :only => INDEX_ACTIONS
+      yield
+      before_action :find_optional_organization, :only => INDEX_ACTIONS
+      before_action :find_product, :only => INDEX_ACTIONS
+    end
+
     def custom_index_relation(collection)
       collection.includes(:product)
     end

data/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb

@@ -18,7 +18,8 @@ module Katello
 
       included do
         prepend Overrides
-        before_action :set_content_view_environments, only: [:create, :update]
+        around_action :handle_content_view_environments_for_create, only: [:create]
+        before_action :handle_content_view_environments_for_update, only: [:update]
 
         def destroy
           Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
@@ -34,21 +35,48 @@ module Katello
           render(:locals => { :resource => @host }, :template => 'katello/api/v2/hosts/show', :status => :ok)
         end
 
-        def set_content_view_environments
+        def handle_content_view_environments_for_create
+          # validations should occur before the action so that the request can fail and not render multiple responses
+          cves = validate_content_view_environment_params
+          yield
+          # the actual assigning needs to wait until the host is created
+          set_content_view_environments(cves)
+        end
+
+        def handle_content_view_environments_for_update
+          cves = validate_content_view_environment_params
+          set_content_view_environments(cves)
+        end
+
+        def validate_content_view_environment_params
           content_facet_attributes = params.dig(:host, :content_facet_attributes)
-          return if content_facet_attributes.blank? || @host&.content_facet.blank? ||
-            (cve_params[:content_view_id].present? && cve_params[:lifecycle_environment_id].present?)
+          return if content_facet_attributes.blank? ||
+          (cve_params[:content_view_id].present? && cve_params[:lifecycle_environment_id].present?)
+
           cves = ::Katello::ContentViewEnvironment.fetch_content_view_environments(
             labels: cve_params[:content_view_environments],
             ids: cve_params[:content_view_environment_ids],
-            organization: @organization || @host&.organization)
-          if cves.present?
-            @host.content_facet.content_view_environments = cves
-          else
+            organization: find_organization || @host&.organization)
+          if cves.blank?
             handle_errors(labels: cve_params[:content_view_environments],
               ids: cve_params[:content_view_environment_ids])
           end
+          cves
+        end
+
+        # rubocop:disable Naming/AccessorMethodName
+        def set_content_view_environments(cves)
+          return if cves.blank?
+          if @host.blank?
+            Rails.logger.debug "No host; not assigning content view environments"
+            return
+          elsif @host&.content_facet.blank?
+            content_facet = Katello::Host::ContentFacet.new(host: @host)
+            @host.content_facet = content_facet
+          end
+          @host.content_facet.content_view_environments = cves
         end
+        # rubocop:enable Naming/AccessorMethodName
 
         def cve_params
           params.require(:host).require(:content_facet_attributes).permit(:content_view_id, :lifecycle_environment_id, content_view_environments: [], content_view_environment_ids: [])

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

@@ -59,13 +59,6 @@ module Actions
             if options[:importing]
               handle_importing_content(version, options[:path], options[:metadata])
             elsif options[:syncable]
-              if separated_repo_map[:pulp3_deb_multicopy].keys.flatten.present?
-                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_deb_multicopy], version)
-              end
-              if separated_repo_map[:pulp3_yum_multicopy].keys.flatten.present?
-                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_yum_multicopy], version)
-              end
-
               # Create import history for syncable imports so they display under hammer's content-import list command.
               if options[:path] && options[:metadata]
                 plan_action(
@@ -76,6 +69,13 @@ module Actions
                   content_view_name: version.content_view.name
                 )
               end
+            else
+              if separated_repo_map[:pulp3_deb_multicopy].keys.flatten.present?
+                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_deb_multicopy], version)
+              end
+              if separated_repo_map[:pulp3_yum_multicopy].keys.flatten.present?
+                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_yum_multicopy], version)
+              end
             end
 
             concurrence do

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

@@ -20,7 +20,15 @@ module Actions
         end
 
         def run
-          ::Katello::Repository.where(id: input[:repository_ids]).destroy_all
+          ::Katello::Repository.where(id: input[:repository_ids]).each do |repository|
+            SmartProxy.unscoped.with_repo(repository).each do |smart_proxy|
+              next if smart_proxy.pulp_primary?
+
+              smart_proxy.content_counts&.dig("content_view_versions", repository.content_view_version_id.to_s, "repositories")&.delete(repository.id.to_s)
+              smart_proxy.save
+            end
+            repository.destroy!
+          end
         end
       end
     end

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

@@ -96,8 +96,9 @@ module Actions
         end
 
         def handle_redhat_content(repository)
-          if repository.content_view.content_view_environment(repository.environment)
-            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, repository.content_view.content_view_environment(repository.environment))
+          content_view_environment = repository.content_view.content_view_environment(repository.environment)
+          if content_view_environment && !repository.content_view.rolling?
+            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, content_view_environment)
           end
         end
 

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

@@ -13,9 +13,8 @@ module Actions
             }.merge(opts)
             action_subject(organization)
             validate_repositories_immediate!(organization) if options[:fail_on_missing_content]
-            content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_library_export_view(destination_server: options[:destination_server],
+            content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_or_create_library_export_view(destination_server: options[:destination_server],
                                                                            organization: organization,
-                                                                           create_by_default: true,
                                                                            format: options[:format])
             repo_ids_in_library = organization.default_content_view_version.repositories.exportable(format: options[:format]).immediate_or_none.pluck(:id)
             content_view.update!(repository_ids: repo_ids_in_library)