Skip to content

Commit

Permalink
Minor changes and improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
davidallendj committed Aug 9, 2024
1 parent 8a25417 commit 8e59885
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
10 changes: 10 additions & 0 deletions internal/cache/sqlite/sqlite.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"

magellan "github.com/OpenCHAMI/magellan/internal"
"github.com/OpenCHAMI/magellan/internal/util"

"github.com/jmoiron/sqlx"
)
Expand Down Expand Up @@ -83,6 +84,15 @@ func DeleteScannedAssets(path string, results ...magellan.ScannedAsset) error {
}

func GetScannedAssets(path string) ([]magellan.ScannedAsset, error) {
// check if path exists first to prevent creating the database
exists, err := util.PathExists(path)
if !exists {
return nil, fmt.Errorf("no file found")
} else if err != nil {
return nil, err
}

// now check if the file is the SQLite database
db, err := sqlx.Open("sqlite3", path)
if err != nil {
return nil, fmt.Errorf("failed to open database: %v", err)
Expand Down
9 changes: 5 additions & 4 deletions internal/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ func CollectInventory(scannedResults *[]ScannedAsset, params *CollectParams) err
done = make(chan struct{}, params.Concurrency+1)
chanScannedResult = make(chan ScannedAsset, params.Concurrency+1)
outputPath = path.Clean(params.OutputPath)
smdClient = client.NewClient(
client.WithSecureTLS(params.CaCertPath),
smdClient = client.NewClient[client.SmdClient](
client.WithSecureTLS[client.SmdClient](params.CaCertPath),
)
)
wg.Add(params.Concurrency)
Expand Down Expand Up @@ -152,13 +152,14 @@ func CollectInventory(scannedResults *[]ScannedAsset, params *CollectParams) err
}

// add all endpoints to smd
err = smdClient.AddRedfishEndpoint(data, headers)
err = smdClient.Add(body, headers)
if err != nil {
log.Error().Err(err).Msgf("failed to add Redfish endpoint")

// try updating instead
if params.ForceUpdate {
err = smdClient.UpdateRedfishEndpoint(data["ID"].(string), body, headers)
smdClient.Xname = data["ID"].(string)
err = smdClient.Update(body, headers)
if err != nil {
log.Error().Err(err).Msgf("failed to update Redfish endpoint")
}
Expand Down

0 comments on commit 8e59885

Please sign in to comment.