From 4982cab608a827635c38fccb1288e37de04fe1a3 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Fri, 3 Feb 2023 19:16:20 +0200 Subject: [PATCH] Fix ListInstances in external provider examples Signed-off-by: Gabriel Adrian Samfira --- contrib/providers.d/azure/garm-external-provider | 4 ++-- contrib/providers.d/openstack/garm-external-provider | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/providers.d/azure/garm-external-provider b/contrib/providers.d/azure/garm-external-provider index 8a7b628c..7974f40f 100755 --- a/contrib/providers.d/azure/garm-external-provider +++ b/contrib/providers.d/azure/garm-external-provider @@ -316,7 +316,7 @@ function GetInstance() { function ListInstances() { INSTANCES=$(az vm list --query "[?tags.garm_pool_id == '${GARM_POOL_ID}']" -o json --only-show-errors 2>&1) - echo $info | jq -r ' + echo $info | jq -r '[ .[] | { provider_id: .name, name: .name, @@ -326,7 +326,7 @@ function ListInstances() { os_arch: .tags.os_arch, pool_id: .tags.garm_pool_id, status: {"Creating": "pending_create", "Migrating": "pending_create", "Failed": "error", "Succeeded": "running", "Deleting": "pending_delete"}[.provisioningState] - }' + }]' } # Login to Azure diff --git a/contrib/providers.d/openstack/garm-external-provider b/contrib/providers.d/openstack/garm-external-provider index 7045c5fb..f2602f57 100755 --- a/contrib/providers.d/openstack/garm-external-provider +++ b/contrib/providers.d/openstack/garm-external-provider @@ -397,12 +397,12 @@ function StopServer() { function ListInstances() { INSTANCES=$(openstack server list --os-compute-api-version 2.52 --tags garm-pool-id=${GARM_POOL_ID} --long -f json) - echo ${INSTANCES} | jq -r ' + echo ${INSTANCES} | jq -r '[ .[] | .Properties * { provider_id: .ID, name: .Name, status: {"ACTIVE": "running", "SHUTOFF": "stopped", "BUILD": "pending_create", "ERROR": "error", "DELETING": "pending_delete"}[.Status] - }' + }]' } function GetInstance() {