From 74679ab77e46302a5985990d64d83cdc2db0cd36 Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Wed, 24 Feb 2021 21:41:30 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=BB=EF=B8=8F=20Update=20Scaleway=20dep?=
 =?UTF-8?q?loyment=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prepare-vms/infra/scaleway        |  2 ++
 prepare-vms/lib/infra/scaleway.sh | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/prepare-vms/infra/scaleway b/prepare-vms/infra/scaleway
index 53f232e7..a39d7633 100644
--- a/prepare-vms/infra/scaleway
+++ b/prepare-vms/infra/scaleway
@@ -1 +1,3 @@
 INFRACLASS=scaleway
+#SCW_INSTANCE_TYPE=DEV1-L
+#SCW_ZONE=fr-par-2
diff --git a/prepare-vms/lib/infra/scaleway.sh b/prepare-vms/lib/infra/scaleway.sh
index 5311b7ec..71227118 100644
--- a/prepare-vms/lib/infra/scaleway.sh
+++ b/prepare-vms/lib/infra/scaleway.sh
@@ -5,6 +5,9 @@ if ! [ -f ~/.config/scw/config.yaml ]; then
   warn "~/.config/scw/config.yaml not found."
 fi
 
+SCW_INSTANCE_TYPE=${SCW_INSTANCE_TYPE-DEV1-M}
+SCW_ZONE=${SCW_ZONE-fr-par-1}
+
 infra_list() {
     scw instance server list -o json |
         jq -r '.[] | [.id, .name, .state, .commercial_type] | @tsv'
@@ -13,9 +16,6 @@ infra_list() {
 infra_start() {
     COUNT=$1
 
-    SCW_INSTANCE_TYPE=${SCW_INSTANCE_TYPE-DEV1-M}
-    SCW_ZONE=${SCW_ZONE-fr-par-1}
-
     for I in $(seq 1 $COUNT); do
         NAME=$(printf "%s-%03d" $TAG $I)
         sep "Starting instance $I/$COUNT"
@@ -36,16 +36,16 @@ infra_stop() {
     scw_get_ids_by_tag $TAG | wc -l
     info "Deleting instances..."
     scw_get_ids_by_tag $TAG | 
-        xargs -n1 -P10 -I@@ \
-        scw instance server delete force-shutdown=true server-id=@@
+        xargs -n1 -P10 \
+        scw instance server delete zone=${SCW_ZONE} force-shutdown=true with-ip=true
 }
 
 scw_get_ids_by_tag() {
     TAG=$1
-    scw instance server list name=$TAG -o json | jq -r .[].id
+    scw instance server list zone=${SCW_ZONE} name=$TAG -o json | jq -r .[].id
 }
 
 scw_get_ips_by_tag() {
     TAG=$1
-    scw instance server list name=$TAG -o json | jq -r .[].public_ip.address
+    scw instance server list zone=${SCW_ZONE} name=$TAG -o json | jq -r .[].public_ip.address
 }