vrr/spawn
2
0
Fork 0
mirror of https://github.com/OpenRouterTeam/spawn.git synced 2026-05-02 22:00:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

refactor: extract ensure_multi_credentials to reduce duplication across 5 providers (#468)

Browse source 
Add a generic ensure_multi_credentials() helper to shared/common.sh that
handles the env-var/config-file/prompt/test/save flow for providers needing
multiple credentials. This eliminates ~270 lines of duplicated logic across
contabo, netcup, ramnode, ionos, and upcloud, replacing it with single
function calls.

Each provider's ensure_*_credentials() function is now 3-8 lines instead
of 30-65 lines.

Agent: complexity-hunter

Co-authored-by: A <6723574+louisgv@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
A 2026-02-11 07:48:32 -08:00 • committed by GitHub
parent e38a75ea17
commit 79e3b887c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 144 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

71
upcloud/lib/common.sh
View file

@ -53,75 +53,12 @@ test_upcloud_credentials() {
# Try loading UpCloud credentials from config file
# Returns 0 if loaded, 1 otherwise
_upcloud_load_config_credentials() {
local config_file="$1"
local creds
creds=$(_load_json_config_fields "$config_file" username password) || return 1
local saved_username saved_password
{ read -r saved_username; read -r saved_password; } <<< "${creds}"
if [[ -z "${saved_username}" ]] || [[ -z "${saved_password}" ]]; then
return 1
fi
export UPCLOUD_USERNAME="${saved_username}"
export UPCLOUD_PASSWORD="${saved_password}"
log_info "Using UpCloud credentials from ${config_file}"
}
# Prompt user for UpCloud credentials interactively
# Returns 0 on success (exports credentials), 1 on failure
_upcloud_prompt_credentials() {
echo ""
log_warn "UpCloud API Credentials Required"
log_warn "Create API credentials at: https://hub.upcloud.com/people/account"
echo ""
local username
username=$(safe_read "Enter your UpCloud API username: ") || return 1
if [[ -z "${username}" ]]; then
log_error "Username is required"
return 1
fi
local password
password=$(safe_read "Enter your UpCloud API password: ") || return 1
if [[ -z "${password}" ]]; then
log_error "Password is required"
return 1
fi
export UPCLOUD_USERNAME="${username}"
export UPCLOUD_PASSWORD="${password}"
}
# Ensure UpCloud credentials are available (env var -> config file -> prompt+save)
ensure_upcloud_credentials() {
check_python_available || return 1
local config_file="$HOME/.config/spawn/upcloud.json"
# 1. Check environment variables
if [[ -n "${UPCLOUD_USERNAME:-}" ]] && [[ -n "${UPCLOUD_PASSWORD:-}" ]]; then
log_info "Using UpCloud credentials from environment"
test_upcloud_credentials
return $?
fi
# 2. Check config file
if _upcloud_load_config_credentials "$config_file"; then
return 0
fi
# 3. Prompt and save
_upcloud_prompt_credentials || return 1
if ! test_upcloud_credentials; then
unset UPCLOUD_USERNAME UPCLOUD_PASSWORD
return 1
fi
_save_json_config "$config_file" username "$UPCLOUD_USERNAME" password "$UPCLOUD_PASSWORD"
ensure_multi_credentials "UpCloud" "$HOME/.config/spawn/upcloud.json" \
"https://hub.upcloud.com/people/account" test_upcloud_credentials \
"UPCLOUD_USERNAME:username:API Username" \
"UPCLOUD_PASSWORD:password:API Password"
}
# Get server name from env var or prompt