katello 4.7.3 → 4.8.0.rc1

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

@@ -3,58 +3,6 @@ module Katello
     apipie_concern_subst(:a_resource => N_("a package group"), :resource => "package_groups")
     include Katello::Concerns::Api::V2::RepositoryContentController
 
-    before_action :find_repository
-
-    api :POST, "/package_group", N_("Create a package group")
-    param :repository_id, String, :required => true, :desc => N_("repository_id")
-    param :name, String, :required => true, :desc => N_("package group name")
-    param :description, String, :desc => N_("package group description. Defaults to params[:name]")
-    param :user_visible, :bool, :desc => N_("set \"user_visible\" flag on package group. Defaults to true")
-    param :mandatory_package_names, Array, :desc => N_("mandatory package names to include in the package group")
-    param :optional_package_names, Array, :desc => N_("optional package names to include in the package group")
-    param :conditional_package_names, Array, :desc => N_("conditional package names to include in the package group")
-    param :default_package_names, Array, :desc => N_("default package names to include in the package group")
-
-    def create
-      fail HttpErrors::BadRequest, _("name not defined.") if params[:name].blank?
-      fail HttpErrors::BadRequest, _("repository_id not defined.") if params[:repository_id].blank?
-      fail Katello::Errors::InvalidRepositoryContent, _("Can only upload to Yum Repositories.") unless @repo.yum?
-
-      if params[:mandatory_package_names].empty? && params[:optional_package_names].empty? &&
-         params[:conditional_package_names].empty? && params[:default_package_names].empty?
-        fail HttpErrors::BadRequest, _("Must supply at least one of mandatory_package_names, " \
-          "optional_package_names, conditional_package_names, default_package_names parameters")
-      end
-
-      params.each do |key, value|
-        if key.to_s.include?('_package_names')
-          if value.present?
-            fail HttpErrors::BadRequest, _("%s must be an array.") % key unless value.is_a?(Array)
-          end
-        end
-      end
-
-      params[:description] = params[:name] if params[:description].empty?
-      params[:user_visible] = ::Foreman::Cast.to_bool(params[:user_visible])
-      params[:user_visible] ||= true
-
-      create_params = params.slice(:name, :description, :user_visible, :mandatory_package_names, :optional_package_names, :conditional_package_names, :default_package_names).to_unsafe_h
-      sync_task(::Actions::Katello::Repository::UploadPackageGroup, @repo, create_params)
-      render :json => {:status => "success"}
-    end
-
-    api :DELETE, "/package_group", N_("Delete a package group")
-    param :name, String, :required => true, :desc => N_("package group name")
-    param :repository_id, String, :required => true, :desc => N_("repository_id")
-
-    def destroy
-      fail Katello::Errors::InvalidRepositoryContent, _("Can only destroy on Yum Repositories.") unless @repo.yum?
-      fail _("name not defined.") if params[:name].blank?
-
-      sync_task(::Actions::Katello::Repository::DestroyPackageGroup, @repo, params[:name])
-      render :json => {:status => "success"}
-    end
-
     def available_for_content_view_filter(filter, _collection)
       collection_ids = []
       current_ids = filter.package_group_rules.map(&:uuid)

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

@@ -14,7 +14,7 @@ module Katello
         bulk_params[:included] ||= {}
         bulk_params[:excluded] ||= {}
 
-        if bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
+        if !params[:install_all] && bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
           fail HttpErrors::BadRequest, _("No hosts have been specified.")
         end
 
@@ -25,9 +25,8 @@ module Katello
           @hosts = @hosts.where(id: bulk_params[:included][:ids])
         end
 
-        if bulk_params[:included][:search]
-          search_hosts = bulk_hosts_relation(permission, @organization).search_for(bulk_params[:included][:search])
-          @hosts = @hosts.merge(search_hosts)
+        if bulk_params[:included][:search].present?
+          @hosts = @hosts.search_for(bulk_params[:included][:search])
         end
 
         @hosts = restrict_to.call(@hosts) if restrict_to
@@ -35,8 +34,7 @@ module Katello
         if bulk_params[:excluded][:ids].present?
           @hosts = @hosts.where.not(id: bulk_params[:excluded][:ids])
         end
