From b6d429f072710e6a5a756a8b32f8b1fb085a65f7 Mon Sep 17 00:00:00 2001
From: "David J. Allen" <allend@lanl.gov>
Date: Thu, 9 May 2024 14:53:44 -0600
Subject: [PATCH] Changed the default storage location for scanning cache

---
 cmd/collect.go |  8 ++++----
 cmd/root.go    |  9 ++++++---
 cmd/update.go  | 10 +++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cmd/collect.go b/cmd/collect.go
index 0dccd70..bcefa56 100644
--- a/cmd/collect.go
+++ b/cmd/collect.go
@@ -48,8 +48,8 @@ var collectCmd = &cobra.Command{
 			threads = mathutil.Clamp(len(probeStates), 1, 255)
 		}
 		q := &magellan.QueryParams{
-			User:        user,
-			Pass:        pass,
+			User:        username,
+			Pass:        password,
 			Protocol:    protocol,
 			Drivers:     drivers,
 			Preferred:   preferredDriver,
@@ -75,8 +75,8 @@ func init() {
 	collectCmd.PersistentFlags().StringSliceVar(&drivers, "driver", []string{"redfish"}, "set the driver(s) and fallback drivers to use")
 	collectCmd.PersistentFlags().StringVar(&smd.Host, "host", smd.Host, "set the host to the smd API")
 	collectCmd.PersistentFlags().IntVarP(&smd.Port, "port", "p", smd.Port, "set the port to the smd API")
-	collectCmd.PersistentFlags().StringVar(&user, "user", "", "set the BMC user")
-	collectCmd.PersistentFlags().StringVar(&pass, "pass", "", "set the BMC password")
+	collectCmd.PersistentFlags().StringVar(&username, "user", "", "set the BMC user")
+	collectCmd.PersistentFlags().StringVar(&password, "pass", "", "set the BMC password")
 	collectCmd.PersistentFlags().StringVar(&protocol, "protocol", "https", "set the protocol used to query")
 	collectCmd.PersistentFlags().StringVarP(&outputPath, "output", "o", "/tmp/magellan/data/", "set the path to store collection data")
 	collectCmd.PersistentFlags().BoolVar(&forceUpdate, "force-update", false, "set flag to force update data sent to SMD ")
diff --git a/cmd/root.go b/cmd/root.go
index bb38247..cccc69a 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"os/user"
 
 	magellan "github.com/OpenCHAMI/magellan/internal"
 	"github.com/OpenCHAMI/magellan/internal/api/smd"
@@ -19,8 +20,8 @@ var (
 	hosts           []string
 	protocol        string
 	cacertPath      string
-	user            string
-	pass            string
+	username        string
+	password        string
 	dbpath          string
 	drivers         []string
 	preferredDriver string
@@ -76,13 +77,15 @@ func LoadAccessToken() (string, error) {
 }
 
 func init() {
+	// get the current user
+	currentUser, _ := user.Current()
 	cobra.OnInitialize(InitializeConfig)
 	rootCmd.PersistentFlags().IntVar(&threads, "threads", -1, "set the number of threads")
 	rootCmd.PersistentFlags().IntVar(&timeout, "timeout", 30, "set the timeout")
 	rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "set the config file path")
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "set verbose flag")
 	rootCmd.PersistentFlags().StringVar(&accessToken, "access-token", "", "set the access token")
-	rootCmd.PersistentFlags().StringVar(&dbpath, "db.path", "/tmp/magellan/magellan.db", "set the probe storage path")
+	rootCmd.PersistentFlags().StringVar(&dbpath, "db.path", fmt.Sprintf("/tmp/%smagellan/magellan.db", currentUser.Name+"/"), "set the probe storage path")
 
 	// bind viper config flags with cobra
 	viper.BindPFlag("threads", rootCmd.Flags().Lookup("threads"))
diff --git a/cmd/update.go b/cmd/update.go
index c099fe0..0a124d9 100644
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -33,15 +33,15 @@ var updateCmd = &cobra.Command{
 				Preferred: "redfish",
 				Protocol:  protocol,
 				Host:      host,
-				User:      user,
-				Pass:      pass,
+				User:      username,
+				Pass:      password,
 				Timeout:   timeout,
 				Port:      port,
 			},
 		}
 
 		// check if required params are set
-		if host == "" || user == "" || pass == "" {
+		if host == "" || username == "" || password == "" {
 			l.Log.Fatal("requires host, user, and pass to be set")
 		}
 
@@ -69,8 +69,8 @@ var updateCmd = &cobra.Command{
 func init() {
 	updateCmd.Flags().StringVar(&host, "bmc-host", "", "set the BMC host")
 	updateCmd.Flags().IntVar(&port, "bmc-port", 443, "set the BMC port")
-	updateCmd.Flags().StringVar(&user, "user", "", "set the BMC user")
-	updateCmd.Flags().StringVar(&pass, "pass", "", "set the BMC password")
+	updateCmd.Flags().StringVar(&username, "user", "", "set the BMC user")
+	updateCmd.Flags().StringVar(&password, "pass", "", "set the BMC password")
 	updateCmd.Flags().StringVar(&transferProtocol, "transfer-protocol", "HTTP", "set the transfer protocol")
 	updateCmd.Flags().StringVar(&protocol, "protocol", "https", "set the Redfish protocol")
 	updateCmd.Flags().StringVar(&firmwareUrl, "firmware-url", "", "set the path to the firmware")