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

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"

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"

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"
 )

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"

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"

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"
 )

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"

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"
 )
 

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"
 )
 

syft/formats/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"
 )

syft/formats/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,7 +38,7 @@ 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
 		}
@@ -46,7 +46,7 @@ func GetDecoder(format cyclonedx.BOMFileFormat) sbom.Decoder {
 	}
 }
 
-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")
 	}

syft/formats/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{

syft/formats/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 (

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"
 )
 

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")

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"
 )
 

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"
 )
 

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")

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"
 )
 

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"
 )
 

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")

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

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