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

Removed GET request in collect and minor changes

Browse source
This commit is contained in:
David J. Allen 2024-05-08 12:48:02 -06:00
parent ca59347a4f
commit 60770dadc0
No known key found for this signature in database
GPG key ID: 717C593FF60A2ACC
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/collect.go
View file

@ -63,10 +63,10 @@ var collectCmd = &cobra.Command{
} }
magellan.CollectAll(&probeStates, l, q) magellan.CollectAll(&probeStates, l, q)
// confirm the inventories were added // add necessary headers for final request (like token)
err = smd.GetRedfishEndpoints() headers := make(map[string]string)
if err != nil { if q.AccessToken != "" {
l.Log.Errorf("could not get redfish endpoints: %v", err) headers["Authorization"] = "Bearer " + q.AccessToken
} }
}, },
} }
@ -77,7 +77,7 @@ func init() {
collectCmd.PersistentFlags().IntVarP(&smd.Port, "port", "p", smd.Port, "set the port 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(&user, "user", "", "set the BMC user")
collectCmd.PersistentFlags().StringVar(&pass, "pass", "", "set the BMC password") collectCmd.PersistentFlags().StringVar(&pass, "pass", "", "set the BMC password")
collectCmd.PersistentFlags().StringVar(&protocol, "protocol", "https", "set the Redfish protocol") 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().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 ") collectCmd.PersistentFlags().BoolVar(&forceUpdate, "force-update", false, "set flag to force update data sent to SMD ")
collectCmd.PersistentFlags().StringVar(&preferredDriver, "preferred-driver", "ipmi", "set the preferred driver to use") collectCmd.PersistentFlags().StringVar(&preferredDriver, "preferred-driver", "ipmi", "set the preferred driver to use")

6
cmd/root.go
View file

@ -56,7 +56,7 @@ func Execute() {
func LoadAccessToken() (string, error) { func LoadAccessToken() (string, error) {
// try to load token from env var // try to load token from env var
testToken := os.Getenv("OCHAMI_ACCESS_TOKEN") testToken := os.Getenv("MAGELLAN_ACCESS_TOKEN")
if testToken != "" { if testToken != "" {
return testToken, nil return testToken, nil
} }
@ -80,7 +80,7 @@ func init() {
rootCmd.PersistentFlags().IntVar(&threads, "threads", -1, "set the number of threads") rootCmd.PersistentFlags().IntVar(&threads, "threads", -1, "set the number of threads")
rootCmd.PersistentFlags().IntVar(&timeout, "timeout", 30, "set the timeout") rootCmd.PersistentFlags().IntVar(&timeout, "timeout", 30, "set the timeout")
rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "set the config file path") rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "set the config file path")
rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", true, "set verbose flag") rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "set verbose flag")
rootCmd.PersistentFlags().StringVar(&accessToken, "access-token", "", "set the access token") 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", "/tmp/magellan/magellan.db", "set the probe storage path")
@ -103,7 +103,7 @@ func SetDefaults() {
viper.SetDefault("threads", 1) viper.SetDefault("threads", 1)
viper.SetDefault("timeout", 30) viper.SetDefault("timeout", 30)
viper.SetDefault("config", "") viper.SetDefault("config", "")
viper.SetDefault("verbose", true) viper.SetDefault("verbose", false)
viper.SetDefault("db.path", "/tmp/magellan/magellan.db") viper.SetDefault("db.path", "/tmp/magellan/magellan.db")
viper.SetDefault("scan.hosts", []string{}) viper.SetDefault("scan.hosts", []string{})
viper.SetDefault("scan.ports", []int{}) viper.SetDefault("scan.ports", []int{})