Fix 'list' command

prepare-vms/lib/commands.sh

@@ -338,10 +338,22 @@ _cmd_ips() {
     done < tags/$TAG/ips.txt
 }
 
-_cmd list "List available groups for a given infrastructure"
+_cmd list "List all VMs on a given infrastructure (or all infras if no arg given)"
 _cmd_list() {
-    need_infra $1
-    infra_list
+    case "$1" in
+    "")
+        for INFRA in infra/*; do
+            $0 list $INFRA
+        done
+        ;;
+    */example.*)
+        ;;
+    *)
+        need_infra $1
+        sep "Listing instances for $1"
+        infra_list
+        ;;
+    esac
 }
 
 _cmd listall "List VMs running on all configured infrastructures"

prepare-vms/lib/infra/aws.sh

@@ -3,7 +3,8 @@ if ! command -v aws >/dev/null; then
 fi
 
 infra_list() {
-    aws_display_tags
+    aws ec2 describe-instances --output json |
+        jq -r '.Reservations[].Instances[] | [.InstanceId, .ClientToken, .State.Name, .InstanceType ] | @tsv'
 }
 
 infra_quotas() {

prepare-vms/lib/infra/hetzner.sh

@@ -5,6 +5,13 @@ if ! [ -f ~/.config/hcloud/cli.toml ]; then
   warn "~/.config/hcloud/cli.toml not found."
 fi
 
+infra_list() {
+    [ "$(hcloud server list -o json)" = "null" ] && return
+
+    hcloud server list -o json |
+        jq -r '.[] | [.id, .name , .status, .server_type.name] | @tsv'
+}
+
 infra_start() {
     COUNT=$1
 

prepare-vms/lib/infra/openstack-cli.sh

@@ -1,3 +1,8 @@
+infra_list() {
+    openstack server list -f json |
+        jq -r '.[] | [.ID, .Name , .Status, .Flavor] | @tsv'
+}
+
 infra_start() {
     COUNT=$1
 
@@ -44,5 +49,5 @@ oscli_get_instances_json() {
 oscli_get_ips_by_tag() {
     TAG=$1
     oscli_get_instances_json $TAG |
-    	jq -r .[].Networks | cut -d= -f2 | cut -d, -f1 | grep . || true
+    	jq -r .[].Networks | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' || true
 }

prepare-vms/lib/infra/scaleway.sh

@@ -5,6 +5,11 @@ if ! [ -f ~/.config/scw/config.yaml ]; then
   warn "~/.config/scw/config.yaml not found."
 fi
 
+infra_list() {
+    scw instance server list -o json |
+        jq -r '.[] | [.id, .name, .state, .commercial_type] | @tsv'
+}
+
 infra_start() {
     COUNT=$1