PHP-95866: Private devcontainer fixes (#258)

* PHP-95866: Private devcontainer fixes

1. Surface git clone errors
2. Fix check if repo private

Author: june-hua

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

@@ -34,8 +34,14 @@ if [[ -d "${LOCAL_REPO}/.git" ]]; then
 fi
 
 PRIVATE_DEVCONTAINER_ENABLED="$(get_metadata_value "private-devcontainer-enabled" "")"
-# Check if repo is private by attempting to list files
-if [[ "${PRIVATE_DEVCONTAINER_ENABLED}" = "TRUE" ]] && ! git ls-remote "${REPO_SRC}" &> /dev/null; then
+# Replace ssh URL with HTTPS URL
+https_url="${REPO_SRC/git@github.com:/https://github.com/}"
+# Create GitHub API URL
+api_url="https://api.github.com/repos/${https_url/https:\/\/github.com\//}"
+api_url="${api_url%.git}"
+# Check if repo is private
+private_status=$(curl --retry 5 -s "${api_url}" | jq -r ".status")
+if [[ "${PRIVATE_DEVCONTAINER_ENABLED}" == "TRUE" && "${private_status}" == 404 ]]; then
   # disable logs to not expose access token
   set +o xtrace
 
@@ -57,11 +63,13 @@ if [[ "${PRIVATE_DEVCONTAINER_ENABLED}" = "TRUE" ]] && ! git ls-remote "${REPO_S
 
   token=$(echo "${response}" | head -n1)
   # Insert token into url
-  repo_auth_url=$(echo "${REPO_SRC}" | sed "s/:\/\//:\/\/${token}@/")
+  repo_auth_url=$(echo "${https_url}" | sed "s/:\/\//:\/\/${token}@/")
 
   # Clone the private repo
+  set +o errexit
   response=$(git clone "${repo_auth_url}" "${LOCAL_REPO}" 2>&1)
   git_status=$?
+  set -o errexit
   if [[ ${git_status} -ne 0 ]]; then
     set_metadata "startup_script/status" "ERROR"
     set_metadata "startup_script/message" "Failed to clone the devcontainer GitHub repo. ERROR: ${response}"
@@ -72,8 +80,10 @@ if [[ "${PRIVATE_DEVCONTAINER_ENABLED}" = "TRUE" ]] && ! git ls-remote "${REPO_S
   set -o xtrace
 else
   # GitHub repo is public
+  set +o errexit
   response=$(git clone "${REPO_SRC}" "${LOCAL_REPO}" 2>&1)
   git_status=$?
+  set -o errexit
   if [[ ${git_status} -ne 0 ]]; then
     set_metadata "startup_script/status" "ERROR"
     set_metadata "startup_script/message" "Failed to clone the devcontainer GitHub repo. ERROR: ${response}"

startupscript/butane/devcontainer-failure-handler.sh

@@ -32,8 +32,10 @@ if [[ "${num_retries}" -ge "${RETRY_COUNT}" ]]; then
         # Log failure
         source /home/core/metadata-utils.sh
         set_metadata "startup_script/status" "ERROR"
-        set_metadata "startup_script/message" "There was an error launching your custom container on the VM. Please try recreating the VM."
-
+        error_message=$(get_guest_attribute "startup_script/message" "")
+        if [[ -z "${error_message}" ]]; then
+          set_metadata "startup_script/message" "There was an error launching your custom container on the VM. Please try recreating the VM."
+        fi
         # Stop the service
         systemctl stop devcontainer.service