katello 4.14.1 → 4.15.0.rc2

data/lib/katello/tasks/migrate_structure_content_for_deb.rake

@@ -0,0 +1,105 @@
+namespace :katello do
+  desc "Migrate all APT repo content to match the deb_enable_structured_apt setting."
+  task :migrate_structure_content_for_deb => ['environment', 'dynflow:client', "check_ping"] do
+    User.current = User.anonymous_api_admin # Set a user
+
+    deb_enable_structured_apt = Setting['deb_enable_structured_apt']
+    puts "'Enable structured APT for deb content' is currently set to '#{deb_enable_structured_apt}'!"
+    if deb_enable_structured_apt
+      puts "Enabling structured APT for existing deb type repos."
+    else
+      puts "Disabling structured APT for existing deb type repos."
+    end
+
+    found_repos_to_migrate = false
+    roots = Katello::RootRepository.deb_type
+    roots.each do |root|
+      next if root.deb_using_structured_apt? == deb_enable_structured_apt
+      found_repos_to_migrate = true
+      puts "Migrating root repo '#{root.name}', id='#{root.id}'."
+
+      # Ensure ensure_valid_deb_constraints won't prevent us from saving the root repo.
+      unless root.ensure_valid_deb_constraints.blank?
+        puts "Root repo '#{root.name}' (id='#{root.id}') violates deb constraints, setting url and deb_releases to nil!"
+        root.url = nil
+        root.deb_releases = nil
+      end
+
+      repos = root.repositories
+      library_instance = root.library_instance
+      if deb_enable_structured_apt
+        if root.content_id != 'NEEDS_RE_MIGRATION'
+          begin
+            # Move the content_id from the root to the library instance so that ContentDestroy will destroy it!
+            old_content_id = root.content_id
+            library_instance.content_id = old_content_id
+            library_instance.save!
+            root.content_id = nil
+            root.save!
+            ForemanTasks.sync_task(::Actions::Katello::Product::ContentDestroy, root.library_instance)
+            library_instance.content_id = nil
+            library_instance.save!
+          rescue
+            root.content_id = old_content_id
+            root.save!
+            library_instance.content_id = nil
+            library_instance.save!
+            raise
+          end
+        end
+        begin
+          root.content_id = nil
+          root.save!
+
+          repos.each do |repo|
+            if repo[:content_id].nil?
+              content_create = ForemanTasks.sync_task(::Actions::Katello::Product::ContentCreate, repo)
+              content_id = content_create.input[:content_id]
+            else
+              content_id = repo.content_id
+            end
+            content_view_environment = repo.content_view_environment
+            if content_view_environment
+              ForemanTasks.sync_task(::Actions::Candlepin::Environment::AddContentToEnvironment, :view_env_cp_id => content_view_environment.cp_id, :content_id => content_id)
+            end
+          end
+        rescue
+          root.content_id = 'NEEDS_RE_MIGRATION'
+          root.save!
+          raise
+        end
+      else
+        library_instance_content_id = library_instance.content_id
+
+        repos.each do |repo|
+          next if repo.library_instance?
+
+          content_view_environment = repo.content_view_environment
+          if content_view_environment
+            ForemanTasks.sync_task(::Actions::Candlepin::Environment::AddContentToEnvironment, :view_env_cp_id => content_view_environment.cp_id, :content_id => library_instance_content_id)
+          end
+          ForemanTasks.sync_task(::Actions::Katello::Product::ContentDestroy, repo)
+          repo.content_id = nil
+          repo.save!
+        end
+
+        root.content_id = library_instance_content_id
+        library_instance.content_id = nil
+        root.save!
+        library_instance.save!
+        ForemanTasks.sync_task(::Actions::Katello::Repository::Update, root, {})
+        repos.each do |repo|
+          ForemanTasks.sync_task(::Actions::Katello::Repository::MetadataGenerate, repo, force_publication: true)
+        end
+      end
+      puts "Successfully migrated root repo '#{root.name}', id='#{root.id}'."
+    end
+
+    if found_repos_to_migrate
+      puts "Successfully migrated all remaining repositories to be consistent with deb_enable_structured_apt='#{deb_enable_structured_apt}'!"
+      puts "IMPORTANT: Any smart proxies serving deb content that was migrated must be re-synced!"
+    else
+      puts "Found no repositories that needed migrating. Everything is consistent with deb_enable_structured_apt='#{deb_enable_structured_apt}'!"
+    end
+  end
+end

