katello 4.6.2.1 → 4.7.0.rc1

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

@@ -6,7 +6,8 @@ module Katello
       included do
         has_many :root_repositories, :class_name => "::Katello::RootRepository", :foreign_key => :http_proxy_id,
           :inverse_of => :http_proxy, :dependent => :nullify
-        has_many :alternate_content_sources, :class_name => "::Katello::AlternateContentSource", :foreign_key => :http_proxy_id,
+        # A smart proxy's HTTP proxy is used for all related alternate content sources.
+        has_many :smart_proxies, :class_name => "::SmartProxy", :foreign_key => :http_proxy_id,
           :inverse_of => :http_proxy, :dependent => :nullify
         after_update :update_default_proxy_setting
         after_commit :update_repository_proxy_details
@@ -31,7 +32,6 @@ module Katello
 
       def remove_references_to_proxy
         root_repos = repositories_with_proxy(nil).uniq.sort
-        acss = ::Katello::AlternateContentSource.where(http_proxy_id: id)
 
         setting = Setting.find_by(name: 'content_default_http_proxy')
         if setting&.value && setting.value == self.name
@@ -47,14 +47,9 @@ module Katello
             http_proxy_id: nil)
         end
 
-        unless acss.empty?
-          acss.each do |acs|
-            ForemanTasks.async_task(
-              ::Actions::Katello::AlternateContentSource::Update,
-              acs,
-              acs.smart_proxies,
-              http_proxy_id: nil
-            )
+        unless smart_proxies.empty?
+          smart_proxies.each do |smart_proxy|
+            smart_proxy.update(http_proxy_id: nil)
           end
         end
       end

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

@@ -38,24 +38,27 @@ module Katello
 
         lazy_accessor :pulp_repositories, :initializer => lambda { |_s| pulp_node.extensions.repository.retrieve_all }
 
+        # A smart proxy's HTTP proxy is used for all related alternate content sources.
+        belongs_to :http_proxy, :inverse_of => :smart_proxies, :class_name => '::HttpProxy'
+
         has_many :capsule_lifecycle_environments,
-                 :class_name  => "Katello::CapsuleLifecycleEnvironment",
+                 :class_name => "Katello::CapsuleLifecycleEnvironment",
                  :foreign_key => :capsule_id,
-                 :dependent   => :destroy,
+                 :dependent => :destroy,
                  :inverse_of => :capsule
 
         has_many :lifecycle_environments,
                  :class_name => "Katello::KTEnvironment",
-                 :through    => :capsule_lifecycle_environments,
-                 :source     => :lifecycle_environment
+                 :through => :capsule_lifecycle_environments,
+                 :source => :lifecycle_environment
 
         has_many :content_facets, :class_name => "::Katello::Host::ContentFacet", :foreign_key => :content_source_id,
-                                  :inverse_of => :content_source, :dependent => :nullify
+                 :inverse_of => :content_source, :dependent => :nullify
 
         has_many :smart_proxy_sync_histories, :class_name => "::Katello::SmartProxySyncHistory", :inverse_of => :smart_proxy, dependent: :delete_all
 
         has_many :hostgroup_content_facets, :class_name => "::Katello::Hostgroup::ContentFacet", :foreign_key => :content_source_id,
-                              :inverse_of => :content_source, :dependent => :nullify
+                 :inverse_of => :content_source, :dependent => :nullify
         has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets
         has_many :smart_proxy_alternate_content_sources, :class_name => "::Katello::SmartProxyAlternateContentSource", :inverse_of => :smart_proxy, :dependent => :delete_all
 
@@ -67,7 +70,7 @@ module Katello
 
         def self.with_repo(repo)
           joins(:capsule_lifecycle_environments).
-          where("#{Katello::CapsuleLifecycleEnvironment.table_name}.lifecycle_environment_id" => repo.environment_id)
+            where("#{Katello::CapsuleLifecycleEnvironment.table_name}.lifecycle_environment_id" => repo.environment_id)
         end
 
         def self.pulp_primary
@@ -101,12 +104,12 @@ module Katello
           features << PULP_FEATURE if include_default
 
           unscoped.with_features(features).joins(:capsule_lifecycle_environments).
-              where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
+            where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
         end
 
         def self.pulpcore_proxies_with_environment(environment)
           unscoped.where(id: unscoped.select { |p| p.pulp_mirror? }.pluck(:id)).joins(:capsule_lifecycle_environments).
