Fix whitespace

This commit is contained in:
Tim Hockin 2025-05-01 17:24:12 -07:00
parent 110bffbe1f
commit bd88a3f9b0
No known key found for this signature in database
1 changed files with 49 additions and 50 deletions

View File

@ -20,20 +20,19 @@ set -o pipefail
# shellcheck disable=SC2120 # shellcheck disable=SC2120
function caller() { function caller() {
local stack_skip=${1:-0} local stack_skip=${1:-0}
stack_skip=$((stack_skip + 1)) stack_skip=$((stack_skip + 1))
if [[ ${#FUNCNAME[@]} -gt ${stack_skip} ]]; then if [[ ${#FUNCNAME[@]} -gt ${stack_skip} ]]; then
local i local i
for ((i=1 ; i <= ${#FUNCNAME[@]} - stack_skip ; i++)) for ((i=1 ; i <= ${#FUNCNAME[@]} - stack_skip ; i++)); do
do local frame_no=$((i - 1 + stack_skip))
local frame_no=$((i - 1 + stack_skip)) local source_lineno=${BASH_LINENO[$((frame_no - 1))]}
local source_lineno=${BASH_LINENO[$((frame_no - 1))]} local funcname=${FUNCNAME[${frame_no}]}
local funcname=${FUNCNAME[${frame_no}]} if [[ "$funcname" =~ 'e2e::' ]]; then
if [[ "$funcname" =~ 'e2e::' ]]; then echo "${source_lineno}"
echo "${source_lineno}" fi
fi done
done fi
fi
} }
function fail() { function fail() {
@ -193,8 +192,8 @@ E2E_TAG=$(git rev-parse --show-toplevel | sed 's|/|_|g')
# current tree. # current tree.
build_container=false build_container=false
if [[ "${GIT_SYNC_E2E_IMAGE:-unset}" == "unset" ]]; then if [[ "${GIT_SYNC_E2E_IMAGE:-unset}" == "unset" ]]; then
GIT_SYNC_E2E_IMAGE="e2e/git-sync:${E2E_TAG}__$(go env GOOS)_$(go env GOARCH)" GIT_SYNC_E2E_IMAGE="e2e/git-sync:${E2E_TAG}__$(go env GOOS)_$(go env GOARCH)"
build_container=true build_container=true
fi fi
# DIR is the directory in which all this test's state lives. # DIR is the directory in which all this test's state lives.
@ -202,11 +201,11 @@ RUNID="${RANDOM}${RANDOM}"
DIR="/tmp/git-sync-e2e.$RUNID" DIR="/tmp/git-sync-e2e.$RUNID"
mkdir "$DIR" mkdir "$DIR"
function final_cleanup() { function final_cleanup() {
if [[ "${CLEANUP:-}" == 0 ]]; then if [[ "${CLEANUP:-}" == 0 ]]; then
echo "leaving logs in $DIR" echo "leaving logs in $DIR"
else else
rm -rf "$DIR" rm -rf "$DIR"
fi fi
} }
# Set the trap to call the final_cleanup function on exit. # Set the trap to call the final_cleanup function on exit.
trap final_cleanup EXIT trap final_cleanup EXIT
@ -216,38 +215,38 @@ required_env_vars=()
LOCAL_GITHUB_APP_PRIVATE_KEY_FILE="github_app_private_key.pem" LOCAL_GITHUB_APP_PRIVATE_KEY_FILE="github_app_private_key.pem"
GITHUB_APP_PRIVATE_KEY_MOUNT=() GITHUB_APP_PRIVATE_KEY_MOUNT=()
if [[ "${skip_github_app_test}" != "true" ]]; then if [[ "${skip_github_app_test}" != "true" ]]; then
required_env_vars=( required_env_vars=(
"TEST_GITHUB_APP_AUTH_TEST_REPO" "TEST_GITHUB_APP_AUTH_TEST_REPO"
"TEST_GITHUB_APP_APPLICATION_ID" "TEST_GITHUB_APP_APPLICATION_ID"
"TEST_GITHUB_APP_INSTALLATION_ID" "TEST_GITHUB_APP_INSTALLATION_ID"
"TEST_GITHUB_APP_CLIENT_ID" "TEST_GITHUB_APP_CLIENT_ID"
) )
if [[ -n "${TEST_GITHUB_APP_PRIVATE_KEY_FILE:-}" && -n "${TEST_GITHUB_APP_PRIVATE_KEY:-}" ]]; then if [[ -n "${TEST_GITHUB_APP_PRIVATE_KEY_FILE:-}" && -n "${TEST_GITHUB_APP_PRIVATE_KEY:-}" ]]; then
echo "ERROR: Both TEST_GITHUB_APP_PRIVATE_KEY_FILE and TEST_GITHUB_APP_PRIVATE_KEY were specified." echo "ERROR: Both TEST_GITHUB_APP_PRIVATE_KEY_FILE and TEST_GITHUB_APP_PRIVATE_KEY were specified."
exit 1 exit 1
fi fi
if [[ -n "${TEST_GITHUB_APP_PRIVATE_KEY_FILE:-}" ]]; then if [[ -n "${TEST_GITHUB_APP_PRIVATE_KEY_FILE:-}" ]]; then
cp "${TEST_GITHUB_APP_PRIVATE_KEY_FILE}" "${DIR}/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}" cp "${TEST_GITHUB_APP_PRIVATE_KEY_FILE}" "${DIR}/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}"
elif [[ -n "${TEST_GITHUB_APP_PRIVATE_KEY:-}" ]]; then elif [[ -n "${TEST_GITHUB_APP_PRIVATE_KEY:-}" ]]; then
echo "${TEST_GITHUB_APP_PRIVATE_KEY}" > "${DIR}/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}" echo "${TEST_GITHUB_APP_PRIVATE_KEY}" > "${DIR}/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}"
else else
echo "ERROR: Neither TEST_GITHUB_APP_PRIVATE_KEY_FILE nor TEST_GITHUB_APP_PRIVATE_KEY was specified." echo "ERROR: Neither TEST_GITHUB_APP_PRIVATE_KEY_FILE nor TEST_GITHUB_APP_PRIVATE_KEY was specified."
echo " Either provide a value or skip this test (SKIP_GITHUB_APP_TEST=true)." echo " Either provide a value or skip this test (SKIP_GITHUB_APP_TEST=true)."
exit 1 exit 1
fi
# Validate all required environment variables for the github-app-auth tests are provided.
for var in "${required_env_vars[@]}"; do
if [[ ! -v "${var}" ]]; then
echo "ERROR: Required environment variable '${var}' is not set."
echo " Either provide a value or skip this test (SKIP_GITHUB_APP_TEST=true)."
exit 1
fi fi
done
# Mount the GitHub App private key file to the git-sync container # Validate all required environment variables for the github-app-auth tests are provided.
GITHUB_APP_PRIVATE_KEY_MOUNT=(-v "${DIR}/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}":"/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}":ro) for var in "${required_env_vars[@]}"; do
if [[ ! -v "${var}" ]]; then
echo "ERROR: Required environment variable '${var}' is not set."
echo " Either provide a value or skip this test (SKIP_GITHUB_APP_TEST=true)."
exit 1
fi
done
# Mount the GitHub App private key file to the git-sync container
GITHUB_APP_PRIVATE_KEY_MOUNT=(-v "${DIR}/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}":"/${LOCAL_GITHUB_APP_PRIVATE_KEY_FILE}":ro)
fi fi
# WORK is temp space and in reset for each testcase. # WORK is temp space and in reset for each testcase.