truefoundry 0.7.0rc4__py3-none-any.whl → 0.7.0rc5__py3-none-any.whl

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/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/deploy/cli/commands/kubeconfig_command.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict, Optional
 from urllib.parse import urljoin
 
+import questionary
 import rich_click as click
 from rich.console import Console
 
@@ -19,55 +20,94 @@ from truefoundry.deploy.cli.commands.utils import (
 console = Console()
 
 
-def construct_k8s_proxy_server(host: str, cluster: str) -> str:
-    """Construct the Kubernetes proxy server URL."""
+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}")
 
 
-@click.command(
-    name="kubeconfig",
-    cls=COMMAND_CLS,
-    help="Update kubeconfig with TrueFoundry cluster context",
-)
+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=True,
-    help="The cluster id from TrueFoundry",
+    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="Overwrite if cluster entry already exists",
+    help="Overwrites existing cluster entry without prompting",
 )
 @handle_exception_wrapper
-def kubeconfig_command(cluster: str, overwrite: bool = False) -> None:
+def kubeconfig_command(cluster: Optional[str] = None, overwrite: bool = False) -> None:
     """
-    Execute kubectl commands with authentication through the TrueFoundry CLI.
+    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: 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
+    kubeconfig = get_kubeconfig_content(path=path)
 
-    k8s_proxy_server: str = construct_k8s_proxy_server(session.tfy_host, cluster)
+    if not overwrite and not _should_update_existing_context(cluster, kubeconfig):
+        console.print(
+            "Existing context found. Use '--overwrite' to force update the context."
+        )
+        return
 
-    context_name: str = add_update_cluster_context(
+    k8s_proxy_server = _construct_k8s_proxy_server(session.tfy_host, cluster)
+    context_name = add_update_cluster_context(
         kubeconfig,
         cluster,
         k8s_proxy_server,
@@ -79,10 +119,11 @@ def kubeconfig_command(cluster: str, overwrite: bool = False) -> None:
             "--cluster",
             cluster,
         ],
+        envs={"TFY_INTERNAL": "1"},
     )
 
     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"
+        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/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/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.dist-info → truefoundry-0.7.0rc5.dist-info}/METADATA

@@ -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.dist-info → truefoundry-0.7.0rc5.dist-info}/RECORD

@@ -69,9 +69,9 @@ truefoundry/deploy/cli/commands/create_command.py,sha256=rCajvQvAfZU10nDZOYpRACb
 truefoundry/deploy/cli/commands/delete_command.py,sha256=8SriRwg5mEHL4zP0mdDjJ0cKWJTU_1Pjq3450zMr9tk,3889
 truefoundry/deploy/cli/commands/deploy_command.py,sha256=8aTBvzPaT9xg6KPmpcpqJlmdj4yXzWUfAy6slcoPN74,4123
 truefoundry/deploy/cli/commands/deploy_init_command.py,sha256=g-jBfrEmhZ0TDWsyqPDn4K6q33EqJSGmBTt1eMYig-w,600
-truefoundry/deploy/cli/commands/get_command.py,sha256=V_q-7Zb-4g1J7G8qAT5CRLW3ee2_gj_RiNZUMaNlXs0,779
-truefoundry/deploy/cli/commands/k8s_exec_credential_command.py,sha256=oXBRra3jZ_NcseNGdMbQJVPqapz8AelRoiiRnDcym_8,2158
-truefoundry/deploy/cli/commands/kubeconfig_command.py,sha256=jsIPltQ0aKrdsaOoSDaw-i3yJPJ6tySFDfjOugoBbWE,2616
+truefoundry/deploy/cli/commands/get_command.py,sha256=bR8tAjQQhimzaTQ57L6BPJwcxQ_SGWCF5CqHDpxgG90,837
+truefoundry/deploy/cli/commands/k8s_exec_credential_command.py,sha256=EknpdufMAEnjSGMG7a-Jj7tkoiS5zmbJRREafb14Alw,2160
+truefoundry/deploy/cli/commands/kubeconfig_command.py,sha256=3u3A_scsdd1UnqxKQgGg8ivZArZKQYVV0Z-ATotbPPc,4176
 truefoundry/deploy/cli/commands/list_command.py,sha256=zKu_JWY35eMIzgSNFYtmwi2uezZ4k-8yk3C1Vqsvshc,4470
 truefoundry/deploy/cli/commands/login_command.py,sha256=EHZH3cDQdbVWMkuFxd7JfB0B0Dr89sUmt214ICBmspY,1024
 truefoundry/deploy/cli/commands/logout_command.py,sha256=u3kfrEp0ETbrz40KjD4GCC3XEZ5YRAlrca_Df4U_mk0,536
@@ -97,7 +97,7 @@ truefoundry/deploy/lib/session.py,sha256=fLdgR6ZDp8-hFl5NTON4ngnWLsMzGxvKtfpDOOw
 truefoundry/deploy/lib/util.py,sha256=J7r8San2wKo48A7-BlH2-OKTlBO67zlPjLEhMsL8os0,1059
 truefoundry/deploy/lib/win32.py,sha256=1RcvPTdlOAJ48rt8rCbE2Ufha2ztRqBAE9dueNXArrY,5009
 truefoundry/deploy/lib/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=NjNGmBsmrIfDZFfqJz12B4TVDHMZeAZDf-5eKSnS9zs,26697
+truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=fmRlPYCimk1ZLbMgdzfJVCbcKRCVnFYL5T3j2uJA0Tc,27037
 truefoundry/deploy/lib/dao/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/dao/application.py,sha256=oMszpueXPUfTUuN_XdKwoRjQyqAgWHhZ-10cbprCVdM,9226
 truefoundry/deploy/lib/dao/apply.py,sha256=5IFERe5sLmZGlavaKTIxL4xPHAme4ZS2Ww0a2rKTyT0,3029
@@ -105,7 +105,7 @@ truefoundry/deploy/lib/dao/delete.py,sha256=uPL2psqWNw2O0oDikXJOlVxmG8n5d3Z0Ia9q
 truefoundry/deploy/lib/dao/version.py,sha256=AtdW_4O1DPUKdfv2qy6iUJsZ_95vM6z0AqeEy3WDKs8,1130
 truefoundry/deploy/lib/dao/workspace.py,sha256=6YvfCgWDzAULI3Q6JswyZmP1CwJ5rM-ANsIFkbQia0Q,2349
 truefoundry/deploy/lib/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/deploy/lib/model/entity.py,sha256=Up-DDOezkwM2tdqibfLdZO6jmT2pVq6SShB5sobBIGI,8531
+truefoundry/deploy/lib/model/entity.py,sha256=Bp9sLB-M5INCpw5lPmFdygHWS1zvnLicnSiSCi2iqhQ,8591
 truefoundry/deploy/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/v2/lib/__init__.py,sha256=WEiVMZXOVljzEE3tpGJil14liIn_PCDoACJ6b3tZ6sI,188
 truefoundry/deploy/v2/lib/deploy.py,sha256=Og7P6S3Gc8pXRudf2luk2IOb_5oMGoz-h0rQcLWaw7M,11708
@@ -376,7 +376,7 @@ truefoundry/workflow/remote_filesystem/__init__.py,sha256=LQ95ViEjJ7Ts4JcCGOxMPs
 truefoundry/workflow/remote_filesystem/logger.py,sha256=em2l7D6sw7xTLDP0kQSLpgfRRCLpN14Qw85TN7ujQcE,1022
 truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=xcT0wQmQlgzcj0nP3tJopyFSVWT1uv3nhiTIuwfXYeg,12342
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=nSGPZu0Gyd_jz0KsEE-7w_BmnTD8CVF1S8cUJoxaCbc,13305
-truefoundry-0.7.0rc4.dist-info/METADATA,sha256=XhZrgwwmvk_TGO77NQa7Hzh69wSvwqDWQggZhQizke4,2410
-truefoundry-0.7.0rc4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.7.0rc4.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.7.0rc4.dist-info/RECORD,,
+truefoundry-0.7.0rc5.dist-info/METADATA,sha256=qY09MnUMrEQSVOCK9FYPjgcRNiK8UzEr4U1wp0xE35c,2410
+truefoundry-0.7.0rc5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.7.0rc5.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.7.0rc5.dist-info/RECORD,,