katello 3.16.0.rc5.1 → 3.16.0

data/app/lib/katello/errors.rb

@@ -112,21 +112,7 @@ module Katello
       end
     end
 
-    class Pulp3Error < StandardError
-      def self.from_task(task)
-        if task[:state] == 'canceled'
-          self.new(_("Task canceled"))
-        elsif task[:state] == 'failed'
-          message = if task[:error][:description].blank?
-                      _("Pulp task error")
-                    else
-                      task[:error][:description]
-                    end
-          self.new(message)
-        end
-      end
-    end
-
+    class Pulp3Error < StandardError; end
     class Pulp3MigrationError < StandardError; end
 
     class PulpError < StandardError

data/app/models/katello/content_view.rb

@@ -289,9 +289,21 @@ module Katello
         where("#{Katello::ContentViewVersion.table_name}.content_view_id" => self.id)
     end
 
-    def repositories_to_publish
+    def repositories_to_publish(override_components = nil)
       if composite?
-        ids = components.flat_map { |version| version.repositories.archived }.map(&:id)
+        components_to_publish = []
+        components.each do |component|
+          override_component = override_components&.detect do |override_cvv|
+            override_cvv.content_view == component.content_view
+          end
+
+          if override_component
+            components_to_publish << override_component
+          else
+            components_to_publish << component
+          end
+        end
+        ids = components_to_publish.flat_map { |version| version.repositories.archived }.map(&:id)
         Repository.where(:id => ids)
       else
         repositories
@@ -302,11 +314,11 @@ module Katello
       composite? ? repositories_to_publish.pluck(&:id) : repository_ids
     end
 
-    def repositories_to_publish_by_library_instance
+    def repositories_to_publish_by_library_instance(override_components = nil)
       # retrieve the list of repositories in a hash, where the key
       # is the library instance id, and the value is an array
       # of the repositories for that instance.
-      repositories_to_publish.inject({}) do |result, repo|
+      repositories_to_publish(override_components).inject({}) do |result, repo|
         result[repo.library_instance] ||= []
         result[repo.library_instance] << repo
         result
@@ -326,8 +338,8 @@ module Katello
       component_composites.where(latest: true).joins(:composite_content_view).where(self.class.table_name => {auto_publish: true})
     end
 
-    def publish_repositories
-      repositories = composite? ? repositories_to_publish_by_library_instance.values : repositories_to_publish
+    def publish_repositories(override_components = nil)
+      repositories = composite? ? repositories_to_publish_by_library_instance(override_components).values : repositories_to_publish
       repositories.each do |repos|
         if repos.is_a? Array
           yield repos

data/app/models/katello/content_view_erratum_filter.rb

@@ -30,6 +30,7 @@ module Katello
       if filter_by_id?
         errata_ids = erratum_rules.map(&:errata_id)
         errata_pulp_ids = errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
+        errata_pulp_ids += errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
       else
         clauses = []
         clauses << errata_from
@@ -37,7 +38,9 @@ module Katello
         clauses << types_clause
         package_filenames = Erratum.list_filenames_by_clauses(repo, clauses.compact)
         errata_pulp_ids = errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
+        errata_pulp_ids += errata_module_stream_pulp_ids_from_clauses(repo, clauses.compact)
       end
+
       errata_pulp_ids
     end
 
@@ -48,10 +51,20 @@ module Katello
       repo.rpms.where("filename ILIKE ANY ( array[?] )", query_params)
     end
 
+    def errata_module_stream_pulp_ids_from_clauses(repo, clauses)
+      module_streams = Erratum.list_modular_streams_by_clauses(repo, clauses)
+      module_streams.pluck(:pulp_id)
+    end
+
     def errata_package_pulp_ids_from_package_filenames(repo, package_filenames)
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)
     end
 
+    def errata_module_stream_pulp_ids_from_errata_ids(errata_ids)
+      module_streams = Katello::Erratum.where(:errata_id => errata_ids).map(&:module_streams).compact.flatten
+      module_streams.pluck(:pulp_id)
+    end
+
     def errata_package_pulp_ids_from_errata_ids(repo, errata_ids)
       package_filenames = Katello::ErratumPackage.joins(:erratum).where("#{Erratum.table_name}.errata_id" => errata_ids).pluck(:filename)
       rpms_by_filename(repo, package_filenames).pluck(:pulp_id)

