masq/halfapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cli/domain] now instantiate HalfAPI and manually add the domain before calling schema function

Browse Source
This commit is contained in:
Maxime Alves LIRMM 2021-12-13 12:45:52 +01:00
parent f82cd5552b
commit e9bf94a607
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
halfapi/__init__.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
__version__ = '0.6.2' __version__ = '0.6.1'
def version(): def version():
return f'HalfAPI version:{__version__}' return f'HalfAPI version:{__version__}'

14
halfapi/cli/domain.py
View File

@ -146,9 +146,17 @@ def domain(domain, delete, update, create, read): #, domains, read, create, upd
if delete: if delete:
raise NotImplementedError raise NotImplementedError
if read: if read:
half_domain = HalfDomain( from ..conf import CONFIG
domain, from ..halfapi import HalfAPI
config=CONFIG.get('domain').get('domain_name', {}))
try:
config_domain = CONFIG.pop('domain').get(domain, {})
except KeyError:
config_domain = {}
halfapi = HalfAPI(CONFIG)
half_domain = halfapi.add_domain(domain, config=config_domain)
click.echo(orjson.dumps( click.echo(orjson.dumps(
half_domain.schema(), half_domain.schema(),

4
halfapi/cli/run.py
View File

@ -53,8 +53,10 @@ def run(host, port, reload, secret, production, loglevel, prefix, check, dryrun,
if domain: if domain:
# If we specify a domain to run as argument # If we specify a domain to run as argument
if 'domain' not in CONFIG:
CONFIG['domain'] = {}
for key in CONFIG['domain']: for key in CONFIG.get('domain'):
# Disable all domains # Disable all domains
CONFIG['domain'].pop(key) CONFIG['domain'].pop(key)