refactor: move formats from internal into syft module (#1172)

anchore · Sep 13, 2022 · 9097614 · 9097614
1 parent c5dca00
commit 9097614
Show file tree

Hide file tree

Showing 185 changed files with 80 additions and 80 deletions.
diff --git a/cmd/syft/cli/attest/attest.go b/cmd/syft/cli/attest/attest.go
@@ -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"

diff --git a/cmd/syft/cli/options/packages.go b/cmd/syft/cli/options/packages.go
@@ -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"

diff --git a/cmd/syft/cli/options/writer.go b/cmd/syft/cli/options/writer.go
@@ -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"
 )

diff --git a/cmd/syft/cli/packages/packages.go b/cmd/syft/cli/packages/packages.go
@@ -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"

diff --git a/cmd/syft/cli/poweruser/poweruser.go b/cmd/syft/cli/poweruser/poweruser.go
@@ -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"

diff --git a/internal/anchore/import_package_sbom.go b/internal/anchore/import_package_sbom.go
@@ -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"
 )

diff --git a/internal/anchore/import_package_sbom_test.go b/internal/anchore/import_package_sbom_test.go
@@ -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"

diff --git a/schema/json/generate.go b/schema/json/generate.go
@@ -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"
 )
 

diff --git a/syft/formats.go b/syft/formats.go
@@ -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"
 )
 

diff --git a/...formats/common/cyclonedxhelpers/author.go → ...formats/common/cyclonedxhelpers/author.go b/...formats/common/cyclonedxhelpers/author.go → ...formats/common/cyclonedxhelpers/author.go
diff --git a/...ts/common/cyclonedxhelpers/author_test.go → ...ts/common/cyclonedxhelpers/author_test.go b/...ts/common/cyclonedxhelpers/author_test.go → ...ts/common/cyclonedxhelpers/author_test.go
diff --git a/...mats/common/cyclonedxhelpers/component.go → ...mats/common/cyclonedxhelpers/component.go b/...mats/common/cyclonedxhelpers/component.go → ...mats/common/cyclonedxhelpers/component.go
@@ -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"
 )

diff --git a/...common/cyclonedxhelpers/component_test.go → ...common/cyclonedxhelpers/component_test.go b/...common/cyclonedxhelpers/component_test.go → ...common/cyclonedxhelpers/component_test.go
diff --git a/...al/formats/common/cyclonedxhelpers/cpe.go → syft/formats/common/cyclonedxhelpers/cpe.go b/...al/formats/common/cyclonedxhelpers/cpe.go → syft/formats/common/cyclonedxhelpers/cpe.go
diff --git a/...rmats/common/cyclonedxhelpers/cpe_test.go → ...rmats/common/cyclonedxhelpers/cpe_test.go b/...rmats/common/cyclonedxhelpers/cpe_test.go → ...rmats/common/cyclonedxhelpers/cpe_test.go
diff --git a/...ormats/common/cyclonedxhelpers/decoder.go → ...ormats/common/cyclonedxhelpers/decoder.go b/...ormats/common/cyclonedxhelpers/decoder.go → ...ormats/common/cyclonedxhelpers/decoder.go
@@ -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"
@@ -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")
 	}

