katello 4.5.0.rc2 → 4.5.1

data/app/models/katello/content_view.rb

@@ -33,49 +33,50 @@ module Katello
     has_many :content_view_repositories, :class_name => 'Katello::ContentViewRepository',
              :dependent => :destroy, :inverse_of => :content_view
     has_many :repositories, :through => :content_view_repositories, :class_name => "Katello::Repository",
-                            :after_remove => :remove_repository
+             :after_remove => :remove_repository
 
     has_many :filters, :dependent => :destroy, :class_name => "Katello::ContentViewFilter"
 
     has_many :activation_keys, :class_name => "Katello::ActivationKey", :dependent => :restrict_with_exception
 
     has_many :content_facets, :class_name => "Katello::Host::ContentFacet",
-                          :inverse_of => :content_view, :dependent => :restrict_with_exception
-    has_many :hosts,      :class_name => "::Host::Managed", :through => :content_facets,
-                          :inverse_of => :content_view
+             :inverse_of => :content_view, :dependent => :restrict_with_exception
+    has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets,
+             :inverse_of => :content_view
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet",
-                          :inverse_of => :content_view, :dependent => :nullify
+             :inverse_of => :content_view, :dependent => :nullify
     has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets,
-                          :inverse_of => :content_view
+             :inverse_of => :content_view
 
     has_many :repository_references, :class_name => 'Katello::Pulp3::RepositoryReference',
              :dependent => :destroy, :inverse_of => :content_view
 
     validates_lengths_from_database :except => [:label]
-    validates :label, :uniqueness => {:scope => :organization_id},
-                      :presence => true
-    validates :name, :presence => true, :uniqueness => {:scope => :organization_id}
+    validates :label, :uniqueness => { :scope => :organization_id },
+              :presence => true
+    validates :name, :presence => true, :uniqueness => { :scope => :organization_id }
     validates :organization_id, :presence => true
     validate :check_non_composite_components
     validate :check_docker_conflicts
     validate :check_non_composite_auto_publish
+    validate :check_default_label_name, if: :default?
     validates :composite, :inclusion => [true, false]
     validates :composite,
-              inclusion: { in: [false], message: "Composite Content Views can not solve dependencies"},
+              inclusion: { in: [false], message: "Composite Content Views can not solve dependencies" },
               if: :solve_dependencies
     validates :import_only, :inclusion => [true, false]
     validates :import_only,
-              inclusion: { in: [false], message: "Import-only Content Views can not be Composite"},
+              inclusion: { in: [false], message: "Import-only Content Views can not be Composite" },
               if: :composite
     validates :import_only,
-              inclusion: { in: [false], message: "Import-only Content Views can not solve dependencies"},
+              inclusion: { in: [false], message: "Import-only Content Views can not solve dependencies" },
               if: :solve_dependencies
     validate :import_only_immutable
     validates :generated_for,
-              exclusion: { in: [:none], message: "Generated Content Views can not be Composite"},
+              exclusion: { in: [:none], message: "Generated Content Views can not be Composite" },
               if: :composite
     validates :generated_for,
-              exclusion: { in: [:none], message: "Generated Content Views can not solve dependencies"},
+              exclusion: { in: [:none], message: "Generated Content Views can not solve dependencies" },
               if: :solve_dependencies
 
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
@@ -279,6 +280,7 @@ module Katello
       required :env, 'Katello::KTEnvironment', desc: 'a __Katello::KTEnvironment__ object for which we load the __Katello::ContentViewVersion__ object'
       returns 'Katello::ContentViewVersion'
     end
+
     def version(env)
       self.versions.in_environment(env).order("#{Katello::ContentViewVersion.table_name}.id ASC").readonly(false).last
     end
@@ -306,7 +308,7 @@ module Katello
 
     def history
       Katello::ContentViewHistory.joins(:content_view_version).where(
-          "#{Katello::ContentViewVersion.table_name}.content_view_id" => self.id)
+        "#{Katello::ContentViewVersion.table_name}.content_view_id" => self.id)
     end
 
     def version_environment(env)
@@ -387,7 +389,7 @@ module Katello
     end
 
     def auto_publish_components
-      component_composites.where(latest: true).joins(:composite_content_view).where(self.class.table_name => {auto_publish: true})
+      component_composites.where(latest: true).joins(:composite_content_view).where(self.class.table_name => { auto_publish: true })
     end
 
     def publish_repositories(override_components = nil)
