Skip to content

refactor: move formats from internal into syft module #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spiffcs merged 6 commits into from
Sep 13, 2022
Merged

refactor: move formats from internal into syft module #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d55b59
feat: add initial interface for parsers
cpendery Aug 23, 2022
6df5bec
fix: add support for spdx & cyclonedx parsing
cpendery Aug 23, 2022
1a71c0d
Revert "fix: add support for spdx & cyclonedx parsing"
cpendery Sep 11, 2022
220c022
Revert "feat: add initial interface for parsers"
cpendery Sep 11, 2022
c634d2c
feat: move formats into the syft module
cpendery Sep 11, 2022
4b1148b
Merge branch 'main' into feat-parser
cpendery Sep 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/syft/cli/attest/attest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import (
"github.com/anchore/syft/cmd/syft/cli/packages"
"github.com/anchore/syft/internal/bus"
"github.com/anchore/syft/internal/config"
"github.com/anchore/syft/internal/formats/cyclonedxjson"
"github.com/anchore/syft/internal/formats/spdx22json"
"github.com/anchore/syft/internal/formats/syftjson"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/ui"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/event"
"github.com/anchore/syft/syft/formats/cyclonedxjson"
"github.com/anchore/syft/syft/formats/spdx22json"
"github.com/anchore/syft/syft/formats/syftjson"
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/source"
"github.com/google/go-containerregistry/pkg/name"
Expand Down
2 changes: 1 addition & 1 deletion cmd/syft/cli/options/packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package options
import (
"fmt"

"github.com/anchore/syft/internal/formats/table"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/formats/table"
"github.com/anchore/syft/syft/pkg/cataloger"
"github.com/anchore/syft/syft/source"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cmd/syft/cli/options/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/anchore/syft/internal/formats/table"
"github.com/anchore/syft/internal/formats/template"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/formats/table"
"github.com/anchore/syft/syft/formats/template"
"github.com/anchore/syft/syft/sbom"
"github.com/hashicorp/go-multierror"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/syft/cli/packages/packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"github.com/anchore/syft/internal/anchore"
"github.com/anchore/syft/internal/bus"
"github.com/anchore/syft/internal/config"
"github.com/anchore/syft/internal/formats/template"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/ui"
"github.com/anchore/syft/internal/version"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/event"
"github.com/anchore/syft/syft/formats/template"
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/source"
"github.com/wagoodman/go-partybus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/syft/cli/poweruser/poweruser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/bus"
"github.com/anchore/syft/internal/config"
"github.com/anchore/syft/internal/formats/syftjson"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/ui"
"github.com/anchore/syft/internal/version"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/event"
"github.com/anchore/syft/syft/formats/syftjson"
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/source"
"github.com/gookit/color"
Expand Down
4 changes: 2 additions & 2 deletions internal/anchore/import_package_sbom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http"

"github.com/anchore/client-go/pkg/external"
"github.com/anchore/syft/internal/formats/syftjson"
syftjsonModel "github.com/anchore/syft/internal/formats/syftjson/model"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/syft/formats/syftjson"
syftjsonModel "github.com/anchore/syft/syft/formats/syftjson/model"
"github.com/anchore/syft/syft/sbom"
"github.com/wagoodman/go-progress"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/anchore/import_package_sbom_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"

"github.com/anchore/client-go/pkg/external"
"github.com/anchore/syft/internal/formats/syftjson"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/formats/syftjson"
"github.com/anchore/syft/syft/linux"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/sbom"
Expand Down
2 changes: 1 addition & 1 deletion schema/json/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/alecthomas/jsonschema"
"github.com/anchore/syft/internal"
syftjsonModel "github.com/anchore/syft/internal/formats/syftjson/model"
syftjsonModel "github.com/anchore/syft/syft/formats/syftjson/model"
"github.com/anchore/syft/syft/pkg"
)

Expand Down
18 changes: 9 additions & 9 deletions syft/formats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"bytes"
"strings"

"github.com/anchore/syft/internal/formats/cyclonedxjson"
"github.com/anchore/syft/internal/formats/cyclonedxxml"
"github.com/anchore/syft/internal/formats/github"
"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/internal/formats/table"
"github.com/anchore/syft/internal/formats/template"
"github.com/anchore/syft/internal/formats/text"
"github.com/anchore/syft/syft/formats/cyclonedxjson"
"github.com/anchore/syft/syft/formats/cyclonedxxml"
"github.com/anchore/syft/syft/formats/github"
"github.com/anchore/syft/syft/formats/spdx22json"
"github.com/anchore/syft/syft/formats/spdx22tagvalue"
"github.com/anchore/syft/syft/formats/syftjson"
"github.com/anchore/syft/syft/formats/table"
"github.com/anchore/syft/syft/formats/template"
"github.com/anchore/syft/syft/formats/text"
"github.com/anchore/syft/syft/sbom"
)