diff --git a/...s/common/cyclonedxhelpers/decoder_test.go → ...s/common/cyclonedxhelpers/decoder_test.go b/...s/common/cyclonedxhelpers/decoder_test.go → ...s/common/cyclonedxhelpers/decoder_test.go
@@ -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:
@@ -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{

diff --git a/...ts/common/cyclonedxhelpers/description.go → ...ts/common/cyclonedxhelpers/description.go b/...ts/common/cyclonedxhelpers/description.go → ...ts/common/cyclonedxhelpers/description.go
diff --git a/...mmon/cyclonedxhelpers/description_test.go → ...mmon/cyclonedxhelpers/description_test.go b/...mmon/cyclonedxhelpers/description_test.go → ...mmon/cyclonedxhelpers/description_test.go
diff --git a/...n/cyclonedxhelpers/external_references.go → ...n/cyclonedxhelpers/external_references.go b/...n/cyclonedxhelpers/external_references.go → ...n/cyclonedxhelpers/external_references.go
diff --git a/...lonedxhelpers/external_references_test.go → ...lonedxhelpers/external_references_test.go b/...lonedxhelpers/external_references_test.go → ...lonedxhelpers/external_references_test.go
diff --git a/...formats/common/cyclonedxhelpers/format.go → ...formats/common/cyclonedxhelpers/format.go b/...formats/common/cyclonedxhelpers/format.go → ...formats/common/cyclonedxhelpers/format.go
diff --git a/.../formats/common/cyclonedxhelpers/group.go → .../formats/common/cyclonedxhelpers/group.go b/.../formats/common/cyclonedxhelpers/group.go → .../formats/common/cyclonedxhelpers/group.go
diff --git a/...ats/common/cyclonedxhelpers/group_test.go → ...ats/common/cyclonedxhelpers/group_test.go b/...ats/common/cyclonedxhelpers/group_test.go → ...ats/common/cyclonedxhelpers/group_test.go
diff --git a/...rmats/common/cyclonedxhelpers/licenses.go → ...rmats/common/cyclonedxhelpers/licenses.go b/...rmats/common/cyclonedxhelpers/licenses.go → ...rmats/common/cyclonedxhelpers/licenses.go
diff --git a/.../common/cyclonedxhelpers/licenses_test.go → .../common/cyclonedxhelpers/licenses_test.go b/.../common/cyclonedxhelpers/licenses_test.go → .../common/cyclonedxhelpers/licenses_test.go
diff --git a/...ats/common/cyclonedxhelpers/properties.go → ...ats/common/cyclonedxhelpers/properties.go b/...ats/common/cyclonedxhelpers/properties.go → ...ats/common/cyclonedxhelpers/properties.go
@@ -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 (

diff --git a/...mats/common/cyclonedxhelpers/publisher.go → ...mats/common/cyclonedxhelpers/publisher.go b/...mats/common/cyclonedxhelpers/publisher.go → ...mats/common/cyclonedxhelpers/publisher.go
diff --git a/...common/cyclonedxhelpers/publisher_test.go → ...common/cyclonedxhelpers/publisher_test.go b/...common/cyclonedxhelpers/publisher_test.go → ...common/cyclonedxhelpers/publisher_test.go
diff --git a/internal/formats/common/property_encoder.go → syft/formats/common/property_encoder.go b/internal/formats/common/property_encoder.go → syft/formats/common/property_encoder.go
diff --git a/...l/formats/common/property_encoder_test.go → syft/formats/common/property_encoder_test.go b/...l/formats/common/property_encoder_test.go → syft/formats/common/property_encoder_test.go
diff --git a/...formats/common/spdxhelpers/description.go → ...formats/common/spdxhelpers/description.go b/...formats/common/spdxhelpers/description.go → ...formats/common/spdxhelpers/description.go
diff --git a/...ts/common/spdxhelpers/description_test.go → ...ts/common/spdxhelpers/description_test.go b/...ts/common/spdxhelpers/description_test.go → ...ts/common/spdxhelpers/description_test.go
diff --git a/...rmats/common/spdxhelpers/document_name.go → ...rmats/common/spdxhelpers/document_name.go b/...rmats/common/spdxhelpers/document_name.go → ...rmats/common/spdxhelpers/document_name.go
diff --git a/.../common/spdxhelpers/document_name_test.go → .../common/spdxhelpers/document_name_test.go b/.../common/spdxhelpers/document_name_test.go → .../common/spdxhelpers/document_name_test.go
diff --git a/.../common/spdxhelpers/document_namespace.go → .../common/spdxhelpers/document_namespace.go b/.../common/spdxhelpers/document_namespace.go → .../common/spdxhelpers/document_namespace.go
diff --git a/...on/spdxhelpers/document_namespace_test.go → ...on/spdxhelpers/document_namespace_test.go b/...on/spdxhelpers/document_namespace_test.go → ...on/spdxhelpers/document_namespace_test.go
diff --git a/...s/common/spdxhelpers/download_location.go → ...s/common/spdxhelpers/download_location.go b/...s/common/spdxhelpers/download_location.go → ...s/common/spdxhelpers/download_location.go
diff --git a/...mon/spdxhelpers/download_location_test.go → ...mon/spdxhelpers/download_location_test.go b/...mon/spdxhelpers/download_location_test.go → ...mon/spdxhelpers/download_location_test.go
diff --git a/...ormats/common/spdxhelpers/external_ref.go → ...ormats/common/spdxhelpers/external_ref.go b/...ormats/common/spdxhelpers/external_ref.go → ...ormats/common/spdxhelpers/external_ref.go
diff --git a/...rmats/common/spdxhelpers/external_refs.go → ...rmats/common/spdxhelpers/external_refs.go b/...rmats/common/spdxhelpers/external_refs.go → ...rmats/common/spdxhelpers/external_refs.go
diff --git a/.../common/spdxhelpers/external_refs_test.go → .../common/spdxhelpers/external_refs_test.go b/.../common/spdxhelpers/external_refs_test.go → .../common/spdxhelpers/external_refs_test.go
diff --git a/...l/formats/common/spdxhelpers/file_type.go → syft/formats/common/spdxhelpers/file_type.go b/...l/formats/common/spdxhelpers/file_type.go → syft/formats/common/spdxhelpers/file_type.go
diff --git a/...al/formats/common/spdxhelpers/homepage.go → syft/formats/common/spdxhelpers/homepage.go b/...al/formats/common/spdxhelpers/homepage.go → syft/formats/common/spdxhelpers/homepage.go
diff --git a/...rmats/common/spdxhelpers/homepage_test.go → ...rmats/common/spdxhelpers/homepage_test.go b/...rmats/common/spdxhelpers/homepage_test.go → ...rmats/common/spdxhelpers/homepage_test.go
diff --git a/...nal/formats/common/spdxhelpers/license.go → syft/formats/common/spdxhelpers/license.go b/...nal/formats/common/spdxhelpers/license.go → syft/formats/common/spdxhelpers/license.go
diff --git a/...ormats/common/spdxhelpers/license_test.go → ...ormats/common/spdxhelpers/license_test.go b/...ormats/common/spdxhelpers/license_test.go → ...ormats/common/spdxhelpers/license_test.go
diff --git a/...rmats/common/spdxhelpers/none_if_empty.go → ...rmats/common/spdxhelpers/none_if_empty.go b/...rmats/common/spdxhelpers/none_if_empty.go → ...rmats/common/spdxhelpers/none_if_empty.go
diff --git a/.../common/spdxhelpers/none_if_empty_test.go → .../common/spdxhelpers/none_if_empty_test.go b/.../common/spdxhelpers/none_if_empty_test.go → .../common/spdxhelpers/none_if_empty_test.go
diff --git a/...ats/common/spdxhelpers/originator_test.go → ...ats/common/spdxhelpers/originator_test.go b/...ats/common/spdxhelpers/originator_test.go → ...ats/common/spdxhelpers/originator_test.go
diff --git a/...l/formats/common/spdxhelpers/origintor.go → syft/formats/common/spdxhelpers/origintor.go b/...l/formats/common/spdxhelpers/origintor.go → syft/formats/common/spdxhelpers/origintor.go
diff --git a/...s/common/spdxhelpers/relationship_type.go → ...s/common/spdxhelpers/relationship_type.go b/...s/common/spdxhelpers/relationship_type.go → ...s/common/spdxhelpers/relationship_type.go
diff --git a/...formats/common/spdxhelpers/source_info.go → ...formats/common/spdxhelpers/source_info.go b/...formats/common/spdxhelpers/source_info.go → ...formats/common/spdxhelpers/source_info.go
diff --git a/...ts/common/spdxhelpers/source_info_test.go → ...ts/common/spdxhelpers/source_info_test.go b/...ts/common/spdxhelpers/source_info_test.go → ...ts/common/spdxhelpers/source_info_test.go
diff --git a/...rnal/formats/common/spdxhelpers/spdxid.go → syft/formats/common/spdxhelpers/spdxid.go b/...rnal/formats/common/spdxhelpers/spdxid.go → syft/formats/common/spdxhelpers/spdxid.go
diff --git a/...formats/common/spdxhelpers/spdxid_test.go → ...formats/common/spdxhelpers/spdxid_test.go b/...formats/common/spdxhelpers/spdxid_test.go → ...formats/common/spdxhelpers/spdxid_test.go
diff --git a/...rmats/common/spdxhelpers/to_syft_model.go → ...rmats/common/spdxhelpers/to_syft_model.go b/...rmats/common/spdxhelpers/to_syft_model.go → ...rmats/common/spdxhelpers/to_syft_model.go
diff --git a/.../common/spdxhelpers/to_syft_model_test.go → .../common/spdxhelpers/to_syft_model_test.go b/.../common/spdxhelpers/to_syft_model_test.go → .../common/spdxhelpers/to_syft_model_test.go
diff --git a/internal/formats/common/testutils/utils.go → syft/formats/common/testutils/utils.go b/internal/formats/common/testutils/utils.go → syft/formats/common/testutils/utils.go
diff --git a/...nal/formats/cyclonedxjson/decoder_test.go → syft/formats/cyclonedxjson/decoder_test.go b/...nal/formats/cyclonedxjson/decoder_test.go → syft/formats/cyclonedxjson/decoder_test.go
diff --git a/internal/formats/cyclonedxjson/encoder.go → syft/formats/cyclonedxjson/encoder.go b/internal/formats/cyclonedxjson/encoder.go → syft/formats/cyclonedxjson/encoder.go
@@ -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"
 )
 

diff --git a/...nal/formats/cyclonedxjson/encoder_test.go → syft/formats/cyclonedxjson/encoder_test.go b/...nal/formats/cyclonedxjson/encoder_test.go → syft/formats/cyclonedxjson/encoder_test.go
@@ -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")

diff --git a/internal/formats/cyclonedxjson/format.go → syft/formats/cyclonedxjson/format.go b/internal/formats/cyclonedxjson/format.go → syft/formats/cyclonedxjson/format.go
@@ -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"
 )
 

