Add gosimports (#1205)

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 {