@@ -446,8 +448,8 @@ module Katello
     def get_repo_clone(env, repo)
       lib_id = repo.library_instance_id || repo.id
       Repository.in_environment(env).where(:library_instance_id => lib_id).
-          joins(:content_view_version).
-          where("#{Katello::ContentViewVersion.table_name}.content_view_id" => self.id)
+        joins(:content_view_version).
+        where("#{Katello::ContentViewVersion.table_name}.content_view_id" => self.id)
     end
 
     def delete(from_env)
@@ -497,9 +499,15 @@ module Katello
       end
     end
 
+    def check_default_label_name
+      if default? && !(name == 'Default Organization View' && label == 'Default_Organization_View')
+        errors.add(:base, _("Name and label of default content view should not be changed"))
+      end
+    end
+
     def check_docker_conflicts
       duplicate_docker_repos.each do |repo|
-        msg = _("Container Image repo '%{repo}' is present in multiple component content views.") % {repo: repo.name}
+        msg = _("Container Image repo '%{repo}' is present in multiple component content views.") % { repo: repo.name }
         errors.add(:base, msg)
       end
     end
@@ -526,7 +534,7 @@ module Katello
                                        :environment_id => env.id,
                                        :content_view => self,
                                        :content_view_version => version
-                                      )
+        )
       end
     end
 
@@ -555,7 +563,7 @@ module Katello
                                            :minor => minor,
                                            :content_view => self,
                                            :components => components
-                                          )
+      )
 
       update(:next_version => major.to_i + 1) unless major.to_i < next_version
       version
@@ -626,14 +634,14 @@ module Katello
     def check_remove_from_environment!(env)
       errors = []
 
