truefoundry 0.7.0rc4__tar.gz → 0.7.0rc5__tar.gz

{truefoundry-0.7.0rc4 → truefoundry-0.7.0rc5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.7.0rc4
+Version: 0.7.0rc5
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1

{truefoundry-0.7.0rc4 → truefoundry-0.7.0rc5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.7.0rc4"  # This is a placeholder version, it will be replaced when releasing
+version = "0.7.0rc5"  # This is a placeholder version, it will be replaced when releasing
 requires-python = ">=3.8.1,<3.14"
 description = "TrueFoundry CLI"
 authors = [{ name = "TrueFoundry Team", email = "abhishek@truefoundry.com" }]

{truefoundry-0.7.0rc4 → truefoundry-0.7.0rc5}/truefoundry/deploy/cli/commands/get_command.py

@@ -1,6 +1,7 @@
 import rich_click as click
 
 from truefoundry.cli.const import GROUP_CLS
+from truefoundry.common.utils import is_internal_env_set
 from truefoundry.deploy.cli.commands.k8s_exec_credential_command import (
     k8s_exec_credential_command,
 )
@@ -17,13 +18,13 @@ def get_command():
 
     \b
     Supported resources:
-    - Kubernetes Exec Credential
     - Kubeconfig
     """
     pass
 
 
 def get_get_command():
-    get_command.add_command(k8s_exec_credential_command)
     get_command.add_command(kubeconfig_command)
+    if is_internal_env_set():
+        get_command.add_command(k8s_exec_credential_command)
     return get_command

{truefoundry-0.7.0rc4 → truefoundry-0.7.0rc5}/truefoundry/deploy/cli/commands/k8s_exec_credential_command.py

@@ -41,7 +41,7 @@ def k8s_exec_credential_command(cluster: str) -> None:
     server_url: Optional[str] = get_cluster_server_url(kubeconfig, cluster)
     if not server_url:
         raise click.ClickException(
-            f"Context `{CONTEXT_NAME_FORMAT.format(cluster=cluster)}` for cluster `{cluster}` not found in kubeconfig. \n\nPlease run `tfy get kubeconfig --cluster {cluster}` first."
+            f"\nContext {CONTEXT_NAME_FORMAT.format(cluster=cluster)!r} for cluster {cluster!r} not found in kubeconfig. \n\nPlease run 'tfy get kubeconfig --cluster {cluster}' first."
         )
     host: str = f"{urlparse(server_url).scheme}://{urlparse(server_url).netloc}"
     login(host=host, output_hook=NoOutputCallBack())

truefoundry-0.7.0rc5/truefoundry/deploy/cli/commands/kubeconfig_command.py

@@ -0,0 +1,129 @@
+from typing import Any, Dict, Optional
+from urllib.parse import urljoin
+
+import questionary
+import rich_click as click
+from rich.console import Console
+
+from truefoundry.cli.const import COMMAND_CLS
+from truefoundry.cli.util import handle_exception_wrapper
+from truefoundry.common.session import Session
+from truefoundry.deploy.cli.commands.utils import (
+    CONTEXT_NAME_FORMAT,
+    add_update_cluster_context,
+    get_cluster_server_url,
+    get_kubeconfig_content,
+    get_kubeconfig_path,
+    save_kubeconfig,
+)
+
+console = Console()
+
+
+def _select_cluster(cluster: Optional[str] = None) -> str:
+    """
+    Retrieve available clusters and either return the specified one after validation
+    or allow the user to interactively select from the list.
+    """
+    from truefoundry.deploy.lib.clients.servicefoundry_client import (
+        ServiceFoundryServiceClient,
+    )
+
+    clusters = ServiceFoundryServiceClient().list_clusters()
+
+    if not clusters:
+        raise click.ClickException("No clusters found in your account.")
+
+    if cluster:
+        if not any(c.id == cluster for c in clusters):
+            raise click.ClickException(
+                f"Cluster {cluster} not found. Either it does not exist or you might not be autthorized to access it"
+            )
+        return cluster
+
+    choices = {cluster.id: cluster for cluster in clusters}
+    cluster = questionary.select(
+        "Available Clusters:", choices=list(choices.keys())
+    ).ask()
+    if not cluster:
+        raise click.ClickException("No cluster selected.")
+    return cluster
+
+
+def _construct_k8s_proxy_server(host: str, cluster: str) -> str:
+    """
+    Construct the Kubernetes proxy server URL.
+    """
+    return urljoin(host, f"api/svc/v1/k8s/proxy/{cluster}")
+
+
+def _should_update_existing_context(cluster: str, kubeconfig: Dict[str, Any]) -> bool:
+    """
+    Prompt the user whether to overwrite an existing kubeconfig context.
+    """
+    server_url = get_cluster_server_url(kubeconfig, cluster)
+    if server_url is not None:
+        console.print(
+            f"\nContext {CONTEXT_NAME_FORMAT.format(cluster=cluster)!r} for cluster {cluster!r} already exists in kubeconfig.\n"
+        )
+        return click.confirm(
+            text="Do you want to update the context?", default=False, err=True
+        )
+    return True
+
+
+@click.command(name="kubeconfig", cls=COMMAND_CLS)
+@click.option(
+    "-c",
+    "--cluster",
+    type=str,
+    required=False,
+    help="The cluster id from TrueFoundry. If not provided, an interactive prompt will list available clusters",
+)
+@click.option(
+    "--overwrite",
+    is_flag=True,
+    default=False,
+    show_default=True,
+    help="Overwrites existing cluster entry without prompting",
+)
+@handle_exception_wrapper
+def kubeconfig_command(cluster: Optional[str] = None, overwrite: bool = False) -> None:
+    """
+    Update kubeconfig file to access cluster attached to TrueFoundry Control Plane.
+
+    By default, credentials are written to ~/.kube/config. You can provide an alternate path by setting the KUBECONFIG environment variable. If KUBECONFIG contains multiple paths, the first one is used.
+    """
+    session = Session.new()
+    cluster = _select_cluster(cluster)
+
+    path = get_kubeconfig_path()
+    kubeconfig = get_kubeconfig_content(path=path)
+
+    if not overwrite and not _should_update_existing_context(cluster, kubeconfig):
+        console.print(
+            "Existing context found. Use '--overwrite' to force update the context."
+        )
+        return
+
+    k8s_proxy_server = _construct_k8s_proxy_server(session.tfy_host, cluster)
+    context_name = add_update_cluster_context(
+        kubeconfig,
+        cluster,
+        k8s_proxy_server,
+        exec_command=[
+            "tfy",
+            "--json",
+            "get",
+            "k8s-exec-credential",
+            "--cluster",
+            cluster,
+        ],
+        envs={"TFY_INTERNAL": "1"},
+    )
+
+    save_kubeconfig(kubeconfig, path=path)
+    console.print(
+        f"\nUpdated kubeconfig at {str(path)!r} with context {context_name!r} for cluster {cluster!r}\n\n"
+        f"Run 'kubectl config use-context {context_name}' to use this context.\n"
+    )

{truefoundry-0.7.0rc4 → truefoundry-0.7.0rc5}/truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -32,6 +32,7 @@ from truefoundry.deploy._autogen import models as autogen_models
 from truefoundry.deploy.io.output_callback import OutputCallBack
 from truefoundry.deploy.lib.model.entity import (
     Application,
+    Cluster,
     CreateDockerRepositoryResponse,
     Deployment,
     DockerRegistryCredentials,
@@ -110,6 +111,13 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         )
         return request_handling(response)
 
+    @check_min_cli_version
+    def list_clusters(self) -> List[Cluster]:
+        url = f"{self._api_server_url}/{VERSION_PREFIX}/clusters"
+        response = session_with_retries().get(url, headers=self._get_headers())
+        response = request_handling(response)
+        return parse_obj_as(List[Cluster], response["data"])
+
     @check_min_cli_version
     def list_workspaces(
         self,

{truefoundry-0.7.0rc4 → truefoundry-0.7.0rc5}/truefoundry/deploy/lib/model/entity.py

@@ -34,6 +34,11 @@ class Entity(Base):
     updatedAt: datetime.datetime = Field(repr=False)
 
 
+class Cluster(Entity):
+    id: str
+    cloudProvider: str
+
+
 class Workspace(Entity):
     id: str = Field(repr=False)
     name: str

truefoundry-0.7.0rc4/truefoundry/deploy/cli/commands/kubeconfig_command.py

@@ -1,88 +0,0 @@
-from typing import Any, Dict, Optional
-from urllib.parse import urljoin
-
-import rich_click as click
-from rich.console import Console
-
-from truefoundry.cli.const import COMMAND_CLS
-from truefoundry.cli.util import handle_exception_wrapper
-from truefoundry.common.session import Session
-from truefoundry.deploy.cli.commands.utils import (
-    CONTEXT_NAME_FORMAT,
-    add_update_cluster_context,
-    get_cluster_server_url,
-    get_kubeconfig_content,
-    get_kubeconfig_path,
-    save_kubeconfig,
-)
-
-console = Console()
-
-
-def construct_k8s_proxy_server(host: str, cluster: str) -> str:
-    """Construct the Kubernetes proxy server URL."""
-    return urljoin(host, f"api/svc/v1/k8s/proxy/{cluster}")
-
-
-@click.command(
-    name="kubeconfig",
-    cls=COMMAND_CLS,
-    help="Update kubeconfig with TrueFoundry cluster context",
-)
-@click.option(
-    "-c",
-    "--cluster",
-    type=str,
-    required=True,
-    help="The cluster id from TrueFoundry",
-)
-@click.option(
-    "--overwrite",
-    is_flag=True,
-    default=False,
-    show_default=True,
-    help="Overwrite if cluster entry already exists",
-)
-@handle_exception_wrapper
-def kubeconfig_command(cluster: str, overwrite: bool = False) -> None:
-    """
-    Execute kubectl commands with authentication through the TrueFoundry CLI.
-    """
-    session = Session.new()
-
-    path = get_kubeconfig_path()
-    kubeconfig: Dict[str, Any] = get_kubeconfig_content(path=path)
-    server_url: Optional[str] = get_cluster_server_url(kubeconfig, cluster)
-    if server_url is not None and not overwrite:
-        should_update = click.confirm(
-            text=f"Context `{CONTEXT_NAME_FORMAT.format(cluster=cluster)}` for cluster `{cluster}` already exists in kubeconfig.\nDo you want to update the context?",
-            default=False,
-            err=True,
-        )
-        if not should_update:
-            console.print(
-                "Existing context found. Use --overwrite to force update the context."
-            )
-            return
-
-    k8s_proxy_server: str = construct_k8s_proxy_server(session.tfy_host, cluster)
-
-    context_name: str = add_update_cluster_context(
-        kubeconfig,
-        cluster,
-        k8s_proxy_server,
-        exec_command=[
-            "tfy",
-            "--json",
-            "get",
-            "k8s-exec-credential",
-            "--cluster",
-            cluster,
-        ],
-    )
-
-    save_kubeconfig(kubeconfig, path=path)
-    console.print(
-        f"Updated kubeconfig at {str(path)!r} with context {context_name!r} for cluster {cluster!r}\n"
-        f"Run `kubectl config use-context {context_name}` to use this context\n"
-    )