Skip to content

Commit

Permalink
SBOM cataloger (go fmt)
Browse files Browse the repository at this point in the history
Signed-off-by: Patrik Beno <patrik.beno@greenhorn.sk>
  • Loading branch information
patrikbeno committed Jun 9, 2022
1 parent 80806a6 commit b09e277
Showing 1 changed file with 41 additions and 41 deletions.
82 changes: 41 additions & 41 deletions syft/pkg/cataloger/sbom/cataloger.go
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
package sbom

import (
"bytes"
"fmt"
"github.com/anchore/syft/internal/formats/cyclonedxjson"
"github.com/anchore/syft/internal/formats/cyclonedxxml"
"github.com/anchore/syft/internal/formats/spdx22json"
"github.com/anchore/syft/internal/formats/spdx22tagvalue"
"github.com/anchore/syft/internal/formats/syftjson"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/pkg/cataloger/common"
"github.com/anchore/syft/syft/sbom"
"io"
"bytes"
"fmt"
"github.com/anchore/syft/internal/formats/cyclonedxjson"
"github.com/anchore/syft/internal/formats/cyclonedxxml"
"github.com/anchore/syft/internal/formats/spdx22json"
"github.com/anchore/syft/internal/formats/spdx22tagvalue"
"github.com/anchore/syft/internal/formats/syftjson"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/pkg/cataloger/common"
"github.com/anchore/syft/syft/sbom"
"io"
)

// NewSBOMCataloger returns a new SBOM cataloger object loaded from saved SBOM JSON.
func NewSBOMCataloger() *common.GenericCataloger {
globParsers := map[string]common.ParserFn{
"**/*.syft.json": parseSyftJson,
"**/bom.json": parseCyclonedxJson,
"**/bom.xml": parseCyclonedxXml,
"**/*.cdx.json": parseCyclonedxJson,
"**/*.cdx.xml": parseCyclonedxXml,
"**/*.spdx.json": parseSpdxJson,
"**/*.spdx": parseSpdx,
}
return common.NewGenericCataloger(nil, globParsers, "sbom-cataloger")
globParsers := map[string]common.ParserFn{
"**/*.syft.json": parseSyftJson,
"**/bom.json": parseCyclonedxJson,
"**/bom.xml": parseCyclonedxXml,
"**/*.cdx.json": parseCyclonedxJson,
"**/*.cdx.xml": parseCyclonedxXml,
"**/*.spdx.json": parseSpdxJson,
"**/*.spdx": parseSpdx,
}
return common.NewGenericCataloger(nil, globParsers, "sbom-cataloger")
}

func parseSyftJson(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, syftjson.Format())
return parseSBOM(path, reader, syftjson.Format())
}

func parseCyclonedxJson(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, cyclonedxjson.Format())
return parseSBOM(path, reader, cyclonedxjson.Format())
}

func parseCyclonedxXml(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, cyclonedxxml.Format())
return parseSBOM(path, reader, cyclonedxxml.Format())
}

func parseSpdxJson(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, spdx22json.Format())
return parseSBOM(path, reader, spdx22json.Format())
}

func parseSpdx(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, spdx22tagvalue.Format())
return parseSBOM(path, reader, spdx22tagvalue.Format())
}

func parseSBOM(_ string, reader io.Reader, format sbom.Format) ([]*pkg.Package, []artifact.Relationship, error) {
by, err := io.ReadAll(reader)
if err != nil {
return nil, nil, fmt.Errorf("unable to read sbom: %w", err)
}
by, err := io.ReadAll(reader)
if err != nil {
return nil, nil, fmt.Errorf("unable to read sbom: %w", err)
}

s, err := format.Decode(bytes.NewReader(by))
if err != nil {
return nil, nil, fmt.Errorf("unable to decode sbom: %w", err)
}
s, err := format.Decode(bytes.NewReader(by))
if err != nil {
return nil, nil, fmt.Errorf("unable to decode sbom: %w", err)
}

var packages []*pkg.Package
for _, p := range s.Artifacts.PackageCatalog.Sorted() {
x := p //copy
packages = append(packages, &x)
}
var packages []*pkg.Package
for _, p := range s.Artifacts.PackageCatalog.Sorted() {
x := p //copy
packages = append(packages, &x)
}

return packages, nil, nil
return packages, nil, nil
}

0 comments on commit b09e277

Please sign in to comment.