Add gosimports (#1205)

.github/workflows/update-bootstrap-tools.yml

@@ -26,6 +26,7 @@ jobs:
           BOUNCER_LATEST_VERSION=$(go list -m -json github.com/wagoodman/go-bouncer@latest 2>/dev/null | jq -r '.Version')
           CHRONICLE_LATEST_VERSION=$(go list -m -json github.com/anchore/chronicle@latest 2>/dev/null | jq -r '.Version')
           GORELEASER_LATEST_VERSION=$(go list -m -json github.com/goreleaser/goreleaser@latest 2>/dev/null | jq -r '.Version')
+          GOSIMPORTS_LATEST_VERSION=$(go list -m -json github.com/rinchsan/gosimports@latest 2>/dev/null | jq -r '.Version')
           YAJSV_LATEST_VERSION=$(go list -m -json github.com/neilpa/yajsv@latest 2>/dev/null | jq -r '.Version')
           COSIGN_LATEST_VERSION=$(go list -m -json github.com/sigstore/cosign@latest 2>/dev/null | jq -r '.Version')
           
@@ -34,6 +35,7 @@ jobs:
           sed -r -i -e 's/^(BOUNCER_VERSION = ).*/\1'${BOUNCER_LATEST_VERSION}'/' Makefile
           sed -r -i -e 's/^(CHRONICLE_VERSION = ).*/\1'${CHRONICLE_LATEST_VERSION}'/' Makefile
           sed -r -i -e 's/^(GORELEASER_VERSION = ).*/\1'${GORELEASER_LATEST_VERSION}'/' Makefile
+          sed -r -i -e 's/^(GOSIMPORTS_VERSION = ).*/\1'${GOSIMPORTS_LATEST_VERSION}'/' Makefile
           sed -r -i -e 's/^(YAJSV_VERSION = ).*/\1'${YAJSV_LATEST_VERSION}'/' Makefile
           sed -r -i -e 's/^(COSIGN_VERSION = ).*/\1'${COSIGN_LATEST_VERSION}'/' Makefile
           
@@ -46,6 +48,7 @@ jobs:
           echo "::set-output name=BOUNCER::$BOUNCER_LATEST_VERSION"
           echo "::set-output name=CHRONICLE::$CHRONICLE_LATEST_VERSION"
           echo "::set-output name=GORELEASER::$GORELEASER_LATEST_VERSION"
+          echo "::set-output name=GOSIMPORTS::$GOSIMPORTS_LATEST_VERSION"
           echo "::set-output name=YAJSV::$YAJSV_LATEST_VERSION"
           echo "::set-output name=COSIGN::$COSIGN_LATEST_VERSION"
         id: latest-versions
@@ -69,6 +72,7 @@ jobs:
             - [bouncer ${{ steps.latest-versions.outputs.BOUNCER }}](https://github.com/wagoodman/go-bouncer/releases/tag/${{ steps.latest-versions.outputs.BOUNCER }})
             - [chronicle ${{ steps.latest-versions.outputs.CHRONICLE }}](https://github.com/anchore/chronicle/releases/tag/${{ steps.latest-versions.outputs.CHRONICLE }})
             - [goreleaser ${{ steps.latest-versions.outputs.GORELEASER }}](https://github.com/goreleaser/goreleaser/releases/tag/${{ steps.latest-versions.outputs.GORELEASER }})
+            - [gosimports ${{ steps.latest-versions.outputs.GOSIMPORTS }}](https://github.com/rinchsan/gosimports/releases/tag/${{ steps.latest-versions.outputs.GOSIMPORTS }})
             - [yajsv ${{ steps.latest-versions.outputs.YAJSV }}](https://github.com/neilpa/yajsv/releases/tag/${{ steps.latest-versions.outputs.YAJSV }})
             - [cosign ${{ steps.latest-versions.outputs.COSIGN }}](https://github.com/sigstore/cosign/releases/tag/${{ steps.latest-versions.outputs.COSIGN }})  
             This is an auto-generated pull request to update all of the bootstrap tools to the latest versions.

.golangci.yaml

@@ -22,7 +22,6 @@ linters:
     - gocritic
     - gocyclo
     - gofmt
-    - goimports
     - goprintffuncname
     - gosec
     - gosimple
@@ -49,6 +48,7 @@ linters:
 #    - godot
 #    - godox
 #    - goerr113
+#    - goimports   # we're using gosimports now instead to account for extra whitespaces (see https://github.com/golang/go/issues/20818)
 #    - golint      # deprecated
 #    - gomnd       # this is too aggressive
 #    - interfacer  # this is a good idea, but is no longer supported and is prone to false positives

Makefile

@@ -4,6 +4,7 @@ RESULTSDIR = test/results
 COVER_REPORT = $(RESULTSDIR)/unit-coverage-details.txt
 COVER_TOTAL = $(RESULTSDIR)/unit-coverage-summary.txt
 LINTCMD = $(TEMPDIR)/golangci-lint run --tests=false --timeout=4m --config .golangci.yaml
+GOIMPORTS_CMD = $(TEMPDIR)/gosimports -local github.com/anchore
 RELEASE_CMD=$(TEMPDIR)/goreleaser release --rm-dist
 SNAPSHOT_CMD=$(RELEASE_CMD) --skip-publish --snapshot
 VERSION=$(shell git describe --dirty --always --tags)
@@ -12,6 +13,7 @@ COMPARE_DIR = ./test/compare
 GOLANGCILINT_VERSION = v1.49.0
 BOUNCER_VERSION = v0.4.0
 CHRONICLE_VERSION = v0.4.1
+GOSIMPORTS_VERSION = v0.3.1
 GORELEASER_VERSION = v1.11.2
 YAJSV_VERSION = v1.4.0
 COSIGN_VERSION = v1.11.1
@@ -116,6 +118,8 @@ bootstrap-tools: $(TEMPDIR)
 	curl -sSfL https://raw.githubusercontent.com/wagoodman/go-bouncer/master/bouncer.sh | sh -s -- -b $(TEMPDIR)/ $(BOUNCER_VERSION)
 	curl -sSfL https://raw.githubusercontent.com/anchore/chronicle/main/install.sh | sh -s -- -b $(TEMPDIR)/ $(CHRONICLE_VERSION)
 	.github/scripts/goreleaser-install.sh -d -b $(TEMPDIR)/ $(GORELEASER_VERSION)
+	# the only difference between goimports and gosimports is that gosimports removes extra whitespace between import blocks (see https://github.com/golang/go/issues/20818)
+	GOBIN="$(realpath $(TEMPDIR))" go install github.com/rinchsan/gosimports/cmd/gosimports@$(GOSIMPORTS_VERSION)
 	GOBIN="$(realpath $(TEMPDIR))" go install github.com/neilpa/yajsv@$(YAJSV_VERSION)
 	GOBIN="$(realpath $(TEMPDIR))" go install github.com/sigstore/cosign/cmd/cosign@$(COSIGN_VERSION)
 
@@ -139,6 +143,7 @@ lint: ## Run gofmt + golangci lint checks
 
 	# run all golangci-lint rules
 	$(LINTCMD)
+	@[ -z "$(shell $(GOIMPORTS_CMD) -d .)" ] || (echo "goimports needs to be fixed" && false)
 
 	# go tooling does not play well with certain filename characters, ensure the common cases don't result in future "go get" failures
 	$(eval MALFORMED_FILENAMES := $(shell find . | grep -e ':'))
@@ -148,6 +153,7 @@ lint: ## Run gofmt + golangci lint checks
 lint-fix: ## Auto-format all source code + run golangci lint fixers
 	$(call title,Running lint fixers)
 	gofmt -w -s .
+	$(GOIMPORTS_CMD) -w .
 	$(LINTCMD) --fix
 	go mod tidy
 

cmd/syft/cli/attest.go

@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"log"
 
+	sigopts "github.com/sigstore/cosign/cmd/cosign/cli/options"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/anchore/syft/cmd/syft/cli/attest"
 	"github.com/anchore/syft/cmd/syft/cli/options"
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/config"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-
-	sigopts "github.com/sigstore/cosign/cmd/cosign/cli/options"
 )
 
 const (

cmd/syft/cli/attest/attest.go

@@ -7,24 +7,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/wagoodman/go-progress"
-
-	"github.com/anchore/stereoscope"
-	"github.com/anchore/stereoscope/pkg/image"
-	"github.com/anchore/syft/cmd/syft/cli/eventloop"
-	"github.com/anchore/syft/cmd/syft/cli/options"
-	"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/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"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/in-toto/in-toto-golang/in_toto"
@@ -43,9 +25,26 @@ import (
 	"github.com/sigstore/rekor/pkg/generated/client"
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/sigstore/pkg/signature/dsse"
-	"github.com/wagoodman/go-partybus"
-
 	signatureoptions "github.com/sigstore/sigstore/pkg/signature/options"
+	"github.com/wagoodman/go-partybus"
+	"github.com/wagoodman/go-progress"
+
+	"github.com/anchore/stereoscope"
+	"github.com/anchore/stereoscope/pkg/image"
+	"github.com/anchore/syft/cmd/syft/cli/eventloop"
+	"github.com/anchore/syft/cmd/syft/cli/options"
+	"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/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"
 )
 
 var (

cmd/syft/cli/attest/password.go

@@ -7,9 +7,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/sigstore/cosign/pkg/cosign"
+
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/log"
-	"github.com/sigstore/cosign/pkg/cosign"
 )
 
 func selectPassFunc(keypath, password string) (cosign.PassFunc, error) {

cmd/syft/cli/commands.go

@@ -4,22 +4,22 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/anchore/stereoscope"
-	"github.com/anchore/syft/internal/logger"
-	"github.com/anchore/syft/syft"
-
-	"github.com/anchore/syft/cmd/syft/cli/options"
-	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/internal/bus"
-	"github.com/anchore/syft/internal/config"
-	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/version"
-	"github.com/anchore/syft/syft/event"
 	cranecmd "github.com/google/go-containerregistry/cmd/crane/cmd"
 	"github.com/gookit/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/wagoodman/go-partybus"
+
+	"github.com/anchore/stereoscope"
+	"github.com/anchore/syft/cmd/syft/cli/options"
+	"github.com/anchore/syft/internal"
+	"github.com/anchore/syft/internal/bus"
+	"github.com/anchore/syft/internal/config"
+	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/internal/logger"
+	"github.com/anchore/syft/internal/version"
+	"github.com/anchore/syft/syft"
+	"github.com/anchore/syft/syft/event"
 )
 
 const indent = "  "

cmd/syft/cli/convert.go

@@ -4,12 +4,13 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/anchore/syft/cmd/syft/cli/convert"
 	"github.com/anchore/syft/cmd/syft/cli/options"
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/config"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 const (

cmd/syft/cli/eventloop/event_loop.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/ui"
 	"github.com/hashicorp/go-multierror"
 	"github.com/wagoodman/go-partybus"
+
+	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/internal/ui"
 )
 
 // eventLoop listens to worker errors (from execution path), worker events (from a partybus subscription), and

cmd/syft/cli/eventloop/event_loop_test.go

@@ -7,11 +7,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/anchore/syft/internal/ui"
-	"github.com/anchore/syft/syft/event"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/wagoodman/go-partybus"
+
+	"github.com/anchore/syft/internal/ui"
+	"github.com/anchore/syft/syft/event"
 )
 
 var _ ui.UI = (*uiMock)(nil)

cmd/syft/cli/options/packages.go

@@ -3,13 +3,14 @@ package options
 import (
 	"fmt"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
+
 	"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"
-	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
 )
 
 type PackagesOptions struct {

cmd/syft/cli/options/writer.go

@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/go-multierror"
+
 	"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"
 )
 
 // makeWriter creates a sbom.Writer for output or returns an error. this will either return a valid writer

cmd/syft/cli/packages.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/anchore/syft/cmd/syft/cli/options"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 
+	"github.com/anchore/syft/cmd/syft/cli/options"
 	"github.com/anchore/syft/cmd/syft/cli/packages"
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/config"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 const (

cmd/syft/cli/packages/packages.go

@@ -6,6 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/wagoodman/go-partybus"
+
 	"github.com/anchore/stereoscope"
 	"github.com/anchore/syft/cmd/syft/cli/eventloop"
 	"github.com/anchore/syft/cmd/syft/cli/options"
@@ -22,7 +24,6 @@ import (
 	"github.com/anchore/syft/syft/formats/template"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
-	"github.com/wagoodman/go-partybus"
 )
 
 func Run(ctx context.Context, app *config.Application, args []string) error {

cmd/syft/cli/poweruser.go

@@ -3,12 +3,13 @@ package cli
 import (
 	"fmt"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/anchore/syft/cmd/syft/cli/options"
 	"github.com/anchore/syft/cmd/syft/cli/poweruser"
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/config"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 const powerUserExample = `  {{.appName}} {{.command}} <image>

cmd/syft/cli/poweruser/poweruser.go

@@ -5,6 +5,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/gookit/color"
+	"github.com/wagoodman/go-partybus"
+
 	"github.com/anchore/stereoscope"
 	"github.com/anchore/syft/cmd/syft/cli/eventloop"
 	"github.com/anchore/syft/cmd/syft/cli/options"
@@ -21,8 +24,6 @@ import (
 	"github.com/anchore/syft/syft/formats/syftjson"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
-	"github.com/gookit/color"
-	"github.com/wagoodman/go-partybus"
 )
 
 func Run(ctx context.Context, app *config.Application, args []string) error {

cmd/syft/cli/version.go

@@ -6,12 +6,13 @@ import (
 	"log"
 	"os"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/anchore/syft/cmd/syft/cli/options"
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/config"
 	"github.com/anchore/syft/internal/version"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 func Version(v *viper.Viper, app *config.Application) *cobra.Command {

internal/anchore/import.go

@@ -6,14 +6,15 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/antihax/optional"
+	"github.com/wagoodman/go-partybus"
+	"github.com/wagoodman/go-progress"
+
 	"github.com/anchore/client-go/pkg/external"
 	"github.com/anchore/stereoscope/pkg/image"
 	"github.com/anchore/syft/internal/bus"
 	"github.com/anchore/syft/syft/event"
 	"github.com/anchore/syft/syft/sbom"
-	"github.com/antihax/optional"
-	"github.com/wagoodman/go-partybus"
-	"github.com/wagoodman/go-progress"
 )
 
 type ImportConfig struct {

internal/anchore/import_config_test.go

@@ -8,11 +8,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/docker/pkg/ioutils"
+	"github.com/go-test/deep"
 	"github.com/wagoodman/go-progress"
 
 	"github.com/anchore/client-go/pkg/external"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/go-test/deep"
 )
 
 type mockConfigImportAPI struct {

internal/anchore/import_dockerfile.go

@@ -8,9 +8,8 @@ import (
 
 	"github.com/wagoodman/go-progress"
 
-	"github.com/anchore/syft/internal/log"
-
 	"github.com/anchore/client-go/pkg/external"
+	"github.com/anchore/syft/internal/log"
 )
 
 type dockerfileImportAPI interface {

internal/anchore/import_dockerfile_test.go

@@ -7,12 +7,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/docker/pkg/ioutils"
+	"github.com/go-test/deep"
 	"github.com/wagoodman/go-progress"
 
-	"github.com/docker/docker/pkg/ioutils"
-
 	"github.com/anchore/client-go/pkg/external"
-	"github.com/go-test/deep"
 )
 
 type mockDockerfileImportAPI struct {

internal/anchore/import_manifest_test.go

@@ -8,11 +8,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/docker/pkg/ioutils"
+	"github.com/go-test/deep"
 	"github.com/wagoodman/go-progress"
 
 	"github.com/anchore/client-go/pkg/external"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/go-test/deep"
 )
 
 type mockManifestImportAPI struct {

internal/anchore/import_package_sbom.go

@@ -8,12 +8,13 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/wagoodman/go-progress"
+
 	"github.com/anchore/client-go/pkg/external"
 	"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"
 )
 
 type packageSBOMImportAPI interface {

internal/anchore/import_package_sbom_test.go

@@ -8,6 +8,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/docker/pkg/ioutils"
+	"github.com/go-test/deep"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/wagoodman/go-progress"
+
 	"github.com/anchore/client-go/pkg/external"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/formats/syftjson"
@@ -15,11 +21,6 @@ import (
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/go-test/deep"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/wagoodman/go-progress"
 )
 
 func must(c pkg.CPE, e error) pkg.CPE {

internal/config/application.go

@@ -8,16 +8,15 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/anchore/syft/syft/pkg/cataloger"
-
-	"github.com/sirupsen/logrus"
-
 	"github.com/adrg/xdg"
-	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/internal/log"
 	"github.com/mitchellh/go-homedir"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"gopkg.in/yaml.v2"
+
+	"github.com/anchore/syft/internal"
+	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/syft/pkg/cataloger"
 )
 
 var (

internal/config/file_classification.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	"github.com/anchore/syft/syft/source"
 	"github.com/spf13/viper"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 type fileClassification struct {

internal/config/file_contents.go

@@ -1,9 +1,10 @@
 package config
 
 import (
+	"github.com/spf13/viper"
+
 	"github.com/anchore/syft/internal/file"
 	"github.com/anchore/syft/syft/source"
-	"github.com/spf13/viper"
 )
 
 type fileContents struct {

internal/config/file_metadata.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	"github.com/anchore/syft/syft/source"
 	"github.com/spf13/viper"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 type FileMetadata struct {

internal/config/pkg.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	"github.com/anchore/syft/syft/pkg/cataloger"
 	"github.com/spf13/viper"
+
+	"github.com/anchore/syft/syft/pkg/cataloger"
 )
 
 type pkg struct {

internal/config/registry.go

@@ -3,9 +3,9 @@ package config
 import (
 	"os"
 
-	"github.com/anchore/stereoscope/pkg/image"
-
 	"github.com/spf13/viper"
+
+	"github.com/anchore/stereoscope/pkg/image"
 )
 
 type RegistryCredentials struct {

internal/config/registry_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/anchore/stereoscope/pkg/image"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/stereoscope/pkg/image"
 )
 
 func TestHasNonEmptyCredentials(t *testing.T) {

internal/config/secrets.go

@@ -1,9 +1,10 @@
 package config
 
 import (
+	"github.com/spf13/viper"
+
 	"github.com/anchore/syft/internal/file"
 	"github.com/anchore/syft/syft/source"
-	"github.com/spf13/viper"
 )
 
 type secrets struct {

internal/spdxlicense/generate/generate_license_list_test.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/google/go-cmp/cmp"
 	"os"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 )
 

internal/spdxlicense/generate/license_test.go

@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 var (

internal/ui/common_event_handlers.go

@@ -3,8 +3,9 @@ package ui
 import (
 	"fmt"
 
-	syftEventParsers "github.com/anchore/syft/syft/event/parsers"
 	"github.com/wagoodman/go-partybus"
+
+	syftEventParsers "github.com/anchore/syft/syft/event/parsers"
 )
 
 // handleExit is a UI function for processing the Exit bus event,

internal/ui/ephemeral_terminal_ui.go

@@ -11,12 +11,13 @@ import (
 	"os"
 	"sync"
 
+	"github.com/wagoodman/go-partybus"
+	"github.com/wagoodman/jotframe/pkg/frame"
+
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/internal/logger"
 	syftEvent "github.com/anchore/syft/syft/event"
 	"github.com/anchore/syft/ui"
-	"github.com/wagoodman/go-partybus"
-	"github.com/wagoodman/jotframe/pkg/frame"
 )
 
 // ephemeralTerminalUI provides an "ephemeral" terminal user interface to display the application state dynamically.

internal/ui/etui_event_handlers.go

@@ -9,12 +9,12 @@ import (
 	"io"
 	"sync"
 
-	"github.com/anchore/syft/internal"
 	"github.com/gookit/color"
+	"github.com/wagoodman/go-partybus"
 	"github.com/wagoodman/jotframe/pkg/frame"
 
+	"github.com/anchore/syft/internal"
 	syftEventParsers "github.com/anchore/syft/syft/event/parsers"
-	"github.com/wagoodman/go-partybus"
 )
 
 // handleAppUpdateAvailable is a UI handler function to display a new application version to the top of the screen.

internal/ui/logger_ui.go

@@ -1,9 +1,10 @@
 package ui
 
 import (
+	"github.com/wagoodman/go-partybus"
+
 	"github.com/anchore/syft/internal/log"
 	syftEvent "github.com/anchore/syft/syft/event"
-	"github.com/wagoodman/go-partybus"
 )
 
 type loggerUI struct {

schema/json/generate.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/alecthomas/jsonschema"
+
 	"github.com/anchore/syft/internal"
 	syftjsonModel "github.com/anchore/syft/syft/formats/syftjson/model"
 	"github.com/anchore/syft/syft/pkg"

syft/event/parsers/parsers.go

@@ -6,11 +6,12 @@ package parsers
 import (
 	"fmt"
 
+	"github.com/wagoodman/go-partybus"
+	"github.com/wagoodman/go-progress"
+
 	"github.com/anchore/syft/syft/event"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/pkg/cataloger"
-	"github.com/wagoodman/go-partybus"
-	"github.com/wagoodman/go-progress"
 )
 
 type ErrBadPayload struct {

syft/file/all_regular_files_test.go

@@ -1,12 +1,14 @@
 package file
 
 import (
-	"github.com/anchore/stereoscope/pkg/imagetest"
+	"testing"
-	"github.com/anchore/syft/syft/source"
+
 	"github.com/scylladb/go-set/strset"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
+
+	"github.com/anchore/stereoscope/pkg/imagetest"
+	"github.com/anchore/syft/syft/source"
 )
 
 func Test_allRegularFiles(t *testing.T) {

syft/file/classification_cataloger_test.go

@@ -1,11 +1,12 @@
 package file
 
 import (
-	"github.com/anchore/stereoscope/pkg/imagetest"
 	"testing"
 
-	"github.com/anchore/syft/syft/source"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/stereoscope/pkg/imagetest"
+	"github.com/anchore/syft/syft/source"
 )
 
 func TestClassifierCataloger_DefaultClassifiers_PositiveCases(t *testing.T) {

syft/file/classifier_test.go

@@ -4,8 +4,9 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/anchore/syft/syft/source"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 func TestFilepathMatches(t *testing.T) {

syft/file/contents_cataloger.go

@@ -7,7 +7,6 @@ import (
 	"io"
 
 	"github.com/anchore/syft/internal"
-
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/source"
 )

syft/file/contents_cataloger_test.go

@@ -3,8 +3,9 @@ package file
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/source"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 func TestContentsCataloger(t *testing.T) {

syft/file/digest_cataloger.go

@@ -8,15 +8,13 @@ import (
 	"io"
 	"strings"
 
-	"github.com/anchore/syft/internal"
-
-	"github.com/anchore/syft/internal/log"
-
-	"github.com/anchore/syft/internal/bus"
-	"github.com/anchore/syft/syft/event"
 	"github.com/wagoodman/go-partybus"
 	"github.com/wagoodman/go-progress"
 
+	"github.com/anchore/syft/internal"
+	"github.com/anchore/syft/internal/bus"
+	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/syft/event"
 	"github.com/anchore/syft/syft/source"
 )
 

syft/file/digest_cataloger_test.go

@@ -3,18 +3,16 @@ package file
 import (
 	"crypto"
 	"fmt"
-	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"github.com/anchore/stereoscope/pkg/file"
-
-	"github.com/anchore/stereoscope/pkg/imagetest"
-
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
+	"github.com/anchore/stereoscope/pkg/file"
+	"github.com/anchore/stereoscope/pkg/imagetest"
 	"github.com/anchore/syft/syft/source"
 )
 

syft/file/metadata_cataloger.go

@@ -1,12 +1,13 @@
 package file
 
 import (
+	"github.com/wagoodman/go-partybus"
+	"github.com/wagoodman/go-progress"
+
 	"github.com/anchore/syft/internal/bus"
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/event"
 	"github.com/anchore/syft/syft/source"
-	"github.com/wagoodman/go-partybus"
-	"github.com/wagoodman/go-progress"
 )
 
 type MetadataCataloger struct {

syft/file/metadata_cataloger_test.go

@@ -5,10 +5,11 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/anchore/stereoscope/pkg/file"
 	"github.com/anchore/stereoscope/pkg/imagetest"
 	"github.com/anchore/syft/syft/source"
-	"github.com/stretchr/testify/assert"
 )
 
 var updateImageGoldenFiles = flag.Bool("update-image", false, "update the golden fixture images used for testing")

syft/file/secrets_cataloger.go

@@ -8,14 +8,14 @@ import (
 	"regexp"
 	"sort"
 
-	"github.com/anchore/syft/internal"
+	"github.com/wagoodman/go-partybus"
+	"github.com/wagoodman/go-progress"
 
+	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/bus"
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/event"
 	"github.com/anchore/syft/syft/source"
-	"github.com/wagoodman/go-partybus"
-	"github.com/wagoodman/go-progress"
 )
 
 var DefaultSecretsPatterns = map[string]string{

syft/file/secrets_cataloger_test.go

@@ -4,11 +4,10 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/anchore/syft/internal/file"
-
-	"github.com/anchore/syft/syft/source"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/internal/file"
+	"github.com/anchore/syft/syft/source"
 )
 
 func TestSecretsCataloger(t *testing.T) {

syft/file/secrets_search_by_line_strategy.go

@@ -9,7 +9,6 @@ import (
 	"regexp"
 
 	"github.com/anchore/syft/internal"
-
 	"github.com/anchore/syft/syft/source"
 )
 

syft/formats/common/cyclonedxhelpers/author_test.go

@@ -3,8 +3,9 @@ package cyclonedxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_encodeAuthor(t *testing.T) {

syft/formats/common/cyclonedxhelpers/description_test.go

@@ -3,8 +3,9 @@ package cyclonedxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_encodeDescription(t *testing.T) {

syft/formats/common/cyclonedxhelpers/external_references.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	syftFile "github.com/anchore/syft/syft/file"
-
 	"github.com/CycloneDX/cyclonedx-go"
+
+	syftFile "github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/pkg"
 )
 

syft/formats/common/cyclonedxhelpers/external_references_test.go

@@ -4,8 +4,9 @@ import (
 	"testing"
 
 	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_encodeExternalReferences(t *testing.T) {

syft/formats/common/cyclonedxhelpers/group_test.go

@@ -3,8 +3,9 @@ package cyclonedxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_encodeGroup(t *testing.T) {

syft/formats/common/cyclonedxhelpers/licenses.go

@@ -2,6 +2,7 @@ package cyclonedxhelpers
 
 import (
 	"github.com/CycloneDX/cyclonedx-go"
+
 	"github.com/anchore/syft/internal/spdxlicense"
 	"github.com/anchore/syft/syft/pkg"
 )

syft/formats/common/cyclonedxhelpers/licenses_test.go

@@ -4,8 +4,9 @@ import (
 	"testing"
 
 	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_encodeLicense(t *testing.T) {

syft/formats/common/cyclonedxhelpers/publisher_test.go

@@ -3,8 +3,9 @@ package cyclonedxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_encodePublisher(t *testing.T) {

syft/formats/common/spdxhelpers/description_test.go

@@ -3,8 +3,9 @@ package spdxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_Description(t *testing.T) {

syft/formats/common/spdxhelpers/document_name_test.go

@@ -5,9 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/anchore/syft/syft/source"
 	"github.com/scylladb/go-set/strset"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 func Test_DocumentName(t *testing.T) {

syft/formats/common/spdxhelpers/document_namespace.go

@@ -5,9 +5,10 @@ import (
 	"net/url"
 	"path"
 
+	"github.com/google/uuid"
+
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/syft/source"
-	"github.com/google/uuid"
 )
 
 func DocumentNameAndNamespace(srcMetadata source.Metadata) (string, string) {

syft/formats/common/spdxhelpers/document_namespace_test.go

@@ -5,9 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/anchore/syft/syft/source"
 	"github.com/scylladb/go-set/strset"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 func Test_documentNamespace(t *testing.T) {

syft/formats/common/spdxhelpers/download_location_test.go

@@ -3,8 +3,9 @@ package spdxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_DownloadLocation(t *testing.T) {

syft/formats/common/spdxhelpers/external_refs_test.go

@@ -3,8 +3,9 @@ package spdxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_ExternalRefs(t *testing.T) {

syft/formats/common/spdxhelpers/homepage_test.go

@@ -3,8 +3,9 @@ package spdxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_Homepage(t *testing.T) {

syft/formats/common/spdxhelpers/license_test.go

@@ -3,8 +3,9 @@ package spdxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_License(t *testing.T) {

syft/formats/common/spdxhelpers/originator_test.go

@@ -3,8 +3,9 @@ package spdxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func Test_Originator(t *testing.T) {

syft/formats/common/spdxhelpers/source_info_test.go

@@ -3,9 +3,10 @@ package spdxhelpers
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/source"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_SourceInfo(t *testing.T) {

syft/formats/common/spdxhelpers/to_syft_model_test.go

@@ -3,11 +3,12 @@ package spdxhelpers
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/source"
 	"github.com/spdx/tools-golang/spdx"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/anchore/syft/syft/pkg"
+	"github.com/anchore/syft/syft/source"
 )
 
 func TestToSyftModel(t *testing.T) {

syft/formats/common/testutils/utils.go

@@ -5,6 +5,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/sergi/go-diff/diffmatchpatch"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/anchore/go-testutils"
 	"github.com/anchore/stereoscope/pkg/filetree"
 	"github.com/anchore/stereoscope/pkg/image"
@@ -13,8 +16,6 @@ import (
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
-	"github.com/sergi/go-diff/diffmatchpatch"
-	"github.com/stretchr/testify/assert"
 )
 
 type redactor func(s []byte) []byte

syft/formats/cyclonedxjson/encoder.go

@@ -4,6 +4,7 @@ import (
 	"io"
 
 	"github.com/CycloneDX/cyclonedx-go"
+
 	"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
 	"github.com/anchore/syft/syft/sbom"
 )

syft/formats/cyclonedxjson/format.go

@@ -2,6 +2,7 @@ package cyclonedxjson
 
 import (
 	"github.com/CycloneDX/cyclonedx-go"
+
 	"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
 	"github.com/anchore/syft/syft/sbom"
 )

syft/formats/cyclonedxxml/encoder.go

@@ -4,6 +4,7 @@ import (
 	"io"
 
 	"github.com/CycloneDX/cyclonedx-go"
+
 	"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
 	"github.com/anchore/syft/syft/sbom"
 )

syft/formats/cyclonedxxml/format.go

@@ -2,6 +2,7 @@ package cyclonedxxml
 
 import (
 	"github.com/CycloneDX/cyclonedx-go"
+
 	"github.com/anchore/syft/syft/formats/common/cyclonedxhelpers"
 	"github.com/anchore/syft/syft/sbom"
 )

syft/formats/spdx22json/decoder_test.go

@@ -5,8 +5,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func TestSPDXJSONDecoder(t *testing.T) {

syft/formats/spdx22json/to_format_model_test.go

@@ -3,16 +3,14 @@ package spdx22json
 import (
 	"testing"
 
-	"github.com/anchore/syft/syft/pkg"
+	"github.com/stretchr/testify/assert"
-
-	"github.com/anchore/syft/syft/file"
 
 	"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/source"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_toFileTypes(t *testing.T) {

syft/formats/spdx22tagvalue/encoder.go

@@ -3,8 +3,9 @@ package spdx22tagvalue
 import (
 	"io"
 
-	"github.com/anchore/syft/syft/sbom"
 	"github.com/spdx/tools-golang/tvsaver"
+
+	"github.com/anchore/syft/syft/sbom"
 )
 
 func encoder(output io.Writer, s sbom.SBOM) error {

syft/formats/spdx22tagvalue/to_format_model.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/anchore/syft/syft/sbom"
+	"github.com/spdx/tools-golang/spdx"
 
 	"github.com/anchore/syft/internal"
 	"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"
+	"github.com/anchore/syft/syft/sbom"
 )
 
 // toFormatModel creates and populates a new JSON document struct that follows the SPDX 2.2 spec from the given cataloging results.

syft/formats/syftjson/decoder.go

@@ -5,9 +5,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/anchore/syft/syft/sbom"
-
 	"github.com/anchore/syft/syft/formats/syftjson/model"
+	"github.com/anchore/syft/syft/sbom"
 )
 
 func decoder(reader io.Reader) (*sbom.SBOM, error) {

syft/formats/syftjson/decoder_test.go

@@ -5,9 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/anchore/syft/syft/formats/common/testutils"
 	"github.com/go-test/deep"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/formats/common/testutils"
 )
 
 func TestEncodeDecodeCycle(t *testing.T) {

syft/formats/syftjson/encoder_test.go

@@ -4,16 +4,13 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/anchore/syft/syft/file"
-
 	"github.com/anchore/syft/syft/artifact"
-
+	"github.com/anchore/syft/syft/file"
+	"github.com/anchore/syft/syft/formats/common/testutils"
 	"github.com/anchore/syft/syft/linux"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
-
-	"github.com/anchore/syft/syft/formats/common/testutils"
 )
 
 var updateJson = flag.Bool("update-json", false, "update the *.golden files for json encoders")

syft/formats/syftjson/model/file.go

@@ -2,7 +2,6 @@ package model
 
 import (
 	"github.com/anchore/syft/syft/file"
-
 	"github.com/anchore/syft/syft/source"
 )
 

syft/formats/syftjson/model/package.go

@@ -5,10 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/anchore/syft/syft/source"
-
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/pkg"
+	"github.com/anchore/syft/syft/source"
 )
 
 var errUnknownMetadataType = errors.New("unknown metadata type")

syft/formats/syftjson/model/package_test.go

@@ -2,10 +2,12 @@ package model
 
 import (
 	"encoding/json"
-	"github.com/anchore/syft/syft/pkg"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
+
+	"github.com/anchore/syft/syft/pkg"
 )
 
 func TestUnmarshalPackageGolang(t *testing.T) {

syft/formats/syftjson/model/source_test.go

@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/anchore/syft/syft/source"
-
 	"github.com/google/go-cmp/cmp"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 func TestSource_UnmarshalJSON(t *testing.T) {

syft/formats/syftjson/to_format_model.go

@@ -5,18 +5,14 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/anchore/syft/syft/linux"
-
-	"github.com/anchore/syft/syft/file"
-
-	"github.com/anchore/syft/syft/artifact"
-
-	"github.com/anchore/syft/syft/sbom"
-
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/syft/artifact"
+	"github.com/anchore/syft/syft/file"
 	"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"
 	"github.com/anchore/syft/syft/source"
 )
 

syft/formats/syftjson/to_format_model_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	"github.com/scylladb/go-set/strset"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/anchore/syft/syft/formats/syftjson/model"
 	"github.com/anchore/syft/syft/source"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func Test_toSourceModel(t *testing.T) {

syft/formats/syftjson/to_syft_model.go

@@ -1,6 +1,8 @@
 package syftjson
 
 import (
+	"github.com/google/go-cmp/cmp"
+
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/formats/syftjson/model"
@@ -8,7 +10,6 @@ import (
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
-	"github.com/google/go-cmp/cmp"
 )
 
 func toSyftModel(doc model.Document) (*sbom.SBOM, error) {

syft/formats/syftjson/to_syft_model_test.go

@@ -3,11 +3,12 @@ package syftjson
 import (
 	"testing"
 
+	"github.com/scylladb/go-set/strset"
+	"github.com/stretchr/testify/assert"
+
 	"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"
 )
 
 func Test_toSyftSourceData(t *testing.T) {

syft/formats/table/encoder.go

@@ -6,9 +6,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/anchore/syft/syft/sbom"
-
 	"github.com/olekukonko/tablewriter"
+
+	"github.com/anchore/syft/syft/sbom"
 )
 
 func encoder(output io.Writer, s sbom.SBOM) error {

syft/formats/table/encoder_test.go

@@ -4,8 +4,9 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/anchore/syft/syft/formats/common/testutils"
 	"github.com/go-test/deep"
+
+	"github.com/anchore/syft/syft/formats/common/testutils"
 )
 
 var updateTableGoldenFiles = flag.Bool("update-table", false, "update the *.golden files for table format")

syft/formats/template/encoder_test.go

@@ -4,8 +4,9 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/anchore/syft/syft/formats/common/testutils"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/syft/formats/common/testutils"
 )
 
 var updateTmpl = flag.Bool("update-tmpl", false, "update the *.golden files for json encoders")

syft/formats/text/encoder.go

@@ -6,7 +6,6 @@ import (
 	"text/tabwriter"
 
 	"github.com/anchore/syft/syft/sbom"
-
 	"github.com/anchore/syft/syft/source"
 )
 

syft/formats_test.go

@@ -6,6 +6,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/anchore/syft/syft/formats/cyclonedxjson"
 	"github.com/anchore/syft/syft/formats/cyclonedxxml"
 	"github.com/anchore/syft/syft/formats/github"
@@ -16,9 +19,6 @@ import (
 	"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"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestIdentify(t *testing.T) {

syft/lib.go

@@ -19,16 +19,16 @@ package syft
 import (
 	"fmt"
 
-	"github.com/anchore/syft/syft/artifact"
+	"github.com/wagoodman/go-partybus"
 
 	"github.com/anchore/syft/internal/bus"
 	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/linux"
 	"github.com/anchore/syft/syft/logger"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/pkg/cataloger"
 	"github.com/anchore/syft/syft/source"
-	"github.com/wagoodman/go-partybus"
 )
 
 // CatalogPackages takes an inventory of packages from the given image from a particular perspective

syft/linux/identify_release.go

@@ -7,10 +7,11 @@ import (
 	"strings"
 
 	"github.com/acobaugh/osrelease"
+	"github.com/google/go-cmp/cmp"
+
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/source"
-	"github.com/google/go-cmp/cmp"
 )
 
 // returns a distro or nil

syft/linux/identify_release_test.go

@@ -5,9 +5,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/anchore/syft/syft/source"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/anchore/syft/syft/source"
 )
 
 func TestIdentifyRelease(t *testing.T) {

syft/pkg/alpm_metadata.go

@@ -4,10 +4,11 @@ import (
 	"sort"
 	"time"
 
+	"github.com/scylladb/go-set/strset"
+
 	"github.com/anchore/packageurl-go"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/linux"
-	"github.com/scylladb/go-set/strset"
 )
 
 const AlpmDBGlob = "**/var/lib/pacman/local/**/desc"