-      dependencies = {hosts: _("hosts"),
-                      activation_keys: _("activation keys")
+      dependencies = { hosts: _("hosts"),
+                       activation_keys: _("activation keys")
       }
 
       dependencies.each do |key, name|
         if (models = self.association(key).scope.in_environment(env)).any?
           errors << _("Cannot remove '%{view}' from environment '%{env}' due to associated %{dependent}: %{names}.") %
-            {view: self.name, env: env.name, dependent: name, names: models.map(&:name).join(", ")}
+            { view: self.name, env: env.name, dependent: name, names: models.map(&:name).join(", ") }
         end
       end
 
@@ -644,15 +652,15 @@ module Katello
     def check_ready_to_destroy!
       errors = []
 
-      dependencies = {environments: _("environments"),
-                      hosts: _("hosts"),
-                      activation_keys: _("activation keys")
+      dependencies = { environments: _("environments"),
+                       hosts: _("hosts"),
+                       activation_keys: _("activation keys")
       }
 
       dependencies.each do |key, name|
         if (models = self.association(key).scope).any?
           errors << _("Cannot delete '%{view}' due to associated %{dependent}: %{names}.") %
-            {view: self.name, dependent: name, names: models.map(&:name).join(", ")}
+            { view: self.name, dependent: name, names: models.map(&:name).join(", ") }
         end
       end
 
@@ -700,7 +708,7 @@ module Katello
     def remove_repository(repository)
       filters.each do |filter_item|
         repo_exists = Repository.unscoped.joins(:filters).where(
-            ContentViewFilter.table_name => {:id => filter_item.id}, :id => repository.id).count
+          ContentViewFilter.table_name => { :id => filter_item.id }, :id => repository.id).count
         if repo_exists
           filter_item.repositories.delete(repository)
           filter_item.save!

data/app/services/katello/content_unit_indexer.rb

@@ -22,7 +22,6 @@ module Katello
     end
 
     def import_all(filtered_indexing = false)
-      additive = filtered_indexing || (@repository&.mirroring_policy == 'additive')
       association_tracker = RepoAssociationTracker.new(@content_type, @service_class, @repository)
       units_from_pulp.each do |units|
         units.each do |unit|
@@ -52,7 +51,7 @@ module Katello
       end
 
       if @model_class.many_repository_associations && @repository
-        sync_repository_associations(association_tracker, additive: additive)
+        sync_repository_associations(association_tracker, additive: filtered_indexing)
       end
     end
 

data/app/services/katello/organization_creator.rb

@@ -101,12 +101,23 @@ module Katello
     end
 
     def create_library_view
-      @library_view = Katello::ContentView.where(
+      cv_wrong_label = Katello::ContentView.where(
         default: true,
         name: DEFAULT_CONTENT_VIEW_NAME,
-        label: DEFAULT_CONTENT_VIEW_LABEL,
         organization: @organization
-      ).first_or_create!
+      ).where.not(label: DEFAULT_CONTENT_VIEW_LABEL)&.first
+
+      if cv_wrong_label
+        cv_wrong_label.update_attribute(:label, DEFAULT_CONTENT_VIEW_LABEL)
+        @library_view = cv_wrong_label
+      else
+        @library_view = Katello::ContentView.where(
+          default: true,
+          name: DEFAULT_CONTENT_VIEW_NAME,
+          label: DEFAULT_CONTENT_VIEW_LABEL,
+          organization: @organization
+        ).first_or_create!
+      end
     end
 
     def create_library_cvv

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

@@ -89,6 +89,10 @@ module Katello
           PulpcoreClient::RepositoriesReclaimSpaceApi.new(core_api_client)
         end
 
+        def yum_exporter_api
+          PulpcoreClient::ExportersFilesystemApi.new(core_api_client)
+        end
+
         def exporter_api
           PulpcoreClient::ExportersPulpApi.new(core_api_client)
         end
@@ -101,6 +105,10 @@ module Katello
           PulpcoreClient::ImportersPulpImportCheckApi.new(core_api_client)
         end
 
+        def yum_export_api
+          PulpcoreClient::ExportersFilesystemExportsApi.new(core_api_client)
+        end
+
         def export_api
           PulpcoreClient::ExportersPulpExportsApi.new(core_api_client)
         end

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

@@ -3,16 +3,31 @@ module Katello
     module ContentViewVersion
       class Export
         include ImportExportCommon
-        attr_reader :smart_proxy, :content_view_version, :destination_server, :from_content_view_version
+        SYNCABLE = "syncable".freeze
+        IMPORTABLE = "importable".freeze
+        FORMATS = [SYNCABLE, IMPORTABLE].freeze
+
+        attr_reader :smart_proxy, :content_view_version, :destination_server, :from_content_view_version, :repository, :base_path
+        def self.create(options)
+          if options.delete(:format) == SYNCABLE
+            SyncableFormatExport.new(options)
+          else
+            self.new(options)
+          end
+        end
 
         def initialize(smart_proxy:,
                         content_view_version: nil,
                         destination_server: nil,
-                        from_content_view_version: nil)
+                        from_content_view_version: nil,
+                        repository: nil,
+                        base_path: nil)
           @smart_proxy = smart_proxy
           @content_view_version = content_view_version
           @destination_server = destination_server
           @from_content_view_version = from_content_view_version
+          @repository = repository
+          @base_path = base_path
         end
 
         def repository_hrefs
@@ -37,21 +52,27 @@ module Katello
         end
 
         def generate_exporter_path
-          export_path = "#{content_view_version.content_view}/#{content_view_version.version}/#{destination_server}/#{date_dir}".gsub(/\s/, '_')
-          "#{content_view_version.organization.label}/#{export_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/, '_')
+          @base_path = "#{Setting['pulpcore_export_destination']}/#{content_view_version.organization.label}/#{export_path}"
         end
 
         def date_dir
           DateTime.now.to_s.gsub(/\W/, '-')
         end
 
-        def create_exporter(export_base_dir: Setting['pulpcore_export_destination'])
-          api.exporter_api.create(name: generate_id(content_view_version),
-                                  path: "#{export_base_dir}/#{generate_exporter_path}",
-                                  repositories: repository_hrefs)
+        def create_exporter
+          exporter_api = api.exporter_api
+          options = { name: generate_id(content_view_version), path: generate_exporter_path }
+          options[:repositories] = repository_hrefs
+
+          exporter_api.create(options)
         end
 
-        def create_export(exporter_href, chunk_size: nil)
+        def create_export(exporter_data, chunk_size: nil)
+          exporter_href = exporter_data[:pulp_href]
           options = { versions: version_hrefs }
           options[:chunk_size] = "#{chunk_size}GB" if chunk_size
           if from_content_view_version
@@ -77,14 +98,16 @@ module Katello
             options[:start_versions] = start_versions
             options[:full] = 'false'
           end
