From 54b302c6d5c69a9ecdf7cc488208cfb0af7df032 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@jpi.io>
Date: Mon, 4 Sep 2023 16:06:08 +0000
Subject: [PATCH 1/2] vscode: add asciigoat, cyclomatic and Wrapf to the
 dictionary

Signed-off-by: Alejandro Mery <amery@jpi.io>
---
 .vscode/settings.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2f6ce64..b4287d2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,9 +1,12 @@
 {
     "cSpell.words": [
+        "asciigoat",
         "ceph",
+        "cyclomatic",
         "darvaza",
         "gofrs",
         "jpictl",
+        "Wrapf",
         "zerolog"
     ]
 }

From 6e7f24f4912430671f5920752c273275e385cf51 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@jpi.io>
Date: Tue, 12 Sep 2023 00:35:01 +0000
Subject: [PATCH 2/2] cluster: ensure ceph monitors are set when loading a
 config file

Signed-off-by: Alejandro Mery <amery@jpi.io>
---
 pkg/cluster/ceph_scan.go      | 6 +++++-
 pkg/cluster/cluster_import.go | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/cluster/ceph_scan.go b/pkg/cluster/ceph_scan.go
index f85d09f..bd65821 100644
--- a/pkg/cluster/ceph_scan.go
+++ b/pkg/cluster/ceph_scan.go
@@ -71,7 +71,7 @@ func newCephScanTODO(cfg *ceph.Config) *cephScanTODO {
 	return todo
 }
 
-func (m *Cluster) scanCephMonitors(_ *ScanOptions) error {
+func (m *Cluster) scanCephMonitors(opts *ScanOptions) error {
 	cfg, err := m.GetCephConfig()
 	switch {
 	case os.IsNotExist(err):
@@ -94,6 +94,10 @@ func (m *Cluster) scanCephMonitors(_ *ScanOptions) error {
 		todo.LogMissing(m.log)
 	}
 
+	return m.initCephMonitors(opts)
+}
+
+func (m *Cluster) initCephMonitors(_ *ScanOptions) error {
 	// make sure every zone has one
 	m.ForEachZone(func(z *Zone) bool {
 		_ = z.GetCephMonitors()
diff --git a/pkg/cluster/cluster_import.go b/pkg/cluster/cluster_import.go
index 697e476..0201324 100644
--- a/pkg/cluster/cluster_import.go
+++ b/pkg/cluster/cluster_import.go
@@ -14,6 +14,7 @@ func (m *Cluster) init(opts *ScanOptions) error {
 		m.scanZoneIDs,
 		m.scanSort,
 		m.scanGateways,
+		m.initCephMonitors,
 		m.initRegions,
 	} {
 		if err := fn(opts); err != nil {