outerbounds 0.8.0rc0__py3-none-any.whl → 0.8.0rc3__py3-none-any.whl

outerbounds/command_groups/workstations_cli.py

@@ -598,7 +598,11 @@ def show_relevant_links(config_dir=None, profile=None, perimeter_id="", output="
             click.secho("Error: {}".format(str(e)), fg="red", err=True)
 
 
-@cli.command(help="Prepare a workstation for SSH access")
+WORKSTATION_CONNECT_MODE = "workstation-connect"
+WORKSTATION_INIT_MODE = "workstation-init"
+
+
+@cli.command(help="Prepare a workstation for SSH access", hidden=True)
 @click.option(
     "--workstation-id",
     default="",
@@ -611,15 +615,55 @@ def show_relevant_links(config_dir=None, profile=None, perimeter_id="", output="
     help="The context to use for the setup command",
     type=click.Choice(["local", "remote"]),
 )
-def prepare_for_ssh_access(workstation_id="", setup_context=""):
+@click.option(
+    "--output",
+    "-o",
+    default="",
+    help="Show output in the specified format.",
+    type=click.Choice(["json", ""]),
+)
+@click.option(
+    "--mode",
+    default="workstation-connect",
+    help="The mode in which the command is being run.",
+    type=click.Choice([WORKSTATION_CONNECT_MODE, WORKSTATION_INIT_MODE]),
+)
+def prepare_for_ssh_access(
+    workstation_id="", setup_context="", output="", mode=WORKSTATION_CONNECT_MODE
+):
     """
     Finds the pod whose WORKSTATION_NAME env var matches `workstation_name`
     and opens an interactive bash shell in its "workstation" container.
     """
-    if setup_context == "local":
-        prepare_for_ssh_access_local(workstation_id)
-    elif setup_context == "remote":
-        prepare_for_ssh_access_remote()
+
+    # Workstation Init is only supported on remote workstation.
+    if mode == WORKSTATION_INIT_MODE and setup_context == "local":
+        raise Exception("workstation-init mode is not supported for local setup")
+
+    response = {
+        "status": "OK",
+        "message": "SSH access prepared successfully",
+    }
+    try:
+        if setup_context == "local":
+            prepare_for_ssh_access_local(workstation_id)
+        elif setup_context == "remote":
+            prepare_for_ssh_access_remote(mode)
+    except Exception as e:
+        response["message"] = str(e)
+        response["status"] = "FAIL"
+        if output == "json":
+            click.echo(json.dumps(response, indent=4))
+        else:
+            click.secho(f"Failed to prepare for SSH access: {str(e)}", fg="red")
+            click.secho("Error: {}".format(str(e)), fg="red")
+
+    if output == "json":
+        click.echo(json.dumps(response, indent=4))
+    else:
+        click.secho(
+            f"SSH access prepared successfully: {response['message']}", fg="green"
+        )
 
 
 def prepare_for_ssh_access_local(workstation_id):
@@ -672,7 +716,7 @@ def prepare_for_ssh_access_local(workstation_id):
         raise Exception(f"Failed to add entry to ssh config: {msg}")
 
 
-def prepare_for_ssh_access_remote():
+def prepare_for_ssh_access_remote(mode: str):
     """
     SSH connection requires both local instance and workstation pod to do some work.
     This function takes care of the remote instance.
@@ -685,16 +729,20 @@ def prepare_for_ssh_access_remote():
     if "WORKSTATION_ID" not in os.environ:
         raise Exception("This can only be run from a workstation!")
 
-    ok, message = ssh_utils.best_effort_install_ssh_netcat()
+    ok, message = ssh_utils.best_effort_install_remote_deps()
     if not ok:
-        raise Exception(f"Failed to install ssh and netcat: {message}")
+        raise Exception(f"Failed to install deps in remote instance: {message}")
 
     ok, msg = ssh_utils.configure_ssh_server()
     if not ok:
         raise Exception(f"Failed to configure ssh server: {msg}")
 
-    ok, msg = ssh_utils.ensure_public_key_registered_in_ssh_agent()
-    if not ok:
-        raise Exception(f"Failed to ensure public key registered in ssh agent: {msg}")
+    # SSH keys can only be guaranteed to be present when a connection is initiated.
+    if mode == WORKSTATION_CONNECT_MODE:
+        ok, msg = ssh_utils.ensure_public_key_registered_in_ssh_agent()
+        if not ok:
+            raise Exception(
+                f"Failed to ensure public key registered in ssh agent: {msg}"
+            )
 
     ssh_utils.add_env_loader_to_bashrc()

outerbounds/utils/ssh_utils.py

@@ -318,7 +318,7 @@ fi
         return False
 
 
-def best_effort_install_ssh_netcat():
+def best_effort_install_remote_deps():
     """
     Best effort installation of openssh-server and netcat.
 
@@ -369,42 +369,49 @@ def best_effort_install_ssh_netcat():
                 "install": "apt-get install -y",
                 "ssh_package": "openssh-server",
                 "nc_packages": ["netcat-openbsd", "netcat-traditional", "netcat"],
+                "curl_package": "curl",
             },
             "apt": {
                 "update": "apt update",
                 "install": "apt install -y",
                 "ssh_package": "openssh-server",
                 "nc_packages": ["netcat-openbsd", "netcat-traditional", "netcat"],
+                "curl_package": "curl",
             },
             "yum": {
                 "update": "yum makecache",
                 "install": "yum install -y",
                 "ssh_package": "openssh-server",
                 "nc_packages": ["nmap-ncat", "nc", "netcat"],
+                "curl_package": "curl",
             },
             "dnf": {
                 "update": "dnf makecache",
                 "install": "dnf install -y",
                 "ssh_package": "openssh-server",
                 "nc_packages": ["nmap-ncat", "nc", "netcat"],
+                "curl_package": "curl",
             },
             "zypper": {
                 "update": "zypper refresh",
                 "install": "zypper install -n",
                 "ssh_package": "openssh",
                 "nc_packages": ["netcat-openbsd", "gnu-netcat", "netcat"],
+                "curl_package": "curl",
             },
             "pacman": {
                 "update": "pacman -Sy",
                 "install": "pacman -S --noconfirm",
                 "ssh_package": "openssh",
                 "nc_packages": ["gnu-netcat", "openbsd-netcat"],
+                "curl_package": "curl",
             },
             "apk": {
                 "update": "apk update",
                 "install": "apk add --no-cache",
                 "ssh_package": "openssh-server",
-                "nc_packages": ["netcat-openbsd", "busybox"],
+                "nc_packages": ["netcat-openbsd"],
+                "curl_package": "curl",
             },
         }
 