Expand Down
0 ...formats/common/cyclonedxhelpers/author.go → ...formats/common/cyclonedxhelpers/author.go
View file
Open in desktop
File renamed without changes.
0 ...ts/common/cyclonedxhelpers/author_test.go → ...ts/common/cyclonedxhelpers/author_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mats/common/cyclonedxhelpers/component.go → ...mats/common/cyclonedxhelpers/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/CycloneDX/cyclonedx-go"

"github.com/anchore/packageurl-go"
"github.com/anchore/syft/internal/formats/common"
"github.com/anchore/syft/syft/formats/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/source"
)
Expand Down
0 ...common/cyclonedxhelpers/component_test.go → ...common/cyclonedxhelpers/component_test.go
View file
Open in desktop
File renamed without changes.
0 ...al/formats/common/cyclonedxhelpers/cpe.go → syft/formats/common/cyclonedxhelpers/cpe.go
View file
Open in desktop
File renamed without changes.
0 ...rmats/common/cyclonedxhelpers/cpe_test.go → ...rmats/common/cyclonedxhelpers/cpe_test.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ormats/common/cyclonedxhelpers/decoder.go → ...ormats/common/cyclonedxhelpers/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/CycloneDX/cyclonedx-go"

"github.com/anchore/syft/internal/formats/common"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/formats/common"
"github.com/anchore/syft/syft/linux"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/sbom"
Expand Down Expand Up @@ -38,15 +38,15 @@ func GetDecoder(format cyclonedx.BOMFileFormat) sbom.Decoder {
if err != nil {
return nil, err
}
s, err := toSyftModel(bom)
s, err := ToSyftModel(bom)
if err != nil {
return nil, err
}
return s, nil
}
}

