Merge branch 'enable-goimports' into 'master'

Enable goimports.

See merge request slon/shad-go-private!70

.golangci.yml

@@ -39,7 +39,7 @@ linters-settings:
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
-    local-prefixes: gitlab.com
+    local-prefixes: gitlab.com/slon/shad-go
   stylecheck:
     # https://staticcheck.io/docs/options#checks
     checks: ["all", "-ST1018"]
@@ -56,6 +56,7 @@ linters:
   enable:
     - errcheck
     - gofmt
+    - goimports
     - stylecheck
     - gosimple
     - govet

blowfish/blowfish_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/blowfish"
 )
 

dao/dao_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/pgfixture"
 )
 

digitalclock/main_test.go

@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

externalsort/sort_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

fetchall/main_test.go

@@ -16,6 +16,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

genericsum/genericsum_test.go

@@ -7,8 +7,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/slon/shad-go/genericsum"
 	"go.uber.org/goleak"
+
+	"gitlab.com/slon/shad-go/genericsum"
 )
 
 func TestMin(t *testing.T) {

illegal/field_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"gitlab.com/slon/shad-go/illegal"
 	"gitlab.com/slon/shad-go/illegal/internal"
 )

illegal/string_test.go

@@ -5,6 +5,7 @@ import (
 	"unsafe"
 
 	"github.com/stretchr/testify/assert"
+
 	"gitlab.com/slon/shad-go/illegal"
 )
 

ledger/ledger_test.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/ledger"
 	"gitlab.com/slon/shad-go/pgfixture"
 )

olympics/main_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/go-resty/resty/v2"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

pgfixture/pg.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

pgfixture/pg_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/jackc/pgx/v4"
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/pgfixture"
 )
 

shopfront/redis_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

shopfront/shopfront_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/go-redis/redis/v8"
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/shopfront"
 )
 

tarstreamtest/stream_test.go

@@ -8,8 +8,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/slon/shad-go/distbuild/pkg/tarstream"
 	"golang.org/x/sys/unix"
+
+	"gitlab.com/slon/shad-go/distbuild/pkg/tarstream"
 )
 
 func TestTarStream(t *testing.T) {

treeiter/treeiter_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"gitlab.com/slon/shad-go/treeiter"
 )
 

urlfetch/main_test.go

@@ -14,6 +14,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

urlshortener/main_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/go-resty/resty/v2"
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )
 

wordcount/main_test.go

@@ -14,6 +14,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
 	"gitlab.com/slon/shad-go/tools/testtool"
 )