diff --git a/...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile b/...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile
diff --git a/...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt b/...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt
diff --git a/...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt b/...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt
diff --git a/...shot/TestCycloneDxDirectoryEncoder.golden → ...shot/TestCycloneDxDirectoryEncoder.golden b/...shot/TestCycloneDxDirectoryEncoder.golden → ...shot/TestCycloneDxDirectoryEncoder.golden
diff --git a/...snapshot/TestCycloneDxImageEncoder.golden → ...snapshot/TestCycloneDxImageEncoder.golden b/...snapshot/TestCycloneDxImageEncoder.golden → ...snapshot/TestCycloneDxImageEncoder.golden
diff --git a/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden b/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
diff --git a/...rnal/formats/cyclonedxxml/decoder_test.go → syft/formats/cyclonedxxml/decoder_test.go b/...rnal/formats/cyclonedxxml/decoder_test.go → syft/formats/cyclonedxxml/decoder_test.go
diff --git a/internal/formats/cyclonedxxml/encoder.go → syft/formats/cyclonedxxml/encoder.go b/internal/formats/cyclonedxxml/encoder.go → syft/formats/cyclonedxxml/encoder.go
@@ -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"
 )
 

diff --git a/...rnal/formats/cyclonedxxml/encoder_test.go → syft/formats/cyclonedxxml/encoder_test.go b/...rnal/formats/cyclonedxxml/encoder_test.go → syft/formats/cyclonedxxml/encoder_test.go
@@ -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")