func toSyftModel(bom *cyclonedx.BOM) (*sbom.SBOM, error) {
func ToSyftModel(bom *cyclonedx.BOM) (*sbom.SBOM, error) {
if bom == nil {
return nil, fmt.Errorf("no content defined in CycloneDX BOM")
}
Expand Down
6 changes: 3 additions & 3 deletions ...s/common/cyclonedxhelpers/decoder_test.go → ...s/common/cyclonedxhelpers/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func Test_decode(t *testing.T) {
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
sbom, err := toSyftModel(&test.input)
sbom, err := ToSyftModel(&test.input)
assert.NoError(t, err)

test:
Expand Down Expand Up @@ -267,12 +267,12 @@ func Test_missingDataDecode(t *testing.T) {
Components: &[]cyclonedx.Component{},
}

_, err := toSyftModel(bom)
_, err := ToSyftModel(bom)
assert.NoError(t, err)

bom.Metadata = &cyclonedx.Metadata{}

_, err = toSyftModel(bom)
_, err = ToSyftModel(bom)
assert.NoError(t, err)

pkg := decodeComponent(&cyclonedx.Component{
Expand Down
0 ...ts/common/cyclonedxhelpers/description.go → ...ts/common/cyclonedxhelpers/description.go
View file
Open in desktop
File renamed without changes.
0 ...mmon/cyclonedxhelpers/description_test.go → ...mmon/cyclonedxhelpers/description_test.go
View file
Open in desktop
File renamed without changes.
0 ...n/cyclonedxhelpers/external_references.go → ...n/cyclonedxhelpers/external_references.go
View file
Open in desktop
File renamed without changes.
0 ...lonedxhelpers/external_references_test.go → ...lonedxhelpers/external_references_test.go
View file
Open in desktop
File renamed without changes.
0 ...formats/common/cyclonedxhelpers/format.go → ...formats/common/cyclonedxhelpers/format.go
View file
Open in desktop
File renamed without changes.
0 .../formats/common/cyclonedxhelpers/group.go → .../formats/common/cyclonedxhelpers/group.go
View file
Open in desktop
File renamed without changes.
0 ...ats/common/cyclonedxhelpers/group_test.go → ...ats/common/cyclonedxhelpers/group_test.go
View file
Open in desktop
File renamed without changes.
0 ...rmats/common/cyclonedxhelpers/licenses.go → ...rmats/common/cyclonedxhelpers/licenses.go
View file
Open in desktop
File renamed without changes.
0 .../common/cyclonedxhelpers/licenses_test.go → .../common/cyclonedxhelpers/licenses_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ats/common/cyclonedxhelpers/properties.go → ...ats/common/cyclonedxhelpers/properties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cyclonedxhelpers
import (
"github.com/CycloneDX/cyclonedx-go"

"github.com/anchore/syft/internal/formats/common"
"github.com/anchore/syft/syft/formats/common"
)

var (
Expand Down
0 ...mats/common/cyclonedxhelpers/publisher.go → ...mats/common/cyclonedxhelpers/publisher.go
View file
Open in desktop
File renamed without changes.
0 ...common/cyclonedxhelpers/publisher_test.go → ...common/cyclonedxhelpers/publisher_test.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/common/property_encoder.go → syft/formats/common/property_encoder.go
View file
Open in desktop
File renamed without changes.
0 ...l/formats/common/property_encoder_test.go → syft/formats/common/property_encoder_test.go
View file
Open in desktop
File renamed without changes.
0 ...formats/common/spdxhelpers/description.go → ...formats/common/spdxhelpers/description.go
View file
Open in desktop
File renamed without changes.
0 ...ts/common/spdxhelpers/description_test.go → ...ts/common/spdxhelpers/description_test.go
View file
Open in desktop
File renamed without changes.
0 ...rmats/common/spdxhelpers/document_name.go → ...rmats/common/spdxhelpers/document_name.go
View file
Open in desktop
File renamed without changes.
0 .../common/spdxhelpers/document_name_test.go → .../common/spdxhelpers/document_name_test.go
View file
Open in desktop
File renamed without changes.
0 .../common/spdxhelpers/document_namespace.go → .../common/spdxhelpers/document_namespace.go
View file
Open in desktop
File renamed without changes.
0 ...on/spdxhelpers/document_namespace_test.go → ...on/spdxhelpers/document_namespace_test.go
View file
Open in desktop
File renamed without changes.
0 ...s/common/spdxhelpers/download_location.go → ...s/common/spdxhelpers/download_location.go
View file
Open in desktop
File renamed without changes.
0 ...mon/spdxhelpers/download_location_test.go → ...mon/spdxhelpers/download_location_test.go
View file
Open in desktop
File renamed without changes.
0 ...ormats/common/spdxhelpers/external_ref.go → ...ormats/common/spdxhelpers/external_ref.go
View file
Open in desktop
File renamed without changes.
0 ...rmats/common/spdxhelpers/external_refs.go → ...rmats/common/spdxhelpers/external_refs.go
View file
Open in desktop
File renamed without changes.
0 .../common/spdxhelpers/external_refs_test.go → .../common/spdxhelpers/external_refs_test.go
View file
Open in desktop
File renamed without changes.
0 ...l/formats/common/spdxhelpers/file_type.go → syft/formats/common/spdxhelpers/file_type.go
View file
Open in desktop
File renamed without changes.
0 ...al/formats/common/spdxhelpers/homepage.go → syft/formats/common/spdxhelpers/homepage.go
View file
Open in desktop
File renamed without changes.
0 ...rmats/common/spdxhelpers/homepage_test.go → ...rmats/common/spdxhelpers/homepage_test.go
View file
Open in desktop
File renamed without changes.
0 ...nal/formats/common/spdxhelpers/license.go → syft/formats/common/spdxhelpers/license.go
View file
Open in desktop
File renamed without changes.
0 ...ormats/common/spdxhelpers/license_test.go → ...ormats/common/spdxhelpers/license_test.go
View file
Open in desktop
File renamed without changes.
0 ...rmats/common/spdxhelpers/none_if_empty.go → ...rmats/common/spdxhelpers/none_if_empty.go
View file
Open in desktop
File renamed without changes.
0 .../common/spdxhelpers/none_if_empty_test.go → .../common/spdxhelpers/none_if_empty_test.go
View file
Open in desktop
File renamed without changes.
0 ...ats/common/spdxhelpers/originator_test.go → ...ats/common/spdxhelpers/originator_test.go
View file
Open in desktop
File renamed without changes.
0 ...l/formats/common/spdxhelpers/origintor.go → syft/formats/common/spdxhelpers/origintor.go
View file
Open in desktop
File renamed without changes.
0 ...s/common/spdxhelpers/relationship_type.go → ...s/common/spdxhelpers/relationship_type.go
View file
Open in desktop
File renamed without changes.
0 ...formats/common/spdxhelpers/source_info.go → ...formats/common/spdxhelpers/source_info.go
View file
Open in desktop
File renamed without changes.
0 ...ts/common/spdxhelpers/source_info_test.go → ...ts/common/spdxhelpers/source_info_test.go
View file
Open in desktop
File renamed without changes.
0 ...rnal/formats/common/spdxhelpers/spdxid.go → syft/formats/common/spdxhelpers/spdxid.go
View file
Open in desktop
File renamed without changes.
0 ...formats/common/spdxhelpers/spdxid_test.go → ...formats/common/spdxhelpers/spdxid_test.go
View file
Open in desktop
File renamed without changes.
0 ...rmats/common/spdxhelpers/to_syft_model.go → ...rmats/common/spdxhelpers/to_syft_model.go
View file
Open in desktop
File renamed without changes.
0 .../common/spdxhelpers/to_syft_model_test.go → .../common/spdxhelpers/to_syft_model_test.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/common/testutils/utils.go → syft/formats/common/testutils/utils.go
View file
Open in desktop
File renamed without changes.
0 ...nal/formats/cyclonedxjson/decoder_test.go → syft/formats/cyclonedxjson/decoder_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/cyclonedxjson/encoder.go → syft/formats/cyclonedxjson/encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"

"github.com/CycloneDX/cyclonedx-go"
"github.com/anchore/syft/internal/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/sbom"
)

Expand Down
2 changes: 1 addition & 1 deletion ...nal/formats/cyclonedxjson/encoder_test.go → syft/formats/cyclonedxjson/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"testing"

"github.com/anchore/syft/internal/formats/common/testutils"
"github.com/anchore/syft/syft/formats/common/testutils"
)

var updateCycloneDx = flag.Bool("update-cyclonedx", false, "update the *.golden files for cyclone-dx encoders")
Expand Down
2 changes: 1 addition & 1 deletion internal/formats/cyclonedxjson/format.go → syft/formats/cyclonedxjson/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cyclonedxjson

import (
"github.com/CycloneDX/cyclonedx-go"
"github.com/anchore/syft/internal/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/sbom"
)

Expand Down
0 ...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt
View file
Open in desktop
File renamed without changes.
0 ...shot/TestCycloneDxDirectoryEncoder.golden → ...shot/TestCycloneDxDirectoryEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...snapshot/TestCycloneDxImageEncoder.golden → ...snapshot/TestCycloneDxImageEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
View file
Open in desktop
File renamed without changes.
0 ...rnal/formats/cyclonedxxml/decoder_test.go → syft/formats/cyclonedxxml/decoder_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/cyclonedxxml/encoder.go → syft/formats/cyclonedxxml/encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"

"github.com/CycloneDX/cyclonedx-go"
"github.com/anchore/syft/internal/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/sbom"
)

Expand Down
2 changes: 1 addition & 1 deletion ...rnal/formats/cyclonedxxml/encoder_test.go → syft/formats/cyclonedxxml/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"testing"

"github.com/anchore/syft/internal/formats/common/testutils"
"github.com/anchore/syft/syft/formats/common/testutils"
)

var updateCycloneDx = flag.Bool("update-cyclonedx", false, "update the *.golden files for cyclone-dx encoders")
Expand Down
2 changes: 1 addition & 1 deletion internal/formats/cyclonedxxml/format.go → syft/formats/cyclonedxxml/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cyclonedxxml

import (
"github.com/CycloneDX/cyclonedx-go"
"github.com/anchore/syft/internal/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
"github.com/anchore/syft/syft/sbom"
)

Expand Down
0 ...xml/test-fixtures/image-simple/Dockerfile → ...xml/test-fixtures/image-simple/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...xml/test-fixtures/image-simple/file-1.txt → ...xml/test-fixtures/image-simple/file-1.txt
View file
Open in desktop
File renamed without changes.
0 ...xml/test-fixtures/image-simple/file-2.txt → ...xml/test-fixtures/image-simple/file-2.txt
View file
Open in desktop
File renamed without changes.
0 ...shot/TestCycloneDxDirectoryEncoder.golden → ...shot/TestCycloneDxDirectoryEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...snapshot/TestCycloneDxImageEncoder.golden → ...snapshot/TestCycloneDxImageEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
View file
Open in desktop
File renamed without changes.
0 internal/formats/github/encoder.go → syft/formats/github/encoder.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/github/encoder_test.go → syft/formats/github/encoder_test.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/github/format.go → syft/formats/github/format.go
View file
Open in desktop
File renamed without changes.
0 ...l/formats/github/github_dependency_api.go → syft/formats/github/github_dependency_api.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/spdx22json/decoder.go → syft/formats/spdx22json/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/spdx/tools-golang/jsonloader"

"github.com/anchore/syft/internal/formats/common/spdxhelpers"
"github.com/anchore/syft/syft/formats/common/spdxhelpers"
"github.com/anchore/syft/syft/sbom"
)

Expand Down
0 internal/formats/spdx22json/decoder_test.go → syft/formats/spdx22json/decoder_test.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/spdx22json/encoder.go → syft/formats/spdx22json/encoder.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/spdx22json/encoder_test.go → syft/formats/spdx22json/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"testing"

"github.com/anchore/syft/internal/formats/common/testutils"
"github.com/anchore/syft/syft/formats/common/testutils"
)