-
-        fail HttpErrors::Forbidden, _("Action unauthorized to be performed on selected hosts.") if @hosts.empty?
+        fail HttpErrors::Forbidden, _("No hosts matched search, or action unauthorized for selected hosts.") if @hosts.empty?
 
         @hosts
       end

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

@@ -19,8 +19,7 @@ module Katello
 
       def host_setup_extension
         if params['host']['lifecycle_environment_id']
-          new_lce = KTEnvironment.readable.find(params['host']['lifecycle_environment_id'])
-          @host.content_facet.lifecycle_environment = new_lce
+          @host.content_facet.assign_single_environment(content_view_id: @host&.content_views&.first&.id, lifecycle_environment_id: params['host']['lifecycle_environment_id'])
           @host.update_candlepin_associations
         end
 

data/app/controllers/katello/concerns/authorization/api/v2/content_views_controller.rb

@@ -118,7 +118,10 @@ module Katello
       # and also ensure that the environments have the remove permission
       return deny_access unless KTEnvironment.promotable.where(:id => env_ids).count == env_ids.size && view.promotable_or_removable?
 
-      total_count = Katello::Host::ContentFacet.where(:content_view_id => view, :lifecycle_environment_id => env_ids).count
+      total_count = Katello::Host::ContentFacet.in_content_views_and_environments(
+        :content_views => [view],
+        :lifecycle_environments => ::Katello::KTEnvironment.where(id: env_ids)
+      ).count
       if total_count > 0
         unless options[:system_content_view_id] && options[:system_environment_id]
           fail _("Unable to reassign content hosts. Please provide system_content_view_id and system_environment_id.")

data/app/controllers/katello/concerns/content_facet_hosts_controller_extensions.rb

@@ -0,0 +1,24 @@
+module Katello
+  module Concerns
+    module ContentFacetHostsControllerExtensions
+      extend ActiveSupport::Concern
+      included do
+        before_action :set_up_content_view_environment, only: [:update]
+
+        def set_up_content_view_environment
+          return unless params[:host] && params[:host][:content_facet_attributes]
+          cv_id = params[:host][:content_facet_attributes].delete(:content_view_id)
+          env_id = params[:host][:content_facet_attributes].delete(:lifecycle_environment_id)
+          Rails.logger.info "set_up_content_view_environment: cv_id=#{cv_id}, env_id=#{env_id}"
+          if (cv_id.present? && env_id.present?)
+            @host.content_facet.assign_single_environment(
+              lifecycle_environment_id: env_id,
+              content_view_id: cv_id
+            )
+            Rails.logger.info "set_up_content_view_environment: done"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -57,15 +57,15 @@ module Katello
             format.csv do
               @hosts = resource_base_with_search.where(organization_id: params[:organization_id])
                          .preload(:subscription_facet, :host_statuses, :operatingsystem,
-                                  :applicable_rpms, :lifecycle_environment, :content_view)
+                                  :applicable_rpms, :content_view_environments)
               csv_response(@hosts,
                 [:name, :subscription_status_label, 'content_facet.installable_security_errata_count',
                  'content_facet.installable_bugfix_errata_count', 'content_facet.installable_enhancement_errata_count',
-                 'content_facet.upgradable_rpm_count', :operatingsystem, :lifecycle_environment, :content_view,
+                 'content_facet.upgradable_rpm_count', :operatingsystem, :content_view_environment_names,
                  'subscription_facet.registered_at', 'subscription_facet.last_checkin'],
                 ['Name', 'Subscription Status', 'Installable Updates - Security',
                  'Installable Updates - Bug Fixes', 'Installable Updates - Enhancements',
-                 'Installable Updates - Package Count', 'OS', 'Environment', 'Content View',
+                 'Installable Updates - Package Count', 'OS', 'Content View Environments',
                  'Registered', 'Last Checkin'])
             end
           end

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -64,7 +64,7 @@ module Katello
     end
 
     def fetch_content_view(host, options = {})
-      return host.content_view if host.try(:content_view_id)
+      return host.single_content_view if host.try(:single_content_view)
       selected_host_group = options.fetch(:selected_host_group, nil)
       return selected_host_group.content_view if selected_host_group.present?
     end
