Merge pull request 'zones: pass logger from cmd to Zones, Zone, and Machine' (#12)

Reviewed-on: #12

pkg/zones/machine.go

@@ -10,6 +10,8 @@ import (
 // A Machine is a machine on a Zone
 type Machine struct {
 	zone *Zone
+	logger
+
 	ID   int    `toml:"id"`
 	Name string `toml:"-" json:"-" yaml:"-"`
 

pkg/zones/options.go

@@ -22,7 +22,7 @@ type ScanOptions struct {
 
 	// Logger specifies the logger to be used. otherwise
 	// the scanner will be mute
-	Logger slog.Logger
+	slog.Logger
 }
 
 // ResolvePublicAddresses instructs the scanner to use

pkg/zones/scan.go

@@ -32,8 +32,9 @@ func (m *Zones) scanDirectory(_ *ScanOptions) error {
 	for _, e := range entries {
 		if e.IsDir() {
 			z := &Zone{
-				zones: m,
+				zones:  m,
-				Name:  e.Name(),
+				logger: m,
+				Name:   e.Name(),
 			}
 
 			if err := z.scan(); err != nil {
@@ -132,8 +133,9 @@ func (z *Zone) scan() error {
 	for _, e := range entries {
 		if e.IsDir() {
 			m := &Machine{
-				zone: z,
+				zone:   z,
-				Name: e.Name(),
+				logger: z,
+				Name:   e.Name(),
 			}
 
 			if err := m.init(); err != nil {

pkg/zones/zones.go

@@ -88,6 +88,7 @@ func FilterMachines(m MachineIterator, cond func(*Machine) bool) (Machines, int)
 // Zone represents one zone in a cluster
 type Zone struct {
 	zones *Zones
+	logger
 
 	ID   int    `toml:"id"`
 	Name string `toml:"name"`