diff --git a/internal/formats/cyclonedxxml/format.go → syft/formats/cyclonedxxml/format.go b/internal/formats/cyclonedxxml/format.go → syft/formats/cyclonedxxml/format.go
@@ -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"
 )
 

diff --git a/...xml/test-fixtures/image-simple/Dockerfile → ...xml/test-fixtures/image-simple/Dockerfile b/...xml/test-fixtures/image-simple/Dockerfile → ...xml/test-fixtures/image-simple/Dockerfile
diff --git a/...xml/test-fixtures/image-simple/file-1.txt → ...xml/test-fixtures/image-simple/file-1.txt b/...xml/test-fixtures/image-simple/file-1.txt → ...xml/test-fixtures/image-simple/file-1.txt
diff --git a/...xml/test-fixtures/image-simple/file-2.txt → ...xml/test-fixtures/image-simple/file-2.txt b/...xml/test-fixtures/image-simple/file-2.txt → ...xml/test-fixtures/image-simple/file-2.txt
diff --git a/...shot/TestCycloneDxDirectoryEncoder.golden → ...shot/TestCycloneDxDirectoryEncoder.golden b/...shot/TestCycloneDxDirectoryEncoder.golden → ...shot/TestCycloneDxDirectoryEncoder.golden
diff --git a/...snapshot/TestCycloneDxImageEncoder.golden → ...snapshot/TestCycloneDxImageEncoder.golden b/...snapshot/TestCycloneDxImageEncoder.golden → ...snapshot/TestCycloneDxImageEncoder.golden
diff --git a/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden b/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
diff --git a/internal/formats/github/encoder.go → syft/formats/github/encoder.go b/internal/formats/github/encoder.go → syft/formats/github/encoder.go
diff --git a/internal/formats/github/encoder_test.go → syft/formats/github/encoder_test.go b/internal/formats/github/encoder_test.go → syft/formats/github/encoder_test.go
diff --git a/internal/formats/github/format.go → syft/formats/github/format.go b/internal/formats/github/format.go → syft/formats/github/format.go
diff --git a/...l/formats/github/github_dependency_api.go → syft/formats/github/github_dependency_api.go b/...l/formats/github/github_dependency_api.go → syft/formats/github/github_dependency_api.go
diff --git a/internal/formats/spdx22json/decoder.go → syft/formats/spdx22json/decoder.go b/internal/formats/spdx22json/decoder.go → syft/formats/spdx22json/decoder.go
@@ -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"
 )
 