var updateSpdxJson = flag.Bool("update-spdx-json", false, "update the *.golden files for spdx-json encoders")
Expand Down
0 internal/formats/spdx22json/format.go → syft/formats/spdx22json/format.go
View file
Open in desktop
File renamed without changes.
0 ...al/formats/spdx22json/model/annotation.go → syft/formats/spdx22json/model/annotation.go
View file
Open in desktop
File renamed without changes.
0 ...rnal/formats/spdx22json/model/checksum.go → syft/formats/spdx22json/model/checksum.go
View file
Open in desktop
File renamed without changes.
0 ...formats/spdx22json/model/creation_info.go → ...formats/spdx22json/model/creation_info.go
View file
Open in desktop
File renamed without changes.
0 ...rnal/formats/spdx22json/model/document.go → syft/formats/spdx22json/model/document.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/spdx22json/model/element.go → syft/formats/spdx22json/model/element.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...al/formats/spdx22json/model/element_id.go → syft/formats/spdx22json/model/element_id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package model

import "github.com/anchore/syft/internal/formats/common/spdxhelpers"
import "github.com/anchore/syft/syft/formats/common/spdxhelpers"

// ElementID represents the identifier string portion of an SPDX element
// identifier. DocElementID should be used for any attributes which can
Expand Down
0 ...spdx22json/model/external_document_ref.go → ...spdx22json/model/external_document_ref.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/spdx22json/model/file.go → syft/formats/spdx22json/model/file.go
View file
Open in desktop
File renamed without changes.
0 ...son/model/has_extracted_licensing_info.go → ...son/model/has_extracted_licensing_info.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/spdx22json/model/item.go → syft/formats/spdx22json/model/item.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/spdx22json/model/package.go → syft/formats/spdx22json/model/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package model

