Page MenuHomeSoftware Heritage

Allow module to specify another config key than their module name
ClosedPublic

Authored by ardumont on May 30 2022, 5:25 PM.

Details

Summary

Some module cannot just define their module db configuration key entry as their module
name because they define more services than just their db (e.g. indexer, scrubber, ...)

Related to T4284

Test Plan

scrubber0.staging patched and it's happy with the fix:

swhworker@scrubber0:~$ swh db --config-file /etc/softwareheritage/scrubber/postgres.yml \
  version scrubber
Usage: swh db version [OPTIONS] MODULE

Error: Invalid value: Configuration cls must be set to 'postgresql' for this command.

swhworker@scrubber0:~$ swh db --config-file /etc/softwareheritage/scrubber/postgres.yml \
  version scrubber --module-config-key=scrubber_db
module: scrubber
current code version: 2
version: 1

Diff Detail

Repository
rDCORE Foundations and core functionalities
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D7910 (id=28516)

Could not rebase; Attempt merge onto 5cda0ca626...

Updating 5cda0ca..240ae09
Fast-forward
 swh/core/cli/db.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)
Changes applied before test
commit 240ae09ddadeaaddce69f9ecbee1e9eaaa8684f4
Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
Date:   Mon May 30 17:21:55 2022 +0200

    Allow module to specify another config key than their module name
    
    Some module cannot just define their module db configuration key entry as their module
    name because they define more services than just their db (e.g. indexer, scrubber, ...)
    
    Related to T4284

commit 9b62406fd36fba3a4417cbdf7f00280417ab9577
Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
Date:   Mon May 30 17:07:34 2022 +0200

    cli.db: Reword ignore sentence

See https://jenkins.softwareheritage.org/job/DCORE/job/tests-on-diff/433/ for more details.

This revision is now accepted and ready to land.May 30 2022, 5:34 PM