drove-cli 0.0.5__tar.gz → 0.0.7__tar.gz

{drove_cli-0.0.5 → drove_cli-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drove-cli
-Version: 0.0.5
+Version: 0.0.7
 Summary: Drove Command Line Interface
 License: Apache-2.0
 Keywords: container,docker,podman,distributed-systems,container-orchestrator
@@ -74,6 +74,20 @@ EOF
 chmod +x ~/bin/drove
 ```
 
+## Upgrade
+
+### Using pip
+
+```bash
+pip install -U drove-cli
+```
+
+### Using Docker
+
+```bash
+docker pull ghcr.io/phonepe/drove-cli:latest
+```
+
 ## Configuration
 
 Create `~/.drove` with your cluster configuration:
@@ -144,7 +158,7 @@ Use `drove -h` or `drove <command> -h` for detailed help.
 
 ## Documentation
 
-Full documentation is available at **[github.com/PhonePe/drove-orchestrator](https://github.com/PhonePe/drove-orchestrator)**
+Full documentation is available at **[phonepe.github.io/drove-orchestrator](https://phonepe.github.io/drove-orchestrator/cli/)**
 
 ## License
 

{drove_cli-0.0.5 → drove_cli-0.0.7}/README.md

@@ -41,6 +41,20 @@ EOF
 chmod +x ~/bin/drove
 ```
 
+## Upgrade
+
+### Using pip
+
+```bash
+pip install -U drove-cli
+```
+
+### Using Docker
+
+```bash
+docker pull ghcr.io/phonepe/drove-cli:latest
+```
+
 ## Configuration
 
 Create `~/.drove` with your cluster configuration:
@@ -111,7 +125,7 @@ Use `drove -h` or `drove <command> -h` for detailed help.
 
 ## Documentation
 
-Full documentation is available at **[github.com/PhonePe/drove-orchestrator](https://github.com/PhonePe/drove-orchestrator)**
+Full documentation is available at **[phonepe.github.io/drove-orchestrator](https://phonepe.github.io/drove-orchestrator/cli/)**
 
 ## License
 

{drove_cli-0.0.5 → drove_cli-0.0.7}/drove.py

@@ -36,14 +36,14 @@ def run():
     except (BrokenPipeError, IOError, KeyboardInterrupt):
         pass
     except droveclient.DroveException as e:
-        debug = True if client != None and client.debug else False
+        debug = True if client is not None and client.debug else False
         droveutils.print_drove_error(e, debug)
         if debug:
             traceback.print_exc()
 
     except Exception as e:
         print("Drove CLI error: " + str(e))
-        debug = True if client != None and client.debug else False
+        debug = True if client is not None and client.debug else False
         if debug:
             traceback.print_exc()
         else:

{drove_cli-0.0.5 → drove_cli-0.0.7}/drovecli.py

@@ -8,14 +8,14 @@ from types import SimpleNamespace
 class DroveCli:
     def __init__(self, parser: argparse.ArgumentParser):
         self.parser = parser
-        self.drove_client = droveclient.DroveClient()
         self.plugins: list = []
         self.debug = False
         subparsers = parser.add_subparsers(help="Available plugins")
+        drove_client = droveclient.DroveClient()
         for plugin_class in DrovePlugin.plugins:
             plugin = plugin_class()
             # print("Loading plugin: " + str(plugin))
-            plugin.populate_options(drove_client=self.drove_client, subparser=subparsers)
+            plugin.populate_options(drove_client=drove_client, subparser=subparsers)
             self.plugins.append(plugin)
         parser.set_defaults(func=self.show_help)
         
@@ -23,10 +23,6 @@ class DroveCli:
     def run(self):
         args = self.parser.parse_args()
         self.debug = args.debug
-        drove_client = droveclient.build_drove_client(self.drove_client, args=args)
-        if drove_client is None:
-            return None
-        self.drove_client = drove_client
 
         # Load plugins
         

{drove_cli-0.0.5 → drove_cli-0.0.7}/plugins/__init__.py

@@ -17,12 +17,20 @@ class DrovePlugin:
     def __init__(self) -> None:
         self.drove_client: droveclient.DroveClient = None
         self.parser: argparse.ArgumentParser = None
-        
+
+    def needs_client(self) -> bool:
+        return True
+
     def populate_options(self, drove_client: droveclient.DroveClient, subparser: argparse.ArgumentParser):
         self.drove_client = drove_client
-        subparser.set_defaults(func=self.process)
+        subparser.set_defaults(func=self.run_plugin)
         self.parser = subparser
 
+    def run_plugin(self, options: SimpleNamespace):
+        if self.needs_client():
+            droveclient.build_drove_client(self.drove_client, options)
+        self.process(options)
+
     def process(self, options: SimpleNamespace):
         self.parser.print_help()
         exit(-1)

{drove_cli-0.0.5 → drove_cli-0.0.7}/plugins/appinstances.py

@@ -20,7 +20,7 @@ class Applications(plugins.DrovePlugin):
         sub_parser = commands.add_parser("list", help="List all application instances")
         sub_parser.add_argument("app_id", metavar="app-id", help="Application ID")
         sub_parser.add_argument("--old", "-o", help="Show old instances", action="store_true")
-        sub_parser.add_argument("--sort", "-s", help="Sort output by column", type=int, choices=range(0, 6), default = 0)
+        sub_parser.add_argument("--sort", "-s", help="Sort output by column", type=int, choices=range(0, 7), default = 0)
         sub_parser.add_argument("--reverse", "-r", help="Sort in reverse order", action="store_true")
         sub_parser.set_defaults(func=self.list_instances)
 
@@ -76,15 +76,20 @@ class Applications(plugins.DrovePlugin):
             api = "/apis/v1/applications/{app_id}/instances/old"
         data = self.drove_client.get(api.format(app_id = options.app_id))
         #headers = ["Instance ID", "Executor", "CPU", "Memory(MB)", "State", "Error Message", "Created", "Last Updated"]
-        headers = ["Instance ID", "Executor Host", "State", "Error Message", "Created", "Last Updated"]
+        headers = ["Instance ID", "Executor Host", "Ports", "State", "Error Message", "Created", "Last Updated"]
         rows = []
         for instance in data:
             instance_row = []
             instance_row.append(instance["instanceId"])
-            try:
-                instance_row.append(instance["localInfo"]["hostname"])
-            except KeyError:
-                instance_row.append("")
+            local_info = instance.get("localInfo", {})
+            instance_row.append(local_info.get("hostname", ""))
+            ports = local_info.get("ports", {})
+            ports_str = ",".join(
+                "{}:{}".format(key, value["hostPort"])
+                for key, value in ports.items()
+                if "hostPort" in value
+            )
+            instance_row.append(ports_str)
             instance_row.append(instance["state"])
             instance_row.append(instance["errorMessage"])
             instance_row.append(droveutils.to_date(instance["created"]))

{drove_cli-0.0.5 → drove_cli-0.0.7}/plugins/config.py

@@ -85,6 +85,9 @@ class Config(plugins.DrovePlugin):
     def __init__(self) -> None:
         pass
 
+    def needs_client(self) -> bool:
+        return False
+
     def populate_options(self, drove_client, subparser: argparse.ArgumentParser):
         parser = subparser.add_parser("config", help="Manage drove cluster configurations")
         commands = parser.add_subparsers(help="Available config commands")

{drove_cli-0.0.5 → drove_cli-0.0.7}/plugins/localserviceinstances.py

@@ -77,15 +77,20 @@ class LocalServices(plugins.DrovePlugin):
             api = "/apis/v1/localservices/{service_id}/instances/old"
         data = self.drove_client.get(api.format(service_id = options.service_id))
         #headers = ["Instance ID", "Executor", "CPU", "Memory(MB)", "State", "Error Message", "Created", "Last Updated"]
-        headers = ["Instance ID", "Executor Host", "State", "Error Message", "Created", "Last Updated"]
+        headers = ["Instance ID", "Executor Host", "Ports", "State", "Error Message", "Created", "Last Updated"]
         rows = []
         for instance in data:
             instance_row = []
             instance_row.append(instance["instanceId"])
-            try:
-                instance_row.append(instance["localInfo"]["hostname"])
-            except KeyError:
-                instance_row.append("")
+            local_info = instance.get("localInfo", {})
+            instance_row.append(local_info.get("hostname", ""))
+            ports = local_info.get("ports", {})
+            ports_str = ",".join(
+                "{}:{}".format(key, value["hostPort"])
+                for key, value in ports.items()
+                if "hostPort" in value
+            )
+            instance_row.append(ports_str)
             instance_row.append(instance["state"])
             instance_row.append(instance["errorMessage"])
             instance_row.append(droveutils.to_date(instance["created"]))

{drove_cli-0.0.5 → drove_cli-0.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "drove-cli"
-version = "0.0.5"
+version = "0.0.7"
 description = "Drove Command Line Interface"
 authors = ["Santanu Sinha <santanu.sinha@gmail.com>"]
 maintainers = [