data/app/models/katello/content_view_module_stream_filter.rb

@@ -18,5 +18,24 @@ module Katello
     def original_module_streams=(value)
       self[:original_module_streams] = value
     end
+
+    def content_unit_pulp_ids(repo, dependents = false)
+      content_unit_ids = []
+      module_ids = []
+
+      self.module_stream_rules.each do |rule|
+        module_ids << rule.module_stream_id
+      end
+      if self.original_module_streams
+        module_ids.concat(repo.module_streams_without_errata.map(&:id))
+      end
+      modules_streams = ModuleStream.where(id: module_ids).includes(:rpms)
+      content_unit_ids += modules_streams.pluck(:pulp_id).flatten.uniq
+      if dependents && !modules_streams.empty?
+        rpms = modules_streams.map(&:rpms).flatten
+        content_unit_ids += rpms.pluck(:pulp_id).flatten.uniq
+      end
+      content_unit_ids.uniq
+    end
   end
 end

data/app/models/katello/module_stream.rb

@@ -65,7 +65,7 @@ module Katello
     end
 
     def module_spec_hash
-      {:name => name, :stream => stream, :version => version, :context => context, :arch => arch, :id => id}.compact
+      {:name => name, :stream => stream, :version => version, :context => context, :arch => arch, :pulp_id => pulp_id, :id => id}.compact
     end
 
     def self.parse_module_spec(module_spec)

data/app/services/katello/pulp3/api/core.rb

@@ -74,6 +74,10 @@ module Katello
           PulpcoreClient::TasksApi.new(core_api_client)
         end
 
+        def task_groups_api
+          PulpcoreClient::TaskGroupsApi.new(core_api_client)
+        end
+
         def upload_class
           PulpcoreClient::Upload
         end

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

@@ -26,8 +26,10 @@ module Katello
       end
 
       def update_model(model)
-        keys = %w(title id severity issued type description reboot_suggested solution updated summary)
+        keys = %w(title id severity issued_date type description reboot_suggested solution updated_date summary)
         custom_json = backend_data.slice(*keys)
+        custom_json["issued"] = custom_json.delete("issued_date")
+        custom_json["updated"] = custom_json.delete("updated_date")
 
         # handle SUSE epoch dates
         custom_json["issued"] = convert_date_if_epoch(custom_json["issued"])

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

@@ -68,8 +68,9 @@ module Katello
       end
 
       def create_migrations
-        migration_plans = @repository_types.map { |label| Katello::Pulp3::MigrationPlan.new(label) }
-        migration_plans.map { |plan| migration_plan_api.create(plan: plan.generate.as_json).pulp_href }
+        plan = Katello::Pulp3::MigrationPlan.new(@repository_types)
+        Rails.logger.info(plan)
+        [migration_plan_api.create(plan: plan.generate.as_json).pulp_href]
       end
 
       def start_migration(plan_href)

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

@@ -1,8 +1,8 @@
 module Katello
   module Pulp3
     class MigrationPlan
-      def initialize(repository_type_label)
-        @repository_type = repository_type_label
+      def initialize(repository_type_labels)
+        @repository_types = repository_type_labels
       end
 
       def master_proxy
@@ -17,12 +17,12 @@ module Katello
       end
 
       def generate_plugins
-        [
+        @repository_types.map do |repository_type|
           {
-            type: pulp2_repository_type(@repository_type),
-            repositories: repository_migrations(@repository_type)
+            type: pulp2_repository_type(repository_type),
+            repositories: repository_migrations(repository_type)
           }
-        ]
+        end
       end
 
       def pulp2_repository_type(repository_type)

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

@@ -193,8 +193,12 @@ module Katello
         ignore_404_exception { api.repositories_api.delete(href) } if href
       end
 
