Skip to content

fix: filter docker compose hook rewrites to supported subcommands #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mercierj wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −7
Open

fix: filter docker compose hook rewrites to supported subcommands #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion hooks/rtk-rewrite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,12 @@ elif echo "$MATCH_CMD" | grep -qE '^(npx[[:space:]]+)?prisma([[:space:]]|$)'; th
# --- Containers (added: docker compose, docker run/build/exec, kubectl describe/apply) ---
elif echo "$MATCH_CMD" | grep -qE '^docker[[:space:]]'; then
if echo "$MATCH_CMD" | grep -qE '^docker[[:space:]]+compose([[:space:]]|$)'; then
REWRITTEN="${ENV_PREFIX}$(echo "$CMD_BODY" | sed 's/^docker /rtk docker /')"
COMPOSE_SUBCMD=$(echo "$MATCH_CMD" | sed -E 's/^docker[[:space:]]+compose[[:space:]]*//')
case "$COMPOSE_SUBCMD" in
ps|ps\ *|logs|logs\ *|build|build\ *)
REWRITTEN="${ENV_PREFIX}$(echo "$CMD_BODY" | sed 's/^docker /rtk docker /')"
;;
esac
else
DOCKER_SUBCMD=$(echo "$MATCH_CMD" | sed -E \
-e 's/^docker[[:space:]]+//' \
Expand Down
28 changes: 22 additions & 6 deletions hooks/test-rtk-rewrite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,13 @@ test_rewrite "env + npm run" \
"NODE_ENV=test npm run test:e2e" \
"NODE_ENV=test rtk npm test:e2e"

test_rewrite "env + docker compose" \
test_rewrite "env + docker compose (unsupported subcommand, NOT rewritten)" \
"COMPOSE_PROJECT_NAME=test docker compose up -d" \
"COMPOSE_PROJECT_NAME=test rtk docker compose up -d"
""

test_rewrite "env + docker compose logs (supported, rewritten)" \
"COMPOSE_PROJECT_NAME=test docker compose logs web" \
"COMPOSE_PROJECT_NAME=test rtk docker compose logs web"

echo ""

Expand All @@ -173,17 +177,29 @@ test_rewrite "npx vue-tsc --noEmit" \
"npx vue-tsc --noEmit" \
"rtk tsc --noEmit"

test_rewrite "docker compose up -d" \
test_rewrite "docker compose up -d (NOT rewritten — unsupported by rtk)" \
"docker compose up -d" \
"rtk docker compose up -d"
""

test_rewrite "docker compose logs postgrest" \
"docker compose logs postgrest" \
"rtk docker compose logs postgrest"

test_rewrite "docker compose down" \
test_rewrite "docker compose ps" \
"docker compose ps" \
"rtk docker compose ps"

test_rewrite "docker compose build" \
"docker compose build" \
"rtk docker compose build"

test_rewrite "docker compose down (NOT rewritten — unsupported by rtk)" \
"docker compose down" \
"rtk docker compose down"
""

test_rewrite "docker compose -f file.yml up (NOT rewritten — flag before subcommand)" \
"docker compose -f docker-compose.preview.yml --project-name myapp up -d --build" \
""

test_rewrite "docker run --rm postgres" \
"docker run --rm postgres" \
Expand Down