added ability to control the prompt colour

pyproject.toml

@@ -73,6 +73,12 @@ dependencies = [
     "rich==13.5.1",
     "ruamel.yaml==0.17.32",
     "typer==0.9.0",
+    "google-cloud-resourcemanager==1.10.1",
+    "google-cloud-compute==4.15.0",
+    "google-cloud-storage==2.13.0",
+    "google-cloud-container==2.32.0",
+    "google-cloud-iam-credentials== 1.4.1",
+
 ]
 
 [project.optional-dependencies]

src/_nebari/provider/cloud/google_cloud.py

@@ -1,9 +1,15 @@
 import functools
-import json
 import os
-import subprocess
 from typing import Dict, List
 
+from google.cloud import (
+    compute_v1,
+    container_v1,
+    iam_credentials_v1,
+    resourcemanager,
+    storage,
+)
+
 from _nebari import constants
 from _nebari.provider.cloud.commons import filter_by_highest_supported_k8s_version
 from nebari import schema
@@ -22,129 +28,90 @@ def check_credentials():
 def projects() -> Dict[str, str]:
     """Return a dict of available projects."""
     check_credentials()
-    output = subprocess.check_output(
-        ["gcloud", "projects", "list", "--format=json(name,projectId)"]
-    )
-    data = json.loads(output)
-    return {_["name"]: _["projectId"] for _ in data}
+    client = resourcemanager.Client()
+    projects = client.list_projects()
+    project_dict = {project.name: project.project_id for project in projects}
+
+    return project_dict
 
 
 @functools.lru_cache()
 def regions(project: str) -> Dict[str, str]:
     """Return a dict of available regions."""
