godfather-cli 2.2.0__tar.gz → 2.3.0__tar.gz

{godfather_cli-2.2.0/godfather_cli.egg-info → godfather_cli-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: godfather-cli
-Version: 2.2.0
+Version: 2.3.0
 Summary: Free compute for ASU students: connect to AI Society at ASU GPU pods
 Author-email: AI Society ASU <theaisocietyasu@gmail.com>
 License: MIT
@@ -84,7 +84,7 @@ Windows 10+ ship it.
 ### Interactive menu
 
 Running `godfather` with no arguments opens a menu. Use the arrow keys to
-choose Connect to a pod, List pods, Sessions, Status, Log out or Exit, and
+choose Connect to a pod, List pods, Sessions, Set up VS Code, Status, Log out or Exit, and
 press Enter. Ctrl-C quits.
 
 Connect to a pod shows a list of your pods with their status, access and
@@ -104,6 +104,8 @@ godfather connect                 # Connect to a pod, picking from a list
 godfather connect <pod-id>        # Connect to a specific pod
 godfather connect --admin         # Ask for a root shell (officers, when pod admin is on)
 godfather sessions                # Upcoming sessions on your pods, in local time
+godfather vscode                  # Set up VS Code Remote-SSH for a pod, picking from a list
+godfather vscode <pod-id>         # The same for one pod; run it again to renew the certificate
 godfather status                  # Show server, org, login, token expiry and version
 godfather auth                    # Log in with Discord in your browser
 godfather auth --paste            # Log in by pasting the token
@@ -114,6 +116,16 @@ godfather update                  # Update the CLI to the latest version
 godfather --api-url https://platform.example.com --org soda list
 ```
 
+### VS Code
+
+`godfather vscode` sets up a pod for the VS Code Remote - SSH extension:
+
+1. It gets a 12-hour certificate for the pod and saves it as `~/.godfather/ssh/<pod-id>-cert.pub`.
+2. It writes a `Host godfather-<pod-id>` block to `~/.godfather/ssh/config` and adds one `Include` line for that file at the top of `~/.ssh/config`.
+3. If the `code` command is on your PATH, it opens VS Code on `/workspace/users/<you>` on the pod. Otherwise run **Remote-SSH: Connect to Host...** in VS Code and pick `godfather-<pod-id>`.
+
+VS Code runs as your pod account (`godfather_<you>`), with the same files and limits as `godfather connect`. After 12 hours VS Code cannot reconnect; run `godfather vscode <pod-id>` again. The pod must run image 2.3.0 or later. `godfather vscode --admin` gives officers a root login on a pod with pod admin on.
+
 ## Files it keeps
 
 Everything lives in `~/.godfather/`:
@@ -121,6 +133,7 @@ Everything lives in `~/.godfather/`:
 - `config.json`: your token (mode 600). Treat it like a password.
 - `ssh/id_ed25519`, `ssh/id_ed25519.pub`: your SSH key, created on first connect. The private key never leaves your machine.
 - `ssh/id_ed25519-cert.pub`: the certificate for the last pod you connected to.
+- `ssh/<pod-id>-cert.pub`, `ssh/config`: the certificate and Host block of each pod set up for VS Code.
 
 Delete the folder to reset everything.
 

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/README.md

@@ -55,7 +55,7 @@ Windows 10+ ship it.
 ### Interactive menu
 
 Running `godfather` with no arguments opens a menu. Use the arrow keys to
-choose Connect to a pod, List pods, Sessions, Status, Log out or Exit, and
+choose Connect to a pod, List pods, Sessions, Set up VS Code, Status, Log out or Exit, and
 press Enter. Ctrl-C quits.
 
 Connect to a pod shows a list of your pods with their status, access and
@@ -75,6 +75,8 @@ godfather connect                 # Connect to a pod, picking from a list
 godfather connect <pod-id>        # Connect to a specific pod
 godfather connect --admin         # Ask for a root shell (officers, when pod admin is on)
 godfather sessions                # Upcoming sessions on your pods, in local time
+godfather vscode                  # Set up VS Code Remote-SSH for a pod, picking from a list
+godfather vscode <pod-id>         # The same for one pod; run it again to renew the certificate
 godfather status                  # Show server, org, login, token expiry and version
 godfather auth                    # Log in with Discord in your browser
 godfather auth --paste            # Log in by pasting the token
@@ -85,6 +87,16 @@ godfather update                  # Update the CLI to the latest version
 godfather --api-url https://platform.example.com --org soda list
 ```
 
+### VS Code
+
+`godfather vscode` sets up a pod for the VS Code Remote - SSH extension:
+
+1. It gets a 12-hour certificate for the pod and saves it as `~/.godfather/ssh/<pod-id>-cert.pub`.
+2. It writes a `Host godfather-<pod-id>` block to `~/.godfather/ssh/config` and adds one `Include` line for that file at the top of `~/.ssh/config`.
+3. If the `code` command is on your PATH, it opens VS Code on `/workspace/users/<you>` on the pod. Otherwise run **Remote-SSH: Connect to Host...** in VS Code and pick `godfather-<pod-id>`.
+
+VS Code runs as your pod account (`godfather_<you>`), with the same files and limits as `godfather connect`. After 12 hours VS Code cannot reconnect; run `godfather vscode <pod-id>` again. The pod must run image 2.3.0 or later. `godfather vscode --admin` gives officers a root login on a pod with pod admin on.
+
 ## Files it keeps
 
 Everything lives in `~/.godfather/`:
@@ -92,6 +104,7 @@ Everything lives in `~/.godfather/`:
 - `config.json`: your token (mode 600). Treat it like a password.
 - `ssh/id_ed25519`, `ssh/id_ed25519.pub`: your SSH key, created on first connect. The private key never leaves your machine.
 - `ssh/id_ed25519-cert.pub`: the certificate for the last pod you connected to.
+- `ssh/<pod-id>-cert.pub`, `ssh/config`: the certificate and Host block of each pod set up for VS Code.
 
 Delete the folder to reset everything.
 

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/godfather_cli/__init__.py

@@ -2,6 +2,6 @@
 Godfather CLI package
 """
 
-__version__ = "2.2.0"
+__version__ = "2.3.0"
 __author__ = "AI Society ASU"
 __email__ = "admin@ais-asu.com"

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/godfather_cli/cli.py

@@ -4,6 +4,8 @@
 import argparse
 import datetime
 import os
+import shutil
+import subprocess
 from pathlib import Path
 from typing import Dict, List, Optional
 
@@ -23,7 +25,7 @@ from .auth import (
 )
 from .picker import ask_menu, ask_pod, ask_yes, connectable, is_interactive
 from .pod_manager import EXPIRED, ApiError, PodManager, report
-from .ssh_connector import SSHConnector
+from .ssh_connector import USERNAME_RE, SSHConnector
 from .ui import BORDER, BOX, PURPLE, console, error, info, spinner, warning
 from .update_checker import check_for_updates, perform_update, show_update_warning
 
@@ -194,32 +196,77 @@ class GodfatherCLI:
             if not pod_id:
                 return
 
-        public_key = self.ssh_connector.ensure_keypair()
-        if not public_key:
+        ssh_info = self.fetch_certificate(pod_id, admin)
+        if not ssh_info:
+            return
+        if not self.ssh_connector.save_certificate(ssh_info.get('certificate', '')):
             return
+        if admin and not ssh_info.get('is_admin'):
+            warning("The server gave you a member shell, not root.")
+
+        self.ssh_connector.connect(ssh_info)
 
-        ssh_info = None
+    def fetch_certificate(self, pod_id: str, admin: bool = False) -> Optional[Dict]:
+        """The connection details with a fresh certificate, or None after printing why not."""
+        public_key = self.ssh_connector.ensure_keypair()
+        if not public_key:
+            return None
         for attempt in range(2):
             try:
                 with spinner(f"Getting a certificate for pod {pod_id[:12]}..."):
-                    ssh_info = self.pod_manager.fetch_connection_info(pod_id, public_key, admin=admin)
-                break
+                    return self.pod_manager.fetch_connection_info(pod_id, public_key, admin=admin)
             except ApiError as e:
                 if e.kind == EXPIRED and attempt == 0:
                     if self._offer_login(e):
                         continue
-                    return
+                    return None
                 report(e)
+                return None
+        return None
+
+    def setup_vscode(self, pod_id: str = None, admin: bool = False):
+        """Write an SSH config entry for a pod and open it in VS Code Remote-SSH."""
+        if not self.ensure_authenticated():
+            return
+        if not pod_id:
+            pod_id = self.choose_pod()
+            if not pod_id:
                 return
+
+        ssh_info = self.fetch_certificate(pod_id, admin)
         if not ssh_info:
             return
-
-        if not self.ssh_connector.save_certificate(ssh_info.get('certificate', '')):
+        cert_file = self.ssh_connector.pod_cert_file(pod_id)
+        if not self.ssh_connector.save_certificate(ssh_info.get('certificate', ''), cert_file):
+            return
+        alias = self.ssh_connector.write_host(pod_id, ssh_info, Path.home() / '.ssh' / 'config')
+        if not alias:
             return
-        if admin and not ssh_info.get('is_admin'):
-            warning("The server gave you a member shell, not root.")
 
-        self.ssh_connector.connect(ssh_info)
+        is_admin = bool(ssh_info.get('is_admin'))
+        if admin and not is_admin:
+            warning("The server gave you a member certificate, not root.")
+        user_folder = str(ssh_info.get('user_folder', ''))
+        folder = f"/workspace/users/{user_folder}" if USERNAME_RE.match(user_folder) else '/workspace'
+        steps = (
+            f"[bold]Host[/bold]      {alias}  [dim](in ~/.ssh/config)[/dim]\n"
+            f"[bold]Folder[/bold]    {folder}\n"
+            f"[bold]Valid[/bold]     12 hours. Run [bold]godfather vscode {pod_id}[/bold] again to renew.\n\n"
+            "In VS Code: install the Remote - SSH extension, run [bold]Remote-SSH: Connect to Host...[/bold],\n"
+            f"pick [bold]{alias}[/bold], then open {folder}."
+        )
+        if is_admin:
+            steps += "\n[yellow]This is a root login. Changes to system files affect every user of the pod.[/yellow]"
+        console.print(Panel(steps, title="VS Code is set up", border_style=BORDER, box=BOX))
+
+        code = shutil.which('code')
+        if code:
+            uri = f'vscode-remote://ssh-remote+{alias}{folder}'
+            try:
+                subprocess.Popen([code, '--folder-uri', uri])
+                info("Opening VS Code...")
+            except OSError:
+                pass
 
     def status(self):
         """Print the server, org, login, token and version details."""
@@ -285,6 +332,8 @@ class GodfatherCLI:
             self.list_pods()
         elif action == picker.SESSIONS:
             self.list_sessions()
+        elif action == picker.VSCODE:
+            self.setup_vscode()
         elif action == picker.STATUS:
             self.status()
         elif action == picker.LOGIN:
@@ -320,7 +369,8 @@ class GodfatherCLI:
             '3': picker.STATUS,
             '4': picker.LOGOUT,
             '5': picker.SESSIONS,
-            '6': picker.EXIT,
+            '6': picker.VSCODE,
+            '7': picker.EXIT,
         }
         while True:
             console.print()
@@ -332,7 +382,8 @@ class GodfatherCLI:
             menu.add_row("3.", "Show status")
             menu.add_row("4.", "Log out")
             menu.add_row("5.", "Show sessions")
-            menu.add_row("6.", "Exit")
+            menu.add_row("6.", "Set up VS Code")
+            menu.add_row("7.", "Exit")
             console.print(Panel(menu, title="What would you like to do?", border_style=BORDER, box=BOX))
 
             try:
@@ -370,6 +421,8 @@ Examples:
   godfather connect <pod-id>    Connect to a specific pod
   godfather connect --admin     Connect as root (officers, on a pod with pod admin on)
   godfather sessions            Show upcoming sessions on your pods
+  godfather vscode              Set up VS Code Remote-SSH for a pod, picking from a list
+  godfather vscode <pod-id>     Set up VS Code for a pod, or renew its 12-hour certificate
   godfather status              Show login and configuration status
   godfather auth                Log in with Discord in your browser
   godfather auth --paste        Log in by pasting the token (browser on another computer)
@@ -383,20 +436,20 @@ Questions or issues: https://discord.gg/fXWXwz6fEG
     parser.add_argument(
         'command',
         nargs='?',
-        choices=['list', 'connect', 'sessions', 'status', 'logout', 'auth', 'update'],
+        choices=['list', 'connect', 'vscode', 'sessions', 'status', 'logout', 'auth', 'update'],
         help='Command to run (omit to open the interactive menu)',
     )
-    parser.add_argument('pod_id', nargs='?', help='Pod ID to connect to (only used with "connect")')
+    parser.add_argument('pod_id', nargs='?', help='Pod ID (with "connect" or "vscode")')
     parser.add_argument('--api-url', help='Use a specific platform API URL instead of the default')
     parser.add_argument('--org', help='Organization prefix on the platform (default: ais)')
     parser.add_argument('--paste', action='store_true', help='With "auth": paste the token, no browser sign-in')
-    parser.add_argument('--admin', action='store_true', help='With "connect": ask for a root shell')
+    parser.add_argument('--admin', action='store_true', help='With "connect" or "vscode": ask for root')
 
     args = parser.parse_args()
     if args.paste and args.command != 'auth':
         parser.error('--paste works only with "auth"')
-    if args.admin and args.command != 'connect':
-        parser.error('--admin works only with "connect"')
+    if args.admin and args.command not in ('connect', 'vscode'):
+        parser.error('--admin works only with "connect" and "vscode"')
 
     if args.api_url:
         os.environ['GODFATHER_API_URL'] = args.api_url
@@ -420,6 +473,8 @@ Questions or issues: https://discord.gg/fXWXwz6fEG
         cli.list_pods()
     elif args.command == 'connect':
         cli.connect_to_pod(args.pod_id, admin=args.admin)
+    elif args.command == 'vscode':
+        cli.setup_vscode(args.pod_id, admin=args.admin)
     elif args.command == 'sessions':
         cli.list_sessions()
     elif args.command == 'status':

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/godfather_cli/picker.py

@@ -40,6 +40,7 @@ STATUS_CLASS = {
 CONNECT = 'connect'
 LIST = 'list'
 SESSIONS = 'sessions'
+VSCODE = 'vscode'
 STATUS = 'status'
 LOGIN = 'login'
 LOGOUT = 'logout'
@@ -117,6 +118,7 @@ def menu_options(logged_in: bool) -> List[Tuple[str, str, str]]:
         (CONNECT, 'Connect to a pod', 'Pick a running pod and open an SSH session'),
         (LIST, 'List pods', 'Show every pod you can use, with its status and ID'),
         (SESSIONS, 'Sessions', 'Upcoming sessions on your pods'),
+        (VSCODE, 'Set up VS Code', 'Open a pod in VS Code Remote-SSH'),
         (STATUS, 'Status', 'Server, org, login, token expiry and CLI version'),
         account,
         (EXIT, 'Exit', 'Quit Godfather'),

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/godfather_cli/ssh_connector.py

@@ -11,6 +11,55 @@ from rich.panel import Panel
 from .ui import BORDER, BOX, console, error, success
 
 USERNAME_RE = re.compile(r'^[a-z0-9_][a-z0-9._-]{0,21}$')
+POD_ID_RE = re.compile(r'^[A-Za-z0-9_-]{1,64}$')
+# The line in ~/.ssh/config that loads the Host blocks this CLI writes.
+INCLUDE_MARK = '# Added by godfather-cli for VS Code Remote-SSH'
+
+
+def host_alias(pod_id: str) -> str:
+    """The ssh_config Host name of a pod."""
+    return f'godfather-{pod_id}'
+
+
+def host_block(alias: str, ssh_info: Dict, key_file: Path, cert_file: Path) -> str:
+    """One ssh_config Host block for a pod, with the CLI key and the pod certificate."""
+    return '\n'.join(
+        [
+            f'Host {alias}',
+            f'    HostName {ssh_info["host"]}',
+            f'    Port {ssh_info.get("port", 22)}',
+            f'    User {ssh_info.get("username", "root")}',
+            f'    IdentityFile "{key_file.as_posix()}"',
+            f'    CertificateFile "{cert_file.as_posix()}"',
+            '    IdentitiesOnly yes',
+            '    StrictHostKeyChecking no',
+            '    UserKnownHostsFile /dev/null',
+            '    LogLevel ERROR',
+            '',
+        ]
+    )
+
+
+def replace_block(text: str, alias: str, block: str) -> str:
+    """The config text with the Host block of alias replaced by block, or block appended."""
+    kept: List[str] = []
+    skipping = False
+    for line in text.splitlines():
+        if line.startswith('Host '):
+            skipping = line.split()[1:] == [alias]
+        if not skipping:
+            kept.append(line)
+    body = '\n'.join(kept).strip()
+    return (body + '\n\n' if body else '') + block
+
+
+def with_include(text: str, include_file: Path) -> str:
+    """The ~/.ssh/config text with an Include of include_file at the top, added once."""
+    line = f'Include "{include_file.as_posix()}"'
+    if line in text.splitlines():
+        return text
+    # Include must come before the first Host block to apply to every host.
+    return f'{INCLUDE_MARK}\n{line}\n\n{text}'
 
 
 class SSHConnector:
@@ -57,13 +106,17 @@ class SSHConnector:
             error(f"Failed to read SSH public key: {e}")
             return None
 
-    def save_certificate(self, certificate: str) -> bool:
+    def pod_cert_file(self, pod_id: str) -> Path:
+        """Where the certificate for one pod is kept for VS Code. Each pod has its own."""
+        return self.ssh_key_dir / f'{pod_id}-cert.pub'
+
+    def save_certificate(self, certificate: str, path: Optional[Path] = None) -> bool:
         """Store the certificate the API issued for this connection."""
         if not certificate:
             error("The server did not issue an SSH certificate. Update the CLI: pip install -U godfather-cli")
             return False
         try:
-            self.cert_file.write_text(certificate.strip() + '\n')
+            (path or self.cert_file).write_text(certificate.strip() + '\n')
             return True
         except OSError as e:
             error(f"Failed to save SSH certificate: {e}")
@@ -145,3 +198,26 @@ class SSHConnector:
 
         success("Disconnected")
         return 0
+
+    def write_host(self, pod_id: str, ssh_info: Dict, ssh_config: Path) -> Optional[str]:
+        """Write the Host block of a pod and include it from ssh_config. Returns the Host name, or None."""
+        if not POD_ID_RE.match(pod_id) or not ssh_info.get('host'):
+            error("Incomplete connection details from the server")
+            return None
+        alias = host_alias(pod_id)
+        own_config = self.ssh_key_dir / 'config'
+        block = host_block(alias, ssh_info, self.key_file, self.pod_cert_file(pod_id))
+        try:
+            old = own_config.read_text() if own_config.exists() else ''
+            own_config.write_text(replace_block(old, alias, block))
+            os.chmod(own_config, 0o600)
+            ssh_config.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
+            text = ssh_config.read_text() if ssh_config.exists() else ''
+            updated = with_include(text, own_config)
+            if updated != text:
+                ssh_config.write_text(updated)
+                os.chmod(ssh_config, 0o600)
+        except OSError as e:
+            error(f"Failed to write the SSH config: {e}")
+            return None
+        return alias

{godfather_cli-2.2.0 → godfather_cli-2.3.0/godfather_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: godfather-cli
-Version: 2.2.0
+Version: 2.3.0
 Summary: Free compute for ASU students: connect to AI Society at ASU GPU pods
 Author-email: AI Society ASU <theaisocietyasu@gmail.com>
 License: MIT
@@ -84,7 +84,7 @@ Windows 10+ ship it.
 ### Interactive menu
 
 Running `godfather` with no arguments opens a menu. Use the arrow keys to
-choose Connect to a pod, List pods, Sessions, Status, Log out or Exit, and
+choose Connect to a pod, List pods, Sessions, Set up VS Code, Status, Log out or Exit, and
 press Enter. Ctrl-C quits.
 
 Connect to a pod shows a list of your pods with their status, access and
@@ -104,6 +104,8 @@ godfather connect                 # Connect to a pod, picking from a list
 godfather connect <pod-id>        # Connect to a specific pod
 godfather connect --admin         # Ask for a root shell (officers, when pod admin is on)
 godfather sessions                # Upcoming sessions on your pods, in local time
+godfather vscode                  # Set up VS Code Remote-SSH for a pod, picking from a list
+godfather vscode <pod-id>         # The same for one pod; run it again to renew the certificate
 godfather status                  # Show server, org, login, token expiry and version
 godfather auth                    # Log in with Discord in your browser
 godfather auth --paste            # Log in by pasting the token
@@ -114,6 +116,16 @@ godfather update                  # Update the CLI to the latest version
 godfather --api-url https://platform.example.com --org soda list
 ```
 
+### VS Code
+
+`godfather vscode` sets up a pod for the VS Code Remote - SSH extension:
+
+1. It gets a 12-hour certificate for the pod and saves it as `~/.godfather/ssh/<pod-id>-cert.pub`.
+2. It writes a `Host godfather-<pod-id>` block to `~/.godfather/ssh/config` and adds one `Include` line for that file at the top of `~/.ssh/config`.
+3. If the `code` command is on your PATH, it opens VS Code on `/workspace/users/<you>` on the pod. Otherwise run **Remote-SSH: Connect to Host...** in VS Code and pick `godfather-<pod-id>`.
+
+VS Code runs as your pod account (`godfather_<you>`), with the same files and limits as `godfather connect`. After 12 hours VS Code cannot reconnect; run `godfather vscode <pod-id>` again. The pod must run image 2.3.0 or later. `godfather vscode --admin` gives officers a root login on a pod with pod admin on.
+
 ## Files it keeps
 
 Everything lives in `~/.godfather/`:
@@ -121,6 +133,7 @@ Everything lives in `~/.godfather/`:
 - `config.json`: your token (mode 600). Treat it like a password.
 - `ssh/id_ed25519`, `ssh/id_ed25519.pub`: your SSH key, created on first connect. The private key never leaves your machine.
 - `ssh/id_ed25519-cert.pub`: the certificate for the last pod you connected to.
+- `ssh/<pod-id>-cert.pub`, `ssh/config`: the certificate and Host block of each pod set up for VS Code.
 
 Delete the folder to reset everything.
 

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/godfather_cli.egg-info/SOURCES.txt

@@ -19,4 +19,5 @@ godfather_cli.egg-info/requires.txt
 godfather_cli.egg-info/top_level.txt
 tests/test_cli.py
 tests/test_login.py
-tests/test_sessions.py
+tests/test_sessions.py
+tests/test_vscode.py

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "godfather-cli"
-version = "2.2.0"
+version = "2.3.0"
 description = "Free compute for ASU students: connect to AI Society at ASU GPU pods"
 authors = [
     {name = "AI Society ASU", email = "theaisocietyasu@gmail.com"}

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/tests/test_cli.py

@@ -145,7 +145,7 @@ def test_menu_offers_login_or_logout():
     from godfather_cli.picker import LOGIN, LOGOUT, menu_options
 
     actions = [action for action, _, _ in menu_options(True)]
-    assert actions == ['connect', 'list', 'sessions', 'status', LOGOUT, 'exit']
+    assert actions == ['connect', 'list', 'sessions', 'vscode', 'status', LOGOUT, 'exit']
     assert (LOGIN, 'Log in', 'Sign in with Discord in your browser') in menu_options(False)
 
 

{godfather_cli-2.2.0 → godfather_cli-2.3.0}/tests/test_sessions.py

@@ -92,7 +92,7 @@ def test_menus_offer_sessions(tmp_path, monkeypatch):
     monkeypatch.setattr(cli_module.Path, 'home', lambda: tmp_path)
     monkeypatch.delenv('GODFATHER_API_URL', raising=False)
     godfather = cli_module.GodfatherCLI()
-    answers = iter(['5', '6'])
+    answers = iter(['5', '7'])
     ran = []
     monkeypatch.setattr(cli_module.Prompt, 'ask', lambda *a, **kw: next(answers))
     monkeypatch.setattr(godfather, 'run_action', ran.append)

godfather_cli-2.3.0/tests/test_vscode.py

@@ -0,0 +1,98 @@
+from pathlib import Path
+
+from godfather_cli import cli as cli_module
+from godfather_cli.ssh_connector import INCLUDE_MARK, SSHConnector, host_alias, host_block, replace_block, with_include
+
+INFO = {
+    'host': '203.0.113.7',
+    'port': 22041,
+    'username': 'root',
+    'user_folder': 'alice',
+    'is_admin': False,
+    'certificate': 'ssh-ed25519-cert-v01@openssh.com AAAA cert',
+}
+
+
+def test_host_block_points_at_the_pod_certificate(tmp_path):
+    block = host_block('godfather-pod1', INFO, tmp_path / 'id_ed25519', tmp_path / 'pod1-cert.pub')
+    lines = block.splitlines()
+    assert lines[0] == 'Host godfather-pod1'
+    assert '    HostName 203.0.113.7' in lines
+    assert '    Port 22041' in lines
+    assert '    User root' in lines
+    assert f'    CertificateFile "{(tmp_path / "pod1-cert.pub").as_posix()}"' in lines
+    assert '    IdentitiesOnly yes' in lines
+
+
+def test_replace_block_keeps_other_pods_and_replaces_the_same_pod():
+    first = replace_block('', 'godfather-a', 'Host godfather-a\n    Port 1\n')
+    both = replace_block(first, 'godfather-b', 'Host godfather-b\n    Port 2\n')
+    renewed = replace_block(both, 'godfather-a', 'Host godfather-a\n    Port 3\n')
+    assert renewed.count('Host godfather-a') == 1
+    assert 'Port 1' not in renewed
+    assert 'Port 2' in renewed and 'Port 3' in renewed
+
+
+def test_with_include_goes_first_and_only_once(tmp_path):
+    own = tmp_path / 'config'
+    text = with_include('Host work\n    User me\n', own)
+    assert text.splitlines()[0] == INCLUDE_MARK
+    assert text.splitlines()[1] == f'Include "{own.as_posix()}"'
+    assert text.endswith('Host work\n    User me\n')
+    assert with_include(text, own) == text
+
+
+def test_write_host_writes_both_files(tmp_path):
+    connector = SSHConnector(tmp_path / '.godfather')
+    connector.ssh_key_dir.mkdir(parents=True)
+    ssh_config = tmp_path / '.ssh' / 'config'
+    assert connector.write_host('pod1', INFO, ssh_config) == host_alias('pod1')
+    assert 'Host godfather-pod1' in (connector.ssh_key_dir / 'config').read_text()
+    assert ssh_config.read_text().count('Include') == 1
+    connector.write_host('pod1', INFO, ssh_config)
+    assert ssh_config.read_text().count('Include') == 1
+
+
+def test_write_host_refuses_a_strange_pod_id(tmp_path):
+    connector = SSHConnector(tmp_path / '.godfather')
+    connector.ssh_key_dir.mkdir(parents=True)
+    assert connector.write_host('pod1\nHost *', INFO, tmp_path / '.ssh' / 'config') is None
+
+
+def test_setup_vscode_saves_a_certificate_for_each_pod(tmp_path, monkeypatch):
+    monkeypatch.setattr(cli_module.Path, 'home', lambda: tmp_path)
+    monkeypatch.delenv('GODFATHER_API_URL', raising=False)
+    monkeypatch.setattr(cli_module.shutil, 'which', lambda name: None)
+    godfather = cli_module.GodfatherCLI()
+    monkeypatch.setattr(godfather, 'ensure_authenticated', lambda: True)
+    monkeypatch.setattr(godfather.ssh_connector, 'ensure_keypair', lambda: 'ssh-ed25519 AAAA')
+    asked = []
+
+    def fetch(pod_id, public_key, admin=False):
+        asked.append((pod_id, admin))
+        return INFO
+
+    monkeypatch.setattr(godfather.pod_manager, 'fetch_connection_info', fetch)
+    godfather.ssh_connector.ssh_key_dir.mkdir(parents=True)
+    godfather.setup_vscode('pod1')
+    godfather.setup_vscode('pod2', admin=True)
+
+    assert asked == [('pod1', False), ('pod2', True)]
+    key_dir = Path(godfather.ssh_connector.ssh_key_dir)
+    assert (key_dir / 'pod1-cert.pub').read_text().startswith('ssh-ed25519-cert')
+    assert (key_dir / 'pod2-cert.pub').exists()
+    own = (key_dir / 'config').read_text()
+    assert 'Host godfather-pod1' in own and 'Host godfather-pod2' in own
+    assert (tmp_path / '.ssh' / 'config').exists()
+
+
+def test_admin_flag_works_with_vscode(monkeypatch):
+    calls = []
+    monkeypatch.setattr(
+        cli_module,
+        'GodfatherCLI',
+        lambda: type('C', (), {'setup_vscode': lambda s, p, admin: calls.append((p, admin))})(),
+    )
+    monkeypatch.setattr('sys.argv', ['godfather', 'vscode', 'pod1', '--admin'])
+    cli_module.main()
+    assert calls == [('pod1', True)]