@@ -431,9 +438,10 @@ def best_effort_install_ssh_netcat():
         or check_command_exists("netcat")
         or check_command_exists("ncat")
     )
+    curl_installed = check_command_exists("curl")
 
-    if ssh_installed and nc_installed:
-        return True, "Both openssh-server and netcat are already installed"
+    if ssh_installed and nc_installed and curl_installed:
+        return True, "openssh-server, netcat, and curl are already installed"
 
     # Prepare status messages
     status = []
@@ -441,6 +449,8 @@ def best_effort_install_ssh_netcat():
         status.append("openssh-server is already installed")
     if nc_installed:
         status.append("netcat is already installed")
+    if curl_installed:
+        status.append("curl is already installed")
 
     # Step 2 & 3: Check sudo availability and access
     has_sudo = check_command_exists("sudo")
@@ -504,6 +514,15 @@ def best_effort_install_ssh_netcat():
             or check_command_exists("ncat")
         )
 
+    # Install curl if needed
+    if not curl_installed:
+        curl_package = pm_config["curl_package"]
+        if install_package(curl_package, pm_config, use_sudo):
+            status.append(f"Successfully installed {curl_package}")
+            curl_installed = check_command_exists("curl")
+        else:
+            status.append(f"Failed to install {curl_package}")
+
     # Step 7: Final check and return appropriate message
     ssh_final = check_ssh_server()
     nc_final = (
@@ -511,10 +530,11 @@ def best_effort_install_ssh_netcat():
         or check_command_exists("netcat")
         or check_command_exists("ncat")
     )
