mirror of
https://github.com/OpenRouterTeam/spawn.git
synced 2026-05-05 23:50:48 +00:00
refactor: Decompose Linode and GenesisCloud create_server functions (#219)
Extract helper functions from the two largest create_server functions: Linode (99 lines -> 30-line orchestrator): - _linode_fetch_ssh_keys: fetch authorized SSH public keys - _linode_build_create_payload: build userdata, root password, request body - _linode_wait_for_active: poll until instance is running GenesisCloud (92 lines -> 28-line orchestrator): - _genesis_fetch_ssh_key_ids: fetch SSH key IDs - _genesis_build_create_payload: build userdata and request body - _genesis_wait_for_active: poll until instance is active 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
GitHub
parent
de537de83d
commit
84c6b935f7
2 changed files with 121 additions and 91 deletions
|
|
@ -111,6 +111,70 @@ get_server_name() {
|
|||
echo "$server_name"
|
||||
}
|
||||
|
||||
# Fetch all SSH key IDs from Genesis Cloud account
|
||||
_genesis_fetch_ssh_key_ids() {
|
||||
local ssh_keys_response
|
||||
ssh_keys_response=$(genesis_api GET "/ssh-keys")
|
||||
echo "$ssh_keys_response" | python3 -c "
|
||||
import json, sys
|
||||
data = json.loads(sys.stdin.read())
|
||||
keys = data.get('ssh_keys', [])
|
||||
ids = [k['id'] for k in keys]
|
||||
print(json.dumps(ids))
|
||||
"
|
||||
}
|
||||
|
||||
# Build the JSON request body for Genesis Cloud instance creation
|
||||
_genesis_build_create_payload() {
|
||||
local name="$1" instance_type="$2" region="$3" image="$4" ssh_key_ids="$5"
|
||||
|
||||
local userdata
|
||||
userdata=$(get_cloud_init_userdata)
|
||||
local userdata_json
|
||||
userdata_json=$(echo "$userdata" | python3 -c "import json,sys; print(json.dumps(sys.stdin.read()))")
|
||||
|
||||
python3 -c "
|
||||
import json
|
||||
body = {
|
||||
'name': '$name',
|
||||
'type': '$instance_type',
|
||||
'region': '$region',
|
||||
'image': '$image',
|
||||
'ssh_key_ids': $ssh_key_ids,
|
||||
'startup_script': json.loads($userdata_json)
|
||||
}
|
||||
print(json.dumps(body))
|
||||
"
|
||||
}
|
||||
|
||||
# Poll Genesis Cloud API until instance is active, sets GENESIS_SERVER_IP
|
||||
_genesis_wait_for_active() {
|
||||
local server_id="$1"
|
||||
log_warn "Waiting for instance to become active..."
|
||||
local max_attempts=60
|
||||
local attempt=1
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
local status_response
|
||||
status_response=$(genesis_api GET "/instances/$server_id")
|
||||
local status
|
||||
status=$(echo "$status_response" | python3 -c "import json,sys; print(json.loads(sys.stdin.read())['instance']['status'])")
|
||||
|
||||
if [[ "$status" == "active" ]]; then
|
||||
GENESIS_SERVER_IP=$(echo "$status_response" | python3 -c "import json,sys; print(json.loads(sys.stdin.read())['instance']['public_ip'])")
|
||||
export GENESIS_SERVER_IP
|
||||
log_info "Instance active: IP=$GENESIS_SERVER_IP"
|
||||
return 0
|
||||
fi
|
||||
|
||||
log_warn "Instance status: $status ($attempt/$max_attempts)"
|
||||
sleep "${INSTANCE_STATUS_POLL_DELAY}"
|
||||
attempt=$((attempt + 1))
|
||||
done
|
||||
|
||||
log_error "Instance did not become active in time"
|
||||
return 1
|
||||
}
|
||||
|
||||
create_server() {
|
||||
local name="$1"
|
||||
local instance_type="${GENESIS_INSTANCE_TYPE:-vcpu-4_memory-12g_nvidia-rtx-3080-1}"
|
||||
|
|
@ -125,36 +189,11 @@ create_server() {
|
|||
|
||||
log_warn "Creating Genesis Cloud instance '$name' (type: $instance_type, region: $region)..."
|
||||
|
||||
# Get all SSH key IDs
|
||||
local ssh_keys_response
|
||||
ssh_keys_response=$(genesis_api GET "/ssh-keys")
|
||||
local ssh_key_ids
|
||||
ssh_key_ids=$(echo "$ssh_keys_response" | python3 -c "
|
||||
import json, sys
|
||||
data = json.loads(sys.stdin.read())
|
||||
keys = data.get('ssh_keys', [])
|
||||
ids = [k['id'] for k in keys]
|
||||
print(json.dumps(ids))
|
||||
")
|
||||
|
||||
local userdata
|
||||
userdata=$(get_cloud_init_userdata)
|
||||
local userdata_json
|
||||
userdata_json=$(echo "$userdata" | python3 -c "import json,sys; print(json.dumps(sys.stdin.read()))")
|
||||
ssh_key_ids=$(_genesis_fetch_ssh_key_ids)
|
||||
|
||||
local body
|
||||
body=$(python3 -c "
|
||||
import json
|
||||
body = {
|
||||
'name': '$name',
|
||||
'type': '$instance_type',
|
||||
'region': '$region',
|
||||
'image': '$image',
|
||||
'ssh_key_ids': $ssh_key_ids,
|
||||
'startup_script': json.loads($userdata_json)
|
||||
}
|
||||
print(json.dumps(body))
|
||||
")
|
||||
body=$(_genesis_build_create_payload "$name" "$instance_type" "$region" "$image" "$ssh_key_ids")
|
||||
|
||||
local response
|
||||
response=$(genesis_api POST "/instances" "$body")
|
||||
|
|
@ -178,30 +217,7 @@ print(json.dumps(body))
|
|||
return 1
|
||||
fi
|
||||
|
||||
# Wait for instance to get an IP and become active
|
||||
log_warn "Waiting for instance to become active..."
|
||||
local max_attempts=60
|
||||
local attempt=1
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
local status_response
|
||||
status_response=$(genesis_api GET "/instances/$GENESIS_SERVER_ID")
|
||||
local status
|
||||
status=$(echo "$status_response" | python3 -c "import json,sys; print(json.loads(sys.stdin.read())['instance']['status'])")
|
||||
|
||||
if [[ "$status" == "active" ]]; then
|
||||
GENESIS_SERVER_IP=$(echo "$status_response" | python3 -c "import json,sys; print(json.loads(sys.stdin.read())['instance']['public_ip'])")
|
||||
export GENESIS_SERVER_IP
|
||||
log_info "Instance active: IP=$GENESIS_SERVER_IP"
|
||||
return 0
|
||||
fi
|
||||
|
||||
log_warn "Instance status: $status ($attempt/$max_attempts)"
|
||||
sleep "${INSTANCE_STATUS_POLL_DELAY}"
|
||||
attempt=$((attempt + 1))
|
||||
done
|
||||
|
||||
log_error "Instance did not become active in time"
|
||||
return 1
|
||||
_genesis_wait_for_active "$GENESIS_SERVER_ID"
|
||||
}
|
||||
|
||||
verify_server_connectivity() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue