Skip to content

Commit 125f93c

Browse files
committed
ci(scaleway_m1): add list command and jq pretty output
1 parent 87dc783 commit 125f93c

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

‎tools/build/scaleway_m1.sh‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,32 +75,45 @@ function server_id {
7575
done
7676
}
7777

78-
cmd=${1:-}
78+
function maybe_jq {
79+
# Process the output via jq if displaying on console, otherwise leave
80+
# it unprocessed.
81+
if [ -t 1 ]; then
82+
jq .
83+
else
84+
cat
85+
fi
86+
}
87+
88+
cmd=${1:-list}
7989
case $cmd in
8090
ensure)
8191
id=$(server_id)
8292
if [[ "$id" ]]; then
8393
log "You have servers."
84-
get "$servers_url/$id"
94+
get "$servers_url/$id" | maybe_jq
8595
else
8696
log "Creating new server."
8797
post $servers_url -d "
8898
{
8999
\"name\": \"mac-m1-psycopg\",
90100
\"project_id\": \"$project_id\",
91101
\"type\": \"M1-M\"
92-
}"
102+
}" | maybe_jq
93103
fi
94104
;;
95105
delete)
96106
id=$(server_id)
97107
if [[ "$id" ]]; then
98108
log "Deleting server $id."
99-
delete "$servers_url/$id"
109+
delete "$servers_url/$id" | maybe_jq
100110
else
101111
log "No server found."
102112
fi
103113
;;
114+
list)
115+
get $servers_url | maybe_jq
116+
;;
104117
*)
105-
error "Usage: $0 {ensure|delete}"
118+
error "Usage: $(basename $0) [list|ensure|delete]"
106119
esac

0 commit comments

Comments
 (0)