move utilities to lib folder

johnstcn · johnstcn · commit 5f7c961023a7 · 2023-06-06T22:53:18.000+01:00
diff --git a/scaletest/lib/coder_init.sh b/scaletest/lib/coder_init.sh
@@ -11,7 +11,11 @@ fi
 [[ -n ${VERBOSE:-} ]] && set -x
 
 CODER_URL=$1
-CONFIG_DIR="${PWD}/.coderv2"
+DRY_RUN="${DRY_RUN:-0}"
+PROJECT_ROOT="$(git rev-parse --show-toplevel)"
+# shellcheck source=scripts/lib.sh
+source "${PROJECT_ROOT}/scripts/lib.sh"
+CONFIG_DIR="${PROJECT_ROOT}/scaletest/.coderv2"
 ARCH="$(arch)"
 if [[ "$ARCH" == "x86_64" ]]; then
 	ARCH="amd64"
@@ -24,10 +28,10 @@ if [[ -f "${CONFIG_DIR}/coder.env" ]]; then
 	exit 0
 fi
 
-mkdir -p "${CONFIG_DIR}"
+maybedryrun "$DRY_RUN" mkdir -p "${CONFIG_DIR}"
 echo "Fetching Coder CLI for first-time setup!"
-curl -fsSLk "${CODER_URL}/bin/coder-${PLATFORM}-${ARCH}" -o "${CONFIG_DIR}/coder"
-chmod +x "${CONFIG_DIR}/coder"
+maybedryrun "$DRY_RUN" curl -fsSLk "${CODER_URL}/bin/coder-${PLATFORM}-${ARCH}" -o "${CONFIG_DIR}/coder"
+maybedryrun "$DRY_RUN" chmod +x "${CONFIG_DIR}/coder"
 
 set +o pipefail
 RANDOM_ADMIN_PASSWORD=$(tr </dev/urandom -dc _A-Z-a-z-0-9 | head -c16)
@@ -37,21 +41,23 @@ CODER_FIRST_USER_USERNAME="coder"
 CODER_FIRST_USER_PASSWORD="${RANDOM_ADMIN_PASSWORD}"
 CODER_FIRST_USER_TRIAL="false"
 echo "Running login command!"
-"${CONFIG_DIR}/coder" login "${CODER_URL}" \
+DRY_RUN="$DRY_RUN" "${PROJECT_ROOT}/scaletest/lib/coder_shim.sh" login "${CODER_URL}" \
 	--global-config="${CONFIG_DIR}" \
 	--first-user-username="${CODER_FIRST_USER_USERNAME}" \
 	--first-user-email="${CODER_FIRST_USER_EMAIL}" \
 	--first-user-password="${CODER_FIRST_USER_PASSWORD}" \
 	--first-user-trial=false
 
 echo "Writing credentials to ${CONFIG_DIR}/coder.env"
-cat <<EOF >"${CONFIG_DIR}/coder.env"
+maybedryrun "$DRY_RUN" cat <<EOF >"${CONFIG_DIR}/coder.env"
 CODER_FIRST_USER_EMAIL=admin@coder.com
 CODER_FIRST_USER_USERNAME=coder
 CODER_FIRST_USER_PASSWORD="${RANDOM_ADMIN_PASSWORD}"
 CODER_FIRST_USER_TRIAL="${CODER_FIRST_USER_TRIAL}"
 EOF
 
 echo "Importing kubernetes template"
-"${CONFIG_DIR}/coder" templates create --global-config="${CONFIG_DIR}" \
-	--directory "${CONFIG_DIR}/templates/kubernetes" --yes kubernetes
+DRY_RUN="$DRY_RUN" "$PROJECT_ROOT/scaletest/lib/coder_shim.sh" templates create \
+	--global-config="${CONFIG_DIR}" \
+	--directory "${CONFIG_DIR}/templates/kubernetes" \
+	--yes kubernetes
diff --git a/scaletest/lib/coder_shim.sh b/scaletest/lib/coder_shim.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# This is a shim for easily executing Coder commands against a loadtest cluster
+# without having to overwrite your own session/URL
+PROJECT_ROOT="$(git rev-parse --show-toplevel)"
+# shellcheck source=scripts/lib.sh
+source "${PROJECT_ROOT}/scripts/lib.sh"
+CONFIG_DIR="${PROJECT_ROOT}/scaletest/.coderv2"
+CODER_BIN="${CONFIG_DIR}/coder"
+DRY_RUN="${DRY_RUN:-0}"
+maybedryrun "$DRY_RUN" exec "${CODER_BIN}" --global-config "${CONFIG_DIR}" "$@"
diff --git a/scaletest/lib/coder_workspacetraffic.sh b/scaletest/lib/coder_workspacetraffic.sh
@@ -11,9 +11,10 @@ fi
 [[ -n ${VERBOSE:-} ]] && set -x
 
 LOADTEST_NAME="$1"
-CODER_TOKEN=$(./coder_shim.sh tokens create)
+PROJECT_ROOT="$(git rev-parse --show-toplevel)"
+CODER_TOKEN=$("${PROJECT_ROOT}/scaletest/lib/coder_shim.sh" tokens create)
 CODER_URL="http://coder.coder-${LOADTEST_NAME}.svc.cluster.local"
-export KUBECONFIG="${PWD}/.coderv2/${LOADTEST_NAME}-cluster.kubeconfig"
+export KUBECONFIG="${PROJECT_ROOT}/scaletest/.coderv2/${LOADTEST_NAME}-cluster.kubeconfig"
 
 # Clean up any pre-existing pods
 kubectl -n "coder-${LOADTEST_NAME}" delete pod coder-scaletest-workspace-traffic --force || true
diff --git a/scaletest/terraform/coder_shim.sh b/scaletest/terraform/coder_shim.sh
