feat: add Woodpecker multi-instance credential support
Add named instance support matching the existing cloudflare pattern:
- credentials.sh: woodpecker-<name> loads .woodpecker.<name>.{url,token}
- credentials.sh: bare woodpecker resolves via .woodpecker.default or
WOODPECKER_INSTANCE env, with legacy flat-key fallback
- All 3 pipeline tools accept -a <instance> flag to select instance
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Jason Woltje
@@ -2,48 +2,43 @@
|
||||
#
|
||||
# pipeline-list.sh — List Woodpecker CI pipelines
|
||||
#
|
||||
# Usage: pipeline-list.sh [-r owner/repo] [-l limit] [-f format]
|
||||
# Usage: pipeline-list.sh [-r owner/repo] [-l limit] [-f format] [-a instance]
|
||||
#
|
||||
# Options:
|
||||
# -r repo Repository in owner/repo format (default: current repo)
|
||||
# -l limit Number of pipelines to show (default: 20)
|
||||
# -f format Output format: table (default), json
|
||||
# -h Show this help
|
||||
# -r repo Repository in owner/repo format (default: current repo)
|
||||
# -l limit Number of pipelines to show (default: 20)
|
||||
# -f format Output format: table (default), json
|
||||
# -a instance Woodpecker instance name (e.g. usc, mosaic)
|
||||
# -h Show this help
|
||||
#
|
||||
# Requires: woodpecker.url and woodpecker.token in credentials.json
|
||||
# Requires: woodpecker credentials in credentials.json
|
||||
set -euo pipefail
|
||||
|
||||
MOSAIC_HOME="${MOSAIC_HOME:-$HOME/.config/mosaic}"
|
||||
source "$MOSAIC_HOME/tools/_lib/credentials.sh"
|
||||
|
||||
# Check if woodpecker credentials exist before loading
|
||||
CRED_FILE="${MOSAIC_CREDENTIALS_FILE:-$HOME/src/jarvis-brain/credentials.json}"
|
||||
if ! jq -e '.woodpecker.token // empty | select(. != "")' "$CRED_FILE" &>/dev/null; then
|
||||
echo "Error: Woodpecker API token not configured in credentials.json" >&2
|
||||
echo "" >&2
|
||||
echo "To configure:" >&2
|
||||
echo " 1. Get your token from Woodpecker CI → User Settings → API" >&2
|
||||
echo " 2. Add to credentials.json:" >&2
|
||||
echo ' "woodpecker": {"url": "https://ci.mosaicstack.dev", "token": "YOUR_TOKEN"}' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
load_credentials woodpecker
|
||||
|
||||
REPO=""
|
||||
LIMIT=20
|
||||
FORMAT="table"
|
||||
WP_INSTANCE=""
|
||||
|
||||
while getopts "r:l:f:h" opt; do
|
||||
while getopts "r:l:f:a:h" opt; do
|
||||
case $opt in
|
||||
r) REPO="$OPTARG" ;;
|
||||
l) LIMIT="$OPTARG" ;;
|
||||
f) FORMAT="$OPTARG" ;;
|
||||
a) WP_INSTANCE="$OPTARG" ;;
|
||||
h) head -14 "$0" | grep "^#" | sed 's/^# \?//'; exit 0 ;;
|
||||
*) echo "Usage: $0 [-r owner/repo] [-l limit] [-f format]" >&2; exit 1 ;;
|
||||
*) echo "Usage: $0 [-r owner/repo] [-l limit] [-f format] [-a instance]" >&2; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -n "$WP_INSTANCE" ]]; then
|
||||
load_credentials "woodpecker-${WP_INSTANCE}"
|
||||
else
|
||||
load_credentials woodpecker
|
||||
fi
|
||||
|
||||
# Auto-detect repo from git remote if not specified
|
||||
if [[ -z "$REPO" ]]; then
|
||||
remote_url=$(git remote get-url origin 2>/dev/null || true)
|
||||
|
||||
@@ -2,43 +2,43 @@
|
||||
#
|
||||
# pipeline-status.sh — Check Woodpecker CI pipeline status
|
||||
#
|
||||
# Usage: pipeline-status.sh [-r owner/repo] [-n number] [-f format]
|
||||
# Usage: pipeline-status.sh [-r owner/repo] [-n number] [-f format] [-a instance]
|
||||
#
|
||||
# Options:
|
||||
# -r repo Repository in owner/repo format (default: current repo)
|
||||
# -n number Pipeline number (default: latest)
|
||||
# -f format Output format: table (default), json
|
||||
# -h Show this help
|
||||
# -r repo Repository in owner/repo format (default: current repo)
|
||||
# -n number Pipeline number (default: latest)
|
||||
# -f format Output format: table (default), json
|
||||
# -a instance Woodpecker instance name (e.g. usc, mosaic)
|
||||
# -h Show this help
|
||||
#
|
||||
# Requires: woodpecker.url and woodpecker.token in credentials.json
|
||||
# Requires: woodpecker credentials in credentials.json
|
||||
set -euo pipefail
|
||||
|
||||
MOSAIC_HOME="${MOSAIC_HOME:-$HOME/.config/mosaic}"
|
||||
source "$MOSAIC_HOME/tools/_lib/credentials.sh"
|
||||
|
||||
CRED_FILE="${MOSAIC_CREDENTIALS_FILE:-$HOME/src/jarvis-brain/credentials.json}"
|
||||
if ! jq -e '.woodpecker.token // empty | select(. != "")' "$CRED_FILE" &>/dev/null; then
|
||||
echo "Error: Woodpecker API token not configured in credentials.json" >&2
|
||||
echo "See: ~/.config/mosaic/tools/woodpecker/README.md" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
load_credentials woodpecker
|
||||
|
||||
REPO=""
|
||||
NUMBER=""
|
||||
FORMAT="table"
|
||||
WP_INSTANCE=""
|
||||
|
||||
while getopts "r:n:f:h" opt; do
|
||||
while getopts "r:n:f:a:h" opt; do
|
||||
case $opt in
|
||||
r) REPO="$OPTARG" ;;
|
||||
n) NUMBER="$OPTARG" ;;
|
||||
f) FORMAT="$OPTARG" ;;
|
||||
a) WP_INSTANCE="$OPTARG" ;;
|
||||
h) head -14 "$0" | grep "^#" | sed 's/^# \?//'; exit 0 ;;
|
||||
*) echo "Usage: $0 [-r owner/repo] [-n number] [-f format]" >&2; exit 1 ;;
|
||||
*) echo "Usage: $0 [-r owner/repo] [-n number] [-f format] [-a instance]" >&2; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -n "$WP_INSTANCE" ]]; then
|
||||
load_credentials "woodpecker-${WP_INSTANCE}"
|
||||
else
|
||||
load_credentials woodpecker
|
||||
fi
|
||||
|
||||
if [[ -z "$REPO" ]]; then
|
||||
remote_url=$(git remote get-url origin 2>/dev/null || true)
|
||||
if [[ -n "$remote_url" ]]; then
|
||||
|
||||
@@ -2,40 +2,40 @@
|
||||
#
|
||||
# pipeline-trigger.sh — Trigger a Woodpecker CI pipeline
|
||||
#
|
||||
# Usage: pipeline-trigger.sh [-r owner/repo] [-b branch]
|
||||
# Usage: pipeline-trigger.sh [-r owner/repo] [-b branch] [-a instance]
|
||||
#
|
||||
# Options:
|
||||
# -r repo Repository in owner/repo format (default: current repo)
|
||||
# -b branch Branch to build (default: main)
|
||||
# -h Show this help
|
||||
# -r repo Repository in owner/repo format (default: current repo)
|
||||
# -b branch Branch to build (default: main)
|
||||
# -a instance Woodpecker instance name (e.g. usc, mosaic)
|
||||
# -h Show this help
|
||||
#
|
||||
# Requires: woodpecker.url and woodpecker.token in credentials.json
|
||||
# Requires: woodpecker credentials in credentials.json
|
||||
set -euo pipefail
|
||||
|
||||
MOSAIC_HOME="${MOSAIC_HOME:-$HOME/.config/mosaic}"
|
||||
source "$MOSAIC_HOME/tools/_lib/credentials.sh"
|
||||
|
||||
CRED_FILE="${MOSAIC_CREDENTIALS_FILE:-$HOME/src/jarvis-brain/credentials.json}"
|
||||
if ! jq -e '.woodpecker.token // empty | select(. != "")' "$CRED_FILE" &>/dev/null; then
|
||||
echo "Error: Woodpecker API token not configured in credentials.json" >&2
|
||||
echo "See: ~/.config/mosaic/tools/woodpecker/README.md" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
load_credentials woodpecker
|
||||
|
||||
REPO=""
|
||||
BRANCH="main"
|
||||
WP_INSTANCE=""
|
||||
|
||||
while getopts "r:b:h" opt; do
|
||||
while getopts "r:b:a:h" opt; do
|
||||
case $opt in
|
||||
r) REPO="$OPTARG" ;;
|
||||
b) BRANCH="$OPTARG" ;;
|
||||
h) head -12 "$0" | grep "^#" | sed 's/^# \?//'; exit 0 ;;
|
||||
*) echo "Usage: $0 [-r owner/repo] [-b branch]" >&2; exit 1 ;;
|
||||
a) WP_INSTANCE="$OPTARG" ;;
|
||||
h) head -14 "$0" | grep "^#" | sed 's/^# \?//'; exit 0 ;;
|
||||
*) echo "Usage: $0 [-r owner/repo] [-b branch] [-a instance]" >&2; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -n "$WP_INSTANCE" ]]; then
|
||||
load_credentials "woodpecker-${WP_INSTANCE}"
|
||||
else
|
||||
load_credentials woodpecker
|
||||
fi
|
||||
|
||||
if [[ -z "$REPO" ]]; then
|
||||
remote_url=$(git remote get-url origin 2>/dev/null || true)
|
||||
if [[ -n "$remote_url" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user