-          [api.export_api.create(exporter_href, options)]
+          export_api = api.export_api
+          [export_api.create(exporter_href, options)]
         end
 
         def fetch_export(exporter_href)
           api.export_api.list(exporter_href).results.first
         end
 
-        def destroy_exporter(exporter_href)
+        def destroy_exporter(exporter_data)
+          exporter_href = exporter_data[:pulp_href]
           export_data = fetch_export(exporter_href)
           api.exporter_api.partial_update(exporter_href, :last_export => nil)
           api.export_api.delete(export_data.pulp_href) unless export_data.blank?
@@ -162,6 +185,10 @@ module Katello
                                        generated_for: generated_for).send(select_method)
         end
 
+        def format
+          is_a?(SyncableFormatExport) ? SYNCABLE : IMPORTABLE
+        end
+
         def self.find_library_export_view(create_by_default: false,
                                           destination_server:,
                                           organization:)

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

@@ -42,11 +42,14 @@ module Katello
           # In other words if metadata had repos {label:foo, product: bar}
           # this would match it to the repo with the label foo and product bar
           # in the library.
-
           queries = metadata_map.repositories.map do |repo|
-            if repo.redhat && repo.product.cp_id
+            if repo.redhat && repo.product.cp_id && repo.content&.id
               library_repositories.where("#{Katello::Product.table_name}.cp_id": repo.product.cp_id,
-                                         "#{Katello::RootRepository.table_name}.label": repo.label)
+                                         "#{::Katello::RootRepository.table_name}" => {
+                                           content_id: repo.content.id,
+                                           arch: repo.arch,
+                                           major: repo.major,
+                                           minor: repo.minor })
             else
               library_repositories.where("#{Katello::Product.table_name}.label": repo.product.label,
                                          "#{Katello::RootRepository.table_name}.label": repo.label)
@@ -84,9 +87,13 @@ module Katello
           relation = content_view_version.importable_repositories.joins(:root, :product)
 
           metadata_map.repositories.each do |metadata_repo|
-            if metadata_repo.redhat && metadata_repo.product.cp_id
+            if metadata_repo.redhat && metadata_repo.product.cp_id && metadata_repo.content&.id
               repo = relation.where("#{::Katello::Product.table_name}" => {cp_id: metadata_repo.product.cp_id},
-                                        "#{::Katello::RootRepository.table_name}" => {label: metadata_repo.label}).first
+                                    "#{::Katello::RootRepository.table_name}" => {
+                                      content_id: metadata_repo.content.id,
+                                      arch: metadata_repo.arch,
+                                      major: metadata_repo.major,
+                                      minor: metadata_repo.minor}).first
             else
               repo = relation.where("#{::Katello::Product.table_name}" => {label: metadata_repo.product.label},
                                         "#{::Katello::RootRepository.table_name}" => {label: metadata_repo.label}).first

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

@@ -22,12 +22,21 @@ module Katello
             product = product_for_metadata_repo(repo)
             fail _("Unable to find product '%s' in organization '%s'" % [repo.product.label, @organization.name]) if product.blank?
 
-            root = product.root_repositories.find { |r| r.label == repo.label }
+            root = product.root_repositories.find do |r|
+              if repo.content&.id && repo.redhat
+                r.content.cp_content_id == repo.content.id &&
+                  r.arch == repo.arch &&
+                  r.major == repo.major &&
+                  r.minor == repo.minor
+              else
+                r.label == repo.label
+              end
+            end
+
             if root
               updatable << { repository: root, options: update_repo_params(repo) }
             elsif repo.redhat
