Skip to content

Commit f3fb32e

Browse files
krishnamiriyalakrishnamiriyala
authored
Use goimports-reviser to fix imports to default order (#38)
1 parent d3609cf commit f3fb32e

20 files changed

+434
-174
lines changed

‎.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ linters:
3232
- forbidigo
3333
# forcetypeassert
3434
- funlen
35-
- gci
35+
# gci
3636
- gochecknoglobals
3737
- gochecknoinits
3838
- gocognit

‎build/install_tools.sh

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ go-licenser -version || go install github.com/elastic/go-licenser@latest
1212
$(go env GOPATH)/bin/shfmt -version | grep ${SHFMT_VERSION} || go install mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}
1313
$(go env GOPATH)/bin/gomarkdoc --version | grep ${GOMRK_VERSION} || go install github.com/princjef/gomarkdoc/cmd/gomarkdoc@${GOMRK_VERSION}
1414
$(go env GOPATH)/bin/golangci-lint version | grep ${GOLNT_VERSION} || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLNT_VERSION}
15+
go install -v github.com/incu6us/goimports-reviser/v3@latest
1516

1617
if [[ "${OSTYPE}" == "linux"* ]]; then
1718
/tmp/typos --version | grep ${TYPOS_VERSION} || wget -qO- https://github.com/crate-ci/typos/releases/download/v${TYPOS_VERSION}/typos-v${TYPOS_VERSION}-x86_64-unknown-linux-musl.tar.gz | tar -zxf - -C /tmp/ ./typos

‎build/lint_fix.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ $(go env GOPATH)/bin/golangci-lint run --enable-all -c /dev/null --fix || echo "
99

1010
go vet ./...
1111
go fix ./...
12-
find . | grep -e \.go$ | grep -v vendor\/ | xargs -t -I ARGS sh -c 'goimports -w ARGS; gofmt -w ARGS'
12+
find . -name "*.go" -print0 | xargs -0 -I {} goimports-reviser --imports-order "std,general,company,project" {}
1313

1414
$(go env GOPATH)/bin/shfmt -w -ci -i 2 .

‎docs/DOCUMENTATION.md

+403-160
Large diffs are not rendered by default.

‎pkg/authorizer/authorizer_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import (
2323
"testing"
2424

2525
"github.com/stretchr/testify/assert"
26+
"google.golang.org/grpc/metadata"
27+
2628
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
2729
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
2830
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
2931
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/test"
30-
"google.golang.org/grpc/metadata"
3132
)
3233

3334
// Checks that it's possible to extract org. ID from auth. context.

‎pkg/authorizer/instancer_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"testing"
2424

2525
"github.com/stretchr/testify/assert"
26+
2627
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
2728
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
2829
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/test"

‎pkg/authorizer/metadata_authorizer.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ import (
2222
"context"
2323
"strings"
2424

25+
"google.golang.org/grpc/metadata"
26+
2527
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
2628
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
27-
"google.golang.org/grpc/metadata"
2829
)
2930

3031
const (

‎pkg/datastore/database.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@ import (
4343

4444
_ "github.com/lib/pq"
4545
"github.com/sirupsen/logrus"
46+
"gorm.io/gorm"
47+
"gorm.io/gorm/clause"
48+
4649
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
4750
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
4851
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
49-
"gorm.io/gorm"
50-
"gorm.io/gorm/clause"
5152
)
5253

5354
const (

‎pkg/datastore/datastore.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ package datastore
3939
import (
4040
"context"
4141

42+
"gorm.io/gorm"
43+
4244
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
4345
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
44-
"gorm.io/gorm"
4546
)
4647

4748
type DataStore interface {

‎pkg/datastore/datastore_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"github.com/bxcodec/faker/v4"
3333
"github.com/sirupsen/logrus"
3434
"github.com/stretchr/testify/assert"
35+
3536
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
3637
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/datastore"
3738
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"

‎pkg/datastore/helper.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ import (
2525
"strings"
2626

2727
"github.com/sirupsen/logrus"
28-
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
29-
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
30-
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
3128
"gorm.io/driver/postgres"
3229
"gorm.io/gorm"
3330
"gorm.io/gorm/logger"
31+
32+
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
33+
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
34+
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
3435
)
3536

3637
const (

‎pkg/datastore/noinstancer_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"time"
1010

1111
"github.com/stretchr/testify/assert"
12+
1213
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
1314
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/datastore"
1415
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"

‎pkg/datastore/record_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"testing"
2323

2424
"github.com/stretchr/testify/assert"
25+
2526
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/datastore"
2627
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/test"
2728
)

‎pkg/datastore/sql_struct_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"testing"
2323

2424
"github.com/stretchr/testify/assert"
25+
2526
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/datastore"
2627
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/test"
2728
"github.com/vmware-labs/multi-tenant-persistence-for-saas/test/pb"

‎pkg/datastore/transaction_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import (
2323

2424
"github.com/bxcodec/faker/v4"
2525
"github.com/stretchr/testify/assert"
26+
"gorm.io/gorm"
27+
2628
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/datastore"
2729
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/protostore"
2830
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/test"
2931
"github.com/vmware-labs/multi-tenant-persistence-for-saas/test/pb"
30-
"gorm.io/gorm"
3132
)
3233

3334
func testSingleTableTransactions(t *testing.T, ds datastore.DataStore, ps protostore.ProtoStore) {

‎pkg/dbrole/dbrole_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"testing"
2525

2626
"github.com/stretchr/testify/assert"
27+
2728
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
2829
)
2930

‎pkg/errors/error_codes_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"github.com/stretchr/testify/assert"
11+
1112
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
1213
)
1314

‎pkg/protostore/protostore.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ import (
3232
"time"
3333

3434
"github.com/sirupsen/logrus"
35+
"google.golang.org/protobuf/proto"
36+
"gorm.io/gorm"
37+
3538
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
3639
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/datastore"
3740
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
3841
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
39-
"google.golang.org/protobuf/proto"
40-
"gorm.io/gorm"
4142
)
4243

4344
type ProtoStore interface {

‎pkg/protostore/protostore_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ import (
2727
"github.com/bxcodec/faker/v3"
2828
log "github.com/sirupsen/logrus"
2929
"github.com/stretchr/testify/assert"
30+
"google.golang.org/protobuf/proto"
31+
3032
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/datastore"
3133
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
3234
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/errors"
3335
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/protostore"
3436
. "github.com/vmware-labs/multi-tenant-persistence-for-saas/test"
3537
"github.com/vmware-labs/multi-tenant-persistence-for-saas/test/pb"
36-
"google.golang.org/protobuf/proto"
3738
)
3839

3940
type MemorySlice []pb.Memory

‎test/data.go

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package test
2121
import (
2222
"github.com/google/go-cmp/cmp"
2323
"github.com/google/uuid"
24+
2425
"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
2526
)
2627

0 commit comments

Comments
 (0)