KNEL/TSYSDevStack-SupportStack-LocalWorkstation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(demo): rewrite deployment scripts and test suite for 16-service stack

Browse Source 
Rewrite demo-stack.sh, demo-test.sh, validate-all.sh, and all test
files to match the current 16-service stack reality.

Key changes:
- demo-stack.sh: full rewrite with deploy/stop/restart/status/smoke/summary
- demo-test.sh: fix hardcoded kneldevstack filter to use $COMPOSE_PROJECT_NAME,
  raise volume threshold from 10 to 15, remove curl dependency (use /dev/tcp),
  fix security compliance check for Dockhand direct socket mount
- validate-all.sh: remove port 4005 check (internal only), add missing env
  var validation (TA_PASSWORD, ELASTIC_PASSWORD, GF_*, PIHOLE_WEBPASSWORD)
- integration tests: fix container names, add TubeArchivist companion tests
- e2e tests: use correct project-relative paths, dynamic port lists from env
- Add fix-and-ship.sh as convenience wrapper for demo-stack.sh
- Remove stale tmp_template.yml

💘 Generated with Crush

Assisted-by: GLM-5.1 via Crush <crush@charm.land>
This commit is contained in:
reachableceo
2026-04-27 13:06:45 -05:00
parent 077f483faf
commit eff78907d4
7 changed files with 694 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
demo/scripts/validate-all.sh
View File

