chore: format codebase

Makefile

@@ -1,7 +1,13 @@
+GOFILES ?= $(shell find . -type f -name '*.go' | grep -v '.pb.go')
+
 .PHONY: license-check
 license-check:
-	find . -type f -name '*.go' | grep -v '.pb.go' | xargs go-license --config=.license.yml --verify
+	go-license --config=.license.yml --verify $(GOFILES)
 
 .PHONY: license-format
 license-format:
-	find . -type f -name '*.go' | grep -v '.pb.go' | xargs go-license --config=.license.yml
+	go-license --config=.license.yml $(GOFILES)
+
+.PHONY: format
+format: license-format
+	goimports -w $(GOFILES)

client/v2/client.go

@@ -18,12 +18,13 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"log"
+	"time"
+
 	"github.com/casbin/casbin-mesh/proto/command"
 	"github.com/golang/protobuf/proto"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"google.golang.org/grpc"
-	"log"
-	"time"
 )
 
 type Client struct {

client/v2/middleware.go

@@ -17,6 +17,7 @@ package client
 import (
 	"context"
 	"encoding/base64"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )

cmd/app/app.go

@@ -20,13 +20,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/casbin/casbin-mesh/pkg/auth"
-	"github.com/casbin/casbin-mesh/pkg/cluster"
-	"github.com/casbin/casbin-mesh/pkg/core"
-	"github.com/casbin/casbin-mesh/pkg/store"
-	"github.com/casbin/casbin-mesh/pkg/transport/tcp"
-	"github.com/rs/cors"
-	"github.com/soheilhy/cmux"
 	"io"
 	"io/ioutil"
 	"log"
@@ -38,6 +31,14 @@ import (
 	"runtime/pprof"
 	"strings"
 	"time"
+
+	"github.com/casbin/casbin-mesh/pkg/auth"
+	"github.com/casbin/casbin-mesh/pkg/cluster"
+	"github.com/casbin/casbin-mesh/pkg/core"
+	"github.com/casbin/casbin-mesh/pkg/store"
+	"github.com/casbin/casbin-mesh/pkg/transport/tcp"
+	"github.com/rs/cors"
+	"github.com/soheilhy/cmux"
 )
 
 func New(cfg *Config) (close func() error) {

cmd/cli/ctx.go

@@ -18,15 +18,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/c-bata/go-prompt"
-	"github.com/casbin/casbin-mesh/client/v2"
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/tidwall/pretty"
 	"log"
 	"os"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/c-bata/go-prompt"
+	"github.com/casbin/casbin-mesh/client/v2"
+	"github.com/jedib0t/go-pretty/v6/table"
+	"github.com/tidwall/pretty"
 )
 
 type Context interface {

cmd/cli/input.go

@@ -16,9 +16,10 @@ package main
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/erikgeiser/promptkit/selection"
 	"github.com/erikgeiser/promptkit/textinput"
-	"os"
 )
 
 const customTemplate = `

cmd/cli/main.go

@@ -16,6 +16,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/c-bata/go-prompt"
 	"github.com/casbin/casbin-mesh/client/v2"
 )

cmd/cli/rule.go

@@ -15,9 +15,10 @@
 package main
 
 import (
-	"github.com/jedib0t/go-pretty/v6/table"
 	"os"
 	"strings"
+
+	"github.com/jedib0t/go-pretty/v6/table"
 )
 
 // CasbinRule represents a Casbin rule line.

pkg/adapter/adapter.go

@@ -18,10 +18,11 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"errors"
+	"strings"
+
 	"github.com/casbin/casbin/v2/model"
 	"github.com/casbin/casbin/v2/persist"
 	"github.com/dgraph-io/badger/v3"
-	"strings"
 )
 
 // CasbinRule represents a Casbin rule line.

pkg/adapter/adapter_test.go

@@ -15,13 +15,14 @@
 package adapter
 
 import (
+	"io/ioutil"
+	"os"
+	"testing"
+
 	"github.com/casbin/casbin/v2"
 	"github.com/casbin/casbin/v2/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
-	"io/ioutil"
-	"os"
-	"testing"
 )
 
 const testDB = "test.db"

pkg/adapter/badger.go

@@ -15,9 +15,10 @@
 package adapter
 
 import (
-	"github.com/dgraph-io/badger/v3"
 	"time"
 
+	"github.com/dgraph-io/badger/v3"
+
 	"io"
 	"log"
 	"sync"

pkg/adapter/badger_test.go

@@ -16,11 +16,12 @@ package adapter
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/suite"
 	"os"
 	"strconv"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
 )
 
 type BadgerTestSuite struct {

pkg/auth/credential_store.go

@@ -17,8 +17,9 @@ package auth
 import (
 	"encoding/json"
 	"errors"
-	"golang.org/x/crypto/bcrypt"
 	"io"
+
+	"golang.org/x/crypto/bcrypt"
 )
 
 // BasicAuthProvider is the interface an object must support to return basic auth information.

pkg/cluster/join.go

@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/casbin/casbin-mesh/pkg/auth"
 	"io/ioutil"
 	"log"
 	"net"
@@ -29,6 +28,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/casbin/casbin-mesh/pkg/auth"
+
 	"github.com/casbin/casbin-mesh/pkg/utils"
 )
 

pkg/cluster/join_test.go

@@ -17,12 +17,13 @@ package cluster
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/casbin/casbin-mesh/pkg/auth"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
+
+	"github.com/casbin/casbin-mesh/pkg/auth"
 )
 
 const numAttempts int = 3

pkg/cluster/listener_test.go

@@ -15,10 +15,11 @@
 package cluster
 
 import (
-	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/nettest"
 	"net"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/net/nettest"
 )
 
 func TestListener(t *testing.T) {

pkg/core/core.go

@@ -16,6 +16,7 @@ package core
 
 import (
 	"context"
+
 	"github.com/casbin/casbin-mesh/pkg/auth"
 	"github.com/casbin/casbin-mesh/pkg/store"
 	"github.com/casbin/casbin-mesh/proto/command"

pkg/core/grpc.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+
 	"github.com/casbin/casbin-mesh/pkg/auth"
 	grpc2 "github.com/casbin/casbin-mesh/pkg/handler/grpc"
 	"github.com/casbin/casbin-mesh/proto/command"

pkg/core/http.go

@@ -18,13 +18,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
+	http2 "net/http"
+
 	"github.com/casbin/casbin-mesh/pkg/auth"
 	"github.com/casbin/casbin-mesh/pkg/handler/http"
 	"github.com/go-playground/validator"
 	"golang.org/x/net/context"
-	"io"
-	"io/ioutil"
-	http2 "net/http"
 )
 
 type httpService struct {

pkg/handler/grpc/basic_auth.go

@@ -19,11 +19,12 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
 	"log"
 	"net/http"
 	"strings"
+
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
 )
 
 var ErrUnauthorized = errors.New("unauthorized")

pkg/log/log.go

@@ -16,6 +16,7 @@ package log
 
 import (
 	"fmt"
+
 	raftbadgerdb "github.com/BBVA/raft-badger"
 	"github.com/hashicorp/raft"
 )

pkg/store/adapter.go

@@ -16,6 +16,7 @@ package store
 
 import (
 	"context"
+
 	"github.com/casbin/casbin-mesh/pkg/adapter"
 	"github.com/casbin/casbin-mesh/proto/command"
 	"github.com/golang/protobuf/proto"

pkg/store/config.go

@@ -15,8 +15,9 @@
 package store
 
 import (
-	"github.com/casbin/casbin-mesh/pkg/auth"
 	"log"
+
+	"github.com/casbin/casbin-mesh/pkg/auth"
 )
 
 // StoreConfig represents the configuration of the underlying Store.

pkg/store/enforcer.go

@@ -17,9 +17,10 @@ package store
 import (
 	"context"
 	"encoding/json"
-	_const "github.com/casbin/casbin-mesh/pkg/const"
 	"time"
 
+	_const "github.com/casbin/casbin-mesh/pkg/const"
+
 	"github.com/casbin/casbin/v2"
 
 	"github.com/casbin/casbin-mesh/proto/command"

pkg/store/fsm.go

@@ -20,14 +20,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/casbin/casbin-mesh/pkg/adapter"
-	"github.com/casbin/casbin-mesh/pkg/auth"
 	"io"
 	"io/ioutil"
 	"log"
 	"sync"
 	"time"
 
+	"github.com/casbin/casbin-mesh/pkg/adapter"
+	"github.com/casbin/casbin-mesh/pkg/auth"
+
 	model2 "github.com/casbin/casbin/v2/model"
 
 	"github.com/casbin/casbin/v2"

pkg/store/manage.go

@@ -16,6 +16,7 @@ package store
 
 import (
 	"context"
+
 	"github.com/casbin/casbin-mesh/proto/command"
 	"github.com/golang/protobuf/proto"
 	"github.com/hashicorp/raft"

pkg/store/store.go

@@ -18,8 +18,6 @@ import (
 	"errors"
 	"expvar"
 	"fmt"
-	"github.com/casbin/casbin-mesh/pkg/adapter"
-	"github.com/casbin/casbin-mesh/pkg/auth"
 	"log"
 	"os"
 	"path/filepath"
@@ -28,6 +26,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/casbin/casbin-mesh/pkg/adapter"
+	"github.com/casbin/casbin-mesh/pkg/auth"
+
 	"github.com/golang/protobuf/proto"
 
 	"github.com/casbin/casbin-mesh/proto/command"