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

[cli] add apihost and apiport options to dbupdate

This commit is contained in:
Maxime Alves LIRMM@home 2020-07-12 22:00:52 +02:00
parent 32ed99deb9
commit 1aba6b5623
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
halfapi/cli.py
View File

@ -11,11 +11,11 @@ import importlib
import psycopg2 import psycopg2
# hop-generated classes # hop-generated classes
from .models.api.version import Version from apidb.api.version import Version
from .models.api.domain import Domain from apidb.api.domain import Domain
from .models.api.route import Route from apidb.api.route import Route
from .models.api.acl_function import AclFunction from apidb.api.acl_function import AclFunction
from .models.api.acl import Acl from apidb.api.acl import Acl
HALFORM_DSN='' HALFORM_DSN=''
@ -39,12 +39,12 @@ def run(envfile, host, port):
if envfile: if envfile:
try: try:
with open(envfile) as f: with open(envfile) as f:
print('Will use the following env parameters :') click.echo('Will use the following env parameters :')
local_env = dict([ tuple(line.strip().split('=', 1)) local_env = dict([ tuple(line.strip().split('=', 1))
for line in f.readlines() ]) for line in f.readlines() ])
print(local_env) click.echo(local_env)
except FileNotFoundError: except FileNotFoundError:
print(f'No file named {envfile}') click.echo(f'No file named {envfile}')
envfile = None envfile = None
if 'DEV' in local_env.keys(): if 'DEV' in local_env.keys():
@ -70,12 +70,14 @@ def run(envfile, host, port):
@click.option('--dbname', default='api') @click.option('--dbname', default='api')
@click.option('--host', default='127.0.0.1') @click.option('--host', default='127.0.0.1')
@click.option('--port', default=5432) @click.option('--port', default=5432)
@click.option('--apihost', default='127.0.0.1')
@click.option('--apiport', default=8080)
@click.option('--user', default='api') @click.option('--user', default='api')
@click.option('--password', default='') @click.option('--password', default='')
@click.option('--domain', default='organigramme') @click.option('--domain', default='organigramme')
@click.option('--drop', is_flag=True, default=False) @click.option('--drop', is_flag=True, default=False)
@cli.command() @cli.command()
def dbupdate(dbname, host, port, user, password, domain, drop): def dbupdate(dbname, host, port, apihost, apiport, user, password, domain, drop):
def dropdb(): def dropdb():
if not click.confirm(f'will now drop database {dbname}', default=True): if not click.confirm(f'will now drop database {dbname}', default=True):
@ -145,7 +147,7 @@ def dbupdate(dbname, host, port, user, password, domain, drop):
def add_route(name, **kwargs): def add_route(name, **kwargs):
print(f'Adding route {version}/{domain}/{name}') click.echo(f'Adding route {version}/{domain}/{name}')
route = Route() route = Route()
route.version = version route.version = version
route.domain = domain route.domain = domain
@ -160,10 +162,15 @@ def dbupdate(dbname, host, port, user, password, domain, drop):
def add_domain(): def add_domain():
new_version = Version(name=version, server=apihost, port=apiport)
if len(new_version) == 0:
click.echo(f'New version : {version}')
new_version.insert()
new_domain = Domain(name=domain) new_domain = Domain(name=domain)
new_domain.version = version new_domain.version = version
if len(new_domain) == 0: if len(new_domain) == 0:
print(f'New domain {domain}') click.echo(f'New domain {domain}')
new_domain.insert() new_domain.insert()