diff --git a/internal/formats/spdx22json/decoder_test.go → syft/formats/spdx22json/decoder_test.go b/internal/formats/spdx22json/decoder_test.go → syft/formats/spdx22json/decoder_test.go
diff --git a/internal/formats/spdx22json/encoder.go → syft/formats/spdx22json/encoder.go b/internal/formats/spdx22json/encoder.go → syft/formats/spdx22json/encoder.go
diff --git a/internal/formats/spdx22json/encoder_test.go → syft/formats/spdx22json/encoder_test.go b/internal/formats/spdx22json/encoder_test.go → syft/formats/spdx22json/encoder_test.go
@@ -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")

diff --git a/internal/formats/spdx22json/format.go → syft/formats/spdx22json/format.go b/internal/formats/spdx22json/format.go → syft/formats/spdx22json/format.go
diff --git a/...al/formats/spdx22json/model/annotation.go → syft/formats/spdx22json/model/annotation.go b/...al/formats/spdx22json/model/annotation.go → syft/formats/spdx22json/model/annotation.go
diff --git a/...rnal/formats/spdx22json/model/checksum.go → syft/formats/spdx22json/model/checksum.go b/...rnal/formats/spdx22json/model/checksum.go → syft/formats/spdx22json/model/checksum.go
diff --git a/...formats/spdx22json/model/creation_info.go → ...formats/spdx22json/model/creation_info.go b/...formats/spdx22json/model/creation_info.go → ...formats/spdx22json/model/creation_info.go
diff --git a/...rnal/formats/spdx22json/model/document.go → syft/formats/spdx22json/model/document.go b/...rnal/formats/spdx22json/model/document.go → syft/formats/spdx22json/model/document.go
diff --git a/internal/formats/spdx22json/model/element.go → syft/formats/spdx22json/model/element.go b/internal/formats/spdx22json/model/element.go → syft/formats/spdx22json/model/element.go
diff --git a/...al/formats/spdx22json/model/element_id.go → syft/formats/spdx22json/model/element_id.go b/...al/formats/spdx22json/model/element_id.go → syft/formats/spdx22json/model/element_id.go
@@ -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

diff --git a/...spdx22json/model/external_document_ref.go → ...spdx22json/model/external_document_ref.go b/...spdx22json/model/external_document_ref.go → ...spdx22json/model/external_document_ref.go
diff --git a/internal/formats/spdx22json/model/file.go → syft/formats/spdx22json/model/file.go b/internal/formats/spdx22json/model/file.go → syft/formats/spdx22json/model/file.go
diff --git a/...son/model/has_extracted_licensing_info.go → ...son/model/has_extracted_licensing_info.go b/...son/model/has_extracted_licensing_info.go → ...son/model/has_extracted_licensing_info.go
diff --git a/internal/formats/spdx22json/model/item.go → syft/formats/spdx22json/model/item.go b/internal/formats/spdx22json/model/item.go → syft/formats/spdx22json/model/item.go
diff --git a/internal/formats/spdx22json/model/package.go → syft/formats/spdx22json/model/package.go b/internal/formats/spdx22json/model/package.go → syft/formats/spdx22json/model/package.go
@@ -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

