fix(rabbitmq): derive restore archive stem from target path

Author: Amber

addons/rabbitmq/dataprotection/restore.sh

@@ -3,9 +3,17 @@ set -Eeuo pipefail
 
 DATA_DIR="${DATA_DIR:-/var/lib/rabbitmq}"
 # Backup jobs inject DP_TARGET_POD_NAME. Volume-populator AsDataSource prepareData
-# may only inject DP_TARGET_RELATIVE_PATH (= pod identity / archive stem). Prefer
-# POD_NAME when present; otherwise accept RELATIVE_PATH so KB12 dataSource restore works.
-TARGET_POD_NAME="${DP_TARGET_POD_NAME:-${DP_TARGET_RELATIVE_PATH:?DP_TARGET_POD_NAME or DP_TARGET_RELATIVE_PATH is required}}"
+# may only inject DP_TARGET_RELATIVE_PATH (= target name / target pod name).
+# DP_BACKUP_BASE_PATH is already scoped to that relative path, so only its final
+# pod-name segment belongs in the archive key.
+if [ -n "${DP_TARGET_POD_NAME:-}" ]; then
+  TARGET_POD_NAME="${DP_TARGET_POD_NAME}"
+else
+  TARGET_RELATIVE_PATH="${DP_TARGET_RELATIVE_PATH:?DP_TARGET_POD_NAME or DP_TARGET_RELATIVE_PATH is required}"
+  TARGET_POD_NAME="${TARGET_RELATIVE_PATH%/}"
+  TARGET_POD_NAME="${TARGET_POD_NAME##*/}"
+  : "${TARGET_POD_NAME:?DP_TARGET_RELATIVE_PATH must end with a target pod name}"
+fi
 ARCHIVE_NAME="${TARGET_POD_NAME}.tar.zst"
 
 [ -n "${DP_DATASAFED_BIN_PATH:-}" ] && export PATH="${PATH}:${DP_DATASAFED_BIN_PATH}"

addons/rabbitmq/scripts-ut-spec/backup_restore_contract_spec.sh

@@ -143,7 +143,7 @@ DATASAFED
     The stdout should include "restore prepareData completed"
   End
 
-  It "falls back to DP_TARGET_RELATIVE_PATH when volume-populator omits DP_TARGET_POD_NAME"
+  It "uses only the pod-name stem from the volume-populator target relative path"
     When call bash -c '
       set -Eeuo pipefail
       restore_script="$1"
@@ -160,8 +160,8 @@ DATASAFED
 set -e
 case "$1" in
   list)
-    # Archive key matches the relative path / pod identity injected by volume populator.
-    printf "%s\n" "${DP_TARGET_RELATIVE_PATH}.tar.zst"
+    test "${DATASAFED_BACKEND_BASE_PATH}" = "${EXPECTED_BACKUP_BASE_PATH}"
+    printf "%s\n" "${EXPECTED_TARGET_POD_NAME}.tar.zst"
     ;;
   pull)
     cat "${FAKE_ARCHIVE_PATH}"
@@ -178,8 +178,10 @@ DATASAFED
       unset DP_TARGET_POD_NAME || true
       PATH="${bin_dir}:${PATH}" \
         DATA_DIR="${data_dir}" \
-        DP_TARGET_RELATIVE_PATH="rmq-br-5400-rabbitmq-2" \
-        DP_BACKUP_BASE_PATH="/backup/base" \
+        DP_TARGET_RELATIVE_PATH="rabbitmq/rmq-br-5400-rabbitmq-2" \
+        DP_BACKUP_BASE_PATH="/backup/base/rabbitmq/rmq-br-5400-rabbitmq-2" \
+        EXPECTED_BACKUP_BASE_PATH="/backup/base/rabbitmq/rmq-br-5400-rabbitmq-2" \
+        EXPECTED_TARGET_POD_NAME="rmq-br-5400-rabbitmq-2" \
         FAKE_ARCHIVE_PATH="${tmp_dir}/payload.tar" \
         bash "${restore_script}"
       test -f "${data_dir}/restored.txt"