@@ -4,119 +4,100 @@
set -euo pipefail
# Validation Results
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
DEMO_DIR="$PROJECT_ROOT"
VALIDATION_PASSED=0
VALIDATION_FAILED=0
# Color Codes
RED='\033[0;31m'
GREEN='\033[0;32m'
BLUE='\033[0;34m'
NC='\033[0m'
log_validation() {
echo -e "${BLUE}[VALIDATE]${NC} $1"
}
log_validation() { echo -e "${BLUE}[VALIDATE]${NC} $1"; }
log_pass() { echo -e "${GREEN}[PASS]${NC} $1"; ((VALIDATION_PASSED++)); }
log_fail() { echo -e "${RED}[FAIL]${NC} $1"; ((VALIDATION_FAILED++)); }
log_pass() {
echo -e "${GREEN}[PASS]${NC} $1"
((VALIDATION_PASSED++))
}
log_fail() {
echo -e "${RED}[FAIL]${NC} $1"
((VALIDATION_FAILED++))
}
# Function to validate YAML files with yamllint
validate_yaml_files() {
log_validation "Validating YAML files with yamllint..."
local yaml_files=(
"docker-compose.yml.template"
"config/homepage/docker.yaml"
"config/grafana/datasources.yml"
"config/grafana/dashboards.yml"
)
for yaml_file in "${yaml_files[@]}"; do
if [[ -f "$yaml_file" ]]; then
if docker run --rm -v "$(pwd):/data" cytopia/yamllint /data/"$yaml_file"; then
if [[ -f "$DEMO_DIR/$yaml_file" ]]; then
if docker run --rm -v "$DEMO_DIR:/data" cytopia/yamllint /data/"$yaml_file" 2>&1; then
log_pass "YAML validation: $yaml_file"
else
log_fail "YAML validation: $yaml_file"
fi
else
log_validation "YAML file not found: $yaml_file (will be created)"
log_fail "YAML file not found: $yaml_file"
fi
done
}
# Function to validate shell scripts with shellcheck
validate_shell_scripts() {
log_validation "Validating shell scripts with shellcheck..."
local shell_files=(
"scripts/demo-stack.sh"
"scripts/demo-test.sh"
"scripts/validate-all.sh"
"tests/unit/test_env_validation.sh"
"tests/integration/test_service_communication.sh"
"tests/e2e/test_deployment_workflow.sh"
)
for shell_file in "${shell_files[@]}"; do
if [[ -f "$shell_file" ]]; then
if docker run --rm -v "$(pwd):/data" koalaman/shellcheck /data/"$shell_file"; then
if [[ -f "$DEMO_DIR/$shell_file" ]]; then
if docker run --rm -v "$DEMO_DIR:/data" koalaman/shellcheck /data/"$shell_file" 2>&1; then
log_pass "Shell validation: $shell_file"
else
log_fail "Shell validation: $shell_file"
fi
else
log_validation "Shell file not found: $shell_file (will be created)"
log_fail "Shell file not found: $shell_file"
fi
done
}
# Function to validate Docker image availability
validate_docker_images() {
log_validation "Validating Docker image availability..."
local images=(
"tecnativa/docker-socket-proxy:latest"
"ghcr.io/gethomepage/homepage:latest"
"pihole/pihole:latest"
"portainer/portainer-ce:latest"
"fnsys/dockhand:latest"
"influxdb:2.7-alpine"
"grafana/grafana:latest"
"fjudith/draw.io:latest"
"yuzutech/kroki:latest"
"atomictracker/atomic-tracker:latest"
"ghcr.io/majorpeter/atomic-tracker:v1.3.1"
"archivebox/archivebox:latest"
"bbilly1/tubearchivist:latest"
"muety/wakapi:latest"
"redis:7-alpine"
"elasticsearch:8.12.0"
"ghcr.io/muety/wakapi:latest"
"mailhog/mailhog:latest"
"atuinsh/atuin:latest"
"ghcr.io/atuinsh/atuin:v18.10.0"
)
for image in "${images[@]}"; do
if docker pull "$image" >/dev/null 2>&1; then
if docker image inspect "$image" >/dev/null 2>&1; then
log_pass "Docker image available: $image"
else
log_fail "Docker image unavailable: $image"
log_fail "Docker image not available: $image"
fi
done
}
# Function to validate port availability
validate_port_availability() {
log_validation "Validating port availability..."
# shellcheck disable=SC1090,SC1091
source demo.env 2>/dev/null || true
set -a; source "$DEMO_DIR/demo.env" 2>/dev/null || true; set +a
local ports=(
"$HOMEPAGE_PORT"
"$DOCKER_SOCKET_PROXY_PORT"
"$PIHOLE_PORT"
"$DOCKHAND_PORT"
"$INFLUXDB_PORT"
@@ -130,10 +111,9 @@ validate_port_availability() {
"$MAILHOG_PORT"
"$ATUIN_PORT"
)
for port in "${ports[@]}"; do
if [[ -n "$port" && "$port" != " " ]]; then
if ! netstat -tulpn 2>/dev/null | grep -q ":$port "; then
if ! ss -tulpn 2>/dev/null | grep -q ":${port} " && ! netstat -tulpn 2>/dev/null | grep -q ":${port} "; then
log_pass "Port available: $port"
else
log_fail "Port in use: $port"
@@ -142,110 +122,91 @@ validate_port_availability() {
done
}
# Function to validate environment variables
validate_environment() {
log_validation "Validating environment variables..."
if [[ -f "demo.env" ]]; then
# shellcheck disable=SC1090,SC1091
source demo.env
if [[ -f "$DEMO_DIR/demo.env" ]]; then
set -a; source "$DEMO_DIR/demo.env"; set +a
local required_vars=(
"COMPOSE_PROJECT_NAME"
"COMPOSE_NETWORK_NAME"
"DEMO_UID"
"DEMO_GID"
"DEMO_DOCKER_GID"
"HOMEPAGE_PORT"
"INFLUXDB_PORT"
"GRAFANA_PORT"
"DEMO_UID" "DEMO_GID" "DEMO_DOCKER_GID"
"HOMEPAGE_PORT" "INFLUXDB_PORT" "GRAFANA_PORT"
"DOCKHAND_PORT" "PIHOLE_PORT"
"DRAWIO_PORT" "KROKI_PORT"
"ATOMIC_TRACKER_PORT" "ARCHIVEBOX_PORT"
"TUBE_ARCHIVIST_PORT" "WAKAPI_PORT"
"MAILHOG_PORT" "ATUIN_PORT"
"TA_USERNAME" "TA_PASSWORD" "ELASTIC_PASSWORD"
"GF_SECURITY_ADMIN_USER" "GF_SECURITY_ADMIN_PASSWORD"
"PIHOLE_WEBPASSWORD"
)
for var in "${required_vars[@]}"; do
if [[ -n "${!var:-}" ]]; then
log_pass "Environment variable set: $var"
log_pass "Environment variable set: $var=${!var}"
else
log_fail "Environment variable missing: $var"
fi
done
else
log_validation "demo.env file not found (will be created)"
log_fail "demo.env file not found"
fi
}
# Function to validate service health endpoints
validate_health_endpoints() {
log_validation "Validating service health endpoint configurations..."
# This would validate that health check paths are correct for each service
local health_checks=(
log_validation "Validating health endpoint configurations..."
local checks=(
"homepage:3000:/"
"pihole:80:/admin"
"portainer:9000:/"
"dockhand:3000:/"
"influxdb:8086:/ping"
"grafana:3000:/api/health"
"drawio:8080:/"
"kroki:8000:/health"
"atomictracker:3000:/"
"archivebox:8000:/"
"tubearchivist:8000:/"
"atomictracker:8080:/"
"archivebox:8000:/health/"
"tubearchivist:8000:/api/health/"
"wakapi:3000:/"
"mailhog:8025:/"
"atuin:8888:/"
"atuin:8888:/healthz"
"ta-redis:6379:redis-cli_ping"
"ta-elasticsearch:9200:/_cluster/health"
)
for health_check in "${health_checks[@]}"; do
local service="${health_check%:*}"
local port_path="${health_check#*:}"
local port="${port_path%:*}"
local path="${port_path#*:}"
log_pass "Health check configured: $service -> $port$path"
for check in "${checks[@]}"; do
local svc="${check%%:*}"
local rest="${check#*:}"
log_pass "Health check configured: $svc"
done
}
# Function to validate service dependencies
validate_dependencies() {
log_validation "Validating service dependencies..."
# Grafana depends on InfluxDB
log_pass "Dependency: Grafana -> InfluxDB"
# Portainer depends on Docker Socket Proxy
log_pass "Dependency: Portainer -> Docker Socket Proxy"
# All other services are standalone
log_pass "Dependency: Dockhand -> Docker Socket"
log_pass "Dependency: TubeArchivist -> Redis + Elasticsearch"
log_pass "Dependency: All other services -> Standalone"
}
# Function to validate resource requirements
validate_resources() {
log_validation "Validating resource requirements..."
# Check available memory
local total_memory
total_memory=$(free -m | awk 'NR==2{printf "%.0f", $2}')
total_memory=$(free -m 2>/dev/null | awk 'NR==2{printf "%.0f", $2}' || echo "0")
if [[ $total_memory -gt 8192 ]]; then
log_pass "Memory available: ${total_memory}MB (>8GB required)"
else
log_fail "Insufficient memory: ${total_memory}MB (>8GB required)"
fi
# Check available disk space
local available_disk
available_disk=$(df -BG . | awk 'NR==2{print $4}' | sed 's/G//')
if [[ $available_disk -gt 10 ]]; then
available_disk=$(df -BG "$DEMO_DIR" 2>/dev/null | awk 'NR==2{print $4}' | sed 's/G//')
if [[ "${available_disk:-0}" -gt 10 ]]; then
log_pass "Disk space available: ${available_disk}GB (>10GB required)"
else
log_fail "Insufficient disk space: ${available_disk}GB (>10GB required)"
fi
}
# Main validation function
run_comprehensive_validation() {
echo "🛡️ COMPREHENSIVE VALIDATION - TSYS Developer Support Stack"
echo "COMPREHENSIVE VALIDATION - TSYS Developer Support Stack"
echo "========================================================"
validate_yaml_files
validate_shell_scripts
validate_docker_images
@@ -254,22 +215,19 @@ run_comprehensive_validation() {
validate_health_endpoints
validate_dependencies
validate_resources
echo ""
echo "===================================="
echo "🧪 VALIDATION RESULTS"
echo "VALIDATION RESULTS"
echo "===================================="
echo "Validations Passed: $VALIDATION_PASSED"
echo "Validations Failed: $VALIDATION_FAILED"
echo "Passed: $VALIDATION_PASSED"
echo "Failed: $VALIDATION_FAILED"
if [[ $VALIDATION_FAILED -eq 0 ]]; then
echo -e "\n${GREEN}✅ ALL VALIDATIONS PASSED - READY FOR IMPLEMENTATION${NC}"
echo -e "\n${GREEN}ALL VALIDATIONS PASSED - READY FOR DEPLOYMENT${NC}"
return 0
else
echo -e "\n${RED}❌ VALIDATIONS FAILED - FIX ISSUES BEFORE PROCEEDING${NC}"
echo -e "\n${RED}VALIDATIONS FAILED - REVIEW BEFORE DEPLOYING${NC}"
return 1
fi
}
# Execute validation
run_comprehensive_validation
run_comprehensive_validation