Finish refactor of main. Align setup, new & init commands (#536)

* refactor setup and create commands

* tidy up main

* align init behaviour with create

* update docs

* rename create -> new

* move auth into users.py

Author: willcl-ark

docs/quickstart.md

@@ -28,13 +28,23 @@ pip install -e .
 
 ## Running
 
-To get started simply run:
+To get started first check you have all the necessary requirements:
 
 ```bash
-warnet quickstart
+warnet setup
 ```
 
-This will check you have the required dependencies and guide you through setting up and deploying your first network.
+Then create your first network:
+
+```bash
+# Create a new network in the current directory
+warnet init
+
+# Or in a directory of choice
+warnet new <directory>
+```
+
+Follow the guide to configure network variables.
 
 ## fork-observer
 

docs/warnet.md

@@ -21,21 +21,14 @@ options:
 |-------------|--------|------------|-----------|
 | kube_config | String | yes        |           |
 
-### `warnet create`
-Create a new warnet project in the specified directory
-
-options:
-| name      | type   | required   | default   |
-|-----------|--------|------------|-----------|
-| directory | Path   | yes        |           |
-
 ### `warnet deploy`
 Deploy a warnet with topology loaded from \<directory>
 
 options:
 | name      | type   | required   | default   |
 |-----------|--------|------------|-----------|
 | directory | Path   | yes        |           |
+| debug     | Bool   |            | False     |
 
 ### `warnet down`
 Bring down a running warnet
@@ -45,9 +38,13 @@ Bring down a running warnet
 Initialize a warnet project in the current directory
 
 
-### `warnet quickstart`
-Setup warnet
+### `warnet new`
+Create a new warnet project in the specified directory
 
+options:
+| name      | type   | required   | default   |
+|-----------|--------|------------|-----------|
+| directory | Path   | yes        |           |
 
 ### `warnet run`
 Run a scenario from a file
@@ -58,6 +55,10 @@ options:
 | scenario_file   | Path   | yes        |           |
 | additional_args | String |            |           |
 
+### `warnet setup`
+Setup warnet
+
+
 ### `warnet status`
 Display the unified status of the Warnet network and active scenarios
 
@@ -72,14 +73,6 @@ options:
 
 ## Admin
 
-### `warnet admin create`
-Create a new warnet project in the specified directory
-
-options:
-| name      | type   | required   | default   |
-|-----------|--------|------------|-----------|
-| directory | Func   | yes        |           |
-
 ### `warnet admin init`
 Initialize a warnet project in the current directory
 

src/warnet/control.py

@@ -4,7 +4,9 @@
 import time
 
 import click
+import inquirer
 import yaml
+from inquirer.themes import GreenPassion
 from rich import print
 from rich.console import Console
 from rich.prompt import Confirm, Prompt
@@ -248,3 +250,50 @@ def run(scenario_file: str, additional_args: tuple[str]):
         print(f"Failed to start scenario: {scenario_name}")
 
     os.unlink(temp_file_path)
+
+
+@click.command()
+@click.argument("pod_name", type=str, default="")
+@click.option("--follow", "-f", is_flag=True, default=False, help="Follow logs")
+def logs(pod_name: str, follow: bool):
+    """Show the logs of a pod"""
+    follow_flag = "--follow" if follow else ""
+    namespace = get_default_namespace()
+
+    if pod_name:
+        try:
+            command = f"kubectl logs pod/{pod_name} -n {namespace} {follow_flag}"
+            stream_command(command)
+            return
+        except Exception as e:
+            print(f"Could not find the pod {pod_name}: {e}")
+
+    try:
+        pods = run_command(f"kubectl get pods -n {namespace} -o json")
+        pods = json.loads(pods)
+        pod_list = [item["metadata"]["name"] for item in pods["items"]]
+    except Exception as e:
+        print(f"Could not fetch any pods in namespace {namespace}: {e}")
+        return
+
+    if not pod_list:
+        print(f"Could not fetch any pods in namespace {namespace}")
+        return
+
+    q = [
+        inquirer.List(
+            name="pod",
+            message="Please choose a pod",
+            choices=pod_list,
+        )
+    ]
+    selected = inquirer.prompt(q, theme=GreenPassion())
+    if selected:
+        pod_name = selected["pod"]
+        try:
+            command = f"kubectl logs pod/{pod_name} -n {namespace} {follow_flag}"
+            stream_command(command)
+        except Exception as e:
+            print(f"Please consider waiting for the pod to become available. Encountered: {e}")
+    else:
+        pass  # cancelled by user