Skip to content

Commit

Permalink
chore: add debug logging for decode errors (#1352)
Browse files Browse the repository at this point in the history
  • Loading branch information
kzantow authored Nov 21, 2022
1 parent 04880c0 commit 0dddf51
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions syft/formats/formats.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ package formats

import (
"bytes"
"errors"
"fmt"
"io"
"strings"

"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/syft/formats/cyclonedxjson"
"github.com/anchore/syft/syft/formats/cyclonedxxml"
"github.com/anchore/syft/syft/formats/github"
Expand Down Expand Up @@ -35,6 +37,9 @@ func Formats() []sbom.Format {
func Identify(by []byte) sbom.Format {
for _, f := range Formats() {
if err := f.Validate(bytes.NewReader(by)); err != nil {
if !errors.Is(err, sbom.ErrValidationNotSupported) {
log.Debugf("format %s returned err: %+v", f.ID(), err)
}
continue
}
return f
Expand Down
2 changes: 1 addition & 1 deletion syft/formats/spdxtagvalue/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
func decoder(reader io.Reader) (*sbom.SBOM, error) {
doc, err := tvloader.Load2_3(reader)
if err != nil {
return nil, fmt.Errorf("unable to decode spdx-json: %w", err)
return nil, fmt.Errorf("unable to decode spdx-tag-value: %w", err)
}

return spdxhelpers.ToSyftModel(doc)
Expand Down

0 comments on commit 0dddf51

Please sign in to comment.