Domain migrate oci (#1237)

* fix missing domain group

* Add support for OCI storage in domain migrate

* url fix

* formatter

Author: YasenT

Dockerfile

@@ -176,8 +176,10 @@ RUN patch -p1 -d /usr/local/lib/pulp/lib/python${PYTHON_VERSION}/site-packages <
 COPY images/assets/patches/0057-Optimize-Simple-API-upload_time-and-provenance.patch /tmp/
 RUN patch -p1 -d /usr/local/lib/pulp/lib/python${PYTHON_VERSION}/site-packages < /tmp/0057-Optimize-Simple-API-upload_time-and-provenance.patch
 
-COPY images/assets/patches/0058-Domain-Migrate-support-for-OCI.patch /tmp/
-RUN patch -p1 -d /usr/local/lib/pulp/lib/python${PYTHON_VERSION}/site-packages < /tmp/0058-Domain-Migrate-support-for-OCI.patch
+
+COPY images/assets/patches/0058-fix-migrate.patch /tmp/
+RUN patch -p1 -d /usr/local/lib/pulp/lib/python${PYTHON_VERSION}/site-packages < /tmp/0058-fix-migrate.patch
+
 
 RUN mkdir /licenses
 COPY LICENSE /licenses/LICENSE

images/assets/patches/0058-fix-migrate.patch

@@ -0,0 +1,80 @@
+From 298018f116419e3a944f663a7d7fc89e426d0d1a Mon Sep 17 00:00:00 2001
+From: Yasen <yasen@trahnov.eu>
+Date: Tue, 26 May 2026 13:18:58 +0200
+Subject: [PATCH] fix migrate
+
+---
+ pulpcore/app/tasks/migrate.py | 36 +++++++++++++++++++++++------------
+ 1 file changed, 24 insertions(+), 12 deletions(-)
+
+diff --git a/pulpcore/app/tasks/migrate.py b/pulpcore/app/tasks/migrate.py
+index dd15adc1e..789c857d1 100644
+--- a/pulpcore/app/tasks/migrate.py
++++ b/pulpcore/app/tasks/migrate.py
+@@ -2,7 +2,6 @@ import logging
+ from gettext import gettext as _
+ 
+ from django.utils.timezone import now
+-from rest_framework.serializers import ValidationError
+ 
+ from pulpcore.app.models import Artifact, ProgressReport, storage
+ from pulpcore.app.serializers import DomainBackendMigratorSerializer
+@@ -25,24 +24,30 @@ def migrate_backend(data):
+     artifacts = Artifact.objects.filter(pulp_domain=domain)
+     date = now()
+ 
++    skipped = []
+     with ProgressReport(
+         message=_("Migrating Artifacts"), code="migrate", total=artifacts.count()
+     ) as pb:
+         while True:
+-            for digest in pb.iter(artifacts.values_list("sha256", flat=True)):
+-                filename = storage.get_artifact_path(digest)
+-                if not new_storage.exists(filename):
++            for artifact in pb.iter(artifacts.iterator()):
++                old_name = artifact.file.name
++                new_name = storage.get_artifact_path(artifact.sha256)
++                if not new_storage.exists(new_name):
+                     try:
+-                        file = old_storage.open(filename)
+-                    except FileNotFoundError:
+-                        raise ValidationError(
+-                            _(
+-                                "Found missing file for artifact(sha256={}). Please run the repair "
+-                                "task or delete the offending artifact."
+-                            ).format(digest)
++                        file = old_storage.open(old_name)
++                    except Exception as e:
++                        _logger.warning(
++                            "Skipping artifact(sha256=%s): unable to read from old storage: %s",
++                            artifact.sha256,
++                            e,
+                         )
+-                    new_storage.save(filename, file)
++                        skipped.append(artifact.sha256)
++                        continue
++                    new_storage.save(new_name, file)
+                     file.close()
++                if old_name != new_name:
++                    artifact.file.name = new_name
++                    artifact.save(update_fields=["file"])
+             # Handle new artifacts saved by the content app
+             artifacts = Artifact.objects.filter(pulp_domain=domain, pulp_created__gte=date)
+             if count := artifacts.count():
+@@ -52,6 +57,13 @@ def migrate_backend(data):
+                 continue
+             break
+ 
++    if skipped:
++        _logger.warning(
++            "Migration completed with %d skipped artifacts (missing from old storage): %s",
++            len(skipped),
++            ", ".join(skipped),
++        )
++
+     # Update the current domain to the new storage backend settings
+     msg = _("Update Domain({domain})'s Backend Settings").format(domain=domain.name)
+     with ProgressReport(message=msg, code="update", total=1) as pb:
+-- 
+2.53.0
+

pulp_service/pulp_service/app/storage.py

@@ -241,12 +241,17 @@ def url(self, artifact_name, parameters={}, **kwargs):
         # Load auth configs
         client.auth.load_configs(container, configs=["/tmp/.docker/config.json"])
 
-        # Use download_blob with return_blob_url=True to get the URL
-        blob_url = client.download_blob(
+        # Use download_blob with return_blob_url=True to get the redirect response
+        response = client.download_blob(
             container=container,
             digest=digest,
             outfile="",  # Not used when return_blob_url=True
             return_blob_url=True,
         )
 
+        # response is a requests.Response with a 302 redirect (allow_redirects=False).
+        # The actual blob URL is in the Location header.
+        blob_url = response.headers.get("Location")
+        if not blob_url:
+            raise ValueError(f"No redirect URL returned for blob {digest} (status={response.status_code})")
         return blob_url