-              where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
+            where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
         end
 
         def self.sync_needed?(environment)
@@ -114,6 +117,10 @@ module Katello
         end
       end
 
+      def alternate_content_sources
+        SmartProxy.joins(:smart_proxy_alternate_content_sources).where('katello_smart_proxy_alternate_content_sources.smart_proxy_id' => self.id)
+      end
+
       def sync_container_gateway
         if has_feature?(::SmartProxy::CONTAINER_GATEWAY_FEATURE)
           update_container_repo_list
@@ -249,7 +256,7 @@ module Katello
       end
 
       def fix_pulp3_capabilities(type)
-        if type.is_a?(String) ||  type.is_a?(Symbol)
+        if type.is_a?(String) || type.is_a?(Symbol)
           repository_type_obj = Katello::RepositoryTypeManager.defined_repository_types[type]
         else
           repository_type_obj = type
@@ -270,7 +277,7 @@ module Katello
         repository_type_obj.pulp3_plugin.present? &&
           pulp3_enabled? &&
           (self.capabilities(PULP3_FEATURE).try(:include?, repository_type_obj.pulp3_plugin) ||
-           self.capabilities(PULP3_FEATURE).try(:include?, 'pulp_' + repository_type_obj.pulp3_plugin))
+            self.capabilities(PULP3_FEATURE).try(:include?, 'pulp_' + repository_type_obj.pulp3_plugin))
       end
 
       def pulp3_content_support?(content_type)
@@ -344,7 +351,7 @@ module Katello
         content_type_string = content_type_obj&.label || content_type
         unless content_type_obj
           fail _("Content type %{content_type_string} does not belong to an enabled repo type.") %
-                { content_type_string: content_type_string }
+                 { content_type_string: content_type_string }
         end
         content_type_obj.pulp3_service_class
       end
@@ -377,7 +384,7 @@ module Katello
       end
 
       def sync_tasks
-        ForemanTasks::Task.for_resource(self)
+        ForemanTasks::Task.for_resource(self).where(:label => 'Actions::Katello::CapsuleContent::Sync')
       end
 
       def active_sync_tasks
@@ -388,10 +395,14 @@ module Katello
         sync_tasks.where('started_at > ?', last_sync_time).where.not(:result => 'pending')
       end
 
+      def last_sync_audit
+        Audited::Audit.where(:auditable_id => self, :auditable_type => SmartProxy.name, action: "sync capsule").order(:created_at).last
+      end
+
       def last_sync_time
         task = sync_tasks.where.not(:ended_at => nil).where(:result => 'success').order(:ended_at).last
 
-        task&.ended_at
+        task&.ended_at || last_sync_audit&.created_at&.to_s
       end
 
       def environment_syncable?(env)
@@ -448,7 +459,7 @@ module Katello
         # Since Foreman 3.1 this setting is set
         if (rhsm_url = setting(SmartProxy::PULP3_FEATURE, 'rhsm_url'))
           URI(rhsm_url)
-        # Compatibility fall back
+          # Compatibility fall back
         elsif pulp_primary?
           URI("https://#{URI.parse(url).host}/rhsm")
         elsif pulp_mirror?
@@ -460,6 +471,10 @@ module Katello
         URI(setting(SmartProxy::PULP3_FEATURE, 'content_app_url'))
       end
 
+      def audit_capsule_sync
+        write_audit(action: "sync capsule", comment: _('Successfully synced capsule.'), audited_changes: {})
+      end
+
       class ::SmartProxy::Jail < ::Safemode::Jail
         allow :rhsm_url, :pulp_content_url
       end

data/app/models/katello/content.rb

@@ -63,5 +63,20 @@ module Katello
       new_url_subs = new_url&.scan(/\$\w+/)&.sort
       current_subs == new_url_subs
     end
+
+    def self.substitute_content_path(arch: nil, releasever: nil, content_path:)
+      arch = nil if arch == "noarch"
+      substitutions = {
+        :releasever => releasever,
+        :basearch => arch
+      }.compact
+      path = substitutions.inject(content_path) do |path_url, (key, value)|
+        path_url.gsub("$#{key}", value)
+      end
+      {
+        path: path,
+        substitutions: substitutions
+      }
+    end
   end
 end

data/app/models/katello/content_credential.rb