@@ -75,8 +75,12 @@ module Katello
       return selected_host_group.content_source if selected_host_group.present?
     end
 
-    def accessible_lifecycle_environments(org, host)
-      selected = host.lifecycle_environment
+    def accessible_lifecycle_environments(org, host_or_hostgroup)
+      selected = if host_or_hostgroup.is_a?(::Host::Managed)
+                   host_or_hostgroup.try(:single_lifecycle_environment)
+                 else
+                   host_or_hostgroup.lifecycle_environment
+                 end
       envs = org.kt_environments.readable.order(:name)
       envs |= [selected] if selected.present? && org == selected.organization
       envs
@@ -207,9 +211,11 @@ module Katello
         if (host.is_a? ::Hostgroup)
           new_host.content_facet = hostgroup_content_facet(host, param_host)
         elsif host.content_facet.present?
-          new_host.content_facet = ::Katello::Host::ContentFacet.new(:lifecycle_environment_id => host.content_facet.lifecycle_environment_id,
-                                                          :content_view_id => host.content_facet.content_view_id,
-                                                          :content_source_id => host.content_source_id)
+          new_host.content_facet = ::Katello::Host::ContentFacet.new(:content_source_id => host.content_source_id)
+          new_host.content_facet.assign_single_environment(
+            :lifecycle_environment => host.content_facet.single_lifecycle_environment,
+            :content_view => host.content_facet.single_content_view
+          )
         end
         new_host.operatingsystem.kickstart_repos(new_host).map { |repo| OpenStruct.new(repo) }
       else
@@ -243,9 +249,11 @@ module Katello
         content_view = fetch_inherited_param(host_params[:content_view_id], ::Katello::ContentView, parent&.content_view)
         content_source = fetch_inherited_param(host_params[:content_source_id], ::SmartProxy, parent&.content_source)
 
-        host.content_facet = Host::ContentFacet.new(:lifecycle_environment_id => lifecycle_env.id,
-                                                    :content_view_id => content_view.id,
-                                                    :content_source => content_source)
+        host.content_facet = Host::ContentFacet.new(:content_source => content_source)
+        host.content_facet.assign_single_environment(
+          :lifecycle_environment_id => lifecycle_env.id,
+          :content_view_id => content_view.id
+        )
         if host.operatingsystem.is_a?(Redhat)
           view_options = host.operatingsystem.kickstart_repos(host).map { |repo| OpenStruct.new(repo) }
         end
@@ -289,35 +297,58 @@ module Katello
     end
 
     def host_registered_time(host)
-      return _('Never registered') unless host.subscription_facet_attributes&.registered_at
+      return ''.html_safe unless host.subscription_facet_attributes&.registered_at
 
       date_time_relative_value(host.subscription_facet_attributes.registered_at)
     end
 
     def host_checkin_time(host)
-      return _('Never checked in') unless host.subscription_facet_attributes&.last_checkin
+      return ''.html_safe unless host.subscription_facet_attributes&.last_checkin
 
       date_time_relative_value(host.subscription_facet_attributes.last_checkin)
     end
 
     private
 
-    def hostgroup_content_facet(hostgroup, param_host)
-      lifecycle_environment_id = hostgroup.inherited_lifecycle_environment_id
-      content_view_id = hostgroup.inherited_content_view_id
+    def inherited_or_own_content_source_id(host_or_hostgroup, hostgroup)
       content_source_id = hostgroup.inherited_content_source_id
-      if param_host.lifecycle_environment_id && (hostgroup.inherited_lifecycle_environment_id != param_host.lifecycle_environment_id)
-        lifecycle_environment_id = param_host.lifecycle_environment_id
-      end
-      if param_host.content_view_id && (hostgroup.inherited_content_view_id != param_host.content_view_id)
-        content_view_id = param_host.content_view_id
+      if host_or_hostgroup.content_source_id && (hostgroup.inherited_content_source_id != host_or_hostgroup.content_source_id)
+        content_source_id = host_or_hostgroup.content_source_id
       end