diff --git a/...22json/model/package_verification_code.go → ...22json/model/package_verification_code.go b/...22json/model/package_verification_code.go → ...22json/model/package_verification_code.go
diff --git a/.../formats/spdx22json/model/relationship.go → .../formats/spdx22json/model/relationship.go b/.../formats/spdx22json/model/relationship.go → .../formats/spdx22json/model/relationship.go
@@ -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

diff --git a/internal/formats/spdx22json/model/snippet.go → syft/formats/spdx22json/model/snippet.go b/internal/formats/spdx22json/model/snippet.go → syft/formats/spdx22json/model/snippet.go
diff --git a/internal/formats/spdx22json/model/version.go → syft/formats/spdx22json/model/version.go b/internal/formats/spdx22json/model/version.go → syft/formats/spdx22json/model/version.go
diff --git a/...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile b/...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile
diff --git a/...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt b/...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt
diff --git a/...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt b/...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt
diff --git a/...pshot/TestSPDXJSONDirectoryEncoder.golden → ...pshot/TestSPDXJSONDirectoryEncoder.golden b/...pshot/TestSPDXJSONDirectoryEncoder.golden → ...pshot/TestSPDXJSONDirectoryEncoder.golden
diff --git a/.../snapshot/TestSPDXJSONImageEncoder.golden → .../snapshot/TestSPDXJSONImageEncoder.golden b/.../snapshot/TestSPDXJSONImageEncoder.golden → .../snapshot/TestSPDXJSONImageEncoder.golden
diff --git a/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden b/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
diff --git a/...-fixtures/spdx/alpine-3.10.syft.spdx.json → ...-fixtures/spdx/alpine-3.10.syft.spdx.json b/...-fixtures/spdx/alpine-3.10.syft.spdx.json → ...-fixtures/spdx/alpine-3.10.syft.spdx.json
diff --git a/...ixtures/spdx/alpine-3.10.vendor.spdx.json → ...ixtures/spdx/alpine-3.10.vendor.spdx.json b/...ixtures/spdx/alpine-3.10.vendor.spdx.json → ...ixtures/spdx/alpine-3.10.vendor.spdx.json
diff --git a/...-fixtures/spdx/bad/example7-bin.spdx.json → ...-fixtures/spdx/bad/example7-bin.spdx.json b/...-fixtures/spdx/bad/example7-bin.spdx.json → ...-fixtures/spdx/bad/example7-bin.spdx.json
diff --git a/...res/spdx/bad/example7-go-module.spdx.json → ...res/spdx/bad/example7-go-module.spdx.json b/...res/spdx/bad/example7-go-module.spdx.json → ...res/spdx/bad/example7-go-module.spdx.json
diff --git a/...xtures/spdx/bad/example7-golang.spdx.json → ...xtures/spdx/bad/example7-golang.spdx.json b/...xtures/spdx/bad/example7-golang.spdx.json → ...xtures/spdx/bad/example7-golang.spdx.json
diff --git a/...ad/example7-third-party-modules.spdx.json → ...ad/example7-third-party-modules.spdx.json b/...ad/example7-third-party-modules.spdx.json → ...ad/example7-third-party-modules.spdx.json
diff --git a/...test-fixtures/spdx/example7-bin.spdx.json → ...test-fixtures/spdx/example7-bin.spdx.json b/...test-fixtures/spdx/example7-bin.spdx.json → ...test-fixtures/spdx/example7-bin.spdx.json
diff --git a/...ixtures/spdx/example7-go-module.spdx.json → ...ixtures/spdx/example7-go-module.spdx.json b/...ixtures/spdx/example7-go-module.spdx.json → ...ixtures/spdx/example7-go-module.spdx.json
diff --git a/...t-fixtures/spdx/example7-golang.spdx.json → ...t-fixtures/spdx/example7-golang.spdx.json b/...t-fixtures/spdx/example7-golang.spdx.json → ...t-fixtures/spdx/example7-golang.spdx.json
diff --git a/...dx/example7-third-party-modules.spdx.json → ...dx/example7-third-party-modules.spdx.json b/...dx/example7-third-party-modules.spdx.json → ...dx/example7-third-party-modules.spdx.json
diff --git a/...nal/formats/spdx22json/to_format_model.go → syft/formats/spdx22json/to_format_model.go b/...nal/formats/spdx22json/to_format_model.go → syft/formats/spdx22json/to_format_model.go
@@ -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"