+      def sync_params
+        {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
+      end
+
       def sync
-        sync_url_params = {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
+        sync_url_params = sync_params
         skip_type_param = skip_types
         sync_url_params[:skip_types] = skip_type_param if skip_type_param
         repository_sync_url_data = api.class.repository_sync_url_class.new(sync_url_params)
@@ -352,6 +356,11 @@ module Katello
         api.repositories_api.modify(repository_reference.repository_href, add_content_units: content_unit_href)
       end
 
+      def add_content_for_repo(repository_href, content_unit_href)
+        content_unit_href = [content_unit_href] unless content_unit_href.is_a?(Array)
+        api.repositories_api.modify(repository_href, add_content_units: content_unit_href)
+      end
+
       def unit_keys(uploads)
         uploads.map do |upload|
           upload.except('id')

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

@@ -31,6 +31,10 @@ module Katello
           }
         end
 
+        def sync_params
+          {remote: repo.remote_href, mirror: repo.root.mirror_on_sync, optimize: false}
+        end
+
         def mirror_remote_options
           policy = smart_proxy.download_policy
 
@@ -70,48 +74,79 @@ module Katello
           "/pulp/repos/#{repo.relative_path}/".sub('//', '/')
         end
 
-        def copy_units(source_repository, content_unit_hrefs, dependency_solving, dest_base_version = 0,
-                       additional_repo_map = {})
+        def multi_copy_units(repo_id_map, dependency_solving)
           tasks = []
 
-          content_unit_hrefs.sort!
-          if content_unit_hrefs.any?
+          if repo_id_map.values.pluck(:content_unit_hrefs).flatten.any?
+            data = PulpRpmClient::Copy.new
+            data.dependency_solving = dependency_solving
+            data.config = []
+            repo_id_map.each do |source_repo_ids, dest_repo_id_map|
+              dest_repo = ::Katello::Repository.find(dest_repo_id_map[:dest_repo])
+              dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_master).repository_reference.repository_href
+              content_unit_hrefs = dest_repo_id_map[:content_unit_hrefs]
+              # Not needed during incremental update due to dest_base_version
+              unless dest_repo_id_map[:base_version]
+                source_repo_for_package_envs = ::Katello::Repository.find(source_repo_ids.first)
+                unless source_repo_for_package_envs.library_instance?
+                  source_repo_for_package_envs = source_repo_for_package_envs.library_instance
+                end
+                package_env_hrefs = packageenvironments({ :repository_version => source_repo_for_package_envs.version_href }).map(&:pulp_href).sort
+                tasks << remove_all_content_from_repo(dest_repo_href)
+                tasks << add_content_for_repo(dest_repo_href, package_env_hrefs) unless package_env_hrefs.empty?
+              end
+              source_repo_ids.each do |source_repo_id|
+                source_repo_version = ::Katello::Repository.find(source_repo_id).version_href
+                config = { source_repo_version: source_repo_version, dest_repo: dest_repo_href, content: content_unit_hrefs }
+                config[:dest_base_version] = dest_repo_id_map[:base_version] if dest_repo_id_map[:base_version]
+                data.config << config
+              end
+            end
+            # FIXME: data's content being [] causes all content to be copied back
+            tasks << api.copy_api.copy_content(data)
+          else
+            tasks << remove_all_content_from_mapping(repo_id_map)
+          end
+          tasks.flatten
+        end
+
+        def remove_all_content_from_mapping(repo_id_map)
+          tasks = []
+          repo_id_map.each do |_source_repo_ids, dest_repo_id_map|
+            dest_repo = ::Katello::Repository.find(dest_repo_id_map[:dest_repo])
+            dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_master).repository_reference.repository_href
+            tasks << remove_all_content_from_repo(dest_repo_href)
+          end
+          tasks
+        end
+
+        def copy_units(source_repository, content_unit_hrefs, dependency_solving)
+          tasks = []
+
+          if content_unit_hrefs.sort!.any?
             data = PulpRpmClient::Copy.new
             data.config = [{
               source_repo_version: source_repository.version_href,
               dest_repo: repository_reference.repository_href,
-              dest_base_version: dest_base_version,
+              dest_base_version: 0,
               content: content_unit_hrefs
             }]
             data.dependency_solving = dependency_solving
-            if dependency_solving
-              # repo_map example: {
-              #   <source_repo_id>: {
-              #     dest_repo: <dest_repo_id>,
-              #     base_version: <base_version>
-              #   }
-              # }
-              additional_repo_map.each do |source_repo, dest_repo_map|
-                source_repo_version = ::Katello::Repository.find(source_repo).version_href
-
-                dest_repo = ::Katello::Repository.find(dest_repo_map[:dest_repo])
-                dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_master).repository_reference.repository_href
-                data.config << {
-                  source_repo_version: source_repo_version,
-                  dest_repo: dest_repo_href,
-                  dest_base_version: dest_repo_map[:base_version],
-                  content: content_unit_hrefs
-                }
-              end
-            end
+            package_env_hrefs = packageenvironments({ :repository_version => source_repository.version_href }).map(&:pulp_href).sort
             tasks << api.copy_api.copy_content(data)