-      if param_host.content_source_id && (hostgroup.inherited_content_source_id != param_host.content_source_id)
-        content_source_id = param_host.content_source_id
+      content_source_id
+    end
+
+    def inherited_or_own_facet_attributes(host_or_hostgroup, hostgroup)
+      lifecycle_environment_id = hostgroup.inherited_lifecycle_environment_id
+      content_view_id = hostgroup.inherited_content_view_id
+      case host_or_hostgroup
+      when ::Hostgroup
+        if host_or_hostgroup.lifecycle_environment_id && (hostgroup.inherited_lifecycle_environment_id != host_or_hostgroup.lifecycle_environment_id)
+          lifecycle_environment_id = host_or_hostgroup.lifecycle_environment_id
+        end
+        if host_or_hostgroup.content_view_id && (hostgroup.inherited_content_view_id != host_or_hostgroup.content_view_id)
+          content_view_id = host_or_hostgroup.content_view_id
+        end
+      when ::Host::Managed
+        if host_or_hostgroup.single_lifecycle_environment && (hostgroup.inherited_lifecycle_environment_id != host_or_hostgroup.single_lifecycle_environment.id)
+          lifecycle_environment_id = host_or_hostgroup.single_lifecycle_environment.id
+        end
+        if host_or_hostgroup.single_content_view && (hostgroup.inherited_content_view_id != host_or_hostgroup.single_content_view.id)
+          content_view_id = host_or_hostgroup.single_content_view.id
+        end
       end
-      ::Katello::Host::ContentFacet.new(:lifecycle_environment_id => lifecycle_environment_id,
-                                        :content_view_id => content_view_id,
-                                        :content_source_id => content_source_id)
+      [lifecycle_environment_id, content_view_id]
+    end
+
+    def hostgroup_content_facet(hostgroup, param_host)
+      lifecycle_environment_id, content_view_id = inherited_or_own_facet_attributes(param_host, hostgroup)
+      content_source_id = inherited_or_own_content_source_id(param_host, hostgroup)
+      facet = ::Katello::Host::ContentFacet.new(:content_source_id => content_source_id)
+      facet.assign_single_environment(
+        :lifecycle_environment_id => lifecycle_environment_id,
+        :content_view_id => content_view_id
+      )
+      facet
     end
   end
 end

data/app/helpers/katello/katello_urls_helper.rb

@@ -43,20 +43,5 @@ module Katello
       optional :content_type, String, desc: 'Content type', default: 'repos'
       returns String, desc: 'Absolute path to a file'
     end
-    def repository_url(content_path, _content_type = nil, schema = 'http')
-      return content_path if content_path =~ %r|^([\w\-\+]+)://|
-      url = if @host.content_source
-              "#{schema}://#{@host.content_source.hostname}"
-            else
-              foreman_settings_url(schema)
-            end
-      content_path = content_path.sub(%r|^/|, '')
-      if @host.content_view && !@host.content_view.default?
-        content_path = [@host.content_view.label, content_path].join('/')
-      end
-      path = ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(
-        @host.lifecycle_environment, content_path)
-      "#{url}/pulp/content/#{path}"
-    end
   end
 end

data/app/helpers/katello/sync_management_helper.rb

@@ -28,10 +28,6 @@ module Katello
       Product.syncable? && current_organization_object.syncable_content?
     end
 
-    def error_state?(status)
-      status[:raw_state] == PulpSyncStatus::ERROR && !status[:error_details].blank?
-    end
-
     module RepoMethods
       # returns all repos in hash representation with minors and arch children included
       def collect_repos(products, env, include_feedless = true)

data/app/lib/actions/candlepin/owner/destroy_imports.rb

@@ -8,7 +8,7 @@ module Actions
 
         def run
           organization = ::Organization.find_by!(label: input[:label])
-          output[:response] = ::Katello::Resources::Candlepin::Owner.destroy_imports(organization.label, true)
+          output[:response] = ::Katello::Resources::Candlepin::Owner.destroy_imports(organization.label, wait_until_complete: true)
           organization.redhat_provider.index_subscriptions
         end
       end

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

@@ -34,10 +34,6 @@ module Actions
                                           environment: environment,
                                           repository: repository)
           sequence do