diff --git a/...ormats/spdx22json/to_format_model_test.go → ...ormats/spdx22json/to_format_model_test.go b/...ormats/spdx22json/to_format_model_test.go → ...ormats/spdx22json/to_format_model_test.go
@@ -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"
 )

diff --git a/internal/formats/spdx22json/validator.go → syft/formats/spdx22json/validator.go b/internal/formats/spdx22json/validator.go → syft/formats/spdx22json/validator.go
diff --git a/internal/formats/spdx22tagvalue/decoder.go → syft/formats/spdx22tagvalue/decoder.go b/internal/formats/spdx22tagvalue/decoder.go → syft/formats/spdx22tagvalue/decoder.go
@@ -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"
 )
 

diff --git a/internal/formats/spdx22tagvalue/encoder.go → syft/formats/spdx22tagvalue/encoder.go b/internal/formats/spdx22tagvalue/encoder.go → syft/formats/spdx22tagvalue/encoder.go
diff --git a/...al/formats/spdx22tagvalue/encoder_test.go → syft/formats/spdx22tagvalue/encoder_test.go b/...al/formats/spdx22tagvalue/encoder_test.go → syft/formats/spdx22tagvalue/encoder_test.go
@@ -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"

diff --git a/internal/formats/spdx22tagvalue/format.go → syft/formats/spdx22tagvalue/format.go b/internal/formats/spdx22tagvalue/format.go → syft/formats/spdx22tagvalue/format.go
diff --git a/...lue/test-fixtures/image-simple/Dockerfile → ...lue/test-fixtures/image-simple/Dockerfile b/...lue/test-fixtures/image-simple/Dockerfile → ...lue/test-fixtures/image-simple/Dockerfile
diff --git a/...lue/test-fixtures/image-simple/file-1.txt → ...lue/test-fixtures/image-simple/file-1.txt b/...lue/test-fixtures/image-simple/file-1.txt → ...lue/test-fixtures/image-simple/file-1.txt
diff --git a/...lue/test-fixtures/image-simple/file-2.txt → ...lue/test-fixtures/image-simple/file-2.txt b/...lue/test-fixtures/image-simple/file-2.txt → ...lue/test-fixtures/image-simple/file-2.txt
diff --git a/...tures/snapshot/TestSPDXJSONSPDXIDs.golden → ...tures/snapshot/TestSPDXJSONSPDXIDs.golden b/...tures/snapshot/TestSPDXJSONSPDXIDs.golden → ...tures/snapshot/TestSPDXJSONSPDXIDs.golden
diff --git a/...t/TestSPDXTagValueDirectoryEncoder.golden → ...t/TestSPDXTagValueDirectoryEncoder.golden b/...t/TestSPDXTagValueDirectoryEncoder.golden → ...t/TestSPDXTagValueDirectoryEncoder.golden
diff --git a/...pshot/TestSPDXTagValueImageEncoder.golden → ...pshot/TestSPDXTagValueImageEncoder.golden b/...pshot/TestSPDXTagValueImageEncoder.golden → ...pshot/TestSPDXTagValueImageEncoder.golden
diff --git a/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden b/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
diff --git a/...formats/spdx22tagvalue/to_format_model.go → ...formats/spdx22tagvalue/to_format_model.go b/...formats/spdx22tagvalue/to_format_model.go → ...formats/spdx22tagvalue/to_format_model.go
@@ -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"
 )

diff --git a/internal/formats/spdx22tagvalue/validator.go → syft/formats/spdx22tagvalue/validator.go b/internal/formats/spdx22tagvalue/validator.go → syft/formats/spdx22tagvalue/validator.go
diff --git a/internal/formats/syftjson/decoder.go → syft/formats/syftjson/decoder.go b/internal/formats/syftjson/decoder.go → syft/formats/syftjson/decoder.go
@@ -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) {

diff --git a/internal/formats/syftjson/decoder_test.go → syft/formats/syftjson/decoder_test.go b/internal/formats/syftjson/decoder_test.go → syft/formats/syftjson/decoder_test.go
@@ -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"
 )

