Skip to content

Commit 89df883

Browse files
authored
Fix user update command response parsing (#233)
Fixes #232
1 parent d27f40a commit 89df883

3 files changed

Lines changed: 7 additions & 13 deletions

File tree

alertaclient/commands/cmd_me.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ def cli(obj, name, email, password, status, text):
1818

1919
client = obj['client']
2020
try:
21-
r = client.update_me(name=name, email=email, password=password, status=status, attributes=None, text=text)
21+
user = client.update_me(name=name, email=email, password=password, status=status, attributes=None, text=text)
2222
except Exception as e:
2323
click.echo('ERROR: {}'.format(e), err=True)
2424
sys.exit(1)
25-
if r['status'] == 'ok':
26-
click.echo('Updated.')
27-
else:
28-
click.echo(r['message'])
25+
click.echo(user.id)

alertaclient/commands/cmd_user.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def parse_args(self, ctx, args):
2626
@click.option('--status', help='Status eg. active, inactive')
2727
@click.option('--role', 'roles', multiple=True, help='List of roles')
2828
@click.option('--text', help='Description of user')
29-
@click.option('--email-verified/--email-not-verified', default=False, help='Email address verified flag')
29+
@click.option('--email-verified/--email-not-verified', default=None, help='Email address verified flag')
3030
@click.option('--delete', '-D', metavar='UUID', help='Delete user using ID')
3131
@click.pass_obj
3232
def cli(obj, id, name, email, password, status, roles, text, email_verified, delete):
@@ -35,21 +35,18 @@ def cli(obj, id, name, email, password, status, roles, text, email_verified, del
3535
if delete:
3636
client.delete_user(delete)
3737
elif id:
38-
if not any([name, email, password, status, roles, text, email_verified]):
38+
if not any([name, email, password, status, roles, text, (email_verified is not None)]):
3939
click.echo('Nothing to update.')
4040
sys.exit(1)
4141
try:
42-
r = client.update_user(
42+
user = client.update_user(
4343
id, name=name, email=email, password=password, status=status,
4444
roles=roles, attributes=None, text=text, email_verified=email_verified
4545
)
4646
except Exception as e:
4747
click.echo('ERROR: {}'.format(e), err=True)
4848
sys.exit(1)
49-
if r['status'] == 'ok':
50-
click.echo('Updated.')
51-
else:
52-
click.echo(r['message'])
49+
click.echo(user.id)
5350
else:
5451
if not email:
5552
raise click.UsageError('Need "--email" to create user.')

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py36,py37,py38
2+
envlist = py36,py37,py38,py39
33
skip_missing_interpreters=true
44

55
[testenv]

0 commit comments

Comments
 (0)