towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 03:27:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: miscellaneous updates

Browse source
This commit is contained in:
David Allen 2025-05-26 22:51:58 -06:00
parent a9492c70f6
commit 86fcf54b6e
Signed by: towk
GPG key ID: 0430CDBE22619155
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/collect.go
View file

@ -50,12 +50,21 @@ var CollectCmd = &cobra.Command{
// try to load access token either from env var, file, or config if var not set
if accessToken == "" {
var err error
accessToken, err = auth.LoadAccessToken(tokenPath)
accessToken, err = auth.LoadAccessToken(accessTokenPath)
if err != nil && verbose {
log.Warn().Err(err).Msgf("could not load access token")
}
}
// try to load session token either from env var, file, or config if var is not set
if sessionToken == "" {
var err error
sessionToken, err = auth.LoadSessionToken(accessTokenPath)
if err != nil && verbose {
log.Warn().Err(err).Msgf("could not load session token")
}
}
// set the minimum/maximum number of concurrent processes
if concurrency <= 0 {
concurrency = mathutil.Clamp(len(scannedResults), 1, 10000)
@ -145,6 +154,7 @@ func init() {
CollectCmd.Flags().StringVarP(&username, "username", "u", "", "Set the master BMC username")
CollectCmd.Flags().StringVarP(&password, "password", "p", "", "Set the master BMC password")
CollectCmd.Flags().StringVar(&secretsFile, "secrets-file", "", "Set path to the node secrets file")
CollectCmd.Flags().StringVar(&sessionToken, "session-token", "", "Set the session token to use for auth")
CollectCmd.Flags().StringVar(&scheme, "scheme", "https", "Set the default scheme used to query when not included in URI")
CollectCmd.Flags().StringVar(&protocol, "protocol", "tcp", "Set the protocol used to query")
CollectCmd.Flags().StringVarP(&outputPath, "output-file", "o", "", "Set the path to store collection data using HIVE partitioning")

6
cmd/root.go
View file

@ -18,6 +18,7 @@ import (
"fmt"
"net"
"os"
"os/user"
magellan "github.com/davidallendj/magellan/internal"
"github.com/davidallendj/magellan/internal/util"
@ -36,6 +37,7 @@ const (
// CLI arguments as variables to not fiddle with error-prone strings
var (
currentUser *user.User
accessToken string
timeout int
concurrency int
@ -193,3 +195,7 @@ func initSecretsStore(uri string) secrets.SecretStore {
}
return store
}
func validSecretArgs(masterKey string, secretsFile string) bool {
return masterKey != "" && secretsFile != ""
}