SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 18:15:42 +01:00
Code Issues Releases Activity Actions

fix: don't require debug level to print error details on failed loading of provider metadata json

Browse source
This commit is contained in:
Marius Goetze 2024-07-15 10:52:13 +02:00 • committed by Paul Schwabauer
parent 51dc9b5bcb
commit 1e531de82d
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/csaf_aggregator/processor.go
View file

@ -89,17 +89,21 @@ func (w *worker) locateProviderMetadata(domain string) error {
lpmd := loader.Load(domain) lpmd := loader.Load(domain)
if w.processor.cfg.Verbose { if !lpmd.Valid() {
for i := range lpmd.Messages { for i := range lpmd.Messages {
w.log.Info( w.log.Error(
"Loading provider-metadata.json", "Loading provider-metadata.json",
"domain", domain, "domain", domain,
"message", lpmd.Messages[i].Message) "message", lpmd.Messages[i].Message)
} }
}
if !lpmd.Valid() {
return fmt.Errorf("no valid provider-metadata.json found for '%s'", domain) return fmt.Errorf("no valid provider-metadata.json found for '%s'", domain)
} else if w.processor.cfg.Verbose {
for i := range lpmd.Messages {
w.log.Debug(
"Loading provider-metadata.json",
"domain", domain,
"message", lpmd.Messages[i].Message)
}
} }
w.metadataProvider = lpmd.Document w.metadataProvider = lpmd.Document

13
cmd/csaf_downloader/downloader.go
View file

@ -199,7 +199,14 @@ func (d *downloader) download(ctx context.Context, domain string) error {
lpmd := loader.Load(domain) lpmd := loader.Load(domain)
if d.cfg.verbose() { if !lpmd.Valid() {
for i := range lpmd.Messages {
slog.Error("Loading provider-metadata.json",
"domain", domain,
"message", lpmd.Messages[i].Message)
}
return fmt.Errorf("no valid provider-metadata.json found for '%s': ", domain)
} else if d.cfg.verbose() {
for i := range lpmd.Messages { for i := range lpmd.Messages {
slog.Debug("Loading provider-metadata.json", slog.Debug("Loading provider-metadata.json",
"domain", domain, "domain", domain,
@ -207,10 +214,6 @@ func (d *downloader) download(ctx context.Context, domain string) error {
} }
} }
if !lpmd.Valid() {
return fmt.Errorf("no valid provider-metadata.json found for '%s'", domain)
}
base, err := url.Parse(lpmd.URL) base, err := url.Parse(lpmd.URL)
if err != nil { if err != nil {
return fmt.Errorf("invalid URL '%s': %v", lpmd.URL, err) return fmt.Errorf("invalid URL '%s': %v", lpmd.URL, err)