-    check_credentials()
-    output = subprocess.check_output(
-        ["gcloud", "compute", "regions", "list", "--project", project, "--format=json"]
+    client = compute_v1.RegionClient()
+    request = compute_v1.ListRegionsRequest(
+        project="project_value",
     )
-    data = json.loads(output.decode("utf-8"))
-    return {_["description"]: _["name"] for _ in data}
+    regions = client.list(request=request)
+    region_dict = {region.description: region.name for region in regions}
+
+    return region_dict
 
 
 @functools.lru_cache()
 def zones(project: str, region: str) -> Dict[str, str]:
     """Return a dict of available zones."""
     check_credentials()
-    output = subprocess.check_output(
-        ["gcloud", "compute", "zones", "list", "--project", project, "--format=json"]
+    client = compute_v1.ZonesClient()
+    request = compute_v1.ListZonesRequest(
+        project="project_value",
     )
-    data = json.loads(output.decode("utf-8"))
-    return {_["description"]: _["name"] for _ in data if _["name"].startswith(region)}
+    zones = client.list(request=request)
+    zone_dict = {
+        zone.description: zone.name for zone in zones if zone.name.startswith(region)
+    }
+    return zone_dict
 
 
 @functools.lru_cache()
 def kubernetes_versions(region: str) -> List[str]:
     """Return list of available kubernetes supported by cloud provider. Sorted from oldest to latest."""
     check_credentials()
-    output = subprocess.check_output(
-        [
-            "gcloud",
-            "container",
-            "get-server-config",
-            "--region",
-            region,
-            "--format=json",
-        ]
+    client = container_v1.ClusterManagerClient()
+    request = container_v1.GetServerConfigRequest()
+    response = client.get_server_config(request=request)
+    supported_kubernetes_versions = sorted(response.valid_master_versions)
+    filtered_versions = filter_by_highest_supported_k8s_version(
+        supported_kubernetes_versions
     )
-    data = json.loads(output.decode("utf-8"))
-    supported_kubernetes_versions = sorted([_ for _ in data["validMasterVersions"]])
-    return filter_by_highest_supported_k8s_version(supported_kubernetes_versions)
+    return filtered_versions
 
 
 @functools.lru_cache()
-def instances(project: str) -> Dict[str, str]:
-    """Return a dict of available instances."""
+def instances(project: str, zone: str) -> Dict[str, str]:
+    """Return a dict of available instances of a particular zone."""
     check_credentials()
-    output = subprocess.check_output(
-        [
-            "gcloud",
-            "compute",
-            "machine-types",
-            "list",
-            "--project",
-            project,
-            "--format=json",
-        ]
+    client = compute_v1.InstancesClient()
+    request = compute_v1.ListInstancesRequest(
+        project="project",
+        zone="zone",
     )
-    data = json.loads(output.decode("utf-8"))
-    return {_["description"]: _["name"] for _ in data}
+    instances = client.list(request=request)
+    instance_dict = {instances.description: instances.name for instance in instances}
+    return instance_dict
 
 
-def cluster_exists(cluster_name: str, project_id: str, region: str) -> bool:
+def cluster_exists(cluster_name: str, project_id: str, zone: str) -> bool:
     """Check if a GKE cluster exists."""
-    try:
-        subprocess.check_output(
-            [
-                "gcloud",
-                "container",
-                "clusters",
-                "describe",
-                cluster_name,
-                "--project",
-                project_id,
-                "--region",
-                region,
-            ]
-        )
-        return True
-    except subprocess.CalledProcessError:
-        return False
+    client = container_v1.ClusterManagerClient()
+    request = container_v1.GetClusterRequest()
+    response = client.get_cluster(request=request, project_id=project_id, zone=zone)
+
+    return response is not None
 
 
 def bucket_exists(bucket_name: str, project_id: str) -> bool:
     """Check if a storage bucket exists."""
-    try:
-        print(f"Checking if bucket {bucket_name} exists in project {project_id}.")
-        subprocess.check_output(
-            [
-                "gsutil",
-                "ls",
-                f"gs://{bucket_name}/",
-                "-p",
-                project_id,
-            ]
-        )
-        return True
-    except subprocess.CalledProcessError:
-        return False
+    client = storage.Client(project=project_id)
+    bucket = client.get_bucket(bucket_name)
+    return bucket is not None
 
 
 def service_account_exists(service_account_name: str, project_id: str) -> bool:
     """Check if a service account exists."""
-    try:
-        subprocess.check_output(
-            [
-                "gcloud",
-                "iam",
-                "service-accounts",
-                "describe",
-                service_account_name,
-                "--project",
-                project_id,
-            ]
-        )
-        return True
-    except subprocess.CalledProcessError:
-        return False
+    client = iam_credentials_v1.IAMCredentialsClient()
+    service_acc = client.service_account_path(project_id, service_account_name)
+    return service_acc is not None
 
 
 def delete_cluster(cluster_name: str, project_id: str, region: str):
@@ -157,24 +124,15 @@ def delete_cluster(cluster_name: str, project_id: str, region: str):
         )
         return
 
+    client = container_v1.ClusterManagerClient()
+    request = client.DeleteClusterRequest()
     try:
-        subprocess.check_call(
-            [
-                "gcloud",
-                "container",
-                "clusters",
-                "delete",
-                cluster_name,
-                "--project",
-                project_id,
-                "--region",
-                region,
-                "--quiet",
-            ]
-        )
-        print(f"Successfully deleted cluster {cluster_name}.")
-    except subprocess.CalledProcessError as e:
-        print(f"Failed to delete cluster {cluster_name}. Error: {e}")
+        client.delete_cluster(request=request)
+    except google.api_core.exceptions.GoogleAPICallError as e:
+        if e.status_code == 200:
+            print("Cluster deleted successfully!")
+        else:
+            print("error deleting cluster!")
 
 
 def delete_storage_bucket(bucket_name: str, project_id: str):
@@ -187,20 +145,12 @@ def delete_storage_bucket(bucket_name: str, project_id: str):
         )
         return
 
+    client = storage.Client(project=project_id)
+    bucket = client.get_bucket(bucket_name)
     try:
-        subprocess.check_call(
-            [
-                "gsutil",
-                "-m",
-                "rm",
-                "-r",
-                f"gs://{bucket_name}",
-                "-p",
-                project_id,
-            ]
-        )
+        bucket.delete()
         print(f"Successfully deleted bucket {bucket_name}.")
-    except subprocess.CalledProcessError as e:
+    except storage.exceptions.BucketNotFoundError as e:
         print(f"Failed to delete bucket {bucket_name}. Error: {e}")
 
 
@@ -213,22 +163,12 @@ def delete_service_account(service_account_name: str, project_id: str):
             f"Service account {service_account_name} does not exist in project {project_id}. Exiting gracefully."
         )
         return
-
+    client = iam_credentials_v1.IAMCredentialsClient()
+    client.service_account_path(project_id, service_account_name)
     try:
-        subprocess.check_call(
-            [
-                "gcloud",
-                "iam",
-                "service-accounts",
-                "delete",
-                service_account_name,
-                "--quiet",
-                "--project",
-                project_id,
-            ]
-        )
+        client.delete_service_account(service_account_name)
         print(f"Successfully deleted service account {service_account_name}.")
-    except subprocess.CalledProcessError as e:
+    except iam_credentials_v1.exceptions.IamServiceAccountNotFoundError as e:
         print(f"Failed to delete service account {service_account_name}. Error: {e}")
 
 

src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/skel/.bashrc

@@ -149,4 +149,9 @@ RESET=$(tput sgr0)
 
 NAME=`whoami | cut -d'@' -f1`
 
-PS1="\[$CYAN\]$NAME:\w\[$RESET\]\$(parse_git_branch) \n\[$GREEN\]\A \$ \[$RESET\]"
+# PS1 (Prompt String)
+if [ "$ENABLE_COLORS" = true ]; then
+    PS1="\[$CYAN\]$NAME:\w\[$RESET\]\$(parse_git_branch) \n\[$GREEN\]\A \$ \[$RESET\]"
+else
+    PS1="$NAME:\w\$(parse_git_branch) \n\A \$ "
+fi