@@ -9,26 +9,25 @@ module Katello
     GPG_KEY_TYPE = 'gpg_key'.freeze
     CERT_TYPE = 'cert'.freeze
 
-    has_many :root_repositories, :class_name => "Katello::RootRepository", :inverse_of => :gpg_key, :dependent => :nullify, :foreign_key => 'gpg_key_id'
+    has_many :root_repositories, :class_name => "Katello::RootRepository", :inverse_of => :gpg_key, :dependent => :restrict_with_exception, :foreign_key => 'gpg_key_id'
     has_many :repositories, :through => :root_repositories
 
-    has_many :products, :class_name => "Katello::Product", :inverse_of => :gpg_key, :dependent => :nullify, :foreign_key => 'gpg_key_id'
-
+    has_many :products, :class_name => "Katello::Product", :inverse_of => :gpg_key, :dependent => :restrict_with_exception, :foreign_key => 'gpg_key_id'
     has_many :ssl_ca_cdn_configurations, :class_name => "Katello::CdnConfiguration", :foreign_key => 'ssl_ca_credential_id',
       :inverse_of => :ssl_ca_credential, :dependent => :nullify
 
     has_many :ssl_ca_products, :class_name => "Katello::Product", :foreign_key => "ssl_ca_cert_id",
-                               :inverse_of => :ssl_ca_cert, :dependent => :nullify
+                               :inverse_of => :ssl_ca_cert, :dependent => :restrict_with_exception
     has_many :ssl_client_products, :class_name => "Katello::Product", :foreign_key => "ssl_client_cert_id",
-                                   :inverse_of => :ssl_client_cert, :dependent => :nullify
+                                   :inverse_of => :ssl_client_cert, :dependent => :restrict_with_exception
     has_many :ssl_key_products, :class_name => "Katello::Product", :foreign_key => "ssl_client_key_id",
-                                :inverse_of => :ssl_client_key, :dependent => :nullify
+                                :inverse_of => :ssl_client_key, :dependent => :restrict_with_exception
     has_many :ssl_ca_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_ca_cert_id",
-                            :inverse_of => :ssl_ca_cert, :dependent => :nullify
+                            :inverse_of => :ssl_ca_cert, :dependent => :restrict_with_exception
     has_many :ssl_client_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_client_cert_id",
-                                :inverse_of => :ssl_client_cert, :dependent => :nullify
+                                :inverse_of => :ssl_client_cert, :dependent => :restrict_with_exception
     has_many :ssl_key_root_repos, :class_name => "Katello::RootRepository", :foreign_key => "ssl_client_key_id",
-                             :inverse_of => :ssl_client_key, :dependent => :nullify
+                             :inverse_of => :ssl_client_key, :dependent => :restrict_with_exception
     has_many :ssl_ca_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_ca_cert_id",
                                 :inverse_of => :ssl_ca_cert, :dependent => :nullify
     has_many :ssl_client_alternate_content_sources, :class_name => "Katello::AlternateContentSource", :foreign_key => "ssl_client_cert_id",

data/app/models/katello/content_view.rb

@@ -87,7 +87,11 @@ module Katello
     scope :composite, -> { where(:composite => true) }
     scope :non_composite, -> { where(:composite => [nil, false]) }
     scope :generated, -> { where.not(:generated_for => :none) }