diff --git a/internal/formats/syftjson/encoder.go → syft/formats/syftjson/encoder.go b/internal/formats/syftjson/encoder.go → syft/formats/syftjson/encoder.go
diff --git a/internal/formats/syftjson/encoder_test.go → syft/formats/syftjson/encoder_test.go b/internal/formats/syftjson/encoder_test.go → syft/formats/syftjson/encoder_test.go
@@ -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")

diff --git a/internal/formats/syftjson/format.go → syft/formats/syftjson/format.go b/internal/formats/syftjson/format.go → syft/formats/syftjson/format.go
diff --git a/internal/formats/syftjson/model/document.go → syft/formats/syftjson/model/document.go b/internal/formats/syftjson/model/document.go → syft/formats/syftjson/model/document.go
diff --git a/internal/formats/syftjson/model/file.go → syft/formats/syftjson/model/file.go b/internal/formats/syftjson/model/file.go → syft/formats/syftjson/model/file.go
diff --git a/...l/formats/syftjson/model/linux_release.go → syft/formats/syftjson/model/linux_release.go b/...l/formats/syftjson/model/linux_release.go → syft/formats/syftjson/model/linux_release.go
diff --git a/...mats/syftjson/model/linux_release_test.go → ...mats/syftjson/model/linux_release_test.go b/...mats/syftjson/model/linux_release_test.go → ...mats/syftjson/model/linux_release_test.go
diff --git a/internal/formats/syftjson/model/package.go → syft/formats/syftjson/model/package.go b/internal/formats/syftjson/model/package.go → syft/formats/syftjson/model/package.go
diff --git a/...al/formats/syftjson/model/package_test.go → syft/formats/syftjson/model/package_test.go b/...al/formats/syftjson/model/package_test.go → syft/formats/syftjson/model/package_test.go
diff --git a/...al/formats/syftjson/model/relationship.go → syft/formats/syftjson/model/relationship.go b/...al/formats/syftjson/model/relationship.go → syft/formats/syftjson/model/relationship.go
diff --git a/internal/formats/syftjson/model/secrets.go → syft/formats/syftjson/model/secrets.go b/internal/formats/syftjson/model/secrets.go → syft/formats/syftjson/model/secrets.go
diff --git a/internal/formats/syftjson/model/source.go → syft/formats/syftjson/model/source.go b/internal/formats/syftjson/model/source.go → syft/formats/syftjson/model/source.go
diff --git a/...nal/formats/syftjson/model/source_test.go → syft/formats/syftjson/model/source_test.go b/...nal/formats/syftjson/model/source_test.go → syft/formats/syftjson/model/source_test.go
diff --git a/...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile b/...son/test-fixtures/image-simple/Dockerfile → ...son/test-fixtures/image-simple/Dockerfile
diff --git a/...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt b/...son/test-fixtures/image-simple/file-1.txt → ...son/test-fixtures/image-simple/file-1.txt
diff --git a/...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt b/...son/test-fixtures/image-simple/file-2.txt → ...son/test-fixtures/image-simple/file-2.txt
diff --git a/...ures/snapshot/TestDirectoryEncoder.golden → ...ures/snapshot/TestDirectoryEncoder.golden b/...ures/snapshot/TestDirectoryEncoder.golden → ...ures/snapshot/TestDirectoryEncoder.golden
diff --git a/...napshot/TestEncodeFullJSONDocument.golden → ...napshot/TestEncodeFullJSONDocument.golden b/...napshot/TestEncodeFullJSONDocument.golden → ...napshot/TestEncodeFullJSONDocument.golden
diff --git a/...fixtures/snapshot/TestImageEncoder.golden → ...fixtures/snapshot/TestImageEncoder.golden b/...fixtures/snapshot/TestImageEncoder.golden → ...fixtures/snapshot/TestImageEncoder.golden
diff --git a/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden b/...t/stereoscope-fixture-image-simple.golden → ...t/stereoscope-fixture-image-simple.golden
diff --git a/internal/formats/syftjson/to_format_model.go → syft/formats/syftjson/to_format_model.go b/internal/formats/syftjson/to_format_model.go → syft/formats/syftjson/to_format_model.go
@@ -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"
 )

diff --git a/.../formats/syftjson/to_format_model_test.go → .../formats/syftjson/to_format_model_test.go b/.../formats/syftjson/to_format_model_test.go → .../formats/syftjson/to_format_model_test.go
@@ -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"