remotivelabs-cli 0.0.1a14__tar.gz → 0.0.1a15__tar.gz

{remotivelabs_cli-0.0.1a14 → remotivelabs_cli-0.0.1a15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remotivelabs-cli
-Version: 0.0.1a14
+Version: 0.0.1a15
 Summary: 
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com

{remotivelabs_cli-0.0.1a14 → remotivelabs_cli-0.0.1a15}/cli/cloud/auth_tokens.py

@@ -35,11 +35,10 @@ def list_personal_access_tokens():
 
 @app.command(name="revoke", help="Revoke the specified access token")
 def revoke(
-        token_name: str = typer.Option(..., help="Name of the access token to revoke")
+        name: str = typer.Option(..., help="Name of the access token to revoke")
 ):
     rest.ensure_auth_token()
-    rest.handle_delete(f'/api/me/keys/{token_name}')
-
+    rest.handle_delete(f'/api/me/keys/{name}', success_msg="Successfully revoked")
 
 @app.command()
 def describe(

{remotivelabs_cli-0.0.1a14 → remotivelabs_cli-0.0.1a15}/cli/cloud/rest_helper.py

@@ -77,7 +77,7 @@ def has_access(url, params={}):
         return True
 
 
-def handle_delete(url, params={}, quiet=False):
+def handle_delete(url, params={}, quiet=False, success_msg="Successfully deleted"):
     ensure_auth_token()
     r = requests.delete(f'{base_url}{url}', headers=headers, params=params)
     if r.status_code == 200:
@@ -85,7 +85,7 @@ def handle_delete(url, params={}, quiet=False):
             print(json.dumps(r.json()))
     if r.status_code == 204:
         if quiet == False:
-            sys.stderr.write('Successfully deleted\n')
+            sys.stderr.write(f'{success_msg}\n')
     else:
         print(f'Got status code: {r.status_code}')
         print(r.text)

{remotivelabs_cli-0.0.1a14 → remotivelabs_cli-0.0.1a15}/cli/cloud/service_account_tokens.py

@@ -47,10 +47,10 @@ def list_files():
 
 @app.command(name="revoke", help="Revoke service account access token")
 def revoke(
+        name: str = typer.Argument(..., help="Access token name"),
         service_account: str = typer.Option(..., help="Service account name"),
-        token_name: str = typer.Option(..., help="Access token name"),
         project: str = typer.Option(..., help="Project ID", envvar='REMOTIVE_CLOUD_PROJECT')):
-    rest.handle_delete(f"/api/project/{project}/admin/accounts/{service_account}/keys/{token_name}")
+    rest.handle_delete(f"/api/project/{project}/admin/accounts/{service_account}/keys/{name}")
 
 
 def write_token(file, token):

{remotivelabs_cli-0.0.1a14 → remotivelabs_cli-0.0.1a15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.0.1.alpha14"
+version = "0.0.1.alpha15"
 description = ""
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"