import "github.com/anchore/syft/internal/formats/common/spdxhelpers"
import "github.com/anchore/syft/syft/formats/common/spdxhelpers"

type Package struct {
Item
Expand Down
0 ...22json/model/package_verification_code.go → ...22json/model/package_verification_code.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../formats/spdx22json/model/relationship.go → .../formats/spdx22json/model/relationship.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package model

import "github.com/anchore/syft/internal/formats/common/spdxhelpers"
import "github.com/anchore/syft/syft/formats/common/spdxhelpers"

type Relationship struct {
// Id to which the SPDX element is related
Expand Down
0 internal/formats/spdx22json/model/snippet.go → syft/formats/spdx22json/model/snippet.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/spdx22json/model/version.go → syft/formats/spdx22json/model/version.go
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt
View file
Open in desktop
File renamed without changes.
0 ...pshot/TestSPDXJSONDirectoryEncoder.golden → ...pshot/TestSPDXJSONDirectoryEncoder.golden
View file
Open in desktop
File renamed without changes.
0 .../snapshot/TestSPDXJSONImageEncoder.golden → .../snapshot/TestSPDXJSONImageEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
View file
Open in desktop
File renamed without changes.
0 ...-fixtures/spdx/alpine-3.10.syft.spdx.json → ...-fixtures/spdx/alpine-3.10.syft.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...ixtures/spdx/alpine-3.10.vendor.spdx.json → ...ixtures/spdx/alpine-3.10.vendor.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...-fixtures/spdx/bad/example7-bin.spdx.json → ...-fixtures/spdx/bad/example7-bin.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...res/spdx/bad/example7-go-module.spdx.json → ...res/spdx/bad/example7-go-module.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...xtures/spdx/bad/example7-golang.spdx.json → ...xtures/spdx/bad/example7-golang.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...ad/example7-third-party-modules.spdx.json → ...ad/example7-third-party-modules.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...test-fixtures/spdx/example7-bin.spdx.json → ...test-fixtures/spdx/example7-bin.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...ixtures/spdx/example7-go-module.spdx.json → ...ixtures/spdx/example7-go-module.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...t-fixtures/spdx/example7-golang.spdx.json → ...t-fixtures/spdx/example7-golang.spdx.json
View file
Open in desktop
File renamed without changes.
0 ...dx/example7-third-party-modules.spdx.json → ...dx/example7-third-party-modules.spdx.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nal/formats/spdx22json/to_format_model.go → syft/formats/spdx22json/to_format_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"time"

"github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/formats/common/spdxhelpers"
"github.com/anchore/syft/internal/formats/spdx22json/model"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/spdxlicense"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/formats/common/spdxhelpers"
"github.com/anchore/syft/syft/formats/spdx22json/model"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/source"
Expand Down
4 changes: 2 additions & 2 deletions ...ormats/spdx22json/to_format_model_test.go → ...ormats/spdx22json/to_format_model_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/anchore/syft/syft/artifact"

"github.com/anchore/syft/internal/formats/common/spdxhelpers"
"github.com/anchore/syft/internal/formats/spdx22json/model"
"github.com/anchore/syft/syft/formats/common/spdxhelpers"
"github.com/anchore/syft/syft/formats/spdx22json/model"
"github.com/anchore/syft/syft/source"
"github.com/stretchr/testify/assert"
)
Expand Down
0 internal/formats/spdx22json/validator.go → syft/formats/spdx22json/validator.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/spdx22tagvalue/decoder.go → syft/formats/spdx22tagvalue/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/spdx/tools-golang/tvloader"

"github.com/anchore/syft/internal/formats/common/spdxhelpers"
"github.com/anchore/syft/syft/formats/common/spdxhelpers"
"github.com/anchore/syft/syft/sbom"
)