+            tasks << add_content(package_env_hrefs) unless package_env_hrefs.empty?
           else
             tasks << remove_all_content
           end
-
           tasks
         end
 
+        def remove_all_content_from_repo(repo_href)
+          data = PulpRpmClient::RepositoryAddRemoveContent.new(
+            remove_content_units: ['*'])
+          api.repositories_api.modify(repo_href, data)
+        end
+
         def remove_all_content
           data = PulpRpmClient::RepositoryAddRemoveContent.new(
             remove_content_units: ['*'])
@@ -119,7 +154,7 @@ module Katello
         end
 
         def packageenvironments(options = {})
-          api.content_package_environments_api.list(options)
+          Katello::Pulp3::Api::Core.fetch_from_list { |page_opts| api.content_package_environments_api.list(page_opts.merge(options)) }
         end
 
         def metadatafiles(options = {})
@@ -130,6 +165,94 @@ module Katello
           api.content_distribution_trees_api.list(options)
         end
 
+        def add_filter_content(source_repo_ids, filters, filter_list_map)
+          filters.each do |filter|
+            if filter.inclusion
+              source_repo_ids.each do |repo_id|
+                filter_list_map[:whitelist_ids] += filter.content_unit_pulp_ids(::Katello::Repository.find(repo_id))
+              end
+            else
+              source_repo_ids.each do |repo_id|
+                filter_list_map[:blacklist_ids] += filter.content_unit_pulp_ids(::Katello::Repository.find(repo_id))
+              end
+            end
+          end
+          filter_list_map
+        end
+
+        def add_un_modular_rpms(source_repo_ids, filters, filter_list_map)
+          if (filter_list_map[:whitelist_ids].empty? && filters.select { |filter| filter.inclusion }.empty?)
+            filter_list_map[:whitelist_ids] += source_repo_ids.collect do |source_repo_id|
+              source_repo = ::Katello::Repository.find(source_repo_id)
+              source_repo.rpms.where(:modular => false).pluck(:pulp_id).sort
+            end
+          end
+          filter_list_map
+        end
+
+        def add_modular_content(source_repo_ids, filters, modular_filters, filter_list_map)
+          inclusion_modular_filters = modular_filters.select { |filter| filter.inclusion }
+          exclusion_modular_filters = modular_filters - inclusion_modular_filters
+          if inclusion_modular_filters.empty? &&
+              !(filters.any? { |filter| filter.class == ContentViewErratumFilter && filter.inclusion })
+            source_repo_ids.each do |source_repo_id|
+              source_repo = ::Katello::Repository.find(source_repo_id)
+              filter_list_map[:whitelist_ids] += source_repo.rpms.where(:modular => true).pluck(:pulp_id).sort
+              filter_list_map[:whitelist_ids] += source_repo.module_streams.pluck(:pulp_id).sort
+            end
+          end
+
+          unless inclusion_modular_filters.empty?
+            filter_list_map[:whitelist_ids] += source_repo_ids.collect do |source_repo_id|
+              source_repo = ::Katello::Repository.find(source_repo_id)
+              modular_packages(source_repo, inclusion_modular_filters)
+            end
+          end
+
+          unless exclusion_modular_filters.empty?
+            filter_list_map[:blacklist_ids] += source_repo_ids.collect do |source_repo_id|
+              source_repo = ::Katello::Repository.find(source_repo_id)
+              modular_packages(source_repo, exclusion_modular_filters)
+            end
+          end
+
+          filter_list_map
+        end
+
+        def copy_content_from_mapping(repo_id_map, options = {})
+          repo_id_map.each do |source_repo_ids, dest_repo_map|
+            filters = [ContentViewErratumFilter, ContentViewPackageGroupFilter, ContentViewPackageFilter].collect do |filter_class|
+              filter_class.where(:id => dest_repo_map[:filter_ids])
+            end
+            modular_filters = ContentViewModuleStreamFilter.where(:id => dest_repo_map[:filter_ids])
+            filters.flatten!.compact!
+
+            filter_list_map = { whitelist_ids: [], blacklist_ids: [] }
+            filter_list_map = add_filter_content(source_repo_ids, filters, filter_list_map)
+            filter_list_map = add_un_modular_rpms(source_repo_ids, filters, filter_list_map)
+            filter_list_map = add_modular_content(source_repo_ids, filters, modular_filters, filter_list_map)
+
+            whitelist_ids = filter_list_map[:whitelist_ids].flatten&.uniq
+            blacklist_ids = filter_list_map[:blacklist_ids].flatten&.uniq
+            content_unit_hrefs = whitelist_ids - blacklist_ids
+
+            if content_unit_hrefs.any?
+              source_repo_ids.each do |source_repo_id|
+                content_unit_hrefs += additional_content_hrefs(::Katello::Repository.find(source_repo_id), content_unit_hrefs)
+              end
+            end
+            source_repo_ids.each do |source_repo_id|
+              content_unit_hrefs += ::Katello::Repository.find(source_repo_id).srpms.pluck(:pulp_id)
+            end
+
+            dest_repo_map[:content_unit_hrefs] = content_unit_hrefs.uniq.sort
+          end
+
+          dependency_solving = options[:solve_dependencies] || false
+
+          multi_copy_units(repo_id_map, dependency_solving)
+        end
+
         def copy_content_for_source(source_repository, options = {})
           filters = [ContentViewErratumFilter, ContentViewPackageGroupFilter, ContentViewPackageFilter].collect do |filter_class|
             filter_class.where(:id => options[:filter_ids])
