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

fix: issue with list double prints

Browse source
This commit is contained in:
David Allen 2025-06-20 14:15:20 -06:00
parent f53829c6ee
commit e79d806341
Signed by: towk
GPG key ID: 0430CDBE22619155
1 changed files with 5 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cmd/list.go
View file

@ -1,11 +1,9 @@
package cmd package cmd
import ( import (
"encoding/json"
"fmt" "fmt"
"os" "os"
"strings" "strings"
"time"
"github.com/davidallendj/magellan/internal/cache/sqlite" "github.com/davidallendj/magellan/internal/cache/sqlite"
urlx "github.com/davidallendj/magellan/internal/urlx" urlx "github.com/davidallendj/magellan/internal/urlx"
@ -13,7 +11,6 @@ import (
"github.com/davidallendj/magellan/pkg/crawler" "github.com/davidallendj/magellan/pkg/crawler"
"github.com/davidallendj/magellan/pkg/secrets" "github.com/davidallendj/magellan/pkg/secrets"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"gopkg.in/yaml.v3"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -47,34 +44,13 @@ var ListCmd = &cobra.Command{
} }
// load the assets found from scan // load the assets found from scan
scannedResults, err := sqlite.GetScannedAssets(cachePath) scannedResults, err := sqlite.GetRemoteAssets(cachePath)
if err != nil { if err != nil {
log.Error().Err(err).Str("path", cachePath).Msg("failed to get scanned assets from cache") log.Error().Err(err).Str("path", cachePath).Msg("failed to get scanned assets from cache")
} }
switch strings.ToLower(listOutputFormat) {
case FORMAT_JSON:
b, err := json.Marshal(scannedResults)
if err != nil {
log.Error().Err(err).Msgf("failed to unmarshal cached data to JSON")
}
fmt.Printf("%s\n", string(b))
case FORMAT_YAML:
b, err := yaml.Marshal(scannedResults)
if err != nil {
log.Error().Err(err).Msgf("failed to unmarshal cached data to YAML")
}
fmt.Printf("%s\n", string(b))
case FORMAT_LIST:
for _, r := range scannedResults {
fmt.Printf("%s:%d (%s) @%s\n", r.Host, r.Port, r.Protocol, r.Timestamp.Format(time.UnixDate))
}
default:
log.Error().Msg("unrecognized format")
os.Exit(1)
}
// print cache data in specified format // print cache data in specified format
magellan.PrintRemoteAssets(scannedResults, listOutputFormat) magellan.PrintRemoteAssets(scannedResults, strings.ToLower(listOutputFormat))
}, },
} }
@ -111,18 +87,19 @@ var listDrivesCmd = &cobra.Command{
log.Error().Err(err).Msg("failed to get drives") log.Error().Err(err).Msg("failed to get drives")
os.Exit(1) os.Exit(1)
} }
magellan.PrintDrives(drives) magellan.PrintDrives(drives, listOutputFormat)
}, },
} }
func init() { func init() {
ListCmd.Flags().StringVarP(&listOutputFormat, "format", "F", "none", "Set the output format (list|json|yaml)") ListCmd.Flags().StringVarP(&listOutputFormat, "format", "F", FORMAT_LIST, "Set the output format (list|json|yaml)")
ListCmd.Flags().BoolVar(&showCacheInfo, "cache-info", false, "Alias for 'magellan cache info'") ListCmd.Flags().BoolVar(&showCacheInfo, "cache-info", false, "Alias for 'magellan cache info'")
listDrivesCmd.Flags().StringVarP(&listUsername, "username", "u", "", "Set the username for BMC login") listDrivesCmd.Flags().StringVarP(&listUsername, "username", "u", "", "Set the username for BMC login")
listDrivesCmd.Flags().StringVarP(&listPassword, "password", "p", "", "Set the password for BMC login") listDrivesCmd.Flags().StringVarP(&listPassword, "password", "p", "", "Set the password for BMC login")
listDrivesCmd.Flags().BoolVarP(&insecure, "insecure", "i", false, "Skip TLS verification") listDrivesCmd.Flags().BoolVarP(&insecure, "insecure", "i", false, "Skip TLS verification")
listDrivesCmd.Flags().StringVarP(&secretsFile, "secrets-file", "f", "secrets.json", "Set the path to secrets store file to store credentials") listDrivesCmd.Flags().StringVarP(&secretsFile, "secrets-file", "f", "secrets.json", "Set the path to secrets store file to store credentials")
listDrivesCmd.Flags().StringVarP(&listOutputFormat, "format", "F", FORMAT_LIST, "Set the output format (list|json|yaml)")
ListCmd.AddCommand(listDrivesCmd) ListCmd.AddCommand(listDrivesCmd)
rootCmd.AddCommand(ListCmd) rootCmd.AddCommand(ListCmd)