data/lib/katello/tasks/receptor/extract_orgs.rake

@@ -13,7 +13,7 @@ namespace :katello do
           id: org.id,
           redhat_account_number: org.redhat_account_number,
           cert: org.owner_details.dig(:upstreamConsumer, :idCert, :cert),
-          key: org.owner_details.dig(:upstreamConsumer, :idCert, :key)
+          key: org.owner_details.dig(:upstreamConsumer, :idCert, :key),
         }
       end
 

data/lib/katello/tasks/reimport.rake

@@ -18,7 +18,7 @@ namespace :katello do
     models = [
       Katello::Subscription,
       Katello::Pool,
-      Katello::Content
+      Katello::Content,
     ]
 
     models.each do |model|

data/lib/katello/tasks/repository.rake

@@ -71,10 +71,11 @@ namespace :katello do
     end
   end
 
-  desc "Re-import all container manifests to populate labels and annotations."
+  desc "Re-import all container manifests and lists to populate labels and annotations."
   task :import_container_manifest_labels => ["dynflow:client", "check_ping"] do
     User.current = User.anonymous_api_admin
     handle_manifest_label_updates
+    handle_manifest_list_label_updates
   end
 
   def lookup_repositories
@@ -114,22 +115,31 @@ namespace :katello do
     end
   end
 
-  def handle_manifest_label_updates
+  def handle_manifest_updates(model_class)
     batch_size = 1000
-    Katello::DockerManifest.
-      where(schema_version: 2).
-      where(annotations: {}, labels: {}).
-      where(is_bootable: false, is_flatpak: false).
-      find_in_batches(batch_size: batch_size) do |group|
+    content_type = model_class::CONTENT_TYPE
+    model_class.
+     where(schema_version: 2).
+     where(annotations: {}, labels: {}).
+     where(is_bootable: false, is_flatpak: false).
+     find_in_batches(batch_size: batch_size) do |group|
       manifest_unit_ids = group.pluck(:pulp_id)
       index_service = Katello::ContentUnitIndexer.new(
-        content_type: Katello::RepositoryTypeManager.find_content_type("docker_manifest"),
-        pulp_content_ids: manifest_unit_ids
+       content_type: Katello::RepositoryTypeManager.find_content_type(content_type),
+       pulp_content_ids: manifest_unit_ids
       )
       index_service.reimport_units
     end
   end
 
+  def handle_manifest_label_updates
+    handle_manifest_updates(Katello::DockerManifest)
+  end
+
+  def handle_manifest_list_label_updates
+    handle_manifest_updates(Katello::DockerManifestList)
+  end
+
   def handle_missing_root_repo(root_repo)
     root_repo.destroy! if commit?
   end

data/lib/katello/tasks/upgrades/4.1/reupdate_content_import_export_perms.rake

@@ -27,7 +27,7 @@ namespace :katello do
 
         permission_map = {
           Permission.find_by(name: :export_library_content) => Permission.find_by(name: :export_content),
-          Permission.find_by(name: :import_library_content) => Permission.find_by(name: :import_content)
+          Permission.find_by(name: :import_library_content) => Permission.find_by(name: :import_content),
         }
 
         permission_map.each do |old_perm, new_perm|

data/lib/katello/tasks/upgrades/4.3/fix_url_auth.rake

@@ -14,7 +14,7 @@ namespace :katello do
             repo_params = {
               upstream_username: user,
               upstream_password: password,
-              url: upstream_url
+              url: upstream_url,
             }
             ForemanTasks.sync_task(Actions::Katello::Repository::Update, repo.root, repo_params)
           end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.14.1".freeze
+  VERSION = "4.15.0.rc2".freeze
 end

data/locale/action_names.rb

@@ -1,44 +1,86 @@
 # Autogenerated!
 _("Abstract async task")
-_("Abstract")
 _("Attach subscriptions")
 _("Auto attach subscriptions")
 _("Bulk generate applicability for hosts")
+_("Commit upload")
+_("Copy all units")
+_("Copy content")
 _("Copy version units to library")
+_("Copy version")
 _("Create Alternate Content Source")
+_("Create Container Push Repository Root")
 _("Create Export History")
 _("Create Import History")
 _("Create Syncable Export History")