@@ -147,12 +270,18 @@ module Katello
             end
           end
 
-          if whitelist_ids.empty? && filters.select { |filter| filter.inclusion }.empty?
-            whitelist_ids = source_repository.rpms.where(:modular => false).pluck(:pulp_id).sort
-          end
+          whitelist_ids = source_repository.rpms.where(:modular => false).pluck(:pulp_id).sort if (whitelist_ids.empty? && filters.select { |filter| filter.inclusion }.empty?)
 
+          modular_filters = ContentViewModuleStreamFilter.where(:id => options[:filter_ids])
+          inclusion_modular_filters = modular_filters.select { |filter| filter.inclusion }
+          exclusion_modular_filters = modular_filters - inclusion_modular_filters
+          if inclusion_modular_filters.empty? && !(filters.any? { |filter| filter.class == ContentViewErratumFilter && filter.inclusion })
+            whitelist_ids += source_repository.rpms.where(:modular => true).pluck(:pulp_id).sort
+            whitelist_ids += source_repository.module_streams.pluck(:pulp_id).sort
+          end
+          whitelist_ids += modular_packages(source_repository, inclusion_modular_filters) unless inclusion_modular_filters.empty?
+          blacklist_ids += modular_packages(source_repository, exclusion_modular_filters) unless exclusion_modular_filters.empty?
           content_unit_hrefs = whitelist_ids - blacklist_ids
-
           if content_unit_hrefs.any?
             content_unit_hrefs += additional_content_hrefs(source_repository, content_unit_hrefs)
           end
@@ -162,6 +291,14 @@ module Katello
           copy_units(source_repository, content_unit_hrefs.uniq, dependency_solving)
         end
 
+        def modular_packages(source_repository, filters)
+          list_ids = []
+          filters.each do |filter|
+            list_ids += filter.content_unit_pulp_ids(source_repository, true)
+          end
+          list_ids
+        end
+
         def additional_content_hrefs(source_repository, content_unit_hrefs)
           repo_service = source_repository.backend_service(SmartProxy.pulp_master)
           options = { :repository_version => source_repository.version_href }
@@ -172,10 +309,6 @@ module Katello
           package_groups_to_include = filter_package_groups_by_pulp_href(source_repository.package_groups, content_unit_hrefs)
           content_unit_hrefs += package_groups_to_include.pluck(:pulp_id)
 
-          package_environment_hrefs_to_include = filter_package_environments_by_pulp_hrefs(
-            repo_service.packageenvironments(options).results, package_groups_to_include.pluck(:pulp_id))
-          content_unit_hrefs += package_environment_hrefs_to_include
-
           metadata_file_hrefs_to_include = filter_metadatafiles_by_pulp_hrefs(
             repo_service.metadatafiles(options).results, content_unit_hrefs)
           content_unit_hrefs += metadata_file_hrefs_to_include