fixes

1. decouple util files
2. fetch workspace_id from user_facing_id

Author: june-hua

startupscript/butane/004-git-clone-devcontainer.sh

@@ -46,7 +46,8 @@ api_url="${api_url%.git}"
 private_status=$(curl --retry 5 -s "${api_url}" | jq -r ".status")
 if [[ "${PRIVATE_DEVCONTAINER_ENABLED}" == "TRUE" && "${private_status}" == 404 ]]; then
   # Get ECM service URL
-  if ! ECM_SERVICE_URL="$(get_service_url "ecm")"; then
+  SERVER="$(get_metadata_value "terra-cli-server" "prod")"
+  if ! ECM_SERVICE_URL="$(get_service_url "ecm" "${SERVER}")"; then
     exit 1
   fi
 

startupscript/butane/pre-devcontainer.sh

@@ -11,29 +11,26 @@ set -o xtrace
 # Keep track of the number of service failures
 touch /tmp/devcontainer-failure-count
 
-# Fetch and cache workspace metadata
-source /home/core/service-utils.sh
+# Fetch and cache workspace_id
 source /home/core/metadata-utils.sh
-
-WORKSPACE_USER_FACING_ID="$(get_metadata_value "terra-workspace-id" "")"
-RESOURCE_ID="$(get_metadata_value "wb-resource-id" "")"
-WSM_SERVICE_URL="$(get_service_url "wsm")"
-
-# Cache workspace_id if not already cached
+source /home/core/service-utils.sh
+MONITORING_UTILS_FILE="/home/core/monitoring-utils.sh"
 WORKSPACE_ID_CACHE_FILE="/tmp/workspace_id_cache"
-if [[ ! -f "${WORKSPACE_ID_CACHE_FILE}" ]]; then
+FIRST_BOOT_START_FILE="/home/core/first-boot-start"
+if [[ -f "${MONITORING_UTILS_FILE}" && ! -f "${FIRST_BOOT_START_FILE}" ]]; then
+    # First boot file does not exist
+    ## Cache workspace id to be used by probe-proxy-readiness.sh
+    WORKSPACE_USER_FACING_ID="$(get_metadata_value "terra-workspace-id" "")"
+    SERVER="$(get_metadata_value "terra-cli-server" "prod")"
+    WSM_SERVICE_URL="$(get_service_url "wsm" "${SERVER}")"
     RESPONSE=$(curl -s -X GET "${WSM_SERVICE_URL}/api/workspaces/v1/workspaceByUserFacingId/${WORKSPACE_USER_FACING_ID}" \
                 -H "Authorization: Bearer $(/home/core/wb.sh auth print-access-token)")
-    WORKSPACE_ID=$(echo "${RESPONSE}" | jq -r '.id')
+    WORKSPACE_ID=$(echo "${RESPONSE}" | jq -r '.id');
     echo "${WORKSPACE_ID}" > "${WORKSPACE_ID_CACHE_FILE}"
-else
-    WORKSPACE_ID=$(cat "${WORKSPACE_ID_CACHE_FILE}")
-fi
 
-# Record startup begin for monitoring on first boot
-FIRST_BOOT_START_FILE="/home/core/first-boot-start"
-if [[ ! -f "${FIRST_BOOT_START_FILE}" ]]; then
-    source /home/core/monitoring-utils.sh
+    ## Record devcontainer begin for monitoring
+    source "${MONITORING_UTILS_FILE}"
+    RESOURCE_ID="$(get_metadata_value "wb-resource-id" "")"
     record_devcontainer_start "${WSM_SERVICE_URL}" "${WORKSPACE_ID}" "${RESOURCE_ID}"
 fi
 touch "${FIRST_BOOT_START_FILE}"

startupscript/butane/probe-proxy-readiness.sh

@@ -25,15 +25,16 @@ if docker ps -q --filter "name=proxy-agent" | grep -q . \
     MONITORING_UTILS_FILE="/home/core/monitoring-utils.sh"
     if [[ -f "${MONITORING_UTILS_FILE}" && ! -f "${FIRST_BOOT_END_FILE}" ]]; then
         # first boot file does not exist
-        # record startup end for monitoring
+        # record devcontainer end for monitoring
         source /home/core/service-utils.sh
         source "${MONITORING_UTILS_FILE}"
 
         # Fetch required values
         WORKSPACE_ID_CACHE_FILE="/tmp/workspace_id_cache"
         WORKSPACE_ID=$(cat "${WORKSPACE_ID_CACHE_FILE}")
         RESOURCE_ID="$(get_metadata_value "wb-resource-id" "")"
-        WSM_SERVICE_URL="$(get_service_url "wsm")"
+        SERVER="$(get_metadata_value "terra-cli-server" "prod")"
+        WSM_SERVICE_URL="$(get_service_url "wsm" "${SERVER}")"
 
         record_devcontainer_end "${WSM_SERVICE_URL}" "${WORKSPACE_ID}" "${RESOURCE_ID}" "${success}"
     fi

startupscript/butane/service-utils.sh

@@ -1,17 +1,15 @@
 #!/bin/bash
 # service-utils defines helper functions for determining service path.
-source /home/core/metadata-utils.sh
 
 # Map the server to appropriate service path
 function get_service_url() {
-  SERVER="$(get_metadata_value "terra-cli-server" "")"
-  if [[ -z "${SERVER}" ]]; then
-    SERVER="prod"
+  if [[ $# -lt 2 ]]; then
+    echo "usage: get_service_url <service> <server>" >&2
+    return 1
   fi
-  readonly SERVER
 
-  SERVICE="$1"
-  readonly SERVICE
+  local SERVICE="$1"
+  local SERVER="$2"
 
   case "${SERVER}" in
     "dev-stable") echo "https://workbench-dev.verily.com/api/${SERVICE}" ;;
@@ -21,4 +19,4 @@ function get_service_url() {
     *) return 1 ;;
   esac
 }
-readonly -f get_service_url
+readonly -f get_service_url