wrynegade
e7484103b9
===================================================================== A follow-up to V5 focused on hardening the environment system and expanding the ZSH logging/caching toolkit. No migration required from v5.0.x, though note the log-level reorganization below may quiet some messages at lower verbosities. --- New Features ------------------------- - persistent cross-runtime cache for ZSH-type scwrypts; extends the v5.0 runtime speedup cache to survive between runs with automatic hash-based invalidation (toggle via SCWRYPTS__ZSH_CACHE_ENABLED) - new 'trace' log level (5) and echo.trace, plus '-v VARNAME' state injection for echo.debug / echo.trace to surface variable values inline - additional scwrypts output formats: 'raw' and 'logfmt' (alongside pretty and json) - normalize.boolean utility for consistent truthy/falsey handling across ZSH-type scwrypts - utils.fzf.file-select for directory-scoped file selection prompts - automatic dependency wrappers providing default arguments, GNU coreutil resolution, and scwrypts trace on wrapped commands --- Changes ------------------------------ - log levels reorganized; success / status / reminder messages now emit at level 3, so lower verbosities will show fewer of these - environment library restructured around get-user-json as the single source of truth (replaces the previous user module and cache-output) - utility renames for consistency: user.Yn / user.yN (from utils.*) - utils.fail and utils.abort deprecated in favor of echo.error and echo.error.user-abort --- Bug Fixes ---------------------------- - CI runs now resolve config lookup-paths (.dotted.path) to their environment variable before reading, fixing false "not set" reports and invalid-export errors for lookup-path checks in CI - hardened environment type detection so array-valued configs reprint correctly after their first check - corrected exit-code capture in the cache layer (now reflects the cached command, not the downstream output filter) - scwrypt exit code now survives the logging pipeline - assorted script fixes (efs unmount file listing, postgres run-sql file discovery)
95 lines
2.6 KiB
Bash
95 lines
2.6 KiB
Bash
#####################################################################
|
|
|
|
DEPENDENCIES+=(
|
|
redis-cli
|
|
docker
|
|
)
|
|
|
|
REQUIRED_ENV+=()
|
|
|
|
utils.environment.check SCWRYPTS_KUBECTL_REDIS --default managed
|
|
|
|
#####################################################################
|
|
|
|
kube.redis() {
|
|
[ ! $USAGE ] && local USAGE="
|
|
usage: [...options...]
|
|
|
|
options:
|
|
--subsession [0-9] use a particular subsession
|
|
|
|
-p, --prefix apply dynamic prefix to the next command line argument
|
|
|
|
--get-prefix output key prefix for current session+subsession
|
|
--get-static-definition output the static ZSH function definition for kube.redis
|
|
|
|
additional arguments and options are passed through to 'redis-cli'
|
|
"
|
|
|
|
local REDIS_ARGS=() USER_ARGS=()
|
|
|
|
[ $SUBSESSION ] || local SUBSESSION=0
|
|
|
|
local REDIS_PREFIX=$(eval echo '$SCWRYPTS_KUBECTL_REDIS_KEY_PREFIX__'$SCWRYPTS_KUBECTL_REDIS)
|
|
[ $REDIS_PREFIX ] && REDIS_PREFIX+=':'
|
|
|
|
while [[ $# -gt 0 ]]
|
|
do
|
|
case $1 in
|
|
( -p | --prefix ) USER_ARGS+=("${REDIS_PREFIX}${SCWRYPTS_ENV}:${SUBSESSION}:$2"); shift 1 ;;
|
|
|
|
( --subsession ) SUBSESSION=$2; shift 1 ;;
|
|
|
|
( --get-prefix ) echo $REDIS_PREFIX; return 0 ;;
|
|
( --get-static-definition ) ECHO_STATIC_DEFINITION=1 ;;
|
|
|
|
( * ) USER_ARGS+=($1) ;;
|
|
esac
|
|
shift 1
|
|
done
|
|
|
|
local REDIS_HOST=$(eval echo '$SCWRYPTS_KUBECTL_REDIS_HOST__'$SCWRYPTS_KUBECTL_REDIS)
|
|
local REDIS_PORT=$(eval echo '$SCWRYPTS_KUBECTL_REDIS_PORT__'$SCWRYPTS_KUBECTL_REDIS)
|
|
local REDIS_AUTH=$(eval echo '$SCWRYPTS_KUBECTL_REDIS_AUTH__'$SCWRYPTS_KUBECTL_REDIS)
|
|
|
|
[ $REDIS_HOST ] && REDIS_ARGS+=(-h $REDIS_HOST)
|
|
[ $REDIS_PORT ] && REDIS_ARGS+=(-p $REDIS_PORT)
|
|
[ $REDIS_AUTH ] && REDIS_ARGS+=(-a $REDIS_AUTH)
|
|
|
|
REDIS_ARGS+=(--raw)
|
|
|
|
[[ $ECHO_STATIC_DEFINITION -eq 1 ]] && {
|
|
echo "kube.redis() {\
|
|
local USER_ARGS=(); \
|
|
[ ! \$SUBSESSION ] && local SUBSESSION=0 ;\
|
|
while [[ \$# -gt 0 ]]; \
|
|
do \
|
|
case \$1 in
|
|
( -p | --prefix ) USER_ARGS+=(\"${REDIS_PREFIX}\${SCWRYPTS_ENV}:\${SUBSESSION}:\$2\"); shift 1 ;; \
|
|
( * ) USER_ARGS+=(\$1) ;; \
|
|
esac; \
|
|
shift 1; \
|
|
done; \
|
|
redis-cli ${REDIS_ARGS[@]} \${USER_ARGS[@]}; \
|
|
}" | sed 's/\s\+/ /g'
|
|
return 0
|
|
}
|
|
|
|
redis-cli ${REDIS_ARGS[@]} ${USER_ARGS[@]}
|
|
}
|
|
|
|
kube.redis ping 2>/dev/null | grep -qi pong || {
|
|
RPID=$(docker ps -a | grep scwrypts-kubectl-redis | awk '{print $1;}')
|
|
[ $RPID ] && echo.status 'refreshing redis instance' && docker rm -f $RPID
|
|
unset RPID
|
|
|
|
docker run \
|
|
--detach \
|
|
--name scwrypts-kubectl-redis \
|
|
--publish $SCWRYPTS_KUBECTL_REDIS_PORT__managed:6379 \
|
|
redis &>/dev/null
|
|
|
|
echo.status 'awaiting redis connection'
|
|
until kube.redis ping 2>/dev/null | grep -qi pong; do sleep 0.5; done
|
|
}
|