Expand Down
0 internal/formats/spdx22tagvalue/encoder.go → syft/formats/spdx22tagvalue/encoder.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...al/formats/spdx22tagvalue/encoder_test.go → syft/formats/spdx22tagvalue/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"testing"

"github.com/anchore/syft/internal/formats/common/testutils"
"github.com/anchore/syft/syft/formats/common/testutils"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/source"
Expand Down
0 internal/formats/spdx22tagvalue/format.go → syft/formats/spdx22tagvalue/format.go
View file
Open in desktop
File renamed without changes.
0 ...lue/test-fixtures/image-simple/Dockerfile → ...lue/test-fixtures/image-simple/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...lue/test-fixtures/image-simple/file-1.txt → ...lue/test-fixtures/image-simple/file-1.txt
View file
Open in desktop
File renamed without changes.
0 ...lue/test-fixtures/image-simple/file-2.txt → ...lue/test-fixtures/image-simple/file-2.txt
View file
Open in desktop
File renamed without changes.
0 ...tures/snapshot/TestSPDXJSONSPDXIDs.golden → ...tures/snapshot/TestSPDXJSONSPDXIDs.golden
View file
Open in desktop
File renamed without changes.
0 ...t/TestSPDXTagValueDirectoryEncoder.golden → ...t/TestSPDXTagValueDirectoryEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...pshot/TestSPDXTagValueImageEncoder.golden → ...pshot/TestSPDXTagValueImageEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...formats/spdx22tagvalue/to_format_model.go → ...formats/spdx22tagvalue/to_format_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/anchore/syft/syft/sbom"