-            if smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE)
-              plan_action(Actions::Pulp::Orchestration::Repository::RefreshRepos, smart_proxy, refresh_options)
-            end
-
             if smart_proxy.has_feature?(SmartProxy::PULP3_FEATURE)
               plan_action(Actions::Pulp3::ContentGuard::Refresh, smart_proxy)
               plan_action(Actions::Pulp3::Orchestration::Repository::RefreshRepos, smart_proxy, refresh_options)

data/app/lib/actions/katello/capsule_content/sync_capsule.rb

@@ -2,7 +2,6 @@ module Actions
   module Katello
     module CapsuleContent
       class SyncCapsule < ::Actions::EntryAction
-        include Actions::Katello::PulpSelector
         # rubocop:disable Metrics/MethodLength
         def plan(smart_proxy, options = {})
           plan_self(:smart_proxy_id => smart_proxy.id)
@@ -18,7 +17,7 @@ module Actions
             repos.in_groups_of(Setting[:foreman_proxy_content_batch_size], false) do |repo_batch|
               concurrence do
                 repo_batch.each do |repo|
-                  if smart_proxy.backend_service_type(repo) == Actions::Pulp3::Abstract::BACKEND_SERVICE_TYPE
+                  if smart_proxy.pulp3_support?(repo)
                     plan_action(Actions::Pulp3::CapsuleContent::Sync,
                       repo, smart_proxy,
                       skip_metadata_check: skip_metadata_check)

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

@@ -112,8 +112,12 @@ module Actions
           version.update_content_counts!
           # update errata applicability counts for all hosts in the CV & Library
           unless input[:skip_promotion]
-            ::Katello::Host::ContentFacet.where(:content_view_id => input[:content_view_id],
-                                                :lifecycle_environment_id => input[:environment_id]).each do |facet|
+            content_view = ::Katello::ContentView.find(input[:content_view_id])
+            lifecycle_environment = ::Katello::KTEnvironment.find(input[:environment_id])
+            ::Katello::Host::ContentFacet.in_content_views_and_environments(
+              content_views: [content_view],
+              lifecycle_environments: [lifecycle_environment]
+            ).each do |facet|
               facet.update_applicability_counts
               facet.update_errata_status
             end

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

@@ -71,12 +71,18 @@ module Actions
                       content_view_history_ids: cv_histories.map { |history| history.id })
 
             if organization_destroy
-              content_view.hostgroups.destroy_all
-              content_view.hosts.destroy_all
+              destroy_host_and_hostgroup_associations(content_view: content_view)
             end
           end
         end
 
+        def destroy_host_and_hostgroup_associations(content_view:)
+          content_view.hostgroups.destroy_all
+          host_ids = content_view.hosts.ids
+          ::Katello::Host::ContentFacet.where(:host_id => host_ids).destroy_all
+          ::Katello::Host::SubscriptionFacet.where(:host_id => host_ids).destroy_all
+        end
+
         def check_version_deletion(versions, cv_envs)
           versions.each do |version|
             version.environments.each do |env|

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

@@ -3,7 +3,7 @@ module Actions
     module ContentViewVersion
       class Destroy < Actions::Base
         def plan(version, options = {})
-          version.validate_destroyable!(options[:skip_environment_check])
+          version.validate_destroyable!(skip_environment_check: options[:skip_environment_check])
 
           destroy_env_content = !options.fetch(:skip_destroy_env_content, false)
           repos = destroy_env_content ? version.repositories : version.archived_repos

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

@@ -24,14 +24,20 @@ module Actions
             end
 
             if organization_destroy
-              env.hostgroups.clear
-              env.hosts.clear
+              delete_host_and_hostgroup_associations(environment: env)
             end
 
             plan_self
           end
         end
 
+        def delete_host_and_hostgroup_associations(environment:)
+          environment.hostgroups.delete_all
+          host_ids = environment.hosts.ids
+          ::Katello::Host::ContentFacet.where(:host_id => host_ids).delete_all
+          ::Katello::Host::SubscriptionFacet.where(:host_id => host_ids).delete_all
+        end
+
         def humanized_name
           _("Delete Lifecycle Environment")
         end

data/app/lib/actions/katello/host/reassign.rb

