commodore tool command group

Author: simu

commodore/cli/__init__.py

@@ -9,7 +9,8 @@
 from reclass_rs import Reclass
 
 from dotenv import load_dotenv, find_dotenv
-from commodore import __git_version__, __version__
+
+from commodore import __git_version__, __version__, tools
 from commodore.config import Config
 from commodore.version import version_info
 
@@ -20,6 +21,7 @@
 from .inventory import inventory_group
 from .package import package_group
 from .oidc import commodore_fetch_token, commodore_login
+from .tool import tool_group
 
 
 def _version():
@@ -75,6 +77,7 @@ def commodore(ctx, working_dir, verbose, request_timeout):
 commodore.add_command(component_group)
 commodore.add_command(inventory_group)
 commodore.add_command(package_group)
+commodore.add_command(tool_group)
 commodore.add_command(commodore_login)
 commodore.add_command(commodore_fetch_token)
 commodore.add_command(commodore_version)
@@ -83,6 +86,7 @@ def commodore(ctx, working_dir, verbose, request_timeout):
 def main():
     multiprocessing.set_start_method("spawn")
     Reclass.set_thread_count(0)
+    tools.setup_path()
 
     load_dotenv(dotenv_path=find_dotenv(usecwd=True))
     commodore.main(

commodore/cli/tool.py

@@ -0,0 +1,75 @@
+from typing import Optional
+
+import click
+
+import commodore.cli.options as options
+
+from commodore import tools
+from commodore.config import Config
+
+
+@click.group(
+    name="tool",
+    short_help="Manage required external tools",
+)
+@options.verbosity
+@options.pass_config
+@options.github_token
+def tool_group(config: Config, verbose: int, github_token: str):
+    config.update_verbosity(verbose)
+    config.managed_tools = tools.load_state()
+    config.github_token = github_token
+
+
+@tool_group.command(name="list", short_help="List external tools")
+@options.verbosity
+@options.pass_config
+@options.github_token
+@click.option(
+    "--version-check/--skip-version-check",
+    " / -V",
+    default=True,
+    help="Query GitHub API to get latest version",
+)
+def tool_list(config: Config, verbose: int, github_token: str, version_check: bool):
+    config.update_verbosity(verbose)
+    config.github_token = github_token
+    tools.list_tools(config, version_check)
+
+
+@tool_group.command(name="install", short_help="Install external tools")
+@options.verbosity
+@options.pass_config
+@options.github_token
+@click.option(
+    "--version",
+    default=None,
+    metavar="VERSION",
+    help="A custom version to install for the requested tool (by default the latest version is installed)",
+)
+@click.argument("tool")
+def tool_install(
+    config: Config, verbose: int, tool: str, version: Optional[str], github_token: str
+):
+    config.update_verbosity(verbose)
+    config.github_token = github_token
+    tools.install_tool(config, tool, version)
+
+
+@tool_group.command(name="upgrade", short_help="Upgrade external tools")
+@options.verbosity
+@options.github_token
+@options.pass_config
+@click.option(
+    "--version",
+    default=None,
+    metavar="VERSION",
+    help="A custom version to install for the requested tool (by default the latest version is installed)",
+)
+@click.argument("tool")
+def tool_upgrade(
+    config: Config, verbose: int, tool: str, version: Optional[str], github_token: str
+):
+    config.update_verbosity(verbose)
+    config.github_token = github_token
+    tools.upgrade_tool(config, tool, version)

commodore/config.py

@@ -101,6 +101,7 @@ class Config:
     _dynamic_facts: dict[str, Any]
     _github_token: Optional[str]
     _request_timeout: int
+    _managed_tools: dict[str, str]
 
     oidc_client: Optional[str]
     oidc_discovery_url: Optional[str]
@@ -141,6 +142,7 @@ def __init__(
         self._dynamic_facts = {}
         self._github_token = None
         self._request_timeout = 5
+        self._managed_tools = {}
 
     @property
     def verbose(self):
@@ -316,6 +318,14 @@ def request_timeout(self) -> int:
     def request_timeout(self, timeout: int):
         self._request_timeout = timeout
 
+    @property
+    def managed_tools(self) -> dict[str, str]:
+        return self._managed_tools
+
+    @managed_tools.setter
+    def managed_tools(self, managed_tools: dict[str, str]):
+        self._managed_tools = managed_tools
+
     @property
     def inventory(self):
         return self._inventory