+_("Create exporter")
+_("Create import")
+_("Create importer")
+_("Create publication")
+_("Create remote")
+_("Create remote")
+_("Create")
+_("Create")
+_("Create")
+_("Create")
 _("Create")
 _("Create")
 _("Create")
 _("Delete Activation Key")
 _("Delete Lifecycle Environment")
+_("Delete Manifest")
 _("Delete Product")
+_("Delete distributions")
+_("Delete orphan alternate content sources")
+_("Delete orphan distributions")
+_("Delete orphan remotes")
+_("Delete orphan repository versions")
+_("Delete orphaned migrated repositories")
+_("Delete remote")
+_("Delete remote")
+_("Delete repository references")
+_("Delete version")
+_("Delete")
+_("Delete")
+_("Delete")
+_("Delete")
 _("Delete")
 _("Delete")
 _("Delete")
 _("Destroy Alternate Content Source")
 _("Destroy Content Host")
+_("Destroy exporter")
+_("Destroy importer")
 _("Destroy")
+_("Disable Simple Content Access")
 _("Disable")
 _("Discover")
+_("Enable Simple Content Access")
 _("Enable")
+_("Environment contents refresh")
 _("Errata mail")
 _("Errata mail")
 _("Export Library")
 _("Export Repository")
 _("Export")
 _("Export")
+_("Export")
 _("Fetch pxe files")
 _("Filtered index content")
 _("Generate host applicability")
+_("Generate metadata")
+_("Generate metadata")
 _("Generate repository applicability")
 _("Hypervisors update")
 _("Hypervisors")
 _("Import Content View Version")
 _("Import Default Content View")
+_("Import Manifest")
 _("Import Repository")
+_("Import migration")
+_("Import repository upload")
+_("Import upload")
+_("Import upload")
 _("Import")
 _("Incremental Update of  Content View Version(s) ")
 _("Incremental Update")
@@ -46,36 +88,79 @@ _("Index content")
 _("Index errata")
 _("Index module streams")
 _("Index package groups")
+_("Initialize")
 _("Instance update")
 _("Metadata generate")
+_("Multi copy all units")
+_("Multi copy content")
+_("Multi copy units")
 _("Product Create")
 _("Promote")
 _("Promotion to Environment")
 _("Publish Lifecycle Environment Container Repositories")
 _("Publish")
+_("Purge completed tasks")
+_("Reclaim space")
+_("Reclaim space")
 _("Refresh Alternate Content Source")
+_("Refresh Manifest")
+_("Refresh all distributions")
+_("Refresh distribution")
+_("Refresh distribution")
+_("Refresh if needed")
+_("Refresh remote")
+_("Refresh remote")
+_("Refresh repos")
+_("Refresh")
+_("Refresh")
+_("Refresh")
 _("Reindex subscriptions")
 _("Remove Content")
 _("Remove Version")
 _("Remove Versions and Associations")
 _("Remove from Environment")
+_("Remove orphans")
+_("Remove orphans")
 _("Remove subscriptions")
+_("Remove units")
+_("Remove units")
+_("Remove unneeded repos")
+_("Repair")
+_("Repositories certs reset")
+_("Repositories gpg reset")
 _("Republish Version Repositories")
 _("Run Sync Plan:")
+_("Save artifact")
+_("Save distribution references")
+_("Save publication")
+_("Save version")
+_("Save versions")
+_("Scan cdn")
 _("Sync capsule")
+_("Sync")
+_("Sync")
+_("Sync")
 _("Syncable export")
 _("Synchronize smart proxy")
 _("Synchronize")
+_("Toggle")
 _("Update Alternate Content Source")
 _("Update CDN Configuration")
 _("Update Content Counts")
 _("Update Content Overrides")
 _("Update content urls")
 _("Update content view environments for host")
+_("Update distributions")
 _("Update http proxy details")
 _("Update http proxy")
 _("Update redhat repository")
 _("Update release version for host")
+_("Update remote")
+_("Update remote")
+_("Update repository")
+_("Update")
+_("Update")
+_("Update")
 _("Update")
 _("Update")
 _("Update")
@@ -83,8 +168,14 @@ _("Update")
 _("Update")
 _("Update")
 _("Updating System Purpose for host")
+_("Updating repository authentication configuration")
+_("Updating repository authentication configuration")
+_("Upload content")
+_("Upload file")
 _("Upload into")
 _("Upload into")
+_("Upload tag")
 _("Verify checksum for content on smart proxy")
 _("Verify checksum of version repositories")
 _("Verify checksum")
+_("Verify checksum")