-    scope :generated_for_repository, -> { where(:generated_for => [:repository_export, :repository_import]) }
+    scope :generated_for_repository, -> {
+      where(:generated_for => [:repository_export,
+                               :repository_import,
+                               :repository_export_syncable])
+    }
     scope :ignore_generated, -> {
       where.not(:generated_for => [:repository_export,
                                    :repository_import,
@@ -585,14 +589,14 @@ module Katello
       true
     end
 
-    def check_ready_to_publish!(importing: false)
+    def check_ready_to_publish!(importing: false, syncable: false)
       fail _("User must be logged in.") if ::User.current.nil?
       fail _("Cannot publish default content view") if default?
 
       if importing
         check_ready_to_import!
       else
-        fail _("Import-only content views can not be published directly") if import_only?
+        fail _("Import-only content views can not be published directly") if import_only? && !syncable
         check_composite_action_allowed!(organization.library)
         check_docker_repository_names!([organization.library])
       end

data/app/models/katello/content_view_component.rb

@@ -56,6 +56,10 @@ module Katello
       if attached_content_view_ids.include?(view.id)
         errors.add(:base, _("Another component already includes content view with ID %s" % view.id))
       end
+
+      unless view.generated_for_none?
+        errors.add(:base, _("Cannot add generated content view versions to composite content view"))
+      end
     end
 
     def ensure_valid_attributes

data/app/models/katello/content_view_version.rb

@@ -56,7 +56,7 @@ module Katello
     scope :with_organization_id, ->(organization_id) do
       joins(:content_view).where("#{Katello::ContentView.table_name}.organization_id" => organization_id)
     end
-
+    scope :not_ignorable, -> { where(content_view_id: Katello::ContentView.ignore_generated) }
     scope :triggered_by, ->(content_view_version_id) do
       sql = Katello::ContentViewHistory.where(:triggered_by_id => content_view_version_id).select(:katello_content_view_version_id).to_sql
       where("#{Katello::ContentViewVersion.table_name}.id in (#{sql})")

data/app/models/katello/erratum.rb

@@ -127,10 +127,14 @@ module Katello
       statement = query_clauses.join(" AND ")
       ModuleStream.where(:id => ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata}).
           where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
-          where(statement).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id")) -
+          where(statement).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id")).
+        joins(:repository_module_streams).
+        where("#{RepositoryModuleStream.table_name}.repository_id" => repo.id) -
       ModuleStream.where(:id => ModuleStreamErratumPackage.joins(:erratum_package => {:erratum => :repository_errata}).
           where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
-          where(statement).where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id"))
+          where(statement).where("#{Erratum.table_name}.errata_id" => additional_included_errata.pluck(:errata_id)).select("#{ModuleStreamErratumPackage.table_name}.module_stream_id")).
+        joins(:repository_module_streams).
+        where("#{RepositoryModuleStream.table_name}.repository_id" => repo.id)
     end
 
     def module_streams

data/app/models/katello/host/content_facet.rb

@@ -83,13 +83,23 @@ module Katello
       end
 
       def errata_counts
-        hash = {
+        installable_hash = {
           :security => installable_security_errata_count,
           :bugfix => installable_bugfix_errata_count,
           :enhancement => installable_enhancement_errata_count
         }
-        hash[:total] = hash.values.inject(:+)
-        hash
+        installable_hash[:total] = installable_hash.values.inject(:+)
+        # same for applicable, but we need to get the counts from the db
+        applicable_hash = {
+          :security => applicable_errata.security.count,
+          :bugfix => applicable_errata.bugfix.count,
+          :enhancement => applicable_errata.enhancement.count
+        }
+        applicable_hash[:total] = applicable_hash.values.inject(:+)
+        # keeping installable at the top level for backward compatibility
+        installable_hash.merge({
+                                 :applicable => applicable_hash
+                               })
       end
 
       def self.trigger_applicability_generation(host_ids)

data/app/models/katello/repository.rb

@@ -140,7 +140,6 @@ module Katello
     scope :order_by_root, ->(attr) { joins(:root).order("#{Katello::RootRepository.table_name}.#{attr}") }
     scope :with_content, ->(content) { joins(Katello::RepositoryTypeManager.find_content_type(content).model_class.repository_association_class.name.demodulize.underscore.pluralize.to_sym).distinct }
     scope :by_rpm_count, -> { left_joins(:repository_rpms).group(:id).order("count(katello_repository_rpms.id) ASC") } # smallest count first
-    scope :exportable, -> { with_type(EXPORTABLE_TYPES) }
     scope :immediate_or_none, -> do
       immediate.or(where("#{RootRepository.table_name}.download_policy" => nil)).
         or(where("#{RootRepository.table_name}.download_policy" => ""))
@@ -186,6 +185,12 @@ module Katello
     delegate :content_id, to: :root, allow_nil: true
     delegate :repository_type, to: :root
 
+    def self.exportable(format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE)
+      types = EXPORTABLE_TYPES
+      types = [YUM_TYPE, FILE_TYPE] if format == ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
+      with_type(types)
+    end
+
     def self.with_type(content_type)
       joins(:root).where("#{RootRepository.table_name}.content_type" => content_type)
     end
@@ -755,6 +760,15 @@ module Katello
       return true
     end
 
+    def content_views_all(include_composite: false)
+      if include_composite
+        cv_ids = library_instances_inverse&.joins(:content_view_version)&.map { |cvv| cvv&.content_view&.id }
+        return ContentView.where(id: cv_ids.uniq)
+      else
+        return self.content_views
+      end
+    end
+
     def sync_hook
       run_callbacks :sync do
         logger.debug "custom hook after_sync on #{name} will be executed if defined."

data/app/models/katello/root_repository.rb

@@ -225,8 +225,6 @@ module Katello
         errors.add(:ignorable_content, N_("Invalid value specified for ignorable content."))
       elsif ignorable_content.any? { |item| !IGNORABLE_CONTENT_UNIT_TYPES.include?(item) }
         errors.add(:ignorable_content, N_("Invalid value specified for ignorable content. Permissible values %s") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
-      elsif self.mirroring_policy == MIRRORING_POLICY_COMPLETE
-        errors.add(:ignorable_content, N_("Ignore %s can not be set in combination with 'Complete Mirroring' mirroring policy.") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
       end
     end
 

data/app/overrides/add_smart_proxy_form.rb

@@ -12,3 +12,8 @@ Deface::Override.new(:virtual_path => "smart_proxies/_form",
                      :name => "add_smart_proxies_download_policy",
                      :insert_bottom => '#primary',
                      :partial => 'overrides/smart_proxies/download_policy')
+
+Deface::Override.new(:virtual_path => "smart_proxies/_form",
+                     :name => "add_smart_proxies_acs_http_proxy",
+                     :insert_bottom => '#primary',
+                     :partial => 'overrides/smart_proxies/acs_http_proxy')

data/app/presenters/katello/content_view_version_compare_presenter.rb

@@ -13,6 +13,11 @@ module Katello
       item_repos.map(&:content_view_version_id) & @versions.map(&:id)
     end
 
+    def comparison_repositories
+      repo = @item
+      @versions.map(&:id) & repo&.published_in_versions&.pluck(:id)
+    end
+
     def respond_to?(method)
       return method.to_s == 'comparison' || @item.respond_to?(method)
     end

data/app/presenters/katello/host_package_presenter.rb

@@ -1,10 +1,10 @@
 module Katello
   class HostPackagePresenter < SimpleDelegator
-    attr_accessor :installed_package, :upgradable_version, :rpm_id
+    attr_accessor :installed_package, :upgradable_versions, :rpm_id
 
-    def initialize(installed_package, upgradable_version, rpm_id)
+    def initialize(installed_package, upgradable_versions, rpm_id)
       @installed_package = installed_package
-      @upgradable_version = upgradable_version
+      @upgradable_versions = upgradable_versions
       @rpm_id = rpm_id
       super(@installed_package)
     end
@@ -14,7 +14,7 @@ module Katello
       installed_packages_map = ::Katello::Rpm.where(nvra: packages.map(&:nvra)).select(:id, :name).group_by(&:name)
 
       packages.map do |p|
-        HostPackagePresenter.new(p, upgradable_packages_map[p.name]&.first&.nvra, installed_packages_map[p.name]&.first&.id)
+        HostPackagePresenter.new(p, upgradable_packages_map[p.name]&.pluck(:nvra), installed_packages_map[p.name]&.first&.id)
       end
     end
   end

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

@@ -22,31 +22,40 @@ module Katello
       end
 
       def smart_proxy_acs
-        if acs.alternate_content_source_type == 'custom'
+        if %w[custom rhui].include?(acs.alternate_content_source_type)
           ::Katello::SmartProxyAlternateContentSource.find_by(alternate_content_source_id: acs.id, smart_proxy_id: smart_proxy.id)
         else
           ::Katello::SmartProxyAlternateContentSource.find_by(alternate_content_source_id: acs.id, smart_proxy_id: smart_proxy.id, repository_id: repository.id)
         end
       end
 
-      def remote_options
-        if repository.present?
-          options = repository.backend_service(smart_proxy).remote_options
-          options[:policy] = 'on_demand'
-          options[:proxy_url] = acs.http_proxy&.url
-          options[:proxy_username] = acs.http_proxy&.username
-          options[:proxy_password] = acs.http_proxy&.password
-          return options
+      def simplified_acs_remote_options
+        options = repository.backend_service(smart_proxy).remote_options
+        options[:policy] = 'on_demand'
+        # Potential RFE: allow inheriting of default smart proxy repo's HTTP proxies for simplified ACSs
+        if acs.use_http_proxies
+          options[:proxy_url] = smart_proxy.http_proxy&.url
+          options[:proxy_username] = smart_proxy.http_proxy&.username
+          options[:proxy_password] = smart_proxy.http_proxy&.password
+        else
+          options[:proxy_url] = nil
+          options[:proxy_username] = nil
+          options[:proxy_password] = nil
         end
+        options
+      end
+
+      def remote_options
+        return simplified_acs_remote_options if repository.present?
 
         remote_options = {
           tls_validation: acs.verify_ssl,
           name: generate_backend_object_name,
           url: acs.base_url,
           policy: 'on_demand',
-          proxy_url: acs.http_proxy&.url,
-          proxy_username: acs.http_proxy&.username,
-          proxy_password: acs.http_proxy&.password,
+          proxy_url: smart_proxy.http_proxy&.url,
+          proxy_username: smart_proxy.http_proxy&.username,
+          proxy_password: smart_proxy.http_proxy&.password,
           total_timeout: Setting[:sync_connect_timeout]
         }
         if acs.content_type == ::Katello::Repository::FILE_TYPE && acs.subpaths.empty? && !remote_options[:url].end_with?('/PULP_MANIFEST')
@@ -57,7 +66,7 @@ module Katello
       end
 
       def ssl_remote_options
-        if acs.custom?
+        if acs.custom? || acs.rhui?
           {
             client_cert: acs.ssl_client_cert&.content,
             client_key: acs.ssl_client_key&.content,
@@ -121,8 +130,7 @@ module Katello
 
       def refresh
         href = smart_proxy_acs.alternate_content_source_href
-        # https://github.com/pulp/pulp_rpm/issues/2504
-        api.alternate_content_source_api.refresh(href, 'placeholder')
+        api.alternate_content_source_api.refresh(href)
       end
 
       private

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

@@ -30,24 +30,21 @@ module Katello
       end
 
       def self.insert_child_associations(units, pulp_id_to_id)
-        insert_tags units
+        tag_names = units.map { |unit| unit['tags'].map { |tag| tag[:name] } }.flatten
+        tag_rows = tag_names.map { |name| {name: name } }
+        Katello::AnsibleTag.insert_all(tag_rows, unique_by: [:name]) if tag_rows.any?
+
         collection_tag_rows = []
         units.each do |unit|
           katello_id = pulp_id_to_id[unit['pulp_href']]
           #delete old tags
-          unit_tags = unit['tags']&.map { |tag| tag[:name] }
+          unit_tags = unit['tags'].map { |tag| tag[:name] }
           Katello::AnsibleCollectionTag.where(:ansible_collection_id => katello_id).where.not(:ansible_tag_id => Katello::AnsibleTag.where(:name => unit_tags)).delete_all
-          collection_tag_rows += Katello::AnsibleTag.where(:name => unit_tags)&.pluck(:id)&.map { |tag_id| {ansible_collection_id: katello_id, ansible_tag_id: tag_id} }
+          collection_tag_rows += Katello::AnsibleTag.where(:name => unit_tags).pluck(:id).map { |tag_id| {ansible_collection_id: katello_id, ansible_tag_id: tag_id} }
         end
 
         collection_tag_rows.flatten!
-        Katello::AnsibleCollectionTag.insert_all(collection_tag_rows, unique_by: [:ansible_collection_id, :ansible_tag_id])
-      end
-
-      def self.insert_tags(units)
-        tag_names = units.map { |unit| unit['tags']&.map { |tag| tag[:name] } }&.flatten
-        tag_rows = tag_names&.compact&.map { |name| {name: name } }
-        Katello::AnsibleTag.insert_all(tag_rows, unique_by: [:name]) if tag_rows.any?
+        Katello::AnsibleCollectionTag.insert_all(collection_tag_rows, unique_by: [:ansible_collection_id, :ansible_tag_id]) unless collection_tag_rows.empty?
       end
     end
   end

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

@@ -40,9 +40,9 @@ module Katello
 
         def repositories(fetch_all: false)
           repos = if content_view_version.default?
-                    content_view_version.repositories.exportable
+                    content_view_version.repositories.exportable(format: format)
                   else
-                    content_view_version.archived_repos.exportable
+                    content_view_version.archived_repos.exportable(format: format)
                   end
           if fetch_all
             repos
@@ -53,9 +53,9 @@ module Katello
 
         def generate_exporter_path
           return base_path if base_path
-          export_path = "#{content_view_version.content_view}/#{content_view_version.version}/"
-          export_path += "#{destination_server}/" unless destination_server.blank?
-          export_path += "#{date_dir}".gsub(/\s/, '_')
+          export_path = "#{content_view_version.content_view.label}/#{content_view_version.version}/"
+          export_path += "#{destination_server}/".gsub(/\s/, '_') unless destination_server.blank?
+          export_path += "#{date_dir}"
           @base_path = "#{Setting['pulpcore_export_destination']}/#{content_view_version.organization.label}/#{export_path}"
         end
 
@@ -126,10 +126,23 @@ module Katello
           validate_repositories_immediate! if fail_on_missing_content
           validate_incremental_export! if validate_incremental && !from_content_view_version.blank?
           validate_chunk_size(chunk_size)
+          validate_export_types! if fail_on_missing_content
+        end
+
+        def validate_export_types!
+          repos = repositories(fetch_all: true).where.not(id: ::Katello::Repository.exportable(format: format))
+          if repos.any?
+            fail _("NOTE: Unable to fully export Content View Version '%{content_view} %{current}'"\
+                   " it contains repositories with un-exportable content types. \n %{repos}" %
+                   { content_view: content_view_version.content_view.name,
+                     current: content_view_version.version,
+                     repos: self.class.generate_product_repo_strings(repositories: repos)})
+
+          end
         end
 
         def validate_repositories_immediate!
-          non_immediate_repos = repositories(fetch_all: true).non_immediate
+          non_immediate_repos = repositories(fetch_all: true).yum_type.non_immediate
           if non_immediate_repos.any?
             fail _("NOTE: Unable to fully export Content View Version '%{content_view} %{current}'"\
                    " it contains repositories without the 'immediate' download policy."\

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

@@ -156,6 +156,8 @@ module Katello
           fail _("Content View label not provided.") if metadata_map.content_view.label.blank?
 
           params = import_content_view_params
+          return if @metadata_map.syncable_format? && params[:generated_for] != :none
+
           cv = ::Katello::ContentView.find_by(label: params[:label],
                                               organization: organization)
           if cv.blank?

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

@@ -13,10 +13,14 @@ module Katello
         end
 
         def check!
-          fail _("Content view not provided in the metadata") if @metadata_map.content_view.blank?
+          if @metadata_map.content_view.blank? && !metadata_map.syncable_format?
+            fail _("Content view not provided in the metadata")
+          end
 
+          ensure_non_syncable_path_valid! unless @metadata_map.syncable_format?
           ensure_pulp_importable!
-          unless @content_view.default?
+          if @content_view && !@content_view.default?
+            ensure_non_composite!
             ensure_importing_cvv_does_not_exist!
             ensure_from_cvv_exists!
           end
@@ -25,7 +29,20 @@ module Katello
           ensure_redhat_products_metadata_are_in_the_library!
         end
 
+        def ensure_non_syncable_path_valid!
+          uri = URI(@path)
+          unless uri.scheme.blank? || uri.scheme == "file"
+            fail _("Invalid path provided. Content can be only imported from file system. ")
+          end
+        end
+
+        def ensure_non_composite!
+          return if @content_view.blank?
+          fail _("Content cannot be imported into a Composite Content View. ") if @content_view.composite?
+        end
+
         def ensure_pulp_importable!
+          return if @metadata_map.syncable_format?
           api = ::Katello::Pulp3::Api::Core.new(@smart_proxy).importer_check_api
           response = api.pulp_import_check_post(toc: "#{@path}/#{@metadata_map.toc}")
           unless response.toc.is_valid
@@ -80,8 +97,7 @@ module Katello
           if bad_repos.any?
             fail _("The following repositories provided in the import metadata have an incorrect content type or provider type. "\
                     "Make sure the export and import repositories are of the same type before importing\n "\
-                    "%{repos}" % { content_view: @content_view.name,
-                                   repos: generate_product_repo_i18n_string(bad_repos).join("")}
+                    "%{repos}" % { repos: generate_product_repo_i18n_string(bad_repos).join("")}
                   )
           end
         end
@@ -94,7 +110,7 @@ module Katello
           if missing.any?
             repos_in_import = generate_product_repo_i18n_string(missing)
             fail _("The organization's manifest does not contain the subscriptions required to enable the following repositories.\n "\
-                    "%{repos}" % { content_view: @content_view.name, repos: repos_in_import.join("")}
+                    "%{repos}" % { repos: repos_in_import.join("")}
                   )
           end
         end