From 9097614f3b116eead9c15805692731c58bc92d65 Mon Sep 17 00:00:00 2001 From: Chapman Pendery <35637443+cpendery@users.noreply.github.com> Date: Tue, 13 Sep 2022 08:20:52 -0700 Subject: [PATCH] refactor: move formats from internal into syft module (#1172) --- cmd/syft/cli/attest/attest.go | 6 +++--- cmd/syft/cli/options/packages.go | 2 +- cmd/syft/cli/options/writer.go | 4 ++-- cmd/syft/cli/packages/packages.go | 2 +- cmd/syft/cli/poweruser/poweruser.go | 2 +- internal/anchore/import_package_sbom.go | 4 ++-- internal/anchore/import_package_sbom_test.go | 2 +- schema/json/generate.go | 2 +- syft/formats.go | 18 +++++++++--------- .../formats/common/cyclonedxhelpers/author.go | 0 .../common/cyclonedxhelpers/author_test.go | 0 .../common/cyclonedxhelpers/component.go | 2 +- .../common/cyclonedxhelpers/component_test.go | 0 .../formats/common/cyclonedxhelpers/cpe.go | 0 .../common/cyclonedxhelpers/cpe_test.go | 0 .../common/cyclonedxhelpers/decoder.go | 6 +++--- .../common/cyclonedxhelpers/decoder_test.go | 6 +++--- .../common/cyclonedxhelpers/description.go | 0 .../cyclonedxhelpers/description_test.go | 0 .../cyclonedxhelpers/external_references.go | 0 .../external_references_test.go | 0 .../formats/common/cyclonedxhelpers/format.go | 0 .../formats/common/cyclonedxhelpers/group.go | 0 .../common/cyclonedxhelpers/group_test.go | 0 .../common/cyclonedxhelpers/licenses.go | 0 .../common/cyclonedxhelpers/licenses_test.go | 0 .../common/cyclonedxhelpers/properties.go | 2 +- .../common/cyclonedxhelpers/publisher.go | 0 .../common/cyclonedxhelpers/publisher_test.go | 0 .../formats/common/property_encoder.go | 0 .../formats/common/property_encoder_test.go | 0 .../formats/common/spdxhelpers/description.go | 0 .../common/spdxhelpers/description_test.go | 0 .../common/spdxhelpers/document_name.go | 0 .../common/spdxhelpers/document_name_test.go | 0 .../common/spdxhelpers/document_namespace.go | 0 .../spdxhelpers/document_namespace_test.go | 0 .../common/spdxhelpers/download_location.go | 0 .../spdxhelpers/download_location_test.go | 0 .../common/spdxhelpers/external_ref.go | 0 .../common/spdxhelpers/external_refs.go | 0 .../common/spdxhelpers/external_refs_test.go | 0 .../formats/common/spdxhelpers/file_type.go | 0 .../formats/common/spdxhelpers/homepage.go | 0 .../common/spdxhelpers/homepage_test.go | 0 .../formats/common/spdxhelpers/license.go | 0 .../common/spdxhelpers/license_test.go | 0 .../common/spdxhelpers/none_if_empty.go | 0 .../common/spdxhelpers/none_if_empty_test.go | 0 .../common/spdxhelpers/originator_test.go | 0 .../formats/common/spdxhelpers/origintor.go | 0 .../common/spdxhelpers/relationship_type.go | 0 .../formats/common/spdxhelpers/source_info.go | 0 .../common/spdxhelpers/source_info_test.go | 0 .../formats/common/spdxhelpers/spdxid.go | 0 .../formats/common/spdxhelpers/spdxid_test.go | 0 .../common/spdxhelpers/to_syft_model.go | 0 .../common/spdxhelpers/to_syft_model_test.go | 0 .../formats/common/testutils/utils.go | 0 .../formats/cyclonedxjson/decoder_test.go | 0 .../formats/cyclonedxjson/encoder.go | 2 +- .../formats/cyclonedxjson/encoder_test.go | 2 +- .../formats/cyclonedxjson/format.go | 2 +- .../test-fixtures/image-simple/Dockerfile | 0 .../test-fixtures/image-simple/file-1.txt | 0 .../test-fixtures/image-simple/file-2.txt | 0 .../TestCycloneDxDirectoryEncoder.golden | 0 .../snapshot/TestCycloneDxImageEncoder.golden | 0 .../stereoscope-fixture-image-simple.golden | Bin .../formats/cyclonedxxml/decoder_test.go | 0 .../formats/cyclonedxxml/encoder.go | 2 +- .../formats/cyclonedxxml/encoder_test.go | 2 +- .../formats/cyclonedxxml/format.go | 2 +- .../test-fixtures/image-simple/Dockerfile | 0 .../test-fixtures/image-simple/file-1.txt | 0 .../test-fixtures/image-simple/file-2.txt | 0 .../TestCycloneDxDirectoryEncoder.golden | 0 .../snapshot/TestCycloneDxImageEncoder.golden | 0 .../stereoscope-fixture-image-simple.golden | Bin {internal => syft}/formats/github/encoder.go | 0 .../formats/github/encoder_test.go | 0 {internal => syft}/formats/github/format.go | 0 .../formats/github/github_dependency_api.go | 0 .../formats/spdx22json/decoder.go | 2 +- .../formats/spdx22json/decoder_test.go | 0 .../formats/spdx22json/encoder.go | 0 .../formats/spdx22json/encoder_test.go | 2 +- .../formats/spdx22json/format.go | 0 .../formats/spdx22json/model/annotation.go | 0 .../formats/spdx22json/model/checksum.go | 0 .../formats/spdx22json/model/creation_info.go | 0 .../formats/spdx22json/model/document.go | 0 .../formats/spdx22json/model/element.go | 0 .../formats/spdx22json/model/element_id.go | 2 +- .../spdx22json/model/external_document_ref.go | 0 .../formats/spdx22json/model/file.go | 0 .../model/has_extracted_licensing_info.go | 0 .../formats/spdx22json/model/item.go | 0 .../formats/spdx22json/model/package.go | 2 +- .../model/package_verification_code.go | 0 .../formats/spdx22json/model/relationship.go | 2 +- .../formats/spdx22json/model/snippet.go | 0 .../formats/spdx22json/model/version.go | 0 .../test-fixtures/image-simple/Dockerfile | 0 .../test-fixtures/image-simple/file-1.txt | 0 .../test-fixtures/image-simple/file-2.txt | 0 .../TestSPDXJSONDirectoryEncoder.golden | 0 .../snapshot/TestSPDXJSONImageEncoder.golden | 0 .../stereoscope-fixture-image-simple.golden | Bin .../spdx/alpine-3.10.syft.spdx.json | 0 .../spdx/alpine-3.10.vendor.spdx.json | 0 .../spdx/bad/example7-bin.spdx.json | 0 .../spdx/bad/example7-go-module.spdx.json | 0 .../spdx/bad/example7-golang.spdx.json | 0 .../example7-third-party-modules.spdx.json | 0 .../test-fixtures/spdx/example7-bin.spdx.json | 0 .../spdx/example7-go-module.spdx.json | 0 .../spdx/example7-golang.spdx.json | 0 .../example7-third-party-modules.spdx.json | 0 .../formats/spdx22json/to_format_model.go | 4 ++-- .../spdx22json/to_format_model_test.go | 4 ++-- .../formats/spdx22json/validator.go | 0 .../formats/spdx22tagvalue/decoder.go | 2 +- .../formats/spdx22tagvalue/encoder.go | 0 .../formats/spdx22tagvalue/encoder_test.go | 2 +- .../formats/spdx22tagvalue/format.go | 0 .../test-fixtures/image-simple/Dockerfile | 0 .../test-fixtures/image-simple/file-1.txt | 0 .../test-fixtures/image-simple/file-2.txt | 0 .../snapshot/TestSPDXJSONSPDXIDs.golden | 0 .../TestSPDXTagValueDirectoryEncoder.golden | 0 .../TestSPDXTagValueImageEncoder.golden | 0 .../stereoscope-fixture-image-simple.golden | Bin .../formats/spdx22tagvalue/to_format_model.go | 2 +- .../formats/spdx22tagvalue/validator.go | 0 .../formats/syftjson/decoder.go | 2 +- .../formats/syftjson/decoder_test.go | 2 +- .../formats/syftjson/encoder.go | 0 .../formats/syftjson/encoder_test.go | 2 +- {internal => syft}/formats/syftjson/format.go | 0 .../formats/syftjson/model/document.go | 0 .../formats/syftjson/model/file.go | 0 .../formats/syftjson/model/linux_release.go | 0 .../syftjson/model/linux_release_test.go | 0 .../formats/syftjson/model/package.go | 0 .../formats/syftjson/model/package_test.go | 0 .../formats/syftjson/model/relationship.go | 0 .../formats/syftjson/model/secrets.go | 0 .../formats/syftjson/model/source.go | 0 .../formats/syftjson/model/source_test.go | 0 .../test-fixtures/image-simple/Dockerfile | 0 .../test-fixtures/image-simple/file-1.txt | 0 .../test-fixtures/image-simple/file-2.txt | 0 .../snapshot/TestDirectoryEncoder.golden | 0 .../TestEncodeFullJSONDocument.golden | 0 .../snapshot/TestImageEncoder.golden | 0 .../stereoscope-fixture-image-simple.golden | Bin .../formats/syftjson/to_format_model.go | 2 +- .../formats/syftjson/to_format_model_test.go | 2 +- .../formats/syftjson/to_syft_model.go | 2 +- .../formats/syftjson/to_syft_model_test.go | 2 +- .../formats/syftjson/validator.go | 2 +- {internal => syft}/formats/table/encoder.go | 0 .../formats/table/encoder_test.go | 2 +- {internal => syft}/formats/table/format.go | 0 .../snapshot/TestTableEncoder.golden | 0 .../formats/template/encoder.go | 0 .../formats/template/encoder_test.go | 2 +- {internal => syft}/formats/template/format.go | 2 +- .../template/test-fixtures/csv.template | 0 .../snapshot/TestFormatWithOption.golden | 0 {internal => syft}/formats/text/encoder.go | 0 .../formats/text/encoder_test.go | 2 +- {internal => syft}/formats/text/format.go | 0 .../test-fixtures/image-simple/Dockerfile | 0 .../test-fixtures/image-simple/file-1.txt | 0 .../test-fixtures/image-simple/file-2.txt | 0 .../snapshot/TestTextDirectoryEncoder.golden | 0 .../snapshot/TestTextImageEncoder.golden | 0 .../stereoscope-fixture-image-simple.golden | Bin syft/formats_test.go | 18 +++++++++--------- test/cli/all_formats_expressible_test.go | 2 +- test/integration/convert_test.go | 12 ++++++------ test/integration/encode_decode_cycle_test.go | 6 +++--- .../package_ownership_relationship_test.go | 4 ++-- 185 files changed, 80 insertions(+), 80 deletions(-) rename {internal => syft}/formats/common/cyclonedxhelpers/author.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/author_test.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/component.go (98%) rename {internal => syft}/formats/common/cyclonedxhelpers/component_test.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/cpe.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/cpe_test.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/decoder.go (97%) rename {internal => syft}/formats/common/cyclonedxhelpers/decoder_test.go (98%) rename {internal => syft}/formats/common/cyclonedxhelpers/description.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/description_test.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/external_references.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/external_references_test.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/format.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/group.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/group_test.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/licenses.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/licenses_test.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/properties.go (88%) rename {internal => syft}/formats/common/cyclonedxhelpers/publisher.go (100%) rename {internal => syft}/formats/common/cyclonedxhelpers/publisher_test.go (100%) rename {internal => syft}/formats/common/property_encoder.go (100%) rename {internal => syft}/formats/common/property_encoder_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/description.go (100%) rename {internal => syft}/formats/common/spdxhelpers/description_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/document_name.go (100%) rename {internal => syft}/formats/common/spdxhelpers/document_name_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/document_namespace.go (100%) rename {internal => syft}/formats/common/spdxhelpers/document_namespace_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/download_location.go (100%) rename {internal => syft}/formats/common/spdxhelpers/download_location_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/external_ref.go (100%) rename {internal => syft}/formats/common/spdxhelpers/external_refs.go (100%) rename {internal => syft}/formats/common/spdxhelpers/external_refs_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/file_type.go (100%) rename {internal => syft}/formats/common/spdxhelpers/homepage.go (100%) rename {internal => syft}/formats/common/spdxhelpers/homepage_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/license.go (100%) rename {internal => syft}/formats/common/spdxhelpers/license_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/none_if_empty.go (100%) rename {internal => syft}/formats/common/spdxhelpers/none_if_empty_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/originator_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/origintor.go (100%) rename {internal => syft}/formats/common/spdxhelpers/relationship_type.go (100%) rename {internal => syft}/formats/common/spdxhelpers/source_info.go (100%) rename {internal => syft}/formats/common/spdxhelpers/source_info_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/spdxid.go (100%) rename {internal => syft}/formats/common/spdxhelpers/spdxid_test.go (100%) rename {internal => syft}/formats/common/spdxhelpers/to_syft_model.go (100%) rename {internal => syft}/formats/common/spdxhelpers/to_syft_model_test.go (100%) rename {internal => syft}/formats/common/testutils/utils.go (100%) rename {internal => syft}/formats/cyclonedxjson/decoder_test.go (100%) rename {internal => syft}/formats/cyclonedxjson/encoder.go (83%) rename {internal => syft}/formats/cyclonedxjson/encoder_test.go (95%) rename {internal => syft}/formats/cyclonedxjson/format.go (83%) rename {internal => syft}/formats/cyclonedxjson/test-fixtures/image-simple/Dockerfile (100%) rename {internal => syft}/formats/cyclonedxjson/test-fixtures/image-simple/file-1.txt (100%) rename {internal => syft}/formats/cyclonedxjson/test-fixtures/image-simple/file-2.txt (100%) rename {internal => syft}/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden (100%) rename {internal => syft}/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden (100%) rename {internal => syft}/formats/cyclonedxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden (100%) rename {internal => syft}/formats/cyclonedxxml/decoder_test.go (100%) rename {internal => syft}/formats/cyclonedxxml/encoder.go (83%) rename {internal => syft}/formats/cyclonedxxml/encoder_test.go (96%) rename {internal => syft}/formats/cyclonedxxml/format.go (83%) rename {internal => syft}/formats/cyclonedxxml/test-fixtures/image-simple/Dockerfile (100%) rename {internal => syft}/formats/cyclonedxxml/test-fixtures/image-simple/file-1.txt (100%) rename {internal => syft}/formats/cyclonedxxml/test-fixtures/image-simple/file-2.txt (100%) rename {internal => syft}/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden (100%) rename {internal => syft}/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden (100%) rename {internal => syft}/formats/cyclonedxxml/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden (100%) rename {internal => syft}/formats/github/encoder.go (100%) rename {internal => syft}/formats/github/encoder_test.go (100%) rename {internal => syft}/formats/github/format.go (100%) rename {internal => syft}/formats/github/github_dependency_api.go (100%) rename {internal => syft}/formats/spdx22json/decoder.go (90%) rename {internal => syft}/formats/spdx22json/decoder_test.go (100%) rename {internal => syft}/formats/spdx22json/encoder.go (100%) rename {internal => syft}/formats/spdx22json/encoder_test.go (95%) rename {internal => syft}/formats/spdx22json/format.go (100%) rename {internal => syft}/formats/spdx22json/model/annotation.go (100%) rename {internal => syft}/formats/spdx22json/model/checksum.go (100%) rename {internal => syft}/formats/spdx22json/model/creation_info.go (100%) rename {internal => syft}/formats/spdx22json/model/document.go (100%) rename {internal => syft}/formats/spdx22json/model/element.go (100%) rename {internal => syft}/formats/spdx22json/model/element_id.go (85%) rename {internal => syft}/formats/spdx22json/model/external_document_ref.go (100%) rename {internal => syft}/formats/spdx22json/model/file.go (100%) rename {internal => syft}/formats/spdx22json/model/has_extracted_licensing_info.go (100%) rename {internal => syft}/formats/spdx22json/model/item.go (100%) rename {internal => syft}/formats/spdx22json/model/package.go (98%) rename {internal => syft}/formats/spdx22json/model/package_verification_code.go (100%) rename {internal => syft}/formats/spdx22json/model/relationship.go (86%) rename {internal => syft}/formats/spdx22json/model/snippet.go (100%) rename {internal => syft}/formats/spdx22json/model/version.go (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/image-simple/Dockerfile (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/image-simple/file-1.txt (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/image-simple/file-2.txt (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/alpine-3.10.syft.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/alpine-3.10.vendor.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/bad/example7-bin.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/bad/example7-go-module.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/bad/example7-golang.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/bad/example7-third-party-modules.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/example7-bin.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/example7-go-module.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/example7-golang.spdx.json (100%) rename {internal => syft}/formats/spdx22json/test-fixtures/spdx/example7-third-party-modules.spdx.json (100%) rename {internal => syft}/formats/spdx22json/to_format_model.go (98%) rename {internal => syft}/formats/spdx22json/to_format_model_test.go (97%) rename {internal => syft}/formats/spdx22json/validator.go (100%) rename {internal => syft}/formats/spdx22tagvalue/decoder.go (84%) rename {internal => syft}/formats/spdx22tagvalue/encoder.go (100%) rename {internal => syft}/formats/spdx22tagvalue/encoder_test.go (97%) rename {internal => syft}/formats/spdx22tagvalue/format.go (100%) rename {internal => syft}/formats/spdx22tagvalue/test-fixtures/image-simple/Dockerfile (100%) rename {internal => syft}/formats/spdx22tagvalue/test-fixtures/image-simple/file-1.txt (100%) rename {internal => syft}/formats/spdx22tagvalue/test-fixtures/image-simple/file-2.txt (100%) rename {internal => syft}/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXJSONSPDXIDs.golden (100%) rename {internal => syft}/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueDirectoryEncoder.golden (100%) rename {internal => syft}/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueImageEncoder.golden (100%) rename {internal => syft}/formats/spdx22tagvalue/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden (100%) rename {internal => syft}/formats/spdx22tagvalue/to_format_model.go (99%) rename {internal => syft}/formats/spdx22tagvalue/validator.go (100%) rename {internal => syft}/formats/syftjson/decoder.go (85%) rename {internal => syft}/formats/syftjson/decoder_test.go (95%) rename {internal => syft}/formats/syftjson/encoder.go (100%) rename {internal => syft}/formats/syftjson/encoder_test.go (98%) rename {internal => syft}/formats/syftjson/format.go (100%) rename {internal => syft}/formats/syftjson/model/document.go (100%) rename {internal => syft}/formats/syftjson/model/file.go (100%) rename {internal => syft}/formats/syftjson/model/linux_release.go (100%) rename {internal => syft}/formats/syftjson/model/linux_release_test.go (100%) rename {internal => syft}/formats/syftjson/model/package.go (100%) rename {internal => syft}/formats/syftjson/model/package_test.go (100%) rename {internal => syft}/formats/syftjson/model/relationship.go (100%) rename {internal => syft}/formats/syftjson/model/secrets.go (100%) rename {internal => syft}/formats/syftjson/model/source.go (100%) rename {internal => syft}/formats/syftjson/model/source_test.go (100%) rename {internal => syft}/formats/syftjson/test-fixtures/image-simple/Dockerfile (100%) rename {internal => syft}/formats/syftjson/test-fixtures/image-simple/file-1.txt (100%) rename {internal => syft}/formats/syftjson/test-fixtures/image-simple/file-2.txt (100%) rename {internal => syft}/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden (100%) rename {internal => syft}/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden (100%) rename {internal => syft}/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden (100%) rename {internal => syft}/formats/syftjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden (100%) rename {internal => syft}/formats/syftjson/to_format_model.go (99%) rename {internal => syft}/formats/syftjson/to_format_model_test.go (97%) rename {internal => syft}/formats/syftjson/to_syft_model.go (98%) rename {internal => syft}/formats/syftjson/to_syft_model_test.go (97%) rename {internal => syft}/formats/syftjson/validator.go (90%) rename {internal => syft}/formats/table/encoder.go (100%) rename {internal => syft}/formats/table/encoder_test.go (93%) rename {internal => syft}/formats/table/format.go (100%) rename {internal => syft}/formats/table/test-fixtures/snapshot/TestTableEncoder.golden (100%) rename {internal => syft}/formats/template/encoder.go (100%) rename {internal => syft}/formats/template/encoder_test.go (90%) rename {internal => syft}/formats/template/format.go (94%) rename {internal => syft}/formats/template/test-fixtures/csv.template (100%) rename {internal => syft}/formats/template/test-fixtures/snapshot/TestFormatWithOption.golden (100%) rename {internal => syft}/formats/text/encoder.go (100%) rename {internal => syft}/formats/text/encoder_test.go (90%) rename {internal => syft}/formats/text/format.go (100%) rename {internal => syft}/formats/text/test-fixtures/image-simple/Dockerfile (100%) rename {internal => syft}/formats/text/test-fixtures/image-simple/file-1.txt (100%) rename {internal => syft}/formats/text/test-fixtures/image-simple/file-2.txt (100%) rename {internal => syft}/formats/text/test-fixtures/snapshot/TestTextDirectoryEncoder.golden (100%) rename {internal => syft}/formats/text/test-fixtures/snapshot/TestTextImageEncoder.golden (100%) rename {internal => syft}/formats/text/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden (100%) diff --git a/cmd/syft/cli/attest/attest.go b/cmd/syft/cli/attest/attest.go index d0d6d0d1625..43b6d85490f 100644 --- 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 index 8891f814e91..f810c1d5c59 100644 --- 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 index 2b28dd97a69..355617896b1 100644 --- 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 index 0914b186c68..0e0ada8bf15 100644 --- 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 index 1908a1650b5..6fda101ecf4 100644 --- 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 index 6c9f6c0ac9e..cd0abd0e37e 100644 --- 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 index 3628a07c482..07b1435f262 100644 --- 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 index 5bd99403cb8..b9e782bb3b0 100644 --- 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 index f3433a48e01..1e606136a9b 100644 --- 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/internal/formats/common/cyclonedxhelpers/author.go b/syft/formats/common/cyclonedxhelpers/author.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/author.go rename to syft/formats/common/cyclonedxhelpers/author.go diff --git a/internal/formats/common/cyclonedxhelpers/author_test.go b/syft/formats/common/cyclonedxhelpers/author_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/author_test.go rename to syft/formats/common/cyclonedxhelpers/author_test.go diff --git a/internal/formats/common/cyclonedxhelpers/component.go b/syft/formats/common/cyclonedxhelpers/component.go similarity index 98% rename from internal/formats/common/cyclonedxhelpers/component.go rename to syft/formats/common/cyclonedxhelpers/component.go index 955b3b227c5..0f2c1fd89b3 100644 --- a/internal/formats/common/cyclonedxhelpers/component.go +++ b/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" ) diff --git a/internal/formats/common/cyclonedxhelpers/component_test.go b/syft/formats/common/cyclonedxhelpers/component_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/component_test.go rename to syft/formats/common/cyclonedxhelpers/component_test.go diff --git a/internal/formats/common/cyclonedxhelpers/cpe.go b/syft/formats/common/cyclonedxhelpers/cpe.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/cpe.go rename to syft/formats/common/cyclonedxhelpers/cpe.go diff --git a/internal/formats/common/cyclonedxhelpers/cpe_test.go b/syft/formats/common/cyclonedxhelpers/cpe_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/cpe_test.go rename to syft/formats/common/cyclonedxhelpers/cpe_test.go diff --git a/internal/formats/common/cyclonedxhelpers/decoder.go b/syft/formats/common/cyclonedxhelpers/decoder.go similarity index 97% rename from internal/formats/common/cyclonedxhelpers/decoder.go rename to syft/formats/common/cyclonedxhelpers/decoder.go index f255d1b228c..36d99e26014 100644 --- a/internal/formats/common/cyclonedxhelpers/decoder.go +++ b/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") } diff --git a/internal/formats/common/cyclonedxhelpers/decoder_test.go b/syft/formats/common/cyclonedxhelpers/decoder_test.go similarity index 98% rename from internal/formats/common/cyclonedxhelpers/decoder_test.go rename to syft/formats/common/cyclonedxhelpers/decoder_test.go index 5f029bd3e41..c2f64775e82 100644 --- a/internal/formats/common/cyclonedxhelpers/decoder_test.go +++ b/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{ diff --git a/internal/formats/common/cyclonedxhelpers/description.go b/syft/formats/common/cyclonedxhelpers/description.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/description.go rename to syft/formats/common/cyclonedxhelpers/description.go diff --git a/internal/formats/common/cyclonedxhelpers/description_test.go b/syft/formats/common/cyclonedxhelpers/description_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/description_test.go rename to syft/formats/common/cyclonedxhelpers/description_test.go diff --git a/internal/formats/common/cyclonedxhelpers/external_references.go b/syft/formats/common/cyclonedxhelpers/external_references.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/external_references.go rename to syft/formats/common/cyclonedxhelpers/external_references.go diff --git a/internal/formats/common/cyclonedxhelpers/external_references_test.go b/syft/formats/common/cyclonedxhelpers/external_references_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/external_references_test.go rename to syft/formats/common/cyclonedxhelpers/external_references_test.go diff --git a/internal/formats/common/cyclonedxhelpers/format.go b/syft/formats/common/cyclonedxhelpers/format.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/format.go rename to syft/formats/common/cyclonedxhelpers/format.go diff --git a/internal/formats/common/cyclonedxhelpers/group.go b/syft/formats/common/cyclonedxhelpers/group.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/group.go rename to syft/formats/common/cyclonedxhelpers/group.go diff --git a/internal/formats/common/cyclonedxhelpers/group_test.go b/syft/formats/common/cyclonedxhelpers/group_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/group_test.go rename to syft/formats/common/cyclonedxhelpers/group_test.go diff --git a/internal/formats/common/cyclonedxhelpers/licenses.go b/syft/formats/common/cyclonedxhelpers/licenses.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/licenses.go rename to syft/formats/common/cyclonedxhelpers/licenses.go diff --git a/internal/formats/common/cyclonedxhelpers/licenses_test.go b/syft/formats/common/cyclonedxhelpers/licenses_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/licenses_test.go rename to syft/formats/common/cyclonedxhelpers/licenses_test.go diff --git a/internal/formats/common/cyclonedxhelpers/properties.go b/syft/formats/common/cyclonedxhelpers/properties.go similarity index 88% rename from internal/formats/common/cyclonedxhelpers/properties.go rename to syft/formats/common/cyclonedxhelpers/properties.go index a43052b9269..ba630daeb21 100644 --- a/internal/formats/common/cyclonedxhelpers/properties.go +++ b/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 ( diff --git a/internal/formats/common/cyclonedxhelpers/publisher.go b/syft/formats/common/cyclonedxhelpers/publisher.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/publisher.go rename to syft/formats/common/cyclonedxhelpers/publisher.go diff --git a/internal/formats/common/cyclonedxhelpers/publisher_test.go b/syft/formats/common/cyclonedxhelpers/publisher_test.go similarity index 100% rename from internal/formats/common/cyclonedxhelpers/publisher_test.go rename to syft/formats/common/cyclonedxhelpers/publisher_test.go diff --git a/internal/formats/common/property_encoder.go b/syft/formats/common/property_encoder.go similarity index 100% rename from internal/formats/common/property_encoder.go rename to syft/formats/common/property_encoder.go diff --git a/internal/formats/common/property_encoder_test.go b/syft/formats/common/property_encoder_test.go similarity index 100% rename from internal/formats/common/property_encoder_test.go rename to syft/formats/common/property_encoder_test.go diff --git a/internal/formats/common/spdxhelpers/description.go b/syft/formats/common/spdxhelpers/description.go similarity index 100% rename from internal/formats/common/spdxhelpers/description.go rename to syft/formats/common/spdxhelpers/description.go diff --git a/internal/formats/common/spdxhelpers/description_test.go b/syft/formats/common/spdxhelpers/description_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/description_test.go rename to syft/formats/common/spdxhelpers/description_test.go diff --git a/internal/formats/common/spdxhelpers/document_name.go b/syft/formats/common/spdxhelpers/document_name.go similarity index 100% rename from internal/formats/common/spdxhelpers/document_name.go rename to syft/formats/common/spdxhelpers/document_name.go diff --git a/internal/formats/common/spdxhelpers/document_name_test.go b/syft/formats/common/spdxhelpers/document_name_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/document_name_test.go rename to syft/formats/common/spdxhelpers/document_name_test.go diff --git a/internal/formats/common/spdxhelpers/document_namespace.go b/syft/formats/common/spdxhelpers/document_namespace.go similarity index 100% rename from internal/formats/common/spdxhelpers/document_namespace.go rename to syft/formats/common/spdxhelpers/document_namespace.go diff --git a/internal/formats/common/spdxhelpers/document_namespace_test.go b/syft/formats/common/spdxhelpers/document_namespace_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/document_namespace_test.go rename to syft/formats/common/spdxhelpers/document_namespace_test.go diff --git a/internal/formats/common/spdxhelpers/download_location.go b/syft/formats/common/spdxhelpers/download_location.go similarity index 100% rename from internal/formats/common/spdxhelpers/download_location.go rename to syft/formats/common/spdxhelpers/download_location.go diff --git a/internal/formats/common/spdxhelpers/download_location_test.go b/syft/formats/common/spdxhelpers/download_location_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/download_location_test.go rename to syft/formats/common/spdxhelpers/download_location_test.go diff --git a/internal/formats/common/spdxhelpers/external_ref.go b/syft/formats/common/spdxhelpers/external_ref.go similarity index 100% rename from internal/formats/common/spdxhelpers/external_ref.go rename to syft/formats/common/spdxhelpers/external_ref.go diff --git a/internal/formats/common/spdxhelpers/external_refs.go b/syft/formats/common/spdxhelpers/external_refs.go similarity index 100% rename from internal/formats/common/spdxhelpers/external_refs.go rename to syft/formats/common/spdxhelpers/external_refs.go diff --git a/internal/formats/common/spdxhelpers/external_refs_test.go b/syft/formats/common/spdxhelpers/external_refs_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/external_refs_test.go rename to syft/formats/common/spdxhelpers/external_refs_test.go diff --git a/internal/formats/common/spdxhelpers/file_type.go b/syft/formats/common/spdxhelpers/file_type.go similarity index 100% rename from internal/formats/common/spdxhelpers/file_type.go rename to syft/formats/common/spdxhelpers/file_type.go diff --git a/internal/formats/common/spdxhelpers/homepage.go b/syft/formats/common/spdxhelpers/homepage.go similarity index 100% rename from internal/formats/common/spdxhelpers/homepage.go rename to syft/formats/common/spdxhelpers/homepage.go diff --git a/internal/formats/common/spdxhelpers/homepage_test.go b/syft/formats/common/spdxhelpers/homepage_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/homepage_test.go rename to syft/formats/common/spdxhelpers/homepage_test.go diff --git a/internal/formats/common/spdxhelpers/license.go b/syft/formats/common/spdxhelpers/license.go similarity index 100% rename from internal/formats/common/spdxhelpers/license.go rename to syft/formats/common/spdxhelpers/license.go diff --git a/internal/formats/common/spdxhelpers/license_test.go b/syft/formats/common/spdxhelpers/license_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/license_test.go rename to syft/formats/common/spdxhelpers/license_test.go diff --git a/internal/formats/common/spdxhelpers/none_if_empty.go b/syft/formats/common/spdxhelpers/none_if_empty.go similarity index 100% rename from internal/formats/common/spdxhelpers/none_if_empty.go rename to syft/formats/common/spdxhelpers/none_if_empty.go diff --git a/internal/formats/common/spdxhelpers/none_if_empty_test.go b/syft/formats/common/spdxhelpers/none_if_empty_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/none_if_empty_test.go rename to syft/formats/common/spdxhelpers/none_if_empty_test.go diff --git a/internal/formats/common/spdxhelpers/originator_test.go b/syft/formats/common/spdxhelpers/originator_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/originator_test.go rename to syft/formats/common/spdxhelpers/originator_test.go diff --git a/internal/formats/common/spdxhelpers/origintor.go b/syft/formats/common/spdxhelpers/origintor.go similarity index 100% rename from internal/formats/common/spdxhelpers/origintor.go rename to syft/formats/common/spdxhelpers/origintor.go diff --git a/internal/formats/common/spdxhelpers/relationship_type.go b/syft/formats/common/spdxhelpers/relationship_type.go similarity index 100% rename from internal/formats/common/spdxhelpers/relationship_type.go rename to syft/formats/common/spdxhelpers/relationship_type.go diff --git a/internal/formats/common/spdxhelpers/source_info.go b/syft/formats/common/spdxhelpers/source_info.go similarity index 100% rename from internal/formats/common/spdxhelpers/source_info.go rename to syft/formats/common/spdxhelpers/source_info.go diff --git a/internal/formats/common/spdxhelpers/source_info_test.go b/syft/formats/common/spdxhelpers/source_info_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/source_info_test.go rename to syft/formats/common/spdxhelpers/source_info_test.go diff --git a/internal/formats/common/spdxhelpers/spdxid.go b/syft/formats/common/spdxhelpers/spdxid.go similarity index 100% rename from internal/formats/common/spdxhelpers/spdxid.go rename to syft/formats/common/spdxhelpers/spdxid.go diff --git a/internal/formats/common/spdxhelpers/spdxid_test.go b/syft/formats/common/spdxhelpers/spdxid_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/spdxid_test.go rename to syft/formats/common/spdxhelpers/spdxid_test.go diff --git a/internal/formats/common/spdxhelpers/to_syft_model.go b/syft/formats/common/spdxhelpers/to_syft_model.go similarity index 100% rename from internal/formats/common/spdxhelpers/to_syft_model.go rename to syft/formats/common/spdxhelpers/to_syft_model.go diff --git a/internal/formats/common/spdxhelpers/to_syft_model_test.go b/syft/formats/common/spdxhelpers/to_syft_model_test.go similarity index 100% rename from internal/formats/common/spdxhelpers/to_syft_model_test.go rename to syft/formats/common/spdxhelpers/to_syft_model_test.go diff --git a/internal/formats/common/testutils/utils.go b/syft/formats/common/testutils/utils.go similarity index 100% rename from internal/formats/common/testutils/utils.go rename to syft/formats/common/testutils/utils.go diff --git a/internal/formats/cyclonedxjson/decoder_test.go b/syft/formats/cyclonedxjson/decoder_test.go similarity index 100% rename from internal/formats/cyclonedxjson/decoder_test.go rename to syft/formats/cyclonedxjson/decoder_test.go diff --git a/internal/formats/cyclonedxjson/encoder.go b/syft/formats/cyclonedxjson/encoder.go similarity index 83% rename from internal/formats/cyclonedxjson/encoder.go rename to syft/formats/cyclonedxjson/encoder.go index aa830291526..3260cfc0098 100644 --- a/internal/formats/cyclonedxjson/encoder.go +++ b/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/internal/formats/cyclonedxjson/encoder_test.go b/syft/formats/cyclonedxjson/encoder_test.go similarity index 95% rename from internal/formats/cyclonedxjson/encoder_test.go rename to syft/formats/cyclonedxjson/encoder_test.go index 06ad8293c44..2928a28cf16 100644 --- a/internal/formats/cyclonedxjson/encoder_test.go +++ b/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 b/syft/formats/cyclonedxjson/format.go similarity index 83% rename from internal/formats/cyclonedxjson/format.go rename to syft/formats/cyclonedxjson/format.go index 9802120919b..77543e115e3 100644 --- a/internal/formats/cyclonedxjson/format.go +++ b/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/internal/formats/cyclonedxjson/test-fixtures/image-simple/Dockerfile b/syft/formats/cyclonedxjson/test-fixtures/image-simple/Dockerfile similarity index 100% rename from internal/formats/cyclonedxjson/test-fixtures/image-simple/Dockerfile rename to syft/formats/cyclonedxjson/test-fixtures/image-simple/Dockerfile diff --git a/internal/formats/cyclonedxjson/test-fixtures/image-simple/file-1.txt b/syft/formats/cyclonedxjson/test-fixtures/image-simple/file-1.txt similarity index 100% rename from internal/formats/cyclonedxjson/test-fixtures/image-simple/file-1.txt rename to syft/formats/cyclonedxjson/test-fixtures/image-simple/file-1.txt diff --git a/internal/formats/cyclonedxjson/test-fixtures/image-simple/file-2.txt b/syft/formats/cyclonedxjson/test-fixtures/image-simple/file-2.txt similarity index 100% rename from internal/formats/cyclonedxjson/test-fixtures/image-simple/file-2.txt rename to syft/formats/cyclonedxjson/test-fixtures/image-simple/file-2.txt diff --git a/internal/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden b/syft/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden similarity index 100% rename from internal/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden rename to syft/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden diff --git a/internal/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden b/syft/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden similarity index 100% rename from internal/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden rename to syft/formats/cyclonedxjson/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden diff --git a/internal/formats/cyclonedxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/cyclonedxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden similarity index 100% rename from internal/formats/cyclonedxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden rename to syft/formats/cyclonedxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden diff --git a/internal/formats/cyclonedxxml/decoder_test.go b/syft/formats/cyclonedxxml/decoder_test.go similarity index 100% rename from internal/formats/cyclonedxxml/decoder_test.go rename to syft/formats/cyclonedxxml/decoder_test.go diff --git a/internal/formats/cyclonedxxml/encoder.go b/syft/formats/cyclonedxxml/encoder.go similarity index 83% rename from internal/formats/cyclonedxxml/encoder.go rename to syft/formats/cyclonedxxml/encoder.go index 315fcd0c2ee..949b940cbbd 100644 --- a/internal/formats/cyclonedxxml/encoder.go +++ b/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/internal/formats/cyclonedxxml/encoder_test.go b/syft/formats/cyclonedxxml/encoder_test.go similarity index 96% rename from internal/formats/cyclonedxxml/encoder_test.go rename to syft/formats/cyclonedxxml/encoder_test.go index 5c4129aa74a..3d677272c94 100644 --- a/internal/formats/cyclonedxxml/encoder_test.go +++ b/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 b/syft/formats/cyclonedxxml/format.go similarity index 83% rename from internal/formats/cyclonedxxml/format.go rename to syft/formats/cyclonedxxml/format.go index 07ac3ad297f..50aabf54fcb 100644 --- a/internal/formats/cyclonedxxml/format.go +++ b/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/internal/formats/cyclonedxxml/test-fixtures/image-simple/Dockerfile b/syft/formats/cyclonedxxml/test-fixtures/image-simple/Dockerfile similarity index 100% rename from internal/formats/cyclonedxxml/test-fixtures/image-simple/Dockerfile rename to syft/formats/cyclonedxxml/test-fixtures/image-simple/Dockerfile diff --git a/internal/formats/cyclonedxxml/test-fixtures/image-simple/file-1.txt b/syft/formats/cyclonedxxml/test-fixtures/image-simple/file-1.txt similarity index 100% rename from internal/formats/cyclonedxxml/test-fixtures/image-simple/file-1.txt rename to syft/formats/cyclonedxxml/test-fixtures/image-simple/file-1.txt diff --git a/internal/formats/cyclonedxxml/test-fixtures/image-simple/file-2.txt b/syft/formats/cyclonedxxml/test-fixtures/image-simple/file-2.txt similarity index 100% rename from internal/formats/cyclonedxxml/test-fixtures/image-simple/file-2.txt rename to syft/formats/cyclonedxxml/test-fixtures/image-simple/file-2.txt diff --git a/internal/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden b/syft/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden similarity index 100% rename from internal/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden rename to syft/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden diff --git a/internal/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden b/syft/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden similarity index 100% rename from internal/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden rename to syft/formats/cyclonedxxml/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden diff --git a/internal/formats/cyclonedxxml/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/cyclonedxxml/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden similarity index 100% rename from internal/formats/cyclonedxxml/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden rename to syft/formats/cyclonedxxml/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden diff --git a/internal/formats/github/encoder.go b/syft/formats/github/encoder.go similarity index 100% rename from internal/formats/github/encoder.go rename to syft/formats/github/encoder.go diff --git a/internal/formats/github/encoder_test.go b/syft/formats/github/encoder_test.go similarity index 100% rename from internal/formats/github/encoder_test.go rename to syft/formats/github/encoder_test.go diff --git a/internal/formats/github/format.go b/syft/formats/github/format.go similarity index 100% rename from internal/formats/github/format.go rename to syft/formats/github/format.go diff --git a/internal/formats/github/github_dependency_api.go b/syft/formats/github/github_dependency_api.go similarity index 100% rename from internal/formats/github/github_dependency_api.go rename to syft/formats/github/github_dependency_api.go diff --git a/internal/formats/spdx22json/decoder.go b/syft/formats/spdx22json/decoder.go similarity index 90% rename from internal/formats/spdx22json/decoder.go rename to syft/formats/spdx22json/decoder.go index f037cd5f402..1e1bbb97817 100644 --- a/internal/formats/spdx22json/decoder.go +++ b/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 b/syft/formats/spdx22json/decoder_test.go similarity index 100% rename from internal/formats/spdx22json/decoder_test.go rename to syft/formats/spdx22json/decoder_test.go diff --git a/internal/formats/spdx22json/encoder.go b/syft/formats/spdx22json/encoder.go similarity index 100% rename from internal/formats/spdx22json/encoder.go rename to syft/formats/spdx22json/encoder.go diff --git a/internal/formats/spdx22json/encoder_test.go b/syft/formats/spdx22json/encoder_test.go similarity index 95% rename from internal/formats/spdx22json/encoder_test.go rename to syft/formats/spdx22json/encoder_test.go index ef5ccfce96e..77b0d35de81 100644 --- a/internal/formats/spdx22json/encoder_test.go +++ b/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 b/syft/formats/spdx22json/format.go similarity index 100% rename from internal/formats/spdx22json/format.go rename to syft/formats/spdx22json/format.go diff --git a/internal/formats/spdx22json/model/annotation.go b/syft/formats/spdx22json/model/annotation.go similarity index 100% rename from internal/formats/spdx22json/model/annotation.go rename to syft/formats/spdx22json/model/annotation.go diff --git a/internal/formats/spdx22json/model/checksum.go b/syft/formats/spdx22json/model/checksum.go similarity index 100% rename from internal/formats/spdx22json/model/checksum.go rename to syft/formats/spdx22json/model/checksum.go diff --git a/internal/formats/spdx22json/model/creation_info.go b/syft/formats/spdx22json/model/creation_info.go similarity index 100% rename from internal/formats/spdx22json/model/creation_info.go rename to syft/formats/spdx22json/model/creation_info.go diff --git a/internal/formats/spdx22json/model/document.go b/syft/formats/spdx22json/model/document.go similarity index 100% rename from internal/formats/spdx22json/model/document.go rename to syft/formats/spdx22json/model/document.go diff --git a/internal/formats/spdx22json/model/element.go b/syft/formats/spdx22json/model/element.go similarity index 100% rename from internal/formats/spdx22json/model/element.go rename to syft/formats/spdx22json/model/element.go diff --git a/internal/formats/spdx22json/model/element_id.go b/syft/formats/spdx22json/model/element_id.go similarity index 85% rename from internal/formats/spdx22json/model/element_id.go rename to syft/formats/spdx22json/model/element_id.go index 0973ce4bd21..45f65da097e 100644 --- a/internal/formats/spdx22json/model/element_id.go +++ b/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/internal/formats/spdx22json/model/external_document_ref.go b/syft/formats/spdx22json/model/external_document_ref.go similarity index 100% rename from internal/formats/spdx22json/model/external_document_ref.go rename to syft/formats/spdx22json/model/external_document_ref.go diff --git a/internal/formats/spdx22json/model/file.go b/syft/formats/spdx22json/model/file.go similarity index 100% rename from internal/formats/spdx22json/model/file.go rename to syft/formats/spdx22json/model/file.go diff --git a/internal/formats/spdx22json/model/has_extracted_licensing_info.go b/syft/formats/spdx22json/model/has_extracted_licensing_info.go similarity index 100% rename from internal/formats/spdx22json/model/has_extracted_licensing_info.go rename to syft/formats/spdx22json/model/has_extracted_licensing_info.go diff --git a/internal/formats/spdx22json/model/item.go b/syft/formats/spdx22json/model/item.go similarity index 100% rename from internal/formats/spdx22json/model/item.go rename to syft/formats/spdx22json/model/item.go diff --git a/internal/formats/spdx22json/model/package.go b/syft/formats/spdx22json/model/package.go similarity index 98% rename from internal/formats/spdx22json/model/package.go rename to syft/formats/spdx22json/model/package.go index a4808e7e21e..711c859412f 100644 --- a/internal/formats/spdx22json/model/package.go +++ b/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/internal/formats/spdx22json/model/package_verification_code.go b/syft/formats/spdx22json/model/package_verification_code.go similarity index 100% rename from internal/formats/spdx22json/model/package_verification_code.go rename to syft/formats/spdx22json/model/package_verification_code.go diff --git a/internal/formats/spdx22json/model/relationship.go b/syft/formats/spdx22json/model/relationship.go similarity index 86% rename from internal/formats/spdx22json/model/relationship.go rename to syft/formats/spdx22json/model/relationship.go index 9c806c41c12..272246302f6 100644 --- a/internal/formats/spdx22json/model/relationship.go +++ b/syft/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 b/syft/formats/spdx22json/model/snippet.go similarity index 100% rename from internal/formats/spdx22json/model/snippet.go rename to syft/formats/spdx22json/model/snippet.go diff --git a/internal/formats/spdx22json/model/version.go b/syft/formats/spdx22json/model/version.go similarity index 100% rename from internal/formats/spdx22json/model/version.go rename to syft/formats/spdx22json/model/version.go diff --git a/internal/formats/spdx22json/test-fixtures/image-simple/Dockerfile b/syft/formats/spdx22json/test-fixtures/image-simple/Dockerfile similarity index 100% rename from internal/formats/spdx22json/test-fixtures/image-simple/Dockerfile rename to syft/formats/spdx22json/test-fixtures/image-simple/Dockerfile diff --git a/internal/formats/spdx22json/test-fixtures/image-simple/file-1.txt b/syft/formats/spdx22json/test-fixtures/image-simple/file-1.txt similarity index 100% rename from internal/formats/spdx22json/test-fixtures/image-simple/file-1.txt rename to syft/formats/spdx22json/test-fixtures/image-simple/file-1.txt diff --git a/internal/formats/spdx22json/test-fixtures/image-simple/file-2.txt b/syft/formats/spdx22json/test-fixtures/image-simple/file-2.txt similarity index 100% rename from internal/formats/spdx22json/test-fixtures/image-simple/file-2.txt rename to syft/formats/spdx22json/test-fixtures/image-simple/file-2.txt diff --git a/internal/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden b/syft/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden similarity index 100% rename from internal/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden rename to syft/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden diff --git a/internal/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden b/syft/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden similarity index 100% rename from internal/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden rename to syft/formats/spdx22json/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden diff --git a/internal/formats/spdx22json/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/spdx22json/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden similarity index 100% rename from internal/formats/spdx22json/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden rename to syft/formats/spdx22json/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden diff --git a/internal/formats/spdx22json/test-fixtures/spdx/alpine-3.10.syft.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/alpine-3.10.syft.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/alpine-3.10.syft.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/alpine-3.10.syft.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/alpine-3.10.vendor.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/alpine-3.10.vendor.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/alpine-3.10.vendor.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/alpine-3.10.vendor.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/bad/example7-bin.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/bad/example7-bin.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/bad/example7-bin.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/bad/example7-bin.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/bad/example7-go-module.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/bad/example7-go-module.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/bad/example7-go-module.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/bad/example7-go-module.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/bad/example7-golang.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/bad/example7-golang.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/bad/example7-golang.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/bad/example7-golang.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/bad/example7-third-party-modules.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/bad/example7-third-party-modules.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/bad/example7-third-party-modules.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/bad/example7-third-party-modules.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/example7-bin.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/example7-bin.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/example7-bin.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/example7-bin.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/example7-go-module.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/example7-go-module.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/example7-go-module.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/example7-go-module.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/example7-golang.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/example7-golang.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/example7-golang.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/example7-golang.spdx.json diff --git a/internal/formats/spdx22json/test-fixtures/spdx/example7-third-party-modules.spdx.json b/syft/formats/spdx22json/test-fixtures/spdx/example7-third-party-modules.spdx.json similarity index 100% rename from internal/formats/spdx22json/test-fixtures/spdx/example7-third-party-modules.spdx.json rename to syft/formats/spdx22json/test-fixtures/spdx/example7-third-party-modules.spdx.json diff --git a/internal/formats/spdx22json/to_format_model.go b/syft/formats/spdx22json/to_format_model.go similarity index 98% rename from internal/formats/spdx22json/to_format_model.go rename to syft/formats/spdx22json/to_format_model.go index d1f3d3d4678..e232014e63f 100644 --- a/internal/formats/spdx22json/to_format_model.go +++ b/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/internal/formats/spdx22json/to_format_model_test.go b/syft/formats/spdx22json/to_format_model_test.go similarity index 97% rename from internal/formats/spdx22json/to_format_model_test.go rename to syft/formats/spdx22json/to_format_model_test.go index ee4c1ed1144..0c75859b864 100644 --- a/internal/formats/spdx22json/to_format_model_test.go +++ b/syft/formats/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 b/syft/formats/spdx22json/validator.go similarity index 100% rename from internal/formats/spdx22json/validator.go rename to syft/formats/spdx22json/validator.go diff --git a/internal/formats/spdx22tagvalue/decoder.go b/syft/formats/spdx22tagvalue/decoder.go similarity index 84% rename from internal/formats/spdx22tagvalue/decoder.go rename to syft/formats/spdx22tagvalue/decoder.go index adce71c3604..a54ff98f066 100644 --- a/internal/formats/spdx22tagvalue/decoder.go +++ b/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 b/syft/formats/spdx22tagvalue/encoder.go similarity index 100% rename from internal/formats/spdx22tagvalue/encoder.go rename to syft/formats/spdx22tagvalue/encoder.go diff --git a/internal/formats/spdx22tagvalue/encoder_test.go b/syft/formats/spdx22tagvalue/encoder_test.go similarity index 97% rename from internal/formats/spdx22tagvalue/encoder_test.go rename to syft/formats/spdx22tagvalue/encoder_test.go index 83992655d9c..f479d2715eb 100644 --- a/internal/formats/spdx22tagvalue/encoder_test.go +++ b/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 b/syft/formats/spdx22tagvalue/format.go similarity index 100% rename from internal/formats/spdx22tagvalue/format.go rename to syft/formats/spdx22tagvalue/format.go diff --git a/internal/formats/spdx22tagvalue/test-fixtures/image-simple/Dockerfile b/syft/formats/spdx22tagvalue/test-fixtures/image-simple/Dockerfile similarity index 100% rename from internal/formats/spdx22tagvalue/test-fixtures/image-simple/Dockerfile rename to syft/formats/spdx22tagvalue/test-fixtures/image-simple/Dockerfile diff --git a/internal/formats/spdx22tagvalue/test-fixtures/image-simple/file-1.txt b/syft/formats/spdx22tagvalue/test-fixtures/image-simple/file-1.txt similarity index 100% rename from internal/formats/spdx22tagvalue/test-fixtures/image-simple/file-1.txt rename to syft/formats/spdx22tagvalue/test-fixtures/image-simple/file-1.txt diff --git a/internal/formats/spdx22tagvalue/test-fixtures/image-simple/file-2.txt b/syft/formats/spdx22tagvalue/test-fixtures/image-simple/file-2.txt similarity index 100% rename from internal/formats/spdx22tagvalue/test-fixtures/image-simple/file-2.txt rename to syft/formats/spdx22tagvalue/test-fixtures/image-simple/file-2.txt diff --git a/internal/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXJSONSPDXIDs.golden b/syft/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXJSONSPDXIDs.golden similarity index 100% rename from internal/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXJSONSPDXIDs.golden rename to syft/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXJSONSPDXIDs.golden diff --git a/internal/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueDirectoryEncoder.golden b/syft/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueDirectoryEncoder.golden similarity index 100% rename from internal/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueDirectoryEncoder.golden rename to syft/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueDirectoryEncoder.golden diff --git a/internal/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueImageEncoder.golden b/syft/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueImageEncoder.golden similarity index 100% rename from internal/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueImageEncoder.golden rename to syft/formats/spdx22tagvalue/test-fixtures/snapshot/TestSPDXTagValueImageEncoder.golden diff --git a/internal/formats/spdx22tagvalue/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/spdx22tagvalue/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden similarity index 100% rename from internal/formats/spdx22tagvalue/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden rename to syft/formats/spdx22tagvalue/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden diff --git a/internal/formats/spdx22tagvalue/to_format_model.go b/syft/formats/spdx22tagvalue/to_format_model.go similarity index 99% rename from internal/formats/spdx22tagvalue/to_format_model.go rename to syft/formats/spdx22tagvalue/to_format_model.go index 41296665ee2..15511cc9451 100644 --- a/internal/formats/spdx22tagvalue/to_format_model.go +++ b/syft/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 b/syft/formats/spdx22tagvalue/validator.go similarity index 100% rename from internal/formats/spdx22tagvalue/validator.go rename to syft/formats/spdx22tagvalue/validator.go diff --git a/internal/formats/syftjson/decoder.go b/syft/formats/syftjson/decoder.go similarity index 85% rename from internal/formats/syftjson/decoder.go rename to syft/formats/syftjson/decoder.go index 95f16fdd223..3c6dece368c 100644 --- a/internal/formats/syftjson/decoder.go +++ b/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 b/syft/formats/syftjson/decoder_test.go similarity index 95% rename from internal/formats/syftjson/decoder_test.go rename to syft/formats/syftjson/decoder_test.go index 3dc069fc2bd..529c7faacdd 100644 --- a/internal/formats/syftjson/decoder_test.go +++ b/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 b/syft/formats/syftjson/encoder.go similarity index 100% rename from internal/formats/syftjson/encoder.go rename to syft/formats/syftjson/encoder.go diff --git a/internal/formats/syftjson/encoder_test.go b/syft/formats/syftjson/encoder_test.go similarity index 98% rename from internal/formats/syftjson/encoder_test.go rename to syft/formats/syftjson/encoder_test.go index 9d8087d5e84..16a10ad0e47 100644 --- a/internal/formats/syftjson/encoder_test.go +++ b/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 b/syft/formats/syftjson/format.go similarity index 100% rename from internal/formats/syftjson/format.go rename to syft/formats/syftjson/format.go diff --git a/internal/formats/syftjson/model/document.go b/syft/formats/syftjson/model/document.go similarity index 100% rename from internal/formats/syftjson/model/document.go rename to syft/formats/syftjson/model/document.go diff --git a/internal/formats/syftjson/model/file.go b/syft/formats/syftjson/model/file.go similarity index 100% rename from internal/formats/syftjson/model/file.go rename to syft/formats/syftjson/model/file.go diff --git a/internal/formats/syftjson/model/linux_release.go b/syft/formats/syftjson/model/linux_release.go similarity index 100% rename from internal/formats/syftjson/model/linux_release.go rename to syft/formats/syftjson/model/linux_release.go diff --git a/internal/formats/syftjson/model/linux_release_test.go b/syft/formats/syftjson/model/linux_release_test.go similarity index 100% rename from internal/formats/syftjson/model/linux_release_test.go rename to syft/formats/syftjson/model/linux_release_test.go diff --git a/internal/formats/syftjson/model/package.go b/syft/formats/syftjson/model/package.go similarity index 100% rename from internal/formats/syftjson/model/package.go rename to syft/formats/syftjson/model/package.go diff --git a/internal/formats/syftjson/model/package_test.go b/syft/formats/syftjson/model/package_test.go similarity index 100% rename from internal/formats/syftjson/model/package_test.go rename to syft/formats/syftjson/model/package_test.go diff --git a/internal/formats/syftjson/model/relationship.go b/syft/formats/syftjson/model/relationship.go similarity index 100% rename from internal/formats/syftjson/model/relationship.go rename to syft/formats/syftjson/model/relationship.go diff --git a/internal/formats/syftjson/model/secrets.go b/syft/formats/syftjson/model/secrets.go similarity index 100% rename from internal/formats/syftjson/model/secrets.go rename to syft/formats/syftjson/model/secrets.go diff --git a/internal/formats/syftjson/model/source.go b/syft/formats/syftjson/model/source.go similarity index 100% rename from internal/formats/syftjson/model/source.go rename to syft/formats/syftjson/model/source.go diff --git a/internal/formats/syftjson/model/source_test.go b/syft/formats/syftjson/model/source_test.go similarity index 100% rename from internal/formats/syftjson/model/source_test.go rename to syft/formats/syftjson/model/source_test.go diff --git a/internal/formats/syftjson/test-fixtures/image-simple/Dockerfile b/syft/formats/syftjson/test-fixtures/image-simple/Dockerfile similarity index 100% rename from internal/formats/syftjson/test-fixtures/image-simple/Dockerfile rename to syft/formats/syftjson/test-fixtures/image-simple/Dockerfile diff --git a/internal/formats/syftjson/test-fixtures/image-simple/file-1.txt b/syft/formats/syftjson/test-fixtures/image-simple/file-1.txt similarity index 100% rename from internal/formats/syftjson/test-fixtures/image-simple/file-1.txt rename to syft/formats/syftjson/test-fixtures/image-simple/file-1.txt diff --git a/internal/formats/syftjson/test-fixtures/image-simple/file-2.txt b/syft/formats/syftjson/test-fixtures/image-simple/file-2.txt similarity index 100% rename from internal/formats/syftjson/test-fixtures/image-simple/file-2.txt rename to syft/formats/syftjson/test-fixtures/image-simple/file-2.txt diff --git a/internal/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden b/syft/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden similarity index 100% rename from internal/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden rename to syft/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden diff --git a/internal/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden b/syft/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden similarity index 100% rename from internal/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden rename to syft/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden diff --git a/internal/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden b/syft/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden similarity index 100% rename from internal/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden rename to syft/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden diff --git a/internal/formats/syftjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/syftjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden similarity index 100% rename from internal/formats/syftjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden rename to syft/formats/syftjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden diff --git a/internal/formats/syftjson/to_format_model.go b/syft/formats/syftjson/to_format_model.go similarity index 99% rename from internal/formats/syftjson/to_format_model.go rename to syft/formats/syftjson/to_format_model.go index b97e2272505..58e4dbb7cc6 100644 --- a/internal/formats/syftjson/to_format_model.go +++ b/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/internal/formats/syftjson/to_format_model_test.go b/syft/formats/syftjson/to_format_model_test.go similarity index 97% rename from internal/formats/syftjson/to_format_model_test.go rename to syft/formats/syftjson/to_format_model_test.go index 18d67936dc0..37564bae259 100644 --- a/internal/formats/syftjson/to_format_model_test.go +++ b/syft/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" diff --git a/internal/formats/syftjson/to_syft_model.go b/syft/formats/syftjson/to_syft_model.go similarity index 98% rename from internal/formats/syftjson/to_syft_model.go rename to syft/formats/syftjson/to_syft_model.go index 992c724767f..9c27604343a 100644 --- a/internal/formats/syftjson/to_syft_model.go +++ b/syft/formats/syftjson/to_syft_model.go @@ -1,9 +1,9 @@ package syftjson import ( - "github.com/anchore/syft/internal/formats/syftjson/model" "github.com/anchore/syft/internal/log" "github.com/anchore/syft/syft/artifact" + "github.com/anchore/syft/syft/formats/syftjson/model" "github.com/anchore/syft/syft/linux" "github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/sbom" diff --git a/internal/formats/syftjson/to_syft_model_test.go b/syft/formats/syftjson/to_syft_model_test.go similarity index 97% rename from internal/formats/syftjson/to_syft_model_test.go rename to syft/formats/syftjson/to_syft_model_test.go index 277106b8e45..5fb8b854fb7 100644 --- a/internal/formats/syftjson/to_syft_model_test.go +++ b/syft/formats/syftjson/to_syft_model_test.go @@ -3,8 +3,8 @@ package syftjson import ( "testing" - "github.com/anchore/syft/internal/formats/syftjson/model" "github.com/anchore/syft/syft/artifact" + "github.com/anchore/syft/syft/formats/syftjson/model" "github.com/anchore/syft/syft/source" "github.com/scylladb/go-set/strset" "github.com/stretchr/testify/assert" diff --git a/internal/formats/syftjson/validator.go b/syft/formats/syftjson/validator.go similarity index 90% rename from internal/formats/syftjson/validator.go rename to syft/formats/syftjson/validator.go index d359b60d940..daf541b8858 100644 --- a/internal/formats/syftjson/validator.go +++ b/syft/formats/syftjson/validator.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/anchore/syft/internal/formats/syftjson/model" + "github.com/anchore/syft/syft/formats/syftjson/model" ) func validator(reader io.Reader) error { diff --git a/internal/formats/table/encoder.go b/syft/formats/table/encoder.go similarity index 100% rename from internal/formats/table/encoder.go rename to syft/formats/table/encoder.go diff --git a/internal/formats/table/encoder_test.go b/syft/formats/table/encoder_test.go similarity index 93% rename from internal/formats/table/encoder_test.go rename to syft/formats/table/encoder_test.go index b2ba0236889..3417e45f3dd 100644 --- a/internal/formats/table/encoder_test.go +++ b/syft/formats/table/encoder_test.go @@ -4,7 +4,7 @@ import ( "flag" "testing" - "github.com/anchore/syft/internal/formats/common/testutils" + "github.com/anchore/syft/syft/formats/common/testutils" "github.com/go-test/deep" ) diff --git a/internal/formats/table/format.go b/syft/formats/table/format.go similarity index 100% rename from internal/formats/table/format.go rename to syft/formats/table/format.go diff --git a/internal/formats/table/test-fixtures/snapshot/TestTableEncoder.golden b/syft/formats/table/test-fixtures/snapshot/TestTableEncoder.golden similarity index 100% rename from internal/formats/table/test-fixtures/snapshot/TestTableEncoder.golden rename to syft/formats/table/test-fixtures/snapshot/TestTableEncoder.golden diff --git a/internal/formats/template/encoder.go b/syft/formats/template/encoder.go similarity index 100% rename from internal/formats/template/encoder.go rename to syft/formats/template/encoder.go diff --git a/internal/formats/template/encoder_test.go b/syft/formats/template/encoder_test.go similarity index 90% rename from internal/formats/template/encoder_test.go rename to syft/formats/template/encoder_test.go index 950d4f91460..dc42e35382c 100644 --- a/internal/formats/template/encoder_test.go +++ b/syft/formats/template/encoder_test.go @@ -4,7 +4,7 @@ import ( "flag" "testing" - "github.com/anchore/syft/internal/formats/common/testutils" + "github.com/anchore/syft/syft/formats/common/testutils" "github.com/stretchr/testify/assert" ) diff --git a/internal/formats/template/format.go b/syft/formats/template/format.go similarity index 94% rename from internal/formats/template/format.go rename to syft/formats/template/format.go index 4b8f28a5ed1..9fe7ad20a31 100644 --- a/internal/formats/template/format.go +++ b/syft/formats/template/format.go @@ -3,7 +3,7 @@ package template import ( "io" - "github.com/anchore/syft/internal/formats/syftjson" + "github.com/anchore/syft/syft/formats/syftjson" "github.com/anchore/syft/syft/sbom" ) diff --git a/internal/formats/template/test-fixtures/csv.template b/syft/formats/template/test-fixtures/csv.template similarity index 100% rename from internal/formats/template/test-fixtures/csv.template rename to syft/formats/template/test-fixtures/csv.template diff --git a/internal/formats/template/test-fixtures/snapshot/TestFormatWithOption.golden b/syft/formats/template/test-fixtures/snapshot/TestFormatWithOption.golden similarity index 100% rename from internal/formats/template/test-fixtures/snapshot/TestFormatWithOption.golden rename to syft/formats/template/test-fixtures/snapshot/TestFormatWithOption.golden diff --git a/internal/formats/text/encoder.go b/syft/formats/text/encoder.go similarity index 100% rename from internal/formats/text/encoder.go rename to syft/formats/text/encoder.go diff --git a/internal/formats/text/encoder_test.go b/syft/formats/text/encoder_test.go similarity index 90% rename from internal/formats/text/encoder_test.go rename to syft/formats/text/encoder_test.go index 7d4a4cd7094..3da100b4db3 100644 --- a/internal/formats/text/encoder_test.go +++ b/syft/formats/text/encoder_test.go @@ -4,7 +4,7 @@ import ( "flag" "testing" - "github.com/anchore/syft/internal/formats/common/testutils" + "github.com/anchore/syft/syft/formats/common/testutils" ) var updateTextEncoderGoldenFiles = flag.Bool("update-text", false, "update the *.golden files for text encoder") diff --git a/internal/formats/text/format.go b/syft/formats/text/format.go similarity index 100% rename from internal/formats/text/format.go rename to syft/formats/text/format.go diff --git a/internal/formats/text/test-fixtures/image-simple/Dockerfile b/syft/formats/text/test-fixtures/image-simple/Dockerfile similarity index 100% rename from internal/formats/text/test-fixtures/image-simple/Dockerfile rename to syft/formats/text/test-fixtures/image-simple/Dockerfile diff --git a/internal/formats/text/test-fixtures/image-simple/file-1.txt b/syft/formats/text/test-fixtures/image-simple/file-1.txt similarity index 100% rename from internal/formats/text/test-fixtures/image-simple/file-1.txt rename to syft/formats/text/test-fixtures/image-simple/file-1.txt diff --git a/internal/formats/text/test-fixtures/image-simple/file-2.txt b/syft/formats/text/test-fixtures/image-simple/file-2.txt similarity index 100% rename from internal/formats/text/test-fixtures/image-simple/file-2.txt rename to syft/formats/text/test-fixtures/image-simple/file-2.txt diff --git a/internal/formats/text/test-fixtures/snapshot/TestTextDirectoryEncoder.golden b/syft/formats/text/test-fixtures/snapshot/TestTextDirectoryEncoder.golden similarity index 100% rename from internal/formats/text/test-fixtures/snapshot/TestTextDirectoryEncoder.golden rename to syft/formats/text/test-fixtures/snapshot/TestTextDirectoryEncoder.golden diff --git a/internal/formats/text/test-fixtures/snapshot/TestTextImageEncoder.golden b/syft/formats/text/test-fixtures/snapshot/TestTextImageEncoder.golden similarity index 100% rename from internal/formats/text/test-fixtures/snapshot/TestTextImageEncoder.golden rename to syft/formats/text/test-fixtures/snapshot/TestTextImageEncoder.golden diff --git a/internal/formats/text/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/text/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden similarity index 100% rename from internal/formats/text/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden rename to syft/formats/text/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden diff --git a/syft/formats_test.go b/syft/formats_test.go index 9596abd6ba5..3b999a8336b 100644 --- a/syft/formats_test.go +++ b/syft/formats_test.go @@ -6,15 +6,15 @@ import ( "os" "testing" - "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" "github.com/stretchr/testify/require" diff --git a/test/cli/all_formats_expressible_test.go b/test/cli/all_formats_expressible_test.go index a48639d765f..7a70da16c3a 100644 --- a/test/cli/all_formats_expressible_test.go +++ b/test/cli/all_formats_expressible_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/anchore/syft/internal/formats/template" "github.com/anchore/syft/syft" + "github.com/anchore/syft/syft/formats/template" ) func TestAllFormatsExpressible(t *testing.T) { diff --git a/test/integration/convert_test.go b/test/integration/convert_test.go index 1efed8a5a7a..e6ef03189c5 100644 --- a/test/integration/convert_test.go +++ b/test/integration/convert_test.go @@ -8,13 +8,13 @@ import ( "github.com/anchore/syft/cmd/syft/cli/convert" "github.com/anchore/syft/internal/config" - "github.com/anchore/syft/internal/formats/cyclonedxjson" - "github.com/anchore/syft/internal/formats/cyclonedxxml" - "github.com/anchore/syft/internal/formats/spdx22json" - "github.com/anchore/syft/internal/formats/spdx22tagvalue" - "github.com/anchore/syft/internal/formats/syftjson" - "github.com/anchore/syft/internal/formats/table" "github.com/anchore/syft/syft" + "github.com/anchore/syft/syft/formats/cyclonedxjson" + "github.com/anchore/syft/syft/formats/cyclonedxxml" + "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/sbom" "github.com/anchore/syft/syft/source" "github.com/stretchr/testify/require" diff --git a/test/integration/encode_decode_cycle_test.go b/test/integration/encode_decode_cycle_test.go index bc9f0b4151e..342d96a358a 100644 --- a/test/integration/encode_decode_cycle_test.go +++ b/test/integration/encode_decode_cycle_test.go @@ -6,9 +6,9 @@ import ( "regexp" "testing" - "github.com/anchore/syft/internal/formats/cyclonedxjson" - "github.com/anchore/syft/internal/formats/cyclonedxxml" - "github.com/anchore/syft/internal/formats/syftjson" + "github.com/anchore/syft/syft/formats/cyclonedxjson" + "github.com/anchore/syft/syft/formats/cyclonedxxml" + "github.com/anchore/syft/syft/formats/syftjson" "github.com/anchore/syft/syft/source" "github.com/google/go-cmp/cmp" diff --git a/test/integration/package_ownership_relationship_test.go b/test/integration/package_ownership_relationship_test.go index e85cd88db43..86da411cde9 100644 --- a/test/integration/package_ownership_relationship_test.go +++ b/test/integration/package_ownership_relationship_test.go @@ -7,8 +7,8 @@ import ( "github.com/anchore/syft/syft/source" - "github.com/anchore/syft/internal/formats/syftjson" - syftjsonModel "github.com/anchore/syft/internal/formats/syftjson/model" + "github.com/anchore/syft/syft/formats/syftjson" + syftjsonModel "github.com/anchore/syft/syft/formats/syftjson/model" ) func TestPackageOwnershipRelationships(t *testing.T) {