+    curl_final = check_command_exists("curl")
 
-    if ssh_final and nc_final:
+    if ssh_final and nc_final and curl_final:
         return True, "Successfully installed all required packages. " + " ".join(status)
-    elif ssh_final or nc_final:
+    elif ssh_final or nc_final or curl_final:
         installed = []
         missing = []
         if ssh_final:

{outerbounds-0.8.0rc0.dist-info → outerbounds-0.8.0rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.8.0rc0
+Version: 0.8.0rc3
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps

{outerbounds-0.8.0rc0.dist-info → outerbounds-0.8.0rc3.dist-info}/RECORD

@@ -51,16 +51,16 @@ outerbounds/command_groups/local_setup_cli.py,sha256=tuuqJRXQ_guEwOuQSIf9wkUU0yg
 outerbounds/command_groups/perimeters_cli.py,sha256=iF_Uw7ROiSctf6FgoJEy30iDBLVE1j9FKuR3shgJRmc,19050
 outerbounds/command_groups/secrets_cli.py,sha256=Vgn_aiTo76a0s5hCJhNWEOrCVhyYeivD08ooQxz0y7c,2952
 outerbounds/command_groups/tutorials_cli.py,sha256=UInFyiMqtscHFfi8YQwiY_6Sdw9quJOtRu5OukEBccw,3522
-outerbounds/command_groups/workstations_cli.py,sha256=GARk9r0ulsoNQytYxHipnWmUHprZSyd-b0ZZFHO2BOE,25631
+outerbounds/command_groups/workstations_cli.py,sha256=-VFJqIvi_jcHcydaMLj8EaZ-Lbe-yBukkd9QCKrH5f0,27201
 outerbounds/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/utils/kubeconfig.py,sha256=yvcyRXGR4AhQuqUDqmbGxEOHw5ixMFV0AZIDg1LI_Qo,7981
 outerbounds/utils/kubectl_utils.py,sha256=y01xZ2AGW3CCnCbX7t9pfrhWsR9pDAyzlYiKdnZ-CK8,1916
 outerbounds/utils/metaflowconfig.py,sha256=l2vJbgPkLISU-XPGZFaC8ZKmYFyJemlD6bwB-EKUsAw,5770
 outerbounds/utils/schema.py,sha256=lMUr9kNgn9wy-sO_t_Tlxmbt63yLeN4b0xQXbDUDj4A,2331
-outerbounds/utils/ssh_utils.py,sha256=A6rgi307DmBTdhDj7V7Tm-OYgMj2xRyx770t2FKs9uw,18737
+outerbounds/utils/ssh_utils.py,sha256=MRJ7Oy0M7Lqqs397JDJczTYvxvyHJ_XvBdjt4ZYKaPE,19599
 outerbounds/utils/utils.py,sha256=4Z8cszNob_8kDYCLNTrP-wWads_S_MdL3Uj3ju4mEsk,501
 outerbounds/vendor.py,sha256=gRLRJNXtZBeUpPEog0LOeIsl6GosaFFbCxUvR4bW6IQ,5093
-outerbounds-0.8.0rc0.dist-info/METADATA,sha256=fMzhxYpFyR-dUkbMw5AsEoiepHwWVwlnB-_0CsrFs7U,1825
-outerbounds-0.8.0rc0.dist-info/entry_points.txt,sha256=AP6rZg7y5SK9e9a9iVq0Fi9Q2KPjPZSwtZ6R98rLw-8,56
-outerbounds-0.8.0rc0.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-outerbounds-0.8.0rc0.dist-info/RECORD,,
+outerbounds-0.8.0rc3.dist-info/METADATA,sha256=XMtUoeg6yt2zrgiGZhgJ7t5FJ90ovnVid4i4jn3NudU,1825
+outerbounds-0.8.0rc3.dist-info/entry_points.txt,sha256=AP6rZg7y5SK9e9a9iVq0Fi9Q2KPjPZSwtZ6R98rLw-8,56
+outerbounds-0.8.0rc3.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+outerbounds-0.8.0rc3.dist-info/RECORD,,