From 08757bc3150953870b2e56ec82bb82027ffbaa7a Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 31 Oct 2024 09:19:15 -0500
Subject: [PATCH] code cleanups

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 add.go                       |  6 +++---
 config.go                    | 14 +-------------
 backup.go => configBackup.go | 12 ++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename backup.go => configBackup.go (77%)

diff --git a/add.go b/add.go
index 8c86322..e1c0298 100644
--- a/add.go
+++ b/add.go
@@ -27,7 +27,7 @@ func (x *Hypervisor) GetMemoryPrintable() string {
 	return fmt.Sprintf("%d GB", i)
 }
 
-func (all *Droplets) FindDroplet(name string) *Droplet {
+func (all *Droplets) oldFindDroplet(name string) *Droplet {
 	for _, d := range all.Droplets {
 		if d.Hostname == name {
 			return d
@@ -45,7 +45,7 @@ func (c *Cluster) FindDropletByName(name string) *Droplet {
 	return nil
 }
 
-func (c *Cluster) FindHypervisor(name string) *Hypervisor {
+func (c *Cluster) FindHypervisorByName(name string) *Hypervisor {
 	for _, h := range c.Hypervisors {
 		if h.Hostname == name {
 			return h
@@ -55,7 +55,7 @@ func (c *Cluster) FindHypervisor(name string) *Hypervisor {
 }
 
 func (c *Cluster) AddHypervisor(hostname string, cpus int, mem int) *Hypervisor {
-	h := c.FindHypervisor(hostname)
+	h := c.FindHypervisorByName(hostname)
 	if h != nil {
 		return h
 	}
diff --git a/config.go b/config.go
index 2fd4c33..7973da9 100644
--- a/config.go
+++ b/config.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"time"
 
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/encoding/prototext"
@@ -19,7 +18,7 @@ import (
 // to make it humanly possible to hand edit things as needed
 func (c *Cluster) ConfigSave() error {
 	// try to backup the current cluster config files
-	if err := backupConfigFiles(); err != nil {
+	if err := backupConfig(); err != nil {
 		return err
 	}
 
@@ -83,17 +82,6 @@ func (c *Cluster) ConfigSave() error {
 	return nil
 }
 
-func backupConfigFiles() error {
-	// make a new dir to backup the files
-	now := time.Now()
-	// timestamp := now.Format("2022.07.18.190545") // 50yr shout out to K&R
-	timestamp := now.Format("2006.01.02.150405") // bummer. other date doesn't work?
-	srcDir := filepath.Join(os.Getenv("VIRTIGO_HOME"))
-	destDir := filepath.Join(os.Getenv("VIRTIGO_HOME"), timestamp)
-
-	return backupFiles(srcDir, destDir)
-}
-
 func (c *Cluster) ConfigLoad() error {
 	if c == nil {
 		return errors.New("It's not safe to run ConfigLoad() on a nil cluster")
diff --git a/backup.go b/configBackup.go
similarity index 77%
rename from backup.go
rename to configBackup.go
index 2834993..6e58aa9 100644
--- a/backup.go
+++ b/configBackup.go
@@ -10,8 +10,20 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"time"
 )
 
+func backupConfig() error {
+	// make a new dir to backup the files
+	now := time.Now()
+	// timestamp := now.Format("2022.07.18.190545") // 50yr shout out to K&R
+	timestamp := now.Format("2006.01.02.150405") // bummer. other date doesn't work?
+	srcDir := filepath.Join(os.Getenv("VIRTIGO_HOME"))
+	destDir := filepath.Join(os.Getenv("VIRTIGO_HOME"), timestamp)
+
+	return backupFiles(srcDir, destDir)
+}
+
 func backupFiles(srcDir string, destDir string) error {
 	// Create the destination directory
 	err := os.MkdirAll(destDir, os.ModePerm)