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

Remove unnecessary marshal/umarshal

Browse source
This commit is contained in:
Chris Harris 2024-07-10 16:00:08 -04:00
parent 70fc040da1
commit ab16c8d5fd
No known key found for this signature in database
GPG key ID: 9DAE9BAB4FBA0FEE
1 changed files with 15 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

56
internal/collect.go
View file

@ -115,9 +115,6 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
"RediscoverOnUpdate": false, "RediscoverOnUpdate": false,
} }
// unmarshal json to send in correct format
var rm map[string]json.RawMessage
// chassis // chassis
if gofishClient != nil { if gofishClient != nil {
chassis, err := CollectChassis(gofishClient, q) chassis, err := CollectChassis(gofishClient, q)
@ -125,33 +122,25 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
l.Log.Errorf("failed to collect chassis: %v", err) l.Log.Errorf("failed to collect chassis: %v", err)
continue continue
} }
err = json.Unmarshal(chassis, &rm) data["Chassis"] = chassis
if err != nil {
l.Log.Errorf("failed to unmarshal chassis JSON: %v", err)
}
data["Chassis"] = rm["Chassis"]
// systems // systems
systems, err := CollectSystems(gofishClient, q) systems, err := CollectSystems(gofishClient, q)
if err != nil { if err != nil {
l.Log.Errorf("failed to collect systems: %v", err) l.Log.Errorf("failed to collect systems: %v", err)
} }
err = json.Unmarshal(systems, &rm) data["Systems"] = systems
if err != nil {
l.Log.Errorf("failed to unmarshal system JSON after collect: %v", err)
}
data["Systems"] = rm["Systems"]
// add other fields from systems // add other fields from systems
if len(rm["Systems"]) > 0 { if len(systems) > 0 {
var s map[string][]any system := systems[0]["Data"].(*redfish.ComputerSystem)
fmt.Printf("Systems before unmarshaling: %v\n", string(rm["Systems"])) if system == nil {
err = json.Unmarshal(rm["Systems"], &s) l.Log.Errorf("invalid system data (data is nil)")
if err != nil { } else {
l.Log.Errorf("failed to unmarshal systems JSON: %v", err) data["Name"] = system.Name
} }
data["Name"] = s["Name"]
} }
} else { } else {
l.Log.Errorf("invalid client (client is nil)") l.Log.Errorf("invalid client (client is nil)")
continue continue
@ -392,19 +381,13 @@ func CollectEthernetInterfaces(c *gofish.APIClient, q *QueryParams, systemID str
return b, nil return b, nil
} }
func CollectChassis(c *gofish.APIClient, q *QueryParams) ([]byte, error) { func CollectChassis(c *gofish.APIClient, q *QueryParams) ([]*redfish.Chassis, error) {
chassis, err := c.Service.Chassis() chassis, err := c.Service.Chassis()
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to query chassis (%v:%v): %v", q.Host, q.Port, err) return nil, fmt.Errorf("failed to query chassis (%v:%v): %v", q.Host, q.Port, err)
} }
data := map[string]any{"Chassis": chassis} return chassis, nil
b, err := json.MarshalIndent(data, "", " ")
if err != nil {
return nil, fmt.Errorf("failed to marshal JSON: %v", err)
}
return b, nil
} }
func CollectStorage(c *gofish.APIClient, q *QueryParams) ([]byte, error) { func CollectStorage(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
@ -432,7 +415,7 @@ func CollectStorage(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
return b, nil return b, nil
} }
func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) { func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]map[string]any, error) {
systems, err := c.Service.Systems() systems, err := c.Service.Systems()
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get systems (%v:%v): %v", q.Host, q.Port, err) return nil, fmt.Errorf("failed to get systems (%v:%v): %v", q.Host, q.Port, err)
@ -445,13 +428,10 @@ func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
// 2.a. if yes, query both properties to use in next step // 2.a. if yes, query both properties to use in next step
// 2.b. for each service, query its data and add the ethernet interfaces // 2.b. for each service, query its data and add the ethernet interfaces
// 2.c. add the system to list of systems to marshal and return // 2.c. add the system to list of systems to marshal and return
var ( var temp []map[string]any
temp []map[string]any
eths []*redfish.EthernetInterface
)
for _, system := range systems { for _, system := range systems {
eths, err = system.EthernetInterfaces() eths, err := system.EthernetInterfaces()
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get system ethernet interfaces: %v", err) return nil, fmt.Errorf("failed to get system ethernet interfaces: %v", err)
} }
@ -589,13 +569,7 @@ func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
// } // }
// } // }
data := map[string]any{"Systems": temp} return temp, nil
b, err := json.MarshalIndent(data, "", " ")
if err != nil {
return nil, fmt.Errorf("failed to marshal JSON: %v", err)
}
return b, nil
} }
func CollectRegisteries(c *gofish.APIClient, q *QueryParams) ([]byte, error) { func CollectRegisteries(c *gofish.APIClient, q *QueryParams) ([]byte, error) {