Fix printing stdout of rathole client subprocess

Author: neumark

splitgraph/cloud/tunnel_client.py

@@ -1,8 +1,9 @@
 import os
 import subprocess
-import sys
 from os import path
-from typing import IO, Optional, cast
+from typing import Optional
+
+from click import echo
 
 RATHOLE_CLIENT_CONFIG_FILENAME = "rathole-client.toml"
 
@@ -62,8 +63,8 @@ def write_rathole_client_config(
     local_address: str,
     tls_hostname: Optional[str],
 ) -> str:
-    # in production, this will be None, but for dev instances, we need to
-    # specify rootCA.pem
+    # If a specific root CA file is used (eg: for self-signed hosts), reference
+    # it in the rathole client config.
     trusted_root = os.environ.get("REQUESTS_CA_BUNDLE") or os.environ.get("SSL_CERT_FILE")
     rathole_client_config = get_rathole_client_config(
         tunnel_connect_address=f"{tunnel_connect_host}:{tunnel_connect_port}",
@@ -79,13 +80,7 @@ def write_rathole_client_config(
     return config_filename
 
 
-# inspired by https://stackoverflow.com/questions/18421757/live-output-from-subprocess-command
-def launch_rathole_client(rathole_client_binary_path: str, rathole_client_config_path: str) -> None:
-    process = subprocess.Popen(
-        [rathole_client_binary_path, "--client", rathole_client_config_path],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-    )
-    # pipe rathole process output to stdout
-    for c in iter(lambda: cast(IO[bytes], process.stdout).read(1), b""):  # nomypy
-        sys.stdout.buffer.write(c)
+def launch_rathole_client(rathole_client_config_path: str) -> None:
+    echo("launching rathole client")
+    command = [get_rathole_client_binary_path(), "--client", rathole_client_config_path]
+    subprocess.check_call(command)

splitgraph/commandline/cloud.py

@@ -18,7 +18,6 @@
 from splitgraph.cloud.models import AddExternalRepositoryRequest, IntrospectionMode
 from splitgraph.cloud.project.models import Metadata, SplitgraphYAML
 from splitgraph.cloud.tunnel_client import (
-    get_rathole_client_binary_path,
     launch_rathole_client,
     write_rathole_client_config,
 )
@@ -1248,8 +1247,7 @@ def start_repository_tunnel(
         tunnel_connect_host,
     )
 
-    print("launching rathole client")
-    launch_rathole_client(get_rathole_client_binary_path(), rathole_client_config_path)
+    launch_rathole_client(rathole_client_config_path)
 
 
 def start_ephemeral_tunnel(remote: str, local_address: str) -> None:
@@ -1272,11 +1270,10 @@ def start_ephemeral_tunnel(remote: str, local_address: str) -> None:
         local_address,
         tunnel_connect_host,
     )
-    print(
+    click.echo(
         f"To connect to {local_address} from Splitgraph, use the following connection parameters:\nHost: {private_address_host}\nPort: {private_address_port}"
     )
-    print("launching rathole client")
-    launch_rathole_client(get_rathole_client_binary_path(), rathole_client_config_path)
+    launch_rathole_client(rathole_client_config_path)
 
 
 @click.command("tunnel")
@@ -1293,17 +1290,17 @@ def tunnel_c(remote: str, repositories_file: List[Path], repository_or_local_add
     external repository specified in the argument.
     """
 
-    if repository_or_local_address.find("/") > -1:
+    if "/" in repository_or_local_address:
         repository: "CoreRepository" = RepositoryType(exists=False).convert(
             repository_or_local_address, None, None
         )
         external = _get_external_from_yaml(repositories_file, repository)[0]
         start_repository_tunnel(remote, repository, external)
 
-    elif repository_or_local_address.find(":") > -1:
+    elif ":" in repository_or_local_address:
         start_ephemeral_tunnel(remote, repository_or_local_address)
     else:
-        raise click.UsageError("argument should be of the form namespace/repository or host:port")
+        raise click.UsageError("Argument should be of the form namespace/repository or host:port")
 
 
 @click.group("cloud")