"github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/formats/common/spdxhelpers"
"github.com/anchore/syft/internal/spdxlicense"
"github.com/anchore/syft/syft/formats/common/spdxhelpers"
"github.com/anchore/syft/syft/pkg"
"github.com/spdx/tools-golang/spdx"
)
Expand Down
0 internal/formats/spdx22tagvalue/validator.go → syft/formats/spdx22tagvalue/validator.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/syftjson/decoder.go → syft/formats/syftjson/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/anchore/syft/syft/sbom"

"github.com/anchore/syft/internal/formats/syftjson/model"
"github.com/anchore/syft/syft/formats/syftjson/model"
)

func decoder(reader io.Reader) (*sbom.SBOM, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/formats/syftjson/decoder_test.go → syft/formats/syftjson/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"testing"

"github.com/anchore/syft/internal/formats/common/testutils"
"github.com/anchore/syft/syft/formats/common/testutils"
"github.com/go-test/deep"
"github.com/stretchr/testify/assert"
)
Expand Down
0 internal/formats/syftjson/encoder.go → syft/formats/syftjson/encoder.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/syftjson/encoder_test.go → syft/formats/syftjson/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/source"

"github.com/anchore/syft/internal/formats/common/testutils"
"github.com/anchore/syft/syft/formats/common/testutils"
)

var updateJson = flag.Bool("update-json", false, "update the *.golden files for json encoders")
Expand Down
0 internal/formats/syftjson/format.go → syft/formats/syftjson/format.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/syftjson/model/document.go → syft/formats/syftjson/model/document.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/syftjson/model/file.go → syft/formats/syftjson/model/file.go
View file
Open in desktop
File renamed without changes.
0 ...l/formats/syftjson/model/linux_release.go → syft/formats/syftjson/model/linux_release.go
View file
Open in desktop
File renamed without changes.
0 ...mats/syftjson/model/linux_release_test.go → ...mats/syftjson/model/linux_release_test.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/syftjson/model/package.go → syft/formats/syftjson/model/package.go
View file
Open in desktop
File renamed without changes.
0 ...al/formats/syftjson/model/package_test.go → syft/formats/syftjson/model/package_test.go
View file
Open in desktop
File renamed without changes.
0 ...al/formats/syftjson/model/relationship.go → syft/formats/syftjson/model/relationship.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/syftjson/model/secrets.go → syft/formats/syftjson/model/secrets.go
View file
Open in desktop
File renamed without changes.
0 internal/formats/syftjson/model/source.go → syft/formats/syftjson/model/source.go
View file
Open in desktop
File renamed without changes.
0 ...nal/formats/syftjson/model/source_test.go → syft/formats/syftjson/model/source_test.go
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt
View file
Open in desktop
File renamed without changes.
0 ...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt
View file
Open in desktop
File renamed without changes.
0 ...ures/snapshot/TestDirectoryEncoder.golden → ...ures/snapshot/TestDirectoryEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...napshot/TestEncodeFullJSONDocument.golden → ...napshot/TestEncodeFullJSONDocument.golden
View file
Open in desktop
File renamed without changes.
0 ...fixtures/snapshot/TestImageEncoder.golden → ...fixtures/snapshot/TestImageEncoder.golden
View file
Open in desktop
File renamed without changes.
0 ...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/formats/syftjson/to_format_model.go → syft/formats/syftjson/to_format_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/anchore/syft/syft/sbom"

"github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/formats/syftjson/model"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/syft/formats/syftjson/model"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/source"
)
Expand Down
2 changes: 1 addition & 1 deletion .../formats/syftjson/to_format_model_test.go → .../formats/syftjson/to_format_model_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/scylladb/go-set/strset"

"github.com/anchore/syft/internal/formats/syftjson/model"
"github.com/anchore/syft/syft/formats/syftjson/model"
"github.com/anchore/syft/syft/source"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
Loading