From 06e755ecd2161f0ae0b11eaf52b18234ef7ee194 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@jpi.io>
Date: Tue, 22 Aug 2023 02:00:08 +0000
Subject: [PATCH] zones: scan for Machine details after they've all been added

Signed-off-by: Alejandro Mery <amery@jpi.io>
---
 pkg/zones/machine_scan.go |  4 ++++
 pkg/zones/scan.go         | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkg/zones/machine_scan.go b/pkg/zones/machine_scan.go
index 9ab8513..732fe45 100644
--- a/pkg/zones/machine_scan.go
+++ b/pkg/zones/machine_scan.go
@@ -24,3 +24,7 @@ func (m *Machine) updatePublicAddresses() error {
 	m.PublicAddresses = addrs
 	return nil
 }
+
+func (m *Machine) scan() error {
+	return m.updatePublicAddresses()
+}
diff --git a/pkg/zones/scan.go b/pkg/zones/scan.go
index 6ab2a7e..3db55e0 100644
--- a/pkg/zones/scan.go
+++ b/pkg/zones/scan.go
@@ -43,13 +43,19 @@ func (z *Zone) scan() error {
 				Name: e.Name(),
 			}
 
-			if err := m.updatePublicAddresses(); err != nil {
-				return err
-			}
-
 			z.Machines = append(z.Machines, m)
 		}
 	}
 
-	return nil
+	return z.scanMachines()
+}
+
+func (z *Zone) scanMachines() error {
+	var err error
+	z.zones.ForEachMachine(func(m *Machine) {
+		if err == nil {
+			err = m.scan()
+		}
+	})
+	return err
 }