From 7ac4d91f436f60f3583887bbffb28b345aeea5dc Mon Sep 17 00:00:00 2001 From: Keith Zantow Date: Fri, 21 Mar 2025 06:13:35 -0400 Subject: [PATCH] chore: reformat (#3754) Signed-off-by: Keith Zantow --- cmd/syft/internal/options/cache.go | 2 +- cmd/syft/internal/options/cache_test.go | 2 +- cmd/syft/internal/options/output_file.go | 3 +-- cmd/syft/internal/options/writer.go | 2 +- cmd/syft/internal/options/writer_test.go | 2 +- syft/format/template/encoder.go | 2 +- syft/internal/fileresolver/unindexed_directory.go | 2 +- syft/pkg/cataloger/golang/config.go | 1 - syft/pkg/cataloger/golang/config_test.go | 3 ++- syft/pkg/cataloger/java/internal/maven/config.go | 1 - syft/pkg/cataloger/java/internal/maven/config_test.go | 2 +- syft/source/directorysource/directory_source_provider.go | 2 +- syft/source/filesource/file_source_provider.go | 2 +- 13 files changed, 12 insertions(+), 14 deletions(-) diff --git a/cmd/syft/internal/options/cache.go b/cmd/syft/internal/options/cache.go index 211ce1c81..10e83f5b0 100644 --- a/cmd/syft/internal/options/cache.go +++ b/cmd/syft/internal/options/cache.go @@ -10,9 +10,9 @@ import ( "time" "github.com/adrg/xdg" - "github.com/anchore/go-homedir" "github.com/anchore/clio" + "github.com/anchore/go-homedir" "github.com/anchore/syft/internal/cache" "github.com/anchore/syft/internal/log" ) diff --git a/cmd/syft/internal/options/cache_test.go b/cmd/syft/internal/options/cache_test.go index 44dda7fa7..f92f658d0 100644 --- a/cmd/syft/internal/options/cache_test.go +++ b/cmd/syft/internal/options/cache_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/adrg/xdg" - "github.com/anchore/go-homedir" "github.com/stretchr/testify/require" + "github.com/anchore/go-homedir" "github.com/anchore/syft/internal" "github.com/anchore/syft/internal/cache" ) diff --git a/cmd/syft/internal/options/output_file.go b/cmd/syft/internal/options/output_file.go index 26e8c5128..b52a91e97 100644 --- a/cmd/syft/internal/options/output_file.go +++ b/cmd/syft/internal/options/output_file.go @@ -3,10 +3,9 @@ package options import ( "fmt" - "github.com/anchore/go-homedir" - "github.com/anchore/clio" "github.com/anchore/fangs" + "github.com/anchore/go-homedir" "github.com/anchore/syft/syft/sbom" ) diff --git a/cmd/syft/internal/options/writer.go b/cmd/syft/internal/options/writer.go index c89fcfee0..801ca2bef 100644 --- a/cmd/syft/internal/options/writer.go +++ b/cmd/syft/internal/options/writer.go @@ -9,10 +9,10 @@ import ( "sort" "strings" - "github.com/anchore/go-homedir" "github.com/hashicorp/go-multierror" "github.com/scylladb/go-set/strset" + "github.com/anchore/go-homedir" "github.com/anchore/syft/internal/bus" "github.com/anchore/syft/internal/log" "github.com/anchore/syft/syft/format" diff --git a/cmd/syft/internal/options/writer_test.go b/cmd/syft/internal/options/writer_test.go index 63a36d3c8..036e49abe 100644 --- a/cmd/syft/internal/options/writer_test.go +++ b/cmd/syft/internal/options/writer_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "github.com/anchore/go-homedir" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/anchore/go-homedir" "github.com/anchore/syft/syft/sbom" ) diff --git a/syft/format/template/encoder.go b/syft/format/template/encoder.go index 54dfc2ee1..8723e1630 100644 --- a/syft/format/template/encoder.go +++ b/syft/format/template/encoder.go @@ -11,8 +11,8 @@ import ( "text/template" "github.com/Masterminds/sprig/v3" - "github.com/anchore/go-homedir" + "github.com/anchore/go-homedir" "github.com/anchore/syft/syft/format/syftjson" "github.com/anchore/syft/syft/sbom" ) diff --git a/syft/internal/fileresolver/unindexed_directory.go b/syft/internal/fileresolver/unindexed_directory.go index 50fc8a528..ccc604588 100644 --- a/syft/internal/fileresolver/unindexed_directory.go +++ b/syft/internal/fileresolver/unindexed_directory.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "github.com/anchore/go-homedir" "github.com/bmatcuk/doublestar/v4" "github.com/spf13/afero" + "github.com/anchore/go-homedir" "github.com/anchore/syft/internal/log" "github.com/anchore/syft/syft/file" ) diff --git a/syft/pkg/cataloger/golang/config.go b/syft/pkg/cataloger/golang/config.go index 506984580..604471954 100644 --- a/syft/pkg/cataloger/golang/config.go +++ b/syft/pkg/cataloger/golang/config.go @@ -6,7 +6,6 @@ import ( "strings" "github.com/anchore/go-homedir" - "github.com/anchore/syft/internal/log" ) diff --git a/syft/pkg/cataloger/golang/config_test.go b/syft/pkg/cataloger/golang/config_test.go index 614d731cb..e9e0ef4b0 100644 --- a/syft/pkg/cataloger/golang/config_test.go +++ b/syft/pkg/cataloger/golang/config_test.go @@ -4,8 +4,9 @@ import ( "path/filepath" "testing" - "github.com/anchore/go-homedir" "github.com/stretchr/testify/assert" + + "github.com/anchore/go-homedir" ) func Test_Config(t *testing.T) { diff --git a/syft/pkg/cataloger/java/internal/maven/config.go b/syft/pkg/cataloger/java/internal/maven/config.go index 2311a8c74..f1b4ad689 100644 --- a/syft/pkg/cataloger/java/internal/maven/config.go +++ b/syft/pkg/cataloger/java/internal/maven/config.go @@ -10,7 +10,6 @@ import ( "strings" "github.com/anchore/go-homedir" - "github.com/anchore/syft/internal" "github.com/anchore/syft/internal/log" ) diff --git a/syft/pkg/cataloger/java/internal/maven/config_test.go b/syft/pkg/cataloger/java/internal/maven/config_test.go index 36d92af33..f51fea3bf 100644 --- a/syft/pkg/cataloger/java/internal/maven/config_test.go +++ b/syft/pkg/cataloger/java/internal/maven/config_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/anchore/go-homedir" "github.com/stretchr/testify/require" + "github.com/anchore/go-homedir" "github.com/anchore/syft/internal" ) diff --git a/syft/source/directorysource/directory_source_provider.go b/syft/source/directorysource/directory_source_provider.go index 5bacde0c7..59acbc3a2 100644 --- a/syft/source/directorysource/directory_source_provider.go +++ b/syft/source/directorysource/directory_source_provider.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/anchore/go-homedir" "github.com/spf13/afero" + "github.com/anchore/go-homedir" "github.com/anchore/syft/syft/source" ) diff --git a/syft/source/filesource/file_source_provider.go b/syft/source/filesource/file_source_provider.go index 21e4383e6..adf80ec88 100644 --- a/syft/source/filesource/file_source_provider.go +++ b/syft/source/filesource/file_source_provider.go @@ -5,9 +5,9 @@ import ( "crypto" "fmt" - "github.com/anchore/go-homedir" "github.com/spf13/afero" + "github.com/anchore/go-homedir" "github.com/anchore/syft/syft/source" )