fix: Compose generator should detect duplicate service names at generate-time (#850)
This commit is contained in:
Agent
parent
e9aed747b5
commit
1170ecb2f0
4 changed files with 379 additions and 2 deletions
|
|
@ -15,6 +15,7 @@
|
|||
set -euo pipefail
|
||||
|
||||
FACTORY_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
export FACTORY_ROOT_REAL="$FACTORY_ROOT"
|
||||
# Always use localhost for mock Forgejo (in case FORGE_URL is set from docker-compose)
|
||||
export FORGE_URL="http://localhost:3000"
|
||||
MOCK_BIN="/tmp/smoke-mock-bin"
|
||||
|
|
@ -30,7 +31,8 @@ cleanup() {
|
|||
rm -rf "$MOCK_BIN" /tmp/smoke-test-repo \
|
||||
"${FACTORY_ROOT}/projects/smoke-repo.toml" \
|
||||
/tmp/smoke-claude-shared /tmp/smoke-home-claude \
|
||||
/tmp/smoke-env-before-rerun /tmp/smoke-env-before-dryrun
|
||||
/tmp/smoke-env-before-rerun /tmp/smoke-env-before-dryrun \
|
||||
"${FACTORY_ROOT}/docker-compose.yml"
|
||||
# Restore .env only if we created the backup
|
||||
if [ -f "${FACTORY_ROOT}/.env.smoke-backup" ]; then
|
||||
mv "${FACTORY_ROOT}/.env.smoke-backup" "${FACTORY_ROOT}/.env"
|
||||
|
|
@ -423,6 +425,51 @@ export CLAUDE_SHARED_DIR="$ORIG_CLAUDE_SHARED_DIR"
|
|||
export CLAUDE_CONFIG_DIR="$ORIG_CLAUDE_CONFIG_DIR"
|
||||
rm -rf /tmp/smoke-claude-shared /tmp/smoke-home-claude
|
||||
|
||||
# ── 8. Test duplicate service name detection ──────────────────────────────
|
||||
echo "=== 8/8 Testing duplicate service name detection ==="
|
||||
|
||||
# Isolated factory root — do NOT touch the real ${FACTORY_ROOT}/projects/
|
||||
SMOKE_DUP_ROOT=$(mktemp -d)
|
||||
mkdir -p "$SMOKE_DUP_ROOT/projects"
|
||||
cat > "$SMOKE_DUP_ROOT/projects/duplicate-test.toml" <<'TOMLEOF'
|
||||
name = "duplicate-test"
|
||||
description = "dup-detection smoke"
|
||||
|
||||
[ci]
|
||||
woodpecker_repo_id = "999"
|
||||
|
||||
[agents.llama]
|
||||
base_url = "http://localhost:8080"
|
||||
model = "qwen:latest"
|
||||
roles = ["dev"]
|
||||
forge_user = "llama-bot"
|
||||
TOMLEOF
|
||||
|
||||
# Call the generator directly — no `disinto init` to overwrite the TOML.
|
||||
# FACTORY_ROOT tells generators.sh where projects/ + compose_file live.
|
||||
(
|
||||
export FACTORY_ROOT="$SMOKE_DUP_ROOT"
|
||||
export ENABLE_LLAMA_AGENT=1
|
||||
# shellcheck disable=SC1091
|
||||
source "${FACTORY_ROOT_REAL:-$(cd "$(dirname "$0")/.." && pwd)}/lib/generators.sh"
|
||||
# Use a temp file to capture output since pipefail will kill the pipeline
|
||||
# when _generate_compose_impl returns non-zero
|
||||
_generate_compose_impl > /tmp/smoke-dup-output.txt 2>&1 || true
|
||||
if grep -q "Duplicate service name" /tmp/smoke-dup-output.txt; then
|
||||
pass "Duplicate service detection: conflict between ENABLE_LLAMA_AGENT and [agents.llama] reported"
|
||||
rm -f /tmp/smoke-dup-output.txt
|
||||
exit 0
|
||||
else
|
||||
fail "Duplicate service detection: no error raised for ENABLE_LLAMA_AGENT + [agents.llama]"
|
||||
cat /tmp/smoke-dup-output.txt >&2
|
||||
rm -f /tmp/smoke-dup-output.txt
|
||||
exit 1
|
||||
fi
|
||||
) || FAILED=1
|
||||
|
||||
rm -rf "$SMOKE_DUP_ROOT"
|
||||
unset ENABLE_LLAMA_AGENT
|
||||
|
||||
# ── Summary ──────────────────────────────────────────────────────────────────
|
||||
echo ""
|
||||
if [ "$FAILED" -ne 0 ]; then
|
||||
|
|
|
|||
210
tests/test-duplicate-service-detection.sh
Executable file
210
tests/test-duplicate-service-detection.sh
Executable file
|
|
@ -0,0 +1,210 @@
|
|||
#!/usr/bin/env bash
|
||||
# tests/test-duplicate-service-detection.sh — Unit test for duplicate service detection
|
||||
#
|
||||
# Tests that the compose generator correctly detects duplicate service names
|
||||
# between ENABLE_LLAMA_AGENT=1 and [agents.llama] TOML configuration.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Get the absolute path to the disinto root
|
||||
DISINTO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
TEST_DIR=$(mktemp -d)
|
||||
trap "rm -rf \"\$TEST_DIR\"" EXIT
|
||||
|
||||
FAILED=0
|
||||
|
||||
fail() { printf 'FAIL: %s\n' "$*" >&2; FAILED=1; }
|
||||
pass() { printf 'PASS: %s\n' "$*"; }
|
||||
|
||||
# Test 1: Duplicate between ENABLE_LLAMA_AGENT and [agents.llama]
|
||||
echo "=== Test 1: Duplicate between ENABLE_LLAMA_AGENT and [agents.llama] ==="
|
||||
|
||||
# Create projects directory and test project TOML with an agent named "llama"
|
||||
mkdir -p "${TEST_DIR}/projects"
|
||||
cat > "${TEST_DIR}/projects/test-project.toml" <<'TOMLEOF'
|
||||
name = "test-project"
|
||||
description = "Test project for duplicate detection"
|
||||
|
||||
[ci]
|
||||
woodpecker_repo_id = "123"
|
||||
|
||||
[agents.llama]
|
||||
base_url = "http://localhost:8080"
|
||||
model = "qwen:latest"
|
||||
roles = ["dev"]
|
||||
forge_user = "llama-bot"
|
||||
TOMLEOF
|
||||
|
||||
# Create a minimal compose file
|
||||
cat > "${TEST_DIR}/docker-compose.yml" <<'COMPOSEEOF'
|
||||
# Test compose file
|
||||
services:
|
||||
agents:
|
||||
image: test:latest
|
||||
command: echo "hello"
|
||||
|
||||
volumes:
|
||||
test-data:
|
||||
|
||||
networks:
|
||||
test-net:
|
||||
COMPOSEEOF
|
||||
|
||||
# Set up the test environment
|
||||
export FACTORY_ROOT="${TEST_DIR}"
|
||||
export PROJECT_NAME="test-project"
|
||||
export ENABLE_LLAMA_AGENT="1"
|
||||
export FORGE_TOKEN=""
|
||||
export FORGE_PASS=""
|
||||
export CLAUDE_TIMEOUT="7200"
|
||||
export POLL_INTERVAL="300"
|
||||
export GARDENER_INTERVAL="21600"
|
||||
export ARCHITECT_INTERVAL="21600"
|
||||
export PLANNER_INTERVAL="43200"
|
||||
export SUPERVISOR_INTERVAL="1200"
|
||||
|
||||
# Source the generators module and run the compose generator directly
|
||||
source "${DISINTO_ROOT}/lib/generators.sh"
|
||||
|
||||
# Delete the compose file to force regeneration
|
||||
rm -f "${TEST_DIR}/docker-compose.yml"
|
||||
|
||||
# Run the compose generator directly
|
||||
if _generate_compose_impl 3000 false 2>&1 | tee "${TEST_DIR}/output.txt"; then
|
||||
# Check if the output contains the duplicate error message
|
||||
if grep -q "Duplicate service name 'agents-llama'" "${TEST_DIR}/output.txt"; then
|
||||
pass "Duplicate detection: correctly detected conflict between ENABLE_LLAMA_AGENT and [agents.llama]"
|
||||
else
|
||||
fail "Duplicate detection: should have detected conflict between ENABLE_LLAMA_AGENT and [agents.llama]"
|
||||
cat "${TEST_DIR}/output.txt" >&2
|
||||
fi
|
||||
else
|
||||
# Generator should fail with non-zero exit code
|
||||
if grep -q "Duplicate service name 'agents-llama'" "${TEST_DIR}/output.txt"; then
|
||||
pass "Duplicate detection: correctly detected conflict and returned non-zero exit code"
|
||||
else
|
||||
fail "Duplicate detection: should have failed with duplicate error"
|
||||
cat "${TEST_DIR}/output.txt" >&2
|
||||
fi
|
||||
fi
|
||||
|
||||
# Test 2: No duplicate when only ENABLE_LLAMA_AGENT is set (no conflicting TOML)
|
||||
echo ""
|
||||
echo "=== Test 2: No duplicate when only ENABLE_LLAMA_AGENT is set ==="
|
||||
|
||||
# Remove the projects directory created in Test 1
|
||||
rm -rf "${TEST_DIR}/projects"
|
||||
|
||||
# Create a fresh compose file
|
||||
cat > "${TEST_DIR}/docker-compose.yml" <<'COMPOSEEOF'
|
||||
# Test compose file
|
||||
services:
|
||||
agents:
|
||||
image: test:latest
|
||||
|
||||
volumes:
|
||||
test-data:
|
||||
|
||||
networks:
|
||||
test-net:
|
||||
COMPOSEEOF
|
||||
|
||||
# Set ENABLE_LLAMA_AGENT
|
||||
export ENABLE_LLAMA_AGENT="1"
|
||||
|
||||
# Delete the compose file to force regeneration
|
||||
rm -f "${TEST_DIR}/docker-compose.yml"
|
||||
|
||||
if _generate_compose_impl 3000 false 2>&1 | tee "${TEST_DIR}/output2.txt"; then
|
||||
if grep -q "Duplicate" "${TEST_DIR}/output2.txt"; then
|
||||
fail "No duplicate: should not detect duplicate when only ENABLE_LLAMA_AGENT is set"
|
||||
else
|
||||
pass "No duplicate: correctly generated compose without duplicates"
|
||||
fi
|
||||
else
|
||||
# Non-zero exit is fine if there's a legitimate reason (e.g., missing files)
|
||||
if grep -q "Duplicate" "${TEST_DIR}/output2.txt"; then
|
||||
fail "No duplicate: should not detect duplicate when only ENABLE_LLAMA_AGENT is set"
|
||||
else
|
||||
pass "No duplicate: generator failed for other reason (acceptable)"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Test 3: Duplicate between two TOML agents with same name
|
||||
echo ""
|
||||
echo "=== Test 3: Duplicate between two TOML agents with same name ==="
|
||||
|
||||
rm -f "${TEST_DIR}/docker-compose.yml"
|
||||
|
||||
# Create projects directory for Test 3
|
||||
mkdir -p "${TEST_DIR}/projects"
|
||||
|
||||
cat > "${TEST_DIR}/projects/project1.toml" <<'TOMLEOF'
|
||||
name = "project1"
|
||||
description = "First project"
|
||||
|
||||
[ci]
|
||||
woodpecker_repo_id = "1"
|
||||
|
||||
[agents.llama]
|
||||
base_url = "http://localhost:8080"
|
||||
model = "qwen:latest"
|
||||
roles = ["dev"]
|
||||
forge_user = "llama-bot1"
|
||||
TOMLEOF
|
||||
|
||||
cat > "${TEST_DIR}/projects/project2.toml" <<'TOMLEOF'
|
||||
name = "project2"
|
||||
description = "Second project"
|
||||
|
||||
[ci]
|
||||
woodpecker_repo_id = "2"
|
||||
|
||||
[agents.llama]
|
||||
base_url = "http://localhost:8080"
|
||||
model = "qwen:latest"
|
||||
roles = ["dev"]
|
||||
forge_user = "llama-bot2"
|
||||
TOMLEOF
|
||||
|
||||
cat > "${TEST_DIR}/docker-compose.yml" <<'COMPOSEEOF'
|
||||
# Test compose file
|
||||
services:
|
||||
agents:
|
||||
image: test:latest
|
||||
|
||||
volumes:
|
||||
test-data:
|
||||
|
||||
networks:
|
||||
test-net:
|
||||
COMPOSEEOF
|
||||
|
||||
unset ENABLE_LLAMA_AGENT
|
||||
|
||||
# Delete the compose file to force regeneration
|
||||
rm -f "${TEST_DIR}/docker-compose.yml"
|
||||
|
||||
if _generate_compose_impl 3000 false 2>&1 | tee "${TEST_DIR}/output3.txt"; then
|
||||
if grep -q "Duplicate service name 'agents-llama'" "${TEST_DIR}/output3.txt"; then
|
||||
pass "Duplicate detection: correctly detected conflict between two [agents.llama] blocks"
|
||||
else
|
||||
fail "Duplicate detection: should have detected conflict between two [agents.llama] blocks"
|
||||
cat "${TEST_DIR}/output3.txt" >&2
|
||||
fi
|
||||
else
|
||||
if grep -q "Duplicate service name 'agents-llama'" "${TEST_DIR}/output3.txt"; then
|
||||
pass "Duplicate detection: correctly detected conflict and returned non-zero exit code"
|
||||
else
|
||||
fail "Duplicate detection: should have failed with duplicate error"
|
||||
cat "${TEST_DIR}/output3.txt" >&2
|
||||
fi
|
||||
fi
|
||||
|
||||
# Summary
|
||||
echo ""
|
||||
if [ "$FAILED" -ne 0 ]; then
|
||||
echo "=== TESTS FAILED ==="
|
||||
exit 1
|
||||
fi
|
||||
echo "=== ALL TESTS PASSED ==="
|
||||
Loading…
Add table
Add a link
Reference in a new issue