mirror of
https://github.com/davidallendj/magellan.git
synced 2025-12-20 03:27:03 -07:00
Split the collect Command For Customization (#93)
* feat: initial implementation of command split * feat: update collect and new send cmd * chore: cleanup unused code * chore: refactored getting username * chore: more refactoring and cleanup * feat: update send cmd implementation * chore: changed/updated example config * chore: made cmd more consistent and added formatting * refactor: removed --host flag from scan * chore: cleaned up and fixed issue with client * chore: cleaned up CLI flags in collect cmd * feat: updated crawl to include managers and output YAML optionally * refactor: updated and improved send implementation * refactor: minor improvements * refactor: added util func to check for empty slices * fix: issue with reading from stdin * refactor: added scheme trimming function for URIs * refactor: changed host arg back to positional * refactor: removed unused vars and added --output-dir flag * fix: make -f for secrets persistent * refactor: removed --host flag and request in collect * refactor: changed --output flag to --output-file * fix: updated flags for collect * fix: typo in crawler error * fix: dir being created when outputDir not set * fix: reading stdin and data args * fix: made output using -v and -o consistent * readme: added info about command split * updated changelog adding missing version entries * chore: updated example to use host as positional arg * fix: issue with reading --data arg * fix: remove unused import from collect pkg Signed-off-by: Devon Bautista <devonb@lanl.gov> --------- Signed-off-by: David Allen <16520934+davidallendj@users.noreply.github.com> Signed-off-by: Devon Bautista <devonb@lanl.gov> Co-authored-by: Devon Bautista <devonb@lanl.gov>
This commit is contained in:
parent
fba4a89a0e
commit
04e1fb26c9
19 changed files with 736 additions and 223 deletions
|
|
@ -4,6 +4,7 @@ package client
|
|||
// https://github.com/OpenCHAMI/hms-smd/blob/master/docs/examples.adoc
|
||||
// https://github.com/OpenCHAMI/hms-smd
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
|
|
@ -16,6 +17,12 @@ type SmdClient struct {
|
|||
Xname string
|
||||
}
|
||||
|
||||
func NewSmdClient() *SmdClient {
|
||||
return &SmdClient{
|
||||
Client: &http.Client{},
|
||||
}
|
||||
}
|
||||
|
||||
func (c *SmdClient) Init() {
|
||||
c.Client = &http.Client{}
|
||||
}
|
||||
|
|
@ -44,7 +51,7 @@ func (c *SmdClient) Add(data HTTPBody, headers HTTPHeader) error {
|
|||
url := c.RootEndpoint("/Inventory/RedfishEndpoints")
|
||||
res, body, err := MakeRequest(c.Client, url, http.MethodPost, data, headers)
|
||||
if res != nil {
|
||||
statusOk := res.StatusCode >= 200 && res.StatusCode < 300
|
||||
statusOk := res.StatusCode >= http.StatusOK && res.StatusCode < http.StatusMultipleChoices
|
||||
if !statusOk {
|
||||
if len(body) > 0 {
|
||||
return fmt.Errorf("%d: %s", res.StatusCode, string(body))
|
||||
|
|
@ -77,3 +84,17 @@ func (c *SmdClient) Update(data HTTPBody, headers HTTPHeader) error {
|
|||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *SmdClient) SetXnameFromJSON(contents []byte, key string) error {
|
||||
var (
|
||||
data map[string]any
|
||||
err error
|
||||
)
|
||||
|
||||
err = json.Unmarshal(contents, &data)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to unmarshal xname: %v", err)
|
||||
}
|
||||
c.Xname = data[key].(string)
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue