Add and use vdev_cmd

Author: thomasqueirozb

scripts/build-docker.sh

@@ -10,8 +10,10 @@ set -euo pipefail
 
 set -x
 
-CHANNEL="${CHANNEL:-"$(${VDEV:-cargo vdev} release channel)"}"
-VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
+vdev_cmd="${VDEV:-cargo vdev}"
+
+CHANNEL="${CHANNEL:-"$($vdev_cmd release channel)"}"
+VERSION="${VECTOR_VERSION:-"$($vdev_cmd version)"}"
 DATE="${DATE:-"$(date -u +%Y-%m-%d)"}"
 PLATFORM="${PLATFORM:-}"
 PUSH="${PUSH:-"true"}"

scripts/package-msi.sh

@@ -9,7 +9,9 @@ set -euo pipefail
 
 set -x
 
-ARCHIVE_VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
+vdev_cmd="${VDEV:-cargo vdev}"
+
+ARCHIVE_VERSION="${VECTOR_VERSION:-"$($vdev_cmd version)"}"
 
 rm -rf target/msi-x64
 cp -R distribution/msi target/msi-x64
@@ -24,7 +26,7 @@ powershell '$progressPreference = "silentlyContinue"; Expand-Archive vector-'"$A
 #     C:\a\vector\vector\target\msi-x64\vector.wxs(6) : error CNDL0108 : The Product/@Version attribute's value, '0.29.0.custom.a28ecdc', is not a valid version.
 #     Legal version values should look like 'x.x.x.x' where x is an integer from 0 to 65534.
 # , by  changing "0.29.0.custom.a28ecdc" -> "0.29.0".
-CHANNEL="${CHANNEL:-"$(${VDEV:-cargo vdev} release channel)"}"
+CHANNEL="${CHANNEL:-"$($vdev_cmd release channel)"}"
 
 if [[ "$CHANNEL" == "custom" ]]; then
     PACKAGE_VERSION="${ARCHIVE_VERSION%.custom*}"

scripts/release-s3.sh

@@ -7,8 +7,10 @@ set -euo pipefail
 #
 #   Uploads archives and packages to S3
 
-CHANNEL="${CHANNEL:-"$(${VDEV:-cargo vdev} release channel)"}"
-VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
+vdev_cmd="${VDEV:-cargo vdev}"
+
+CHANNEL="${CHANNEL:-"$($vdev_cmd release channel)"}"
+VERSION="${VECTOR_VERSION:-"$($vdev_cmd version)"}"
 DATE="${DATE:-"$(date -u +%Y-%m-%d)"}"
 VERIFY_TIMEOUT="${VERIFY_TIMEOUT:-"30"}" # seconds
 VERIFY_RETRIES="${VERIFY_RETRIES:-"2"}"

scripts/run-integration-test.sh

@@ -10,6 +10,8 @@ if [[ "${ACTIONS_RUNNER_DEBUG:-}" == "true" ]]; then
   set -x
 fi
 
+vdev_cmd="${VDEV:-cargo vdev}"
+
 print_compose_logs_on_failure() {
   local LAST_RETURN_CODE=$1
   if [[ "$LAST_RETURN_CODE" -ne 0 || "${ACTIONS_RUNNER_DEBUG:-}" == "true" ]]; then
@@ -104,7 +106,7 @@ if [[ ${#TEST_ENV} -gt 0 ]]; then
   TEST_ENVIRONMENTS="${TEST_ENV}"
 else
   # Collect all available environments via auto-discovery
-  mapfile -t TEST_ENVIRONMENTS < <(${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" show -e "${TEST_NAME}")
+  mapfile -t TEST_ENVIRONMENTS < <($vdev_cmd "${VERBOSITY}" "${TEST_TYPE}" show -e "${TEST_NAME}")
   if [[ ${#TEST_ENVIRONMENTS[@]} -eq 0 ]]; then
     echo "ERROR: no environments found for ${TEST_TYPE} test '${TEST_NAME}'" >&2
     exit 1
@@ -127,12 +129,12 @@ for TEST_ENV in "${TEST_ENVIRONMENTS[@]}"; do
   docker run --rm -v vector_target:/output/"${TEST_NAME}" alpine:3.20 \
     sh -c "rm -rf /output/${TEST_NAME}/*"
 
-  ${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" start "${TEST_NAME}" "${TEST_ENV}"
+  $vdev_cmd "${VERBOSITY}" "${TEST_TYPE}" start "${TEST_NAME}" "${TEST_ENV}"
   START_RET=$?
   print_compose_logs_on_failure "$START_RET"
 
   if [[ "$START_RET" -eq 0 ]]; then
-    ${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" test --retries "$RETRIES" "${TEST_NAME}" "${TEST_ENV}"
+    $vdev_cmd "${VERBOSITY}" "${TEST_TYPE}" test --retries "$RETRIES" "${TEST_NAME}" "${TEST_ENV}"
     RET=$?
     print_compose_logs_on_failure "$RET"
 
@@ -144,7 +146,7 @@ for TEST_ENV in "${TEST_ENVIRONMENTS[@]}"; do
   fi
 
   # Always stop the environment (best effort cleanup)
-  ${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" stop "${TEST_NAME}" || true
+  $vdev_cmd "${VERBOSITY}" "${TEST_TYPE}" stop "${TEST_NAME}" || true
 
   # Exit early on first failure
   if [[ "$RET" -ne 0 ]]; then