@@ -3,8 +3,10 @@ module Actions
     module Host
       class Reassign < Actions::Base
         def plan(host, content_view_id, environment_id)
-          host.content_facet.content_view = ::Katello::ContentView.find(content_view_id)
-          host.content_facet.lifecycle_environment = ::Katello::KTEnvironment.find(environment_id)
+          host.content_facet.assign_single_environment(
+            content_view: ::Katello::ContentView.find(content_view_id),
+            lifecycle_environment: ::Katello::KTEnvironment.find(environment_id)
+          )
           host.update_candlepin_associations
         end
       end

data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb

@@ -7,7 +7,6 @@ module Actions
         end
         def plan(proxy)
           sequence do
-            plan_action(Actions::Pulp::Orchestration::OrphanCleanup::RemoveOrphans, proxy) if (proxy.has_feature?(SmartProxy::PULP_FEATURE) || proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE))
             if proxy.pulp3_enabled?
               plan_action(
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,

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

@@ -46,8 +46,9 @@ module Actions
                               product_id: product.cp_id,
                               content_id: pc.content.cp_content_id)
                 end
-                plan_action(Candlepin::Product::Destroy, cp_id: product.cp_id, :owner => product.organization.label)
               end
+
+              plan_action(Candlepin::Product::Destroy, cp_id: product.cp_id, :owner => product.organization.label)
             end
 
             clear_pool_associations(product)

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

@@ -34,7 +34,7 @@ module Actions
               input[:upload_actions].each { |action| uploaded_content_unit_hrefs << action.try(:[], "content_unit_href") }
               unit_ids = uploaded_content_unit_hrefs.compact
             else
-              unit_ids = search_units(repo)
+              unit_ids = []
             end
             ::Katello::Deb.import_all(unit_ids, repo, {filtered_indexing: true})
           elsif repo.yum?
@@ -45,7 +45,7 @@ module Actions
               input[:upload_actions].each { |action| uploaded_content_unit_hrefs << action.try(:[], "content_unit_href") }
               unit_ids = uploaded_content_unit_hrefs.compact
             else
-              unit_ids = search_units(repo)
+              unit_ids = []
             end
             if input[:content_type] == ::Katello::Srpm::CONTENT_TYPE
               ::Katello::Srpm.import_all(unit_ids, repo, {filtered_indexing: true})
@@ -54,14 +54,6 @@ module Actions
             end
           end
         end
-
-        private
-
-        def search_units(repo)
-          found = repo.unit_search(:type_ids => [input[:content_type]],
-                                   :filters => input[:filter])
-          found.map { |result| result.try(:[], :unit_id) }.compact
-        end
       end
     end
   end

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

@@ -3,7 +3,6 @@ module Actions
   module Katello
     module Repository
       class ImportUpload < Actions::EntryAction
-        include Actions::Katello::PulpSelector
         # rubocop:disable Metrics/MethodLength
         def plan(repository, uploads, options = {})
           action_subject(repository)

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

@@ -49,7 +49,6 @@ module Actions
               plan_action(Katello::Repository::IndexContent, :id => repo.id, :force_index => skip_metadata_check)
               plan_action(Katello::Foreman::ContentUpdate, repo.environment, repo.content_view, repo)
               plan_action(Katello::Repository::FetchPxeFiles, :id => repo.id)
-              plan_action(Katello::Repository::CorrectChecksum, repo)
               concurrence do
                 plan_action(Katello::Repository::ErrataMail, repo)
                 plan_action(Actions::Katello::Applicability::Repository::Regenerate, :repo_ids => [repo.id]) if generate_applicability

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

@@ -2,8 +2,7 @@ module Actions
   module Katello
     module Repository
       class Update < Actions::EntryAction
-        include Actions::Katello::PulpSelector
-
+        # rubocop:disable Metrics/MethodLength
         def plan(root, repo_params)
           repository = root.library_instance
           action_subject root.library_instance
@@ -46,7 +45,10 @@ module Actions
                                SmartProxy.pulp_primary)
               plan_self(:repository_id => root.library_instance.id)
               if update_cv_cert_protected
