diff --git a/internal/file/tar_file_traversal.go b/internal/file/tar_file_traversal.go index 13bd95c04..c1fbf0f84 100644 --- a/internal/file/tar_file_traversal.go +++ b/internal/file/tar_file_traversal.go @@ -6,9 +6,10 @@ import ( "os" "path/filepath" - "github.com/anchore/syft/internal/log" "github.com/bmatcuk/doublestar/v4" "github.com/mholt/archives" + + "github.com/anchore/syft/internal/log" ) // TraverseFilesInTar enumerates all paths stored within a tar archive using the visitor pattern. diff --git a/internal/file/zip_file_manifest.go b/internal/file/zip_file_manifest.go index 5e8685e19..8dcb0d2f2 100644 --- a/internal/file/zip_file_manifest.go +++ b/internal/file/zip_file_manifest.go @@ -6,9 +6,10 @@ import ( "sort" "strings" - "github.com/anchore/syft/internal/log" "github.com/mholt/archives" "github.com/scylladb/go-set/strset" + + "github.com/anchore/syft/internal/log" ) // ZipFileManifest is a collection of paths and their file metadata. diff --git a/internal/file/zip_file_traversal.go b/internal/file/zip_file_traversal.go index 384faf025..6f0e9c57f 100644 --- a/internal/file/zip_file_traversal.go +++ b/internal/file/zip_file_traversal.go @@ -8,8 +8,9 @@ import ( "path/filepath" "strings" - "github.com/anchore/syft/internal/log" "github.com/mholt/archives" + + "github.com/anchore/syft/internal/log" ) const ( diff --git a/internal/task/unknowns_tasks.go b/internal/task/unknowns_tasks.go index fefc380bb..2f63ce28e 100644 --- a/internal/task/unknowns_tasks.go +++ b/internal/task/unknowns_tasks.go @@ -4,13 +4,14 @@ import ( "context" "strings" + "github.com/mholt/archives" + "github.com/anchore/syft/internal/log" "github.com/anchore/syft/internal/sbomsync" "github.com/anchore/syft/syft/cataloging" "github.com/anchore/syft/syft/file" "github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/sbom" - "github.com/mholt/archives" ) const unknownsLabelerTaskName = "unknowns-labeler" diff --git a/syft/format/github/internal/model/model.go b/syft/format/github/internal/model/model.go index f969f35f3..e3baaa747 100644 --- a/syft/format/github/internal/model/model.go +++ b/syft/format/github/internal/model/model.go @@ -6,12 +6,13 @@ import ( "strings" "time" + "github.com/mholt/archives" + "github.com/anchore/packageurl-go" "github.com/anchore/syft/internal/log" "github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/sbom" "github.com/anchore/syft/syft/source" - "github.com/mholt/archives" ) // ToGithubModel converts the provided SBOM to a GitHub dependency model diff --git a/syft/source/filesource/file_source.go b/syft/source/filesource/file_source.go index 74bfa8bc3..f88f8b071 100644 --- a/syft/source/filesource/file_source.go +++ b/syft/source/filesource/file_source.go @@ -10,6 +10,7 @@ import ( "path/filepath" "sync" + "github.com/mholt/archives" "github.com/opencontainers/go-digest" stereoFile "github.com/anchore/stereoscope/pkg/file" @@ -21,7 +22,6 @@ import ( "github.com/anchore/syft/syft/source" "github.com/anchore/syft/syft/source/directorysource" "github.com/anchore/syft/syft/source/internal" - "github.com/mholt/archives" ) var _ source.Source = (*fileSource)(nil)