Skip to content

Commit 4faee3a

Browse files
committed
Add proper return value to sync task
Also address other tasks returning deprecated values that are ignored anyway.
1 parent 0057a97 commit 4faee3a

File tree

4 files changed

+29
-10
lines changed

4 files changed

+29
-10
lines changed

CHANGES/+sync_result.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Allow sync and build tasks to properly return the created repository_version (depends on pulpcore to support task results).

pulp_container/app/tasks/builder.py

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@
55
import tempfile
66
from uuid import uuid4
77

8+
from pulpcore.plugin.models import (
9+
Artifact,
10+
ContentArtifact,
11+
Content,
12+
PulpTemporaryFile,
13+
)
14+
from pulpcore.plugin.util import get_domain
15+
16+
from pulp_container.constants import MEDIA_TYPE
817
from pulp_container.app.models import (
918
Blob,
1019
BlobManifest,
1120
ContainerRepository,
1221
Manifest,
1322
Tag,
1423
)
15-
from pulp_container.constants import MEDIA_TYPE
1624
from pulp_container.app.utils import calculate_digest
17-
from pulpcore.plugin.models import (
18-
Artifact,
19-
ContentArtifact,
20-
Content,
21-
PulpTemporaryFile,
22-
)
23-
from pulpcore.plugin.util import get_domain
2425

2526

2627
def get_or_create_blob(layer_json, manifest, path):
@@ -192,6 +193,15 @@ def build_image(
192193
if isinstance(containerfile_artifact, PulpTemporaryFile):
193194
containerfile_artifact.delete()
194195

196+
if repository_version:
197+
try:
198+
from pulpcore.plugin.serializers import RepositoryVersionSerializer
199+
200+
repository_version = RepositoryVersionSerializer(
201+
instance=repository_version, context={"request": None}
202+
).data
203+
except ImportError:
204+
pass
195205
return repository_version
196206

197207

pulp_container/app/tasks/download_image_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def download_image_data(repository_pk, remote_pk, raw_text_manifest_data, tag_na
2626
log.info("Pulling cache: repository={r} remote={p}".format(r=repository.name, p=remote.name))
2727
first_stage = ContainerPullThroughFirstStage(remote, raw_text_manifest_data, tag_name)
2828
dv = ContainerDeclarativeVersion(first_stage, repository)
29-
return dv.create()
29+
dv.create()
3030

3131

3232
class ContainerPullThroughFirstStage(ContainerFirstStage):

pulp_container/app/tasks/synchronize.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ def synchronize(remote_pk, repository_pk, mirror, signed_only):
3838
log.info("Synchronizing: repository={r} remote={p}".format(r=repository.name, p=remote.name))
3939
first_stage = ContainerFirstStage(remote, signed_only)
4040
dv = ContainerDeclarativeVersion(first_stage, repository, mirror)
41-
return dv.create()
41+
rv = dv.create()
42+
if rv:
43+
try:
44+
from pulpcore.plugin.serializers import RepositoryVersionSerializer
45+
46+
rv = RepositoryVersionSerializer(instance=rv, context={"request": None}).data
47+
except ImportError:
48+
pass
49+
return rv
4250

4351

4452
class ContainerDeclarativeVersion(DeclarativeVersion):

0 commit comments

Comments
 (0)