From 86eaea1b5a695930a1a40343baedbfd106f28e8c Mon Sep 17 00:00:00 2001 From: Arseny Balobanov Date: Sun, 17 Apr 2022 18:28:33 +0300 Subject: [PATCH] Enable goimports. --- .golangci.yml | 3 ++- blowfish/blowfish_test.go | 1 + dao/dao_test.go | 1 + digitalclock/main_test.go | 1 + externalsort/sort_test.go | 1 + fetchall/main_test.go | 1 + genericsum/genericsum_test.go | 3 ++- illegal/field_test.go | 1 + illegal/string_test.go | 1 + ledger/ledger_test.go | 1 + olympics/main_test.go | 1 + pgfixture/pg.go | 1 + pgfixture/pg_test.go | 1 + shopfront/redis_test.go | 1 + shopfront/shopfront_test.go | 1 + tarstreamtest/stream_test.go | 3 ++- treeiter/treeiter_test.go | 1 + urlfetch/main_test.go | 1 + urlshortener/main_test.go | 1 + wordcount/main_test.go | 1 + 20 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index f91a73b..ec74ecf 100644 --- a/.golangci.yml +++ b/.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 diff --git a/blowfish/blowfish_test.go b/blowfish/blowfish_test.go index ae9b3cc..9936afd 100644 --- a/blowfish/blowfish_test.go +++ b/blowfish/blowfish_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/blowfish" ) diff --git a/dao/dao_test.go b/dao/dao_test.go index a891b22..1e5b841 100644 --- a/dao/dao_test.go +++ b/dao/dao_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/pgfixture" ) diff --git a/digitalclock/main_test.go b/digitalclock/main_test.go index cf10f7f..6585eeb 100644 --- a/digitalclock/main_test.go +++ b/digitalclock/main_test.go @@ -17,6 +17,7 @@ import ( "time" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/tools/testtool" ) diff --git a/externalsort/sort_test.go b/externalsort/sort_test.go index 2d41774..f11d5fd 100644 --- a/externalsort/sort_test.go +++ b/externalsort/sort_test.go @@ -11,6 +11,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/tools/testtool" ) diff --git a/fetchall/main_test.go b/fetchall/main_test.go index 22ba64a..3213694 100644 --- a/fetchall/main_test.go +++ b/fetchall/main_test.go @@ -16,6 +16,7 @@ import ( "time" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/tools/testtool" ) diff --git a/genericsum/genericsum_test.go b/genericsum/genericsum_test.go index 4360a23..55120a8 100644 --- a/genericsum/genericsum_test.go +++ b/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) { diff --git a/illegal/field_test.go b/illegal/field_test.go index d542de1..b1ddcf4 100644 --- a/illegal/field_test.go +++ b/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" ) diff --git a/illegal/string_test.go b/illegal/string_test.go index 1ceff73..d2514cc 100644 --- a/illegal/string_test.go +++ b/illegal/string_test.go @@ -5,6 +5,7 @@ import ( "unsafe" "github.com/stretchr/testify/assert" + "gitlab.com/slon/shad-go/illegal" ) diff --git a/ledger/ledger_test.go b/ledger/ledger_test.go index 81d7491..06f19c6 100644 --- a/ledger/ledger_test.go +++ b/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" ) diff --git a/olympics/main_test.go b/olympics/main_test.go index a6531ec..c67f967 100644 --- a/olympics/main_test.go +++ b/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" ) diff --git a/pgfixture/pg.go b/pgfixture/pg.go index 3948539..d4c4feb 100644 --- a/pgfixture/pg.go +++ b/pgfixture/pg.go @@ -10,6 +10,7 @@ import ( "time" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/tools/testtool" ) diff --git a/pgfixture/pg_test.go b/pgfixture/pg_test.go index e2d5612..fdb20a2 100644 --- a/pgfixture/pg_test.go +++ b/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" ) diff --git a/shopfront/redis_test.go b/shopfront/redis_test.go index 20aecfd..8d89c7c 100644 --- a/shopfront/redis_test.go +++ b/shopfront/redis_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/tools/testtool" ) diff --git a/shopfront/shopfront_test.go b/shopfront/shopfront_test.go index bca110e..45c39bd 100644 --- a/shopfront/shopfront_test.go +++ b/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" ) diff --git a/tarstreamtest/stream_test.go b/tarstreamtest/stream_test.go index 0f18ded..dcae861 100644 --- a/tarstreamtest/stream_test.go +++ b/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) { diff --git a/treeiter/treeiter_test.go b/treeiter/treeiter_test.go index 52fdaa9..e0fe992 100644 --- a/treeiter/treeiter_test.go +++ b/treeiter/treeiter_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "gitlab.com/slon/shad-go/treeiter" ) diff --git a/urlfetch/main_test.go b/urlfetch/main_test.go index c02af54..cfb0972 100644 --- a/urlfetch/main_test.go +++ b/urlfetch/main_test.go @@ -14,6 +14,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/tools/testtool" ) diff --git a/urlshortener/main_test.go b/urlshortener/main_test.go index b67497b..e0e1a7b 100644 --- a/urlshortener/main_test.go +++ b/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" ) diff --git a/wordcount/main_test.go b/wordcount/main_test.go index 41ddb80..2a4ac6e 100644 --- a/wordcount/main_test.go +++ b/wordcount/main_test.go @@ -14,6 +14,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "gitlab.com/slon/shad-go/tools/testtool" )