uncloud/uncloud-cli
2
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
ahmadbilalkhalid 2019-12-31 20:18:14 +05:00
commit 436cb881b2
8 changed files with 39 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

24
uncloud_cli/commands/helper.py
View file

@ -11,16 +11,19 @@ from uncloud_cli.config import config, config_file
def load_dump_pretty(content):
if isinstance(content, bytes):
content = content.decode("utf-8")
content = content.decode('utf-8')
parsed = json.loads(content)
return json.dumps(parsed, indent=4, sort_keys=True)
def make_request(*args, data=None, request_method=requests.post):
r = request_method(
join_path(config['client']['api_server'], *args), json=data
join_path(config.get('client', 'api_server'), *args), json=data
)
print(load_dump_pretty(r.content))
try:
print(load_dump_pretty(r.content))
except Exception:
print('Error occurred while getting output from api server.')
def get_token(ctx, param, value):
@ -28,7 +31,7 @@ def get_token(ctx, param, value):
try:
token = TOTP(value).now()
except binascii.Error:
raise click.BadParameter('Please enter the correct seed in {}'.format(config_file))
raise click.BadParameter('')
else:
param.name = 'token'
return token
@ -37,16 +40,17 @@ def get_token(ctx, param, value):
def add_otp_options(f):
options = [
click.option(
"--name", required=True, default=config['client']['name'],
show_default='name mentioned in {}'.format(config_file)
'--name', required=True, default=config.get('client', 'name', fallback=''),
show_default='name mentioned in {}'.format(config_file), prompt=True
),
click.option(
"--realm", required=True, default=config['client']['realm'],
show_default='realm mentioned in {}'.format(config_file)
'--realm', required=True, default=config.get('client', 'realm', fallback=''),
show_default='realm mentioned in {}'.format(config_file), prompt=True
),
click.option(
"--seed", required=True, default=config['client']['seed'],
callback=get_token, show_default='seed mentioned in {}'.format(config_file)
'--seed', required=True, default=config.get('client', 'seed', fallback=''),
callback=get_token, prompt=True,
show_default='seed mentioned in {}'.format(config_file)
)
]