-                plan_optional_pulp_action([::Actions::Pulp3::Orchestration::Repository::TriggerUpdateRepoCertGuard], repository, ::SmartProxy.pulp_primary)
+                smart_proxy = ::SmartProxy.pulp_primary
+                if smart_proxy.pulp3_support?(repository)
+                  plan_action(::Actions::Pulp3::Orchestration::Repository::TriggerUpdateRepoCertGuard, repository, smart_proxy)
+                end
               end
 
               handle_alternate_content_sources(repository, create_acs, delete_acs, old_url)

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

@@ -6,7 +6,6 @@ module Actions
   module Katello
     module Repository
       class UploadFiles < Actions::EntryAction
-        include Actions::Katello::PulpSelector
         def plan(repository, files, content_type = nil, options = {})
           action_subject(repository)
           repository.clear_smart_proxy_sync_histories

data/app/lib/actions/pulp3/abstract.rb

@@ -4,12 +4,6 @@ module Actions
       middleware.use ::Actions::Middleware::RemoteAction
       middleware.use Actions::Middleware::Pulp3ServicesCheck
 
-      BACKEND_SERVICE_TYPE = 'pulp3'.freeze
-
-      def self.backend_service_type
-        BACKEND_SERVICE_TYPE
-      end
-
       def smart_proxy
         SmartProxy.unscoped.find(input[:smart_proxy_id])
       end

data/app/lib/actions/pulp3/content_view/delete_repository_references.rb

@@ -14,8 +14,7 @@ module Actions
           to_delete = content_view.repository_references.select do |repository_reference|
             repo = repository_reference.root_repository.library_instance
             if delete_href?(repository_reference.repository_href, content_view)
-              #force pulp3 in case we've done migrations, but haven't switched over yet
-              tasks << repo.backend_service(smart_proxy, true).delete_repository(repository_reference)
+              tasks << repo.backend_service(smart_proxy).delete_repository(repository_reference)
               true
             else
               false

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

@@ -6,6 +6,7 @@ module Actions
           param :smart_proxy_id, Integer
           param :base_path, String
           param :content_view_version_id, Integer
+          param :from_content_view_version_id, Integer
           param :destination_server, String
         end
 
@@ -18,8 +19,10 @@ module Actions
           smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
           output[:path] = input[:base_path]
           cvv = ::Katello::ContentViewVersion.find(input[:content_view_version_id])
+          from_cvv = ::Katello::ContentViewVersion.find(input[:from_content_view_version_id]) unless input[:from_content_view_version_id].blank?
           export_metadata = ::Katello::Pulp3::ContentViewVersion::Export.create(
                                                      content_view_version: cvv,
+                                                     from_content_view_version: from_cvv,
                                                      smart_proxy: smart_proxy,
                                                      format: input[:format]).generate_metadata
 
@@ -30,6 +33,7 @@ module Actions
             metadata: export_metadata,
             audit_comment: ::Katello::ContentViewVersionExportHistory.generate_audit_comment(content_view_version: cvv,
                                                                                              user: User.current,
+                                                                                             from_version: from_cvv,
                                                                                              metadata: export_metadata)
           )
           output[:export_history_id] = history.id

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

@@ -28,6 +28,7 @@ module Actions
               sequence do
                 export_output = plan_action(SyncableExport,
                           content_view_version: content_view_version,
+                          from_content_view_version: from_history&.content_view_version,
                           smart_proxy: smart_proxy,
                           destination_server: destination_server).output
                 plan_self(export_history_id: export_output[:export_history_id],

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

@@ -49,11 +49,16 @@ module Actions
           end
 
           def validate_export_types!(repository, format)
-            unless ::Katello::Repository.exportable(format: format).where(id: repository.id).exists?
+            return if ::Katello::Repository.exportable(format: format).where(id: repository.id).exists?
+            if format == ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
               fail _("NOTE: Unable to export repository '%{repository}' because"\
-                     " it does not have an exportable content type."\
+                     " it does not have an syncably exportable content type."\
                        % { repository: repository.name })
             end
+
+            fail _("NOTE: Unable to export repository '%{repository}' because"\
+                   " it does not have an exportable content type."\
+                     % { repository: repository.name })
           end
         end
       end