-              content = repo.content
-              product_content = product_content_by_label(content.label)
+              product_content = fetch_product_content(repo.content, product)
               substitutions = {
                 basearch: repo.arch,
                 releasever: repo.minor
@@ -49,8 +58,14 @@ module Katello
           end
         end
 
-        def product_content_by_label(content_label)
-          ::Katello::Content.find_by_label(content_label)
+        def fetch_product_content(content_metadata, product)
+          query = ::Katello::Content.joins(:product_contents).where("#{Katello::ProductContent.table_name}.product_id": product.id)
+          table_name = Katello::Content.table_name
+          if content_metadata&.id
+            query.find_by("#{table_name}.cp_content_id": content_metadata.id)
+          else
+            query.find_by("#{table_name}.label": content_metadata.label)
+          end
         end
 
         def gpg_key_id(metadata_repo)

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

@@ -16,10 +16,12 @@ module Katello
 
         def generate!
           ret = { organization: organization.name,
+                  base_path: Setting['pulpcore_export_destination'],
                   repositories: {},
                   content_view: content_view.slice(:name, :label, :description, :generated_for),
                   content_view_version: content_view_version.slice(:major, :minor, :description),
-                  incremental: from_content_view_version.present?
+                  incremental: from_content_view_version.present?,
+                  format: export_service.format
           }
 
           unless from_content_view_version.blank?

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

@@ -0,0 +1,34 @@
+module Katello
+  module Pulp3
+    module ContentViewVersion
+      class SyncableFormatExport < Export
+        def create_exporter
+          api.yum_exporter_api.create(name: "#{generate_id(content_view_version)}-#{repository.id}",
+                                      path: generate_repository_exporter_path,
+                                      method: :hardlink)
+        end
+
+        def create_export(exporter_data, _options = {})
+          [api.yum_export_api.create(exporter_data[:pulp_href], publication: repository.publication_href)]
+        end
+
+        def fetch_export(exporter_href)
+          api.yum_export_api.list(exporter_href).results.first
+        end
+
+        def destroy_exporter(exporter_data)
+          exporter_href = exporter_data[:pulp_href]
+          export_data = fetch_export(exporter_href)
+          api.yum_export_api.delete(export_data.pulp_href)
+          api.yum_exporter_api.delete(exporter_href)
+        end
+
+        def generate_repository_exporter_path
+          _org, _content, content_path = repository.library_instance_or_self.relative_path.split("/", 3)
+          content_path = content_path.sub(%r|^/|, '')
+          "#{generate_exporter_path}/#{content_path}".gsub(/\s/, '_')
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ module Katello
       end
 
       def self.content_api_create(opts = {})
+        opts.delete(:relative_path) if opts.key?(:relative_path)
         self.content_api.create(opts)
       end
 
@@ -24,7 +25,8 @@ module Katello
       end
 
       def self.generate_model_row(unit)
-        {
+        unit = unit.try(:with_indifferent_access)
+        return {
           pulp_id: unit[unit_identifier],
           checksum: unit[:sha256],
           filename: unit[:relative_path],

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

@@ -55,12 +55,15 @@ module Katello
           bugzillas += build_bugzillas(katello_id, unit['references'])
           cves += build_cves(katello_id, unit['references'])
           packages += build_packages(katello_id, unit['pkglist'])
-          modules += build_modules(katello_id, unit['pkglist'])
         end
 
         Katello::ErratumBugzilla.insert_all(bugzillas, unique_by: [:erratum_id, :bug_id, :href]) if bugzillas.any?
         Katello::ErratumCve.insert_all(cves, unique_by: [:erratum_id, :cve_id, :href]) if cves.any?
         Katello::ErratumPackage.insert_all(packages, unique_by: [:erratum_id, :nvrea, :name, :filename]) if packages.any?
+        units.each do |unit|
+          katello_id = pulp_id_to_id[unit['id']]
+          modules += build_modules(katello_id, unit['pkglist'])
+        end
         ModuleStreamErratumPackage.insert_all(modules, unique_by: [:module_stream_id, :erratum_package_id]) if modules.any?
         nil
       end

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

@@ -146,6 +146,8 @@ module Katello
         elsif repository.generic?
           duplicate_sha_path_content_list = content_backend_service.content_api(repository.repository_type, unit_type_id).list(
             filter_label => checksum)
+        elsif unit_type_id == 'deb'
+          duplicate_sha_path_content_list = content_backend_service.content_api.list(filter_label => checksum)
         else
           duplicate_sha_path_content_list = content_backend_service.content_api.list(
             filter_label => checksum,

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

@@ -15,11 +15,12 @@ foreign_input_sets:
   exclude: action,package
 %>
 
+<% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
+# RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
+
 <% if @host.operatingsystem.family == 'Suse' -%>
-    <% advisories = @host.advisory_ids(search: input("Errata search query")).join(' ') %>
-    <%= render_template('Package Action - Script Default', :action => 'install -n -t patch', :package => advisories) %>
+    <%= render_template('Package Action - Script Default', :action => 'install -n -t patch', :package => advisory_ids.join(' ')) %>
 <% else %>
-    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
     <% raise "No errata matching given search query" if !input("Errata search query").blank? && advisory_ids.empty? %>
 
     <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>

data/db/migrate/20211220185935_clean_duplicate_content_units.rb

@@ -20,7 +20,7 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
     to_delete = []
     to_update = []
     duplicate_models.each do |duplicate|
-      query = {new_id_field => new_id}
+      query = { new_id_field => new_id }
       unique_fields.each do |field|
         query[field] = duplicate.send(field)
       end
@@ -52,28 +52,25 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
   def up
     handle_null_pulp_ids
     add_foreign_keys
+    delete_deprecated_models
 
     handle_duplicate(Katello::ModuleStream,
                      'module_stream_id',
                      [:pulp_id],
-                     associated_models: {Katello::RepositoryModuleStream => :repository_id},
+                     associated_models: { Katello::RepositoryModuleStream => :repository_id },
                      child_models: [Katello::ContentViewModuleStreamFilterRule,
                                     Katello::ContentFacetApplicableModuleStream,
                                     Katello::ModuleProfile,
                                     Katello::ModuleStreamArtifact,
                                     Katello::ModuleStreamErratumPackage,
                                     Katello::ModuleStreamRpm])
-    add_index :katello_module_streams, :pulp_id, :unique => true
 
-    handle_duplicate(Katello::ModuleProfile, 'module_profile_id', [:module_stream_id, :name],
-                     child_models: [Katello::ModuleProfileRpm])
+    add_index :katello_module_streams, :pulp_id, :unique => true
     add_index :katello_module_profiles, [:module_stream_id, :name], :unique => true
-
-    handle_duplicate(Katello::ModuleProfileRpm, 'module_profile_rpm_id', [:module_profile_id, :name])
     add_index :katello_module_profile_rpms, [:module_profile_id, :name], :unique => true
 
     handle_duplicate(Katello::AnsibleTag, 'ansible_tag_id', [:name],
-                     associated_models: {Katello::AnsibleCollectionTag => :ansible_collection_id})
+                     associated_models: { Katello::AnsibleCollectionTag => :ansible_collection_id })
     add_index :katello_ansible_tags, [:name], :unique => true
 
     handle_duplicate(Katello::AnsibleCollectionTag, 'ansible_collection_tag_id', [:ansible_collection_id, :ansible_tag_id])
@@ -83,7 +80,7 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
     handle_duplicate(Katello::GenericContentUnit,
                      'generic_content_unit_id',
                      [:pulp_id],
-                     associated_models: {Katello::RepositoryGenericContentUnit => :repository_id})
+                     associated_models: { Katello::RepositoryGenericContentUnit => :repository_id })
     add_index :katello_generic_content_units, :pulp_id, :unique => true
 
     handle_duplicate(Katello::DockerManifestList, 'docker_manifest_list_id', [:pulp_id],
@@ -112,6 +109,11 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
     change_column :katello_docker_manifests, :pulp_id, :string, :null => false
   end
 
+  def delete_deprecated_models
+    Katello::ModuleProfileRpm.delete_all
+    Katello::ModuleProfile.delete_all
+  end
+
   def add_foreign_keys
     Katello::DockerManifestListManifest.where.not(docker_manifest_list_id: Katello::DockerManifestList.pluck(:id)).delete_all
     add_foreign_key :katello_docker_manifest_list_manifests, :katello_docker_manifest_lists, column: :docker_manifest_list_id

data/db/seeds.d/102-organizations.rb

@@ -1,7 +1,7 @@
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
-# !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
+# !! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!
 #
 
 unless Rails.env.test?

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js

@@ -115,7 +115,7 @@ angular.module('Bastion.activation-keys').config(['$stateProvider', function ($s
     })
     .state('activation-key.copy', {
         url: '/copy',
-        permission: 'create_activation_key',
+        permission: 'create_activation_keys',
         controller: 'ActivationKeyCopyController',
         templateUrl: 'activation-keys/details/views/activation-key-copy.html',
         ncyBreadcrumb: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -8,7 +8,7 @@
   <div data-block="item-actions" bst-feature-flag="custom_products">
     <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
-        <li role="menuitem" ng-hide="denied('create_activation_key')">
+        <li role="menuitem" ng-hide="denied('create_activation_keys')">
           <a ui-sref="activation-key.copy" translate>
             Copy Activation Key
           </a>