deposit.cli: Generate uuid as is
ClosedPublic
Actions

Authored by ardumont on Apr 15 2019, 3:43 PM.

Details

Reviewers

moranegg
douardda

Group Reviewers

Reviewers

Commits

rDDEP76b3ff6aa038: deposit_status: Simplify the deposit status computation
rDDEP93a168e8ad7a: Expose optional external id in deposit status endpoint
rDDEP3dd15b494eb3: deposit.cli: Generate uuid as is

Summary

Expose optional external id in deposit status endpoint

As this is generated, this could be useful for client who wants to
deposit further new version

From docker-env (manually formatted):

INFO:swh.deposit.cli.deposit:{
'deposit_id': '3',
'deposit_status': 'done',
'deposit_status_detail': 'The deposit has been successfully loaded into the Software Heritage archive',
'deposit_swh_id': 'swh:1:dir:3b0919ddd42be1ba0405d33f383b6e0ee8dedcba',
'deposit_swh_id_context': 'swh:1:dir:3b0919ddd42be1ba0405d33f383b6e0ee8dedcba;origin=https://forge.softwareheritage.org/source/jesuisgpl/',
'deposit_swh_anchor_id': 'swh:1:rev:7336885eda39fb1f7265c0e8ea75b139cc1773d4',
'deposit_swh_anchor_id_context': 'swh:1:rev:7336885eda39fb1f7265c0e8ea75b139cc1773d4;origin=https://forge.softwareheritage.org/source/jesuisgpl/',
'deposit_external_id': '6a7ef0a1-e88d-4590-b153-2ae9dce3c7ee'  # <- HERE we go!
}

Test Plan

tox

Diff Detail

Repository

rDDEP Push deposit

Branch

adaptations

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 5448
Build 7383: tox-on-jenkins	Jenkins
Build 7382: arc lint + arc unit

Event Timeline

ardumont created this revision.Apr 15 2019, 3:43 PM

Build is green
See https://jenkins.softwareheritage.org/job/DDEP/job/tox/101/ for more details.

Harbormaster completed remote builds in B5444: Diff 4581.Apr 15 2019, 3:46 PM

douardda added inline comments.Apr 15 2019, 5:02 PM

swh/deposit/api/deposit_status.py

43–51

Shouldn't this be the time to think about something like:

context = {
    'deposit_id': deposit.id,
    'status_detail': status_detail, 
}
keys = ('status', 'swh_id', 'swh_id_context', 'swh_anchor_id', 'swh_anchor_id_context', 'external_id')
for k in keys:
    context[k] = getattr(deposit, k, None)

ardumont added inline comments.Apr 15 2019, 6:46 PM