Compare commits
1 Commits
fix/t_3a36
...
fix/pr-ci-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4cbd4be51 |
@@ -1,53 +0,0 @@
|
|||||||
# t_3a368a52 — Gitea login selection for USC repos
|
|
||||||
|
|
||||||
## Objective
|
|
||||||
|
|
||||||
Fix Mosaic git wrapper behavior so `git.uscllc.com` repositories use the USC Gitea/tea login instead of the Mosaic Stack login during PR merge operations.
|
|
||||||
|
|
||||||
## Issue / tracking
|
|
||||||
|
|
||||||
- Kanban: `t_3a368a52`
|
|
||||||
- Gitea issue: `#516` (`http://git.mosaicstack.dev/mosaicstack/stack/issues/516`)
|
|
||||||
- Branch: `fix/t_3a368a52-gitea-usc-login`
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
- In scope: Mosaic framework git wrapper scripts under `packages/mosaic/framework/tools/git/` and matching framework docs.
|
|
||||||
- Out of scope: U-Connect source, PR #1905 contents, Authentik settings, smoke credentials, and runtime infrastructure manifests.
|
|
||||||
|
|
||||||
## Root cause
|
|
||||||
|
|
||||||
`pr-merge.sh` always built the Gitea merge command with `--login ${GITEA_LOGIN:-mosaicstack}`. In a `git.uscllc.com/USC/uconnect` repo with no explicit `GITEA_LOGIN`, this selected the `mosaicstack` tea login even though the remote host requires the `usc` login. While validating `pr-metadata.sh`, I also found that `load_credentials` preserves existing env vars; an ambient `GITEA_TOKEN` for a different account could override host-specific credential loading unless the lookup clears Gitea env vars inside the credential-loader subshell.
|
|
||||||
|
|
||||||
## Plan
|
|
||||||
|
|
||||||
1. Add regression coverage for host → tea login selection.
|
|
||||||
2. Add shared `get_gitea_login(host)` helper in `detect-platform.sh`.
|
|
||||||
3. Update `pr-merge.sh` to derive the tea login from the current remote host.
|
|
||||||
4. Document the host mapping in framework `TOOLS.md`.
|
|
||||||
5. Validate with safe fake-`tea` merge command captures; do not perform a real merge.
|
|
||||||
|
|
||||||
## Evidence log
|
|
||||||
|
|
||||||
- Reproduced old behavior safely from `/src/uconnect` with fake `tea`: PR #1905 command used `--login mosaicstack` for repo `USC/uconnect`.
|
|
||||||
- RED test: `bash packages/mosaic/framework/tools/git/tests/gitea-login-selection.test.sh` failed because `get_gitea_login` did not exist.
|
|
||||||
- RED test extension: same test failed with `expected 'usc-token', got 'ambient-wrong-token'`, proving ambient `GITEA_TOKEN` could override host-specific USC credentials.
|
|
||||||
- GREEN test: `bash packages/mosaic/framework/tools/git/tests/gitea-login-selection.test.sh` passed after adding host mapping and clearing Gitea env vars in the credential-loader subshell.
|
|
||||||
- Syntax check: `bash -n packages/mosaic/framework/tools/git/detect-platform.sh packages/mosaic/framework/tools/git/pr-merge.sh packages/mosaic/framework/tools/git/tests/gitea-login-selection.test.sh` passed.
|
|
||||||
- Metadata validation from `/src/uconnect` using the fixed wrapper source and `MOSAIC_CREDENTIALS_FILE=/src/jarvis-brain/credentials.json`:
|
|
||||||
- PR #1905: `number=1905 state=open base=main head=edith/t_39ce717c-authentik-smoke-gate mergeable=True`.
|
|
||||||
- PR #1869: `number=1869 state=closed base=main head=fix/t_6f492e4a-cert-renewal-malformed-crt mergeable=True`.
|
|
||||||
- Safe fake-`tea` merge validation from `/src/uconnect` using the fixed wrapper source and `MOSAIC_CREDENTIALS_FILE=/src/jarvis-brain/credentials.json`:
|
|
||||||
- PR #1905 command captured `pr merge 1905 --style squash --repo USC/uconnect --login usc` and exited through fake `tea` with code 42; no merge was attempted.
|
|
||||||
- PR #1869 command captured `pr merge 1869 --style squash --repo USC/uconnect --login usc` and exited through fake `tea` with code 42; no merge was attempted.
|
|
||||||
- `ci-queue-wait.sh --purpose merge -B main -t 5 -i 1` from `/src/uconnect` resolved `platform=gitea`, branch `main`, SHA `49f0bce75c242eee19472ed367295658da9e56fc`, state `unknown`, exit 0.
|
|
||||||
- Final shell regression: `bash packages/mosaic/framework/tools/git/tests/gitea-login-selection.test.sh` passed, including `pr-merge.sh` fake-`tea` argv capture for USC login selection and a negative metacharacter login override test.
|
|
||||||
- Final syntax check: `bash -n packages/mosaic/framework/tools/git/detect-platform.sh packages/mosaic/framework/tools/git/pr-merge.sh packages/mosaic/framework/tools/git/pr-metadata.sh packages/mosaic/framework/tools/git/tests/gitea-login-selection.test.sh` passed.
|
|
||||||
- Independent review initially found the changed `pr-merge.sh` path still used string-built `eval`; remediated by switching GitHub/Gitea merge execution to argv arrays, validating numeric PR numbers, and rejecting unsupported characters in explicit `GITEA_LOGIN` overrides.
|
|
||||||
- Workspace gates: `pnpm typecheck`, `pnpm lint`, and `pnpm format:check` passed after dependency install.
|
|
||||||
|
|
||||||
## Current blocker/risk
|
|
||||||
|
|
||||||
`ci-queue-wait.sh` still reports `state=unknown` for U-Connect main because the Gitea commit status payload does not classify into success/failure/pending/no-status. This task fixed the wrong tea login selection path; it did not alter CI status semantics.
|
|
||||||
|
|
||||||
Full `pnpm test` remains blocked by unrelated gateway database setup in this Kanban workspace: gateway tests fail with `PostgresError: relation "messages" does not exist` (`42P01`) even after starting Postgres/Valkey with Docker Compose. Jaeger also fails to start because host port `16686` is already allocated. The targeted wrapper regression and repo type/lint/format gates pass.
|
|
||||||
@@ -9,7 +9,7 @@ All tool suites are located at `~/.config/mosaic/tools/`.
|
|||||||
|
|
||||||
### Git Wrappers (Use First)
|
### Git Wrappers (Use First)
|
||||||
|
|
||||||
Mosaic wrappers at `~/.config/mosaic/tools/git/*.sh` handle platform detection and edge cases. Always use these before raw CLI commands. For self-hosted Gitea, the shared credential helper selects API credentials by remote host (`git.mosaicstack.dev` → `gitea-mosaicstack`, `git.uscllc.com` → `gitea-usc`), and the PR merge wrapper selects the matching tea login (`git.mosaicstack.dev` → `mosaicstack`, `git.uscllc.com` → `usc`) unless `GITEA_LOGIN` is explicitly set to a safe tea login override.
|
Mosaic wrappers at `~/.config/mosaic/tools/git/*.sh` handle platform detection and edge cases. Always use these before raw CLI commands.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Issues
|
# Issues
|
||||||
|
|||||||
@@ -91,31 +91,6 @@ get_remote_host() {
|
|||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Resolve the tea login name for the given Gitea host.
|
|
||||||
# Priority: explicit caller override → known Mosaic host mapping → no forced login.
|
|
||||||
get_gitea_login() {
|
|
||||||
local host="$1"
|
|
||||||
|
|
||||||
if [[ -n "${GITEA_LOGIN:-}" ]]; then
|
|
||||||
echo "$GITEA_LOGIN"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$host" in
|
|
||||||
git.mosaicstack.dev)
|
|
||||||
echo "mosaicstack"
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
git.uscllc.com)
|
|
||||||
echo "usc"
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
return 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
# Resolve a Gitea API token for the given host.
|
# Resolve a Gitea API token for the given host.
|
||||||
# Priority: Mosaic credential loader → GITEA_TOKEN env → ~/.git-credentials
|
# Priority: Mosaic credential loader → GITEA_TOKEN env → ~/.git-credentials
|
||||||
get_gitea_token() {
|
get_gitea_token() {
|
||||||
@@ -129,10 +104,6 @@ get_gitea_token() {
|
|||||||
local token
|
local token
|
||||||
token=$(
|
token=$(
|
||||||
source "$cred_loader"
|
source "$cred_loader"
|
||||||
# load_credentials preserves pre-existing env vars by design. Clear
|
|
||||||
# Gitea env in this subshell so host-specific credential lookup wins
|
|
||||||
# over an ambient token for a different Gitea instance.
|
|
||||||
unset GITEA_TOKEN GITEA_URL
|
|
||||||
case "$host" in
|
case "$host" in
|
||||||
git.mosaicstack.dev) load_credentials gitea-mosaicstack 2>/dev/null ;;
|
git.mosaicstack.dev) load_credentials gitea-mosaicstack 2>/dev/null ;;
|
||||||
git.uscllc.com) load_credentials gitea-usc 2>/dev/null ;;
|
git.uscllc.com) load_credentials gitea-usc 2>/dev/null ;;
|
||||||
|
|||||||
@@ -30,12 +30,19 @@ EOF
|
|||||||
# get_remote_host and get_gitea_token are provided by detect-platform.sh
|
# get_remote_host and get_gitea_token are provided by detect-platform.sh
|
||||||
|
|
||||||
extract_state_from_status_json() {
|
extract_state_from_status_json() {
|
||||||
python3 - <<'PY'
|
# Capture piped JSON BEFORE invoking `python3 - <<PY`. The heredoc binds
|
||||||
|
# stdin to the Python program text — so json.load(sys.stdin) inside would
|
||||||
|
# try to re-read stdin after `-` already consumed it for the program,
|
||||||
|
# yielding EOF and returning "unknown" every time. Pass payload via env.
|
||||||
|
local payload
|
||||||
|
payload=$(cat)
|
||||||
|
PR_CI_STATUS_JSON="$payload" python3 - <<'PY'
|
||||||
import json
|
import json
|
||||||
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
try:
|
||||||
payload = json.load(sys.stdin)
|
payload = json.loads(os.environ.get("PR_CI_STATUS_JSON", ""))
|
||||||
except Exception:
|
except Exception:
|
||||||
print("unknown")
|
print("unknown")
|
||||||
raise SystemExit(0)
|
raise SystemExit(0)
|
||||||
@@ -66,12 +73,16 @@ PY
|
|||||||
}
|
}
|
||||||
|
|
||||||
print_status_summary() {
|
print_status_summary() {
|
||||||
python3 - <<'PY'
|
# Same stdin-collision fix as extract_state_from_status_json above.
|
||||||
|
local payload
|
||||||
|
payload=$(cat)
|
||||||
|
PR_CI_STATUS_JSON="$payload" python3 - <<'PY'
|
||||||
import json
|
import json
|
||||||
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
try:
|
||||||
payload = json.load(sys.stdin)
|
payload = json.loads(os.environ.get("PR_CI_STATUS_JSON", ""))
|
||||||
except Exception:
|
except Exception:
|
||||||
print("[pr-ci-wait] status payload unavailable")
|
print("[pr-ci-wait] status payload unavailable")
|
||||||
raise SystemExit(0)
|
raise SystemExit(0)
|
||||||
|
|||||||
@@ -69,11 +69,6 @@ if [[ -z "$PR_NUMBER" ]]; then
|
|||||||
usage
|
usage
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
|
|
||||||
echo "Error: PR number must be numeric." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$MERGE_METHOD" != "squash" ]]; then
|
if [[ "$MERGE_METHOD" != "squash" ]]; then
|
||||||
echo "Error: Mosaic policy enforces squash merge only. Received '$MERGE_METHOD'." >&2
|
echo "Error: Mosaic policy enforces squash merge only. Received '$MERGE_METHOD'." >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -99,31 +94,19 @@ REPO=$(get_repo_name)
|
|||||||
|
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
github)
|
github)
|
||||||
CMD=(gh pr merge "$PR_NUMBER" --squash)
|
CMD="gh pr merge $PR_NUMBER --squash"
|
||||||
[[ "$DELETE_BRANCH" == true ]] && CMD+=(--delete-branch)
|
[[ "$DELETE_BRANCH" == true ]] && CMD="$CMD --delete-branch"
|
||||||
"${CMD[@]}"
|
eval "$CMD"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
HOST=$(get_remote_host) || {
|
CMD="tea pr merge $PR_NUMBER --style squash --repo $OWNER/$REPO --login ${GITEA_LOGIN:-mosaicstack}"
|
||||||
echo "Error: Could not determine remote host." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
CMD=(tea pr merge "$PR_NUMBER" --style squash --repo "$OWNER/$REPO")
|
|
||||||
GITEA_TEA_LOGIN=$(get_gitea_login "$HOST" || true)
|
|
||||||
if [[ -n "$GITEA_TEA_LOGIN" ]]; then
|
|
||||||
if [[ ! "$GITEA_TEA_LOGIN" =~ ^[A-Za-z0-9._-]+$ ]]; then
|
|
||||||
echo "Error: Gitea tea login contains unsupported characters." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
CMD+=(--login "$GITEA_TEA_LOGIN")
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Delete branch after merge if requested
|
# Delete branch after merge if requested
|
||||||
if [[ "$DELETE_BRANCH" == true ]]; then
|
if [[ "$DELETE_BRANCH" == true ]]; then
|
||||||
echo "Note: Branch deletion after merge may need to be done separately with tea" >&2
|
echo "Note: Branch deletion after merge may need to be done separately with tea" >&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${CMD[@]}"
|
eval "$CMD"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Error: Could not detect git platform" >&2
|
echo "Error: Could not detect git platform" >&2
|
||||||
|
|||||||
@@ -1,97 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
||||||
source "$SCRIPT_DIR/detect-platform.sh"
|
|
||||||
|
|
||||||
fail() {
|
|
||||||
echo "FAIL: $*" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
assert_eq() {
|
|
||||||
local expected="$1"
|
|
||||||
local actual="$2"
|
|
||||||
local message="$3"
|
|
||||||
if [[ "$actual" != "$expected" ]]; then
|
|
||||||
fail "$message: expected '$expected', got '$actual'"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
unset GITEA_LOGIN || true
|
|
||||||
assert_eq "usc" "$(get_gitea_login git.uscllc.com)" "USC Gitea host should select usc tea login"
|
|
||||||
assert_eq "mosaicstack" "$(get_gitea_login git.mosaicstack.dev)" "Mosaic Gitea host should select mosaicstack tea login"
|
|
||||||
|
|
||||||
GITEA_LOGIN="custom-login"
|
|
||||||
export GITEA_LOGIN
|
|
||||||
assert_eq "custom-login" "$(get_gitea_login git.uscllc.com)" "Explicit GITEA_LOGIN should override host default"
|
|
||||||
|
|
||||||
unset GITEA_LOGIN || true
|
|
||||||
unknown_login="$(get_gitea_login git.example.invalid || true)"
|
|
||||||
assert_eq "" "$unknown_login" "Unknown Gitea hosts should not force a mismatched login"
|
|
||||||
|
|
||||||
TEST_WORKDIR="${TEST_WORKDIR:-$SCRIPT_DIR/tests/.tmp-gitea-login-selection}"
|
|
||||||
rm -rf "$TEST_WORKDIR"
|
|
||||||
mkdir -p "$TEST_WORKDIR"
|
|
||||||
trap 'rm -rf "$TEST_WORKDIR"' EXIT
|
|
||||||
|
|
||||||
cat > "$TEST_WORKDIR/credentials.json" <<'JSON'
|
|
||||||
{
|
|
||||||
"gitea": {
|
|
||||||
"mosaicstack": {
|
|
||||||
"url": "https://git.mosaicstack.dev",
|
|
||||||
"token": "mosaic-token"
|
|
||||||
},
|
|
||||||
"usc": {
|
|
||||||
"url": "https://git.uscllc.com",
|
|
||||||
"token": "usc-token"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
JSON
|
|
||||||
|
|
||||||
export MOSAIC_CREDENTIALS_FILE="$TEST_WORKDIR/credentials.json"
|
|
||||||
GITEA_TOKEN="ambient-wrong-token"
|
|
||||||
GITEA_URL="https://git.mosaicstack.dev"
|
|
||||||
export GITEA_TOKEN GITEA_URL
|
|
||||||
assert_eq "usc-token" "$(get_gitea_token git.uscllc.com)" "Host-specific credential lookup should ignore ambient mismatched GITEA_TOKEN"
|
|
||||||
assert_eq "mosaic-token" "$(get_gitea_token git.mosaicstack.dev)" "Host-specific credential lookup should select Mosaic token for Mosaic host"
|
|
||||||
|
|
||||||
FAKEBIN="$TEST_WORKDIR/fakebin"
|
|
||||||
REPO_DIR="$TEST_WORKDIR/repo"
|
|
||||||
CAPTURE_FILE="$TEST_WORKDIR/tea-args.txt"
|
|
||||||
mkdir -p "$FAKEBIN" "$REPO_DIR"
|
|
||||||
|
|
||||||
cat > "$FAKEBIN/python3" <<'SH'
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
cat >/dev/null
|
|
||||||
printf 'main\n'
|
|
||||||
SH
|
|
||||||
chmod +x "$FAKEBIN/python3"
|
|
||||||
|
|
||||||
cat > "$FAKEBIN/tea" <<'SH'
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
printf '%s\n' "$@" > "$TEA_CAPTURE_FILE"
|
|
||||||
SH
|
|
||||||
chmod +x "$FAKEBIN/tea"
|
|
||||||
|
|
||||||
(
|
|
||||||
cd "$REPO_DIR"
|
|
||||||
git init -q
|
|
||||||
git remote add origin https://git.uscllc.com/USC/uconnect.git
|
|
||||||
PATH="$FAKEBIN:$PATH" TEA_CAPTURE_FILE="$CAPTURE_FILE" "$SCRIPT_DIR/pr-merge.sh" --skip-queue-guard -n 1905
|
|
||||||
)
|
|
||||||
assert_eq $'pr\nmerge\n1905\n--style\nsquash\n--repo\nUSC/uconnect\n--login\nusc' "$(cat "$CAPTURE_FILE")" "pr-merge should pass USC tea login as isolated argv entries"
|
|
||||||
|
|
||||||
PWNED_FILE="$TEST_WORKDIR/pwned"
|
|
||||||
if (
|
|
||||||
cd "$REPO_DIR"
|
|
||||||
PATH="$FAKEBIN:$PATH" TEA_CAPTURE_FILE="$CAPTURE_FILE" GITEA_LOGIN="bad;touch $PWNED_FILE" "$SCRIPT_DIR/pr-merge.sh" --skip-queue-guard -n 1905 >/dev/null 2>&1
|
|
||||||
); then
|
|
||||||
fail "pr-merge should reject GITEA_LOGIN values with shell metacharacters"
|
|
||||||
fi
|
|
||||||
if [[ -e "$PWNED_FILE" ]]; then
|
|
||||||
fail "pr-merge executed shell metacharacters from GITEA_LOGIN"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "gitea-login-selection tests passed"
|
|
||||||
Reference in New Issue
Block a user