chore: Add goimports linter for consistent imports ordering (sourcene…

…twork#816)

api/http/handler.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/pkg/errors"
+
 	"github.com/sourcenetwork/defradb/client"
 )
 

api/http/handler_test.go

@@ -22,10 +22,11 @@ import (
 
 	badger "github.com/dgraph-io/badger/v3"
 	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+
 	badgerds "github.com/sourcenetwork/defradb/datastore/badger/v3"
 	"github.com/sourcenetwork/defradb/db"
 	"github.com/sourcenetwork/defradb/logging"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestSimpleDataResponse(t *testing.T) {

api/http/handlerfuncs.go

@@ -22,6 +22,7 @@ import (
 	dag "github.com/ipfs/go-merkledag"
 	"github.com/multiformats/go-multihash"
 	"github.com/pkg/errors"
+
 	corecrdt "github.com/sourcenetwork/defradb/core/crdt"
 )
 

api/http/handlerfuncs_test.go

@@ -24,12 +24,13 @@ import (
 	badger "github.com/dgraph-io/badger/v3"
 	"github.com/ipfs/go-cid"
 	dshelp "github.com/ipfs/go-ipfs-ds-help"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+
 	"github.com/sourcenetwork/defradb/client"
 	badgerds "github.com/sourcenetwork/defradb/datastore/badger/v3"
 	"github.com/sourcenetwork/defradb/db"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 )
 
 type testOptions struct {

api/http/logger_test.go

@@ -21,8 +21,9 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
-	"github.com/sourcenetwork/defradb/logging"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/sourcenetwork/defradb/logging"
 )
 
 func TestNewLoggingResponseWriterLogger(t *testing.T) {

cli/blocks_get.go

@@ -16,9 +16,10 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	httpapi "github.com/sourcenetwork/defradb/api/http"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/spf13/cobra"
 )
 
 var getCmd = &cobra.Command{

cli/cli.go

@@ -23,10 +23,11 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/sourcenetwork/defradb/config"
 	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/logging"
-	"github.com/spf13/cobra"
 )
 
 const badgerDatastoreName = "badger"

cli/dump.go

@@ -17,9 +17,10 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	httpapi "github.com/sourcenetwork/defradb/api/http"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/spf13/cobra"
 )
 
 var dumpCmd = &cobra.Command{

cli/init.go

@@ -14,9 +14,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/sourcenetwork/defradb/config"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/spf13/cobra"
 )
 
 var reinitialize bool

cli/peerid.go

@@ -17,10 +17,10 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/sourcenetwork/defradb/errors"
+	"github.com/spf13/cobra"
 
 	httpapi "github.com/sourcenetwork/defradb/api/http"
-	"github.com/spf13/cobra"
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 var peerIDCmd = &cobra.Command{

cli/peerid_test.go

@@ -18,10 +18,10 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	httpapi "github.com/sourcenetwork/defradb/api/http"
 	"github.com/sourcenetwork/defradb/config"
-
-	"github.com/stretchr/testify/assert"
 )
 
 // setTestingAddresses overrides the config addresses to be the ones reserved for testing.

cli/ping.go

@@ -17,9 +17,10 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	httpapi "github.com/sourcenetwork/defradb/api/http"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/spf13/cobra"
 )
 
 var pingCmd = &cobra.Command{

cli/root.go

@@ -14,10 +14,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/sourcenetwork/defradb/config"
-	"github.com/sourcenetwork/defradb/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"github.com/sourcenetwork/defradb/config"
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 var rootDirParam string

cli/serverdump.go

@@ -16,11 +16,12 @@ import (
 	"os/signal"
 
 	ds "github.com/ipfs/go-datastore"
+	"github.com/spf13/cobra"
+
 	badgerds "github.com/sourcenetwork/defradb/datastore/badger/v3"
 	"github.com/sourcenetwork/defradb/db"
 	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/logging"
-	"github.com/spf13/cobra"
 )
 
 var datastore string

cli/start.go

@@ -19,26 +19,26 @@ import (
 	"os/signal"
 	"strings"
 
+	badger "github.com/dgraph-io/badger/v3"
+	ds "github.com/ipfs/go-datastore"
 	ma "github.com/multiformats/go-multiaddr"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"github.com/textileio/go-threads/broadcast"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/keepalive"
+
 	httpapi "github.com/sourcenetwork/defradb/api/http"
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/config"
 	badgerds "github.com/sourcenetwork/defradb/datastore/badger/v3"
 	"github.com/sourcenetwork/defradb/db"
 	"github.com/sourcenetwork/defradb/errors"
+	"github.com/sourcenetwork/defradb/logging"
 	netapi "github.com/sourcenetwork/defradb/net/api"
 	netpb "github.com/sourcenetwork/defradb/net/api/pb"
 	netutils "github.com/sourcenetwork/defradb/net/utils"
 	"github.com/sourcenetwork/defradb/node"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/keepalive"
-
-	badger "github.com/dgraph-io/badger/v3"
-	ds "github.com/ipfs/go-datastore"
-	"github.com/sourcenetwork/defradb/logging"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"github.com/textileio/go-threads/broadcast"
 )
 
 const busBufferSize = 100

cli/version.go

@@ -12,10 +12,12 @@ package cli
 
 import (
 	"bytes"
+
 	"encoding/json"
 
-	"github.com/sourcenetwork/defradb/version"
 	"github.com/spf13/cobra"
+
+	"github.com/sourcenetwork/defradb/version"
 )
 
 var format string

client/db.go

@@ -13,10 +13,10 @@ package client
 import (
 	"context"
 
-	"github.com/sourcenetwork/defradb/datastore"
-
 	ds "github.com/ipfs/go-datastore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
+
+	"github.com/sourcenetwork/defradb/datastore"
 )
 
 type DB interface {

client/dockey.go

@@ -15,11 +15,11 @@ import (
 	"encoding/binary"
 	"strings"
 
-	"github.com/sourcenetwork/defradb/errors"
-
 	"github.com/ipfs/go-cid"
 	mbase "github.com/multiformats/go-multibase"
 	uuid "github.com/satori/go.uuid"
+
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 // DocKey versions.

client/document.go

@@ -16,11 +16,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/sourcenetwork/defradb/errors"
-
 	"github.com/fxamacker/cbor/v2"
 	"github.com/ipfs/go-cid"
 	mh "github.com/multiformats/go-multihash"
+
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 // This is the main implementation starting point for accessing the internal Document API

cmd/genclidocs/genclidocs.go

@@ -18,10 +18,10 @@ import (
 	"flag"
 	"os"
 
+	"github.com/spf13/cobra/doc"
+
 	"github.com/sourcenetwork/defradb/cli"
 	"github.com/sourcenetwork/defradb/logging"
-
-	"github.com/spf13/cobra/doc"
 )
 
 var log = logging.MustNewLogger("defra.genclidocs")

cmd/genmanpages/main.go

@@ -19,9 +19,10 @@ import (
 	"flag"
 	"os"
 
+	"github.com/spf13/cobra/doc"
+
 	"github.com/sourcenetwork/defradb/cli"
 	"github.com/sourcenetwork/defradb/logging"
-	"github.com/spf13/cobra/doc"
 )
 
 const defaultPerm os.FileMode = 0o777

config/config.go

@@ -58,11 +58,12 @@ import (
 
 	"github.com/mitchellh/mapstructure"
 	ma "github.com/multiformats/go-multiaddr"
+	"github.com/spf13/viper"
+
 	badgerds "github.com/sourcenetwork/defradb/datastore/badger/v3"
 	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/logging"
 	"github.com/sourcenetwork/defradb/node"
-	"github.com/spf13/viper"
 )
 
 var log = logging.MustNewLogger("defra.config")

config/config_test.go

@@ -18,9 +18,10 @@ import (
 	"time"
 
 	ma "github.com/multiformats/go-multiaddr"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/sourcenetwork/defradb/logging"
 	"github.com/sourcenetwork/defradb/node"
-	"github.com/stretchr/testify/assert"
 )
 
 var envVarsDifferentThanDefault = map[string]string{

core/crdt/base.go

@@ -15,6 +15,7 @@ import (
 	"encoding/binary"
 
 	ds "github.com/ipfs/go-datastore"
+
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/errors"

core/crdt/base_test.go

@@ -15,6 +15,7 @@ import (
 	"testing"
 
 	ds "github.com/ipfs/go-datastore"
+
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/datastore"
 )

core/crdt/composite.go

@@ -16,13 +16,13 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/datastore"
-	"github.com/sourcenetwork/defradb/errors"
-
 	ipld "github.com/ipfs/go-ipld-format"
 	dag "github.com/ipfs/go-merkledag"
 	"github.com/ugorji/go/codec"
+
+	"github.com/sourcenetwork/defradb/core"
+	"github.com/sourcenetwork/defradb/datastore"
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 var (

core/crdt/lwwreg.go

@@ -16,16 +16,14 @@ import (
 	"bytes"
 	"context"
 
-	"github.com/sourcenetwork/defradb/errors"
+	ipld "github.com/ipfs/go-ipld-format"
+	dag "github.com/ipfs/go-merkledag"
+	"github.com/ugorji/go/codec"
 
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/datastore"
-
-	ipld "github.com/ipfs/go-ipld-format"
-	dag "github.com/ipfs/go-merkledag"
-
-	"github.com/ugorji/go/codec"
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 var (

core/crdt/lwwreg_test.go

@@ -17,14 +17,13 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
-	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/datastore"
-
-	"github.com/ugorji/go/codec"
-
 	ipld "github.com/ipfs/go-ipld-format"
 	dag "github.com/ipfs/go-merkledag"
 	mh "github.com/multiformats/go-multihash"
+	"github.com/ugorji/go/codec"
+
+	"github.com/sourcenetwork/defradb/core"
+	"github.com/sourcenetwork/defradb/datastore"
 )
 
 func newMockStore() datastore.DSReaderWriter {

core/key.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
+
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/errors"
 )