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

chore: more miscellaneous updates

Browse source
This commit is contained in:
David Allen 2025-05-26 22:52:34 -06:00
parent 7ffb080c7e
commit 094fb0df3b
Signed by: towk
GPG key ID: 0430CDBE22619155
6 changed files with 56 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
pkg/crawler/main.go
View file

@ -16,11 +16,13 @@ type CrawlerConfig struct {
URI string // URI of the BMC
Insecure bool // Whether to ignore SSL errors
CredentialStore secrets.SecretStore
SessionID string
SessionToken string
UseDefault bool
}
func (cc *CrawlerConfig) GetUserPass() (bmc.BMCCredentials, error) {
return loadBMCCreds(*cc)
return LoadBMCCreds(*cc)
}
type EthernetInterface struct {
@ -110,7 +112,7 @@ func CrawlBMCForSystems(config CrawlerConfig) ([]InventoryDetail, error) {
rf_systems []*redfish.ComputerSystem
)
// get username and password from secret store
bmc_creds, err := loadBMCCreds(config)
bmc_creds, err := LoadBMCCreds(config)
if err != nil {
event := log.Error()
event.Err(err)
@ -120,12 +122,17 @@ func CrawlBMCForSystems(config CrawlerConfig) ([]InventoryDetail, error) {
// initialize gofish client
client, err := gofish.Connect(gofish.ClientConfig{
Endpoint: config.URI,
Username: bmc_creds.Username,
Password: bmc_creds.Password,
Insecure: config.Insecure,
Endpoint: config.URI,
Username: bmc_creds.Username,
Password: bmc_creds.Password,
Insecure: config.Insecure,
Session: &gofish.Session{
ID: config.SessionID,
Token: bmc_creds.SessionTokens[config.SessionID],
},
BasicAuth: true,
})
if err != nil {
if strings.HasPrefix(err.Error(), "404:") {
err = fmt.Errorf("no ServiceRoot found. This is probably not a BMC: %s", config.URI)
@ -186,7 +193,7 @@ func CrawlBMCForSystems(config CrawlerConfig) ([]InventoryDetail, error) {
func CrawlBMCForManagers(config CrawlerConfig) ([]Manager, error) {
// get username and password from secret store
bmc_creds, err := loadBMCCreds(config)
bmc_creds, err := LoadBMCCreds(config)
if err != nil {
event := log.Error()
event.Err(err)
@ -229,7 +236,7 @@ func CrawlBMCForManagers(config CrawlerConfig) ([]Manager, error) {
func CrawlBMCForStorage(config CrawlerConfig) ([]Storage, error) {
// get username and password from secret store
bmc_creds, err := loadBMCCreds(config)
bmc_creds, err := LoadBMCCreds(config)
if err != nil {
event := log.Error()
event.Err(err)
@ -466,12 +473,12 @@ func walkStorage(rf_storage []*redfish.Storage, baseURI string) ([]Storage, erro
return storage, nil
}
func loadBMCCreds(config CrawlerConfig) (bmc.BMCCredentials, error) {
func LoadBMCCreds(config CrawlerConfig) (bmc.BMCCredentials, error) {
// NOTE: it is possible for the SecretStore to be nil, so we need a check
if config.CredentialStore == nil {
return bmc.BMCCredentials{}, fmt.Errorf("credential store is invalid")
}
if creds := util.GetBMCCredentials(config.CredentialStore, config.URI); creds == (bmc.BMCCredentials{}) {
if creds := util.GetBMCCredentials(config.CredentialStore, config.URI); creds.IsEmpty() {
return creds, fmt.Errorf("%s: credentials blank for BMC", config.URI)
} else {
return creds, nil