Update Cloud Platform

Signed-off-by: GitHub <noreply@github.com>

Author: Jacob Woffenden

features/src/cloud-platform/CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.1] - 2024-10-28
+
+- Updated environment colour map
+
 ## [1.0.0] - 2024-10-17
 
 ## Changed

features/src/cloud-platform/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "cloud-platform",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "name": "Cloud Platform",
   "description": "Installs the Cloud Platform CLI",
   "options": {

features/src/cloud-platform/src/home/vscode/.devcontainer/promptrc.d/cloud-platform.sh

@@ -1,21 +1,41 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2016
 
+# Logic for authentication check is:
+# Check context is "cloud-platform-live" and client-id is "REPLACE_WITH_CLIENT_ID", then you aren't authenticated
+# Check context is "cloud-platform-live" and client-id is not "REPLACE_WITH_CLIENT_ID" and server version is returned, then you are authenticated
+# Check context is "cloud-platform-live" and client-id is not "REPLACE_WITH_CLIENT_ID" and server version is null, then there is a potential issue with authentication
+
 PROMPT+='`\
-  kubectlCurrentContext=$(kubectl config current-context 2>/dev/null); \
-  kubectlCurrentNamespace=$(kubectl config view --minify --output "jsonpath={..namespace}"); \
-  kubectlClientId=$(kubectl config view --output json | jq -r ".users[0].user[\"auth-provider\"].config[\"client-id\"]"); \
-  kubectlServerVersion=$(kubectl version --output json 2>/dev/null | jq -r .serverVersion.gitVersion); \
-  if [[ "${kubectlCurrentContext}" == "cloud-platform-live" ]] && [[ "${kubectlClientId}" == "REPLACE_WITH_CLIENT_ID" ]]; then \
-    echo -n "[ cluster: %{$fg[yellow]%}${kubectlCurrentContext} (requires authentication)%{$reset_color%} ] "; \
-  elif [[ "${kubectlCurrentContext}" == "cloud-platform-live" ]] && [[ "${kubectlClientId}" != "REPLACE_WITH_CLIENT_ID" ]] && [[ "${kubectlServerVersion}" != "null" ]]; then \
-    echo -n "[ cluster: %{$fg[green]%}${kubectlCurrentContext} (authenticated)%{$reset_color%} ] "; \
-  elif [[ "${kubectlCurrentContext}" == "cloud-platform-live" ]] && [[ "${kubectlClientId}" != "REPLACE_WITH_CLIENT_ID" ]] && [[ "${kubectlServerVersion}" == "null" ]]; then
-    echo -n "[ cluster: %{$fg[red]%}${kubectlCurrentContext} (issue with authentication)%{$reset_color%} ] "; \
-  fi \
-  && if [[ "${kubectlCurrentContext}" == "cloud-platform-live" ]] && [[ ! -z "${kubectlCurrentNamespace}" ]] && [[ "${kubectlCurrentNamespace}" == *"-prod"* ]]; then \
-    echo -n "[ namespace: %{$fg[red]%}${kubectlCurrentNamespace}%{$reset_color%} ] "; \
-  elif [[ "${kubectlCurrentContext}" == "cloud-platform-live" ]] && [[ ! -z "${kubectlCurrentNamespace}" ]]; then \
-    echo -n "[ namespace: %{$fg[green]%}${kubectlCurrentNamespace}%{$reset_color%} ] "; \
-  fi \
+  CURRENT_CONTEXT=$(kubectl config current-context 2>/dev/null); \
+  CURRENT_NAMESPACE=$(kubectl config view --minify --output "jsonpath={..namespace}"); \
+  CURRENT_CLIENT_ID=$(kubectl config view --output json | jq -r ".users[0].user[\"auth-provider\"].config[\"client-id\"]"); \
+  SERVER_VERSION=$(kubectl version --output json 2>/dev/null | jq -r .serverVersion.gitVersion); \
+  if [[ "${CURRENT_CONTEXT}" == "cloud-platform-live" ]] && [[ "${CURRENT_CLIENT_ID}" == "REPLACE_WITH_CLIENT_ID" ]]; then \
+    echo -n "[ cluster: %{$fg[yellow]%}${CURRENT_CONTEXT} (requires authentication)%{$reset_color%} ] "; \
+  elif [[ "${CURRENT_CONTEXT}" == "cloud-platform-live" ]] && [[ "${CURRENT_CLIENT_ID}" != "REPLACE_WITH_CLIENT_ID" ]] && [[ "${SERVER_VERSION}" != "null" ]]; then \
+    echo -n "[ cluster: %{$fg[green]%}${CURRENT_CONTEXT} (authenticated)%{$reset_color%} ] "; \
+  elif [[ "${CURRENT_CONTEXT}" == "cloud-platform-live" ]] && [[ "${CURRENT_CLIENT_ID}" != "REPLACE_WITH_CLIENT_ID" ]] && [[ "${SERVER_VERSION}" == "null" ]]; then
+    echo -n "[ cluster: %{$fg[red]%}${CURRENT_CONTEXT} (issue with authentication)%{$reset_color%} ] "; \
+  fi; \
+  case ${CURRENT_NAMESPACE} in \
+    *"development"*|*"sandbox"*) \
+      colour=green \
+      ;; \
+    *"test"*) \
+      colour=blue \
+      ;; \
+    *"preproduction"*) \
+      colour=yellow \
+      ;; \
+    *"production"*) \
+      colour=red \
+      ;; \
+    *) \
+      colour=white \
+      ;; \
+  esac; \
+  if [[ ! -z ${CURRENT_NAMESPACE} ]]; then \
+    echo -n "[ namespace: %{$fg[$colour]%}${CURRENT_NAMESPACE}%{$reset_color%} ] "; \
+  fi
 `'