Jon Chery
fc94326b0e
P00 — Re-architecture Foundation (deprecation/migration/test-infra/persona/docs). Deprecation sweep (REQ-068, REQ-072, REQ-089): - Add // Deprecated: doc comments to internal/daemon (R-001), internal/transport (REQ-073), internal/security/ca.go+csr.go (D-101/REQ-076), internal/engine/ dispatcher.go+peer.go (CLI-side scheduler), internal/cli/daemon.go. - orca daemon emits slog.Warn deprecation banner on every run (ungated); fires R-001 + v0.10-P05 drain-and-stop + v0.10-P14 deletion. - orca cert and orca node join (mTLS path) emit deprecation warnings; proxmox SSH path (the v0.9 replacement) does not warn. - Add --no-deprecation-warnings global flag on root command (PersistentPreRunE) for orca upgrade migrations. - 12 new daemon/cert/node deprecation tests in internal/cli/daemon_test.go (cli coverage 81.9%, warnDeprecated 100%). - Add DEPRECATED banners to v0.8 sections of ARCHITECTURE.md (verified the v0.9 supersession section + Supersession Table from prior turn are present). Bash tooling gate (grill C-06, C-15, C-16, C-17, C-18): - scripts/tests/test_helper.bash + example_test.bash — bats framework + helpers. - scripts/lib/orca-log.sh — slog-compatible JSON logging to syslog (C-17). - scripts/orca-verify-render.sh — render-contract validator skeleton (C-16). - scripts/tests/orca-log_test.bash + orca-verify-render_test.bash — 20 bats tests total (happy + failure paths per C-15). - .shellcheckrc — project shellcheck config. - Makefile: test-bash + lint-bash targets (graceful skip if tools missing); wired into test + lint targets. - internal/emit/contract.go + contract_test.go — versioned JSON render contract (orca.emit/v1) between Go emitters and bash appliers (C-16). - .ciagent/BASH_CAPABILITY_MAP_v0.9.md — maps shipped internal/transport capabilities to bash-side equivalents or accepted drops (C-18). - D-186 recorded in PROJECT.md: bash exempt from Go coverage gate; compensating control is bats + shellcheck + shfmt (C-06). verify-reqs: 90 requirements consistent. Build/test/lint/fmt all green. 20 bats tests pass. Go tests pass. No v0.8 code deleted — only marked deprecated (deletion deferred to v0.10-P14 per REQ-090 dual-write window). ---ci--- project: orca phase: P00 milestone: v0.9 status: execute ---/ci---
69 lines
2.8 KiB
Bash
69 lines
2.8 KiB
Bash
#!/usr/bin/env bats
|
|
# Tests for scripts/lib/orca-log.sh (C-17 — slog-compatible JSON to syslog).
|
|
# Verifies the JSON structure is valid, field set is present, level maps correctly,
|
|
# and the logger-fallback-to-stderr path works in test environments (no logger).
|
|
|
|
load test_helper
|
|
|
|
@test "orca_log_info emits valid JSON with all required fields" {
|
|
export ORCA_LOG_ACTOR="test-actor"
|
|
output="$(_orca_log_for_test info test-action test-resource ok "")"
|
|
assert_json_field "$output" "ts"
|
|
assert_json_field "$output" "level"
|
|
assert_json_field "$output" "actor"
|
|
assert_json_field "$output" "action"
|
|
assert_json_field "$output" "resource"
|
|
assert_json_field "$output" "result"
|
|
assert_contains "$output" '"level":"info"'
|
|
assert_contains "$output" '"action":"test-action"'
|
|
assert_contains "$output" '"resource":"test-resource"'
|
|
assert_contains "$output" '"result":"ok"'
|
|
}
|
|
|
|
@test "orca_log_warn maps level correctly" {
|
|
output="$(_orca_log_for_test warn w-action w-resource warn-result)"
|
|
assert_contains "$output" '"level":"warn"'
|
|
}
|
|
|
|
@test "orca_log_error maps level and includes error field when provided" {
|
|
output="$(_orca_log_for_test error err-action err-resource failed "something broke")"
|
|
assert_contains "$output" '"level":"error"'
|
|
assert_contains "$output" '"result":"failed"'
|
|
assert_contains "$output" '"error":"something broke"'
|
|
}
|
|
|
|
@test "orca_log_error omits error field when not provided" {
|
|
output="$(_orca_log_for_test error err-action err-resource failed)"
|
|
assert_contains "$output" '"level":"error"'
|
|
assert_not_contains "$output" '"error":'
|
|
}
|
|
|
|
@test "orca_log escapes quotes and backslashes in error field" {
|
|
output="$(_orca_log_for_test error a r failed 'has "quote" and \backslash')"
|
|
assert_contains "$output" '\"quote\"'
|
|
assert_contains "$output" '\\backslash'
|
|
}
|
|
|
|
@test "ORCA_LOG_ACTOR env var overrides the actor field" {
|
|
export ORCA_LOG_ACTOR="custom-actor-123"
|
|
output="$(_orca_log_for_test info a r ok)"
|
|
assert_contains "$output" '"actor":"custom-actor-123"'
|
|
}
|
|
|
|
# Test helper: source orca-log.sh and emit to stderr (force fallback by hiding logger).
|
|
_orca_log_for_test() {
|
|
local level="$1" action="$2" resource="$3" result="$4" error="${5:-}"
|
|
# Source the library in a subshell with logger hidden so it falls back to stderr.
|
|
(
|
|
PATH="/usr/bin:/bin" # hide logger if it's in /usr/local/bin etc.
|
|
# shellcheck disable=SC2317 # logger is overridden below for test capture
|
|
logger() { echo "$3"; } # $3 is the message arg (logger -t orca "$line")
|
|
# shellcheck disable=SC1091 # path is set at runtime by SCRIPTS_DIR
|
|
source "$SCRIPTS_DIR/lib/orca-log.sh"
|
|
case "$level" in
|
|
info) orca_log_info "$action" "$resource" "$result" "$error" ;;
|
|
warn) orca_log_warn "$action" "$resource" "$result" "$error" ;;
|
|
error) orca_log_error "$action" "$resource" "$result" "$error" ;;
|
|
esac
|
|
)
|
|
} |