refactor: rename pkg to server

casbin · Jun 23, 2023 · ed9d5ee · ed9d5ee
1 parent 23a4fc3
commit ed9d5ee
Show file tree

Hide file tree

Showing 38 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,4 +19,4 @@ jobs:
         go-version: 1.18
 
     - name: Test
-      run: go test -v ./pkg/...
+      run: go test -v ./server/...
diff --git a/cmd/app/app.go b/cmd/app/app.go
@@ -32,11 +32,11 @@ import (
 	"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/casbin/casbin-mesh/server/auth"
+	"github.com/casbin/casbin-mesh/server/cluster"
+	"github.com/casbin/casbin-mesh/server/core"
+	"github.com/casbin/casbin-mesh/server/store"
+	"github.com/casbin/casbin-mesh/server/transport/tcp"
 	"github.com/rs/cors"
 	"github.com/soheilhy/cmux"
 )

diff --git a/pkg/adapter/adapter.go → server/adapter/adapter.go b/pkg/adapter/adapter.go → server/adapter/adapter.go
diff --git a/pkg/adapter/adapter_test.go → server/adapter/adapter_test.go b/pkg/adapter/adapter_test.go → server/adapter/adapter_test.go
diff --git a/pkg/adapter/badger.go → server/adapter/badger.go b/pkg/adapter/badger.go → server/adapter/badger.go
diff --git a/pkg/adapter/badger_test.go → server/adapter/badger_test.go b/pkg/adapter/badger_test.go → server/adapter/badger_test.go
diff --git a/pkg/auth/auth.go → server/auth/auth.go b/pkg/auth/auth.go → server/auth/auth.go
diff --git a/pkg/auth/credential_store.go → server/auth/credential_store.go b/pkg/auth/credential_store.go → server/auth/credential_store.go
diff --git a/pkg/auth/credential_store_test.go → server/auth/credential_store_test.go b/pkg/auth/credential_store_test.go → server/auth/credential_store_test.go
diff --git a/pkg/cluster/doc.go → server/cluster/doc.go b/pkg/cluster/doc.go → server/cluster/doc.go
diff --git a/pkg/cluster/join.go → server/cluster/join.go b/pkg/cluster/join.go → server/cluster/join.go
@@ -28,9 +28,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/casbin/casbin-mesh/pkg/auth"
+	"github.com/casbin/casbin-mesh/server/auth"
 
-	"github.com/casbin/casbin-mesh/pkg/utils"
+	"github.com/casbin/casbin-mesh/server/utils"
 )
 
 var (

diff --git a/pkg/cluster/join_test.go → server/cluster/join_test.go b/pkg/cluster/join_test.go → server/cluster/join_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/casbin/casbin-mesh/pkg/auth"
+	"github.com/casbin/casbin-mesh/server/auth"
 )
 
 const numAttempts int = 3

diff --git a/pkg/cluster/listener.go → server/cluster/listener.go b/pkg/cluster/listener.go → server/cluster/listener.go
diff --git a/pkg/cluster/listener_test.go → server/cluster/listener_test.go b/pkg/cluster/listener_test.go → server/cluster/listener_test.go
diff --git a/pkg/const/const.go → server/const/const.go b/pkg/const/const.go → server/const/const.go
diff --git a/pkg/core/core.go → server/core/core.go b/pkg/core/core.go → server/core/core.go
@@ -17,9 +17,9 @@ 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"
+	"github.com/casbin/casbin-mesh/server/auth"
+	"github.com/casbin/casbin-mesh/server/store"
 )
 
 type core struct {

diff --git a/pkg/core/grpc.go → server/core/grpc.go b/pkg/core/grpc.go → server/core/grpc.go
@@ -19,9 +19,9 @@ import (
 	"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"
+	"github.com/casbin/casbin-mesh/server/auth"
+	grpc2 "github.com/casbin/casbin-mesh/server/handler/grpc"
 	_ "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"google.golang.org/grpc"

diff --git a/pkg/core/http.go → server/core/http.go b/pkg/core/http.go → server/core/http.go
@@ -22,8 +22,8 @@ import (
 	"io/ioutil"
 	http2 "net/http"
 
-	"github.com/casbin/casbin-mesh/pkg/auth"
-	"github.com/casbin/casbin-mesh/pkg/handler/http"
+	"github.com/casbin/casbin-mesh/server/auth"
+	"github.com/casbin/casbin-mesh/server/handler/http"
 	"github.com/go-playground/validator"
 	"golang.org/x/net/context"
 )

diff --git a/pkg/handler/grpc/basic_auth.go → server/handler/grpc/basic_auth.go b/pkg/handler/grpc/basic_auth.go → server/handler/grpc/basic_auth.go
diff --git a/pkg/handler/http/basic_auth.go → server/handler/http/basic_auth.go b/pkg/handler/http/basic_auth.go → server/handler/http/basic_auth.go
diff --git a/pkg/handler/http/config.go → server/handler/http/config.go b/pkg/handler/http/config.go → server/handler/http/config.go
diff --git a/pkg/handler/http/context.go → server/handler/http/context.go b/pkg/handler/http/context.go → server/handler/http/context.go
diff --git a/pkg/handler/http/handler.go → server/handler/http/handler.go b/pkg/handler/http/handler.go → server/handler/http/handler.go
diff --git a/pkg/handler/http/server.go → server/handler/http/server.go b/pkg/handler/http/server.go → server/handler/http/server.go
diff --git a/pkg/log/log.go → server/log/log.go b/pkg/log/log.go → server/log/log.go
diff --git a/pkg/log/log_test.go → server/log/log_test.go b/pkg/log/log_test.go → server/log/log_test.go
diff --git a/pkg/store/adapter.go → server/store/adapter.go b/pkg/store/adapter.go → server/store/adapter.go
@@ -17,8 +17,8 @@ package store
 import (
 	"context"
 
-	"github.com/casbin/casbin-mesh/pkg/adapter"
 	"github.com/casbin/casbin-mesh/proto/command"
+	"github.com/casbin/casbin-mesh/server/adapter"
 	"github.com/golang/protobuf/proto"
 	"github.com/hashicorp/raft"
 )

diff --git a/pkg/store/config.go → server/store/config.go b/pkg/store/config.go → server/store/config.go
@@ -17,7 +17,7 @@ package store
 import (
 	"log"
 
-	"github.com/casbin/casbin-mesh/pkg/auth"
+	"github.com/casbin/casbin-mesh/server/auth"
 )
 
 // StoreConfig represents the configuration of the underlying Store.

diff --git a/pkg/store/enforcer.go → server/store/enforcer.go b/pkg/store/enforcer.go → server/store/enforcer.go
@@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"time"
 
-	_const "github.com/casbin/casbin-mesh/pkg/const"
+	_const "github.com/casbin/casbin-mesh/server/const"
 
 	"github.com/casbin/casbin/v2"
 

diff --git a/pkg/store/fsm.go → server/store/fsm.go b/pkg/store/fsm.go → server/store/fsm.go
@@ -26,8 +26,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/casbin/casbin-mesh/pkg/adapter"
-	"github.com/casbin/casbin-mesh/pkg/auth"
+	"github.com/casbin/casbin-mesh/server/adapter"
+	"github.com/casbin/casbin-mesh/server/auth"
 
 	model2 "github.com/casbin/casbin/v2/model"
 

diff --git a/pkg/store/manage.go → server/store/manage.go b/pkg/store/manage.go → server/store/manage.go
diff --git a/pkg/store/server.go → server/store/server.go b/pkg/store/server.go → server/store/server.go
diff --git a/pkg/store/store.go → server/store/store.go b/pkg/store/store.go → server/store/store.go
@@ -26,14 +26,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/casbin/casbin-mesh/pkg/adapter"
-	"github.com/casbin/casbin-mesh/pkg/auth"
+	"github.com/casbin/casbin-mesh/server/adapter"
+	"github.com/casbin/casbin-mesh/server/auth"
 
 	"github.com/golang/protobuf/proto"
 
 	"github.com/casbin/casbin-mesh/proto/command"
 
-	rlog "github.com/casbin/casbin-mesh/pkg/log"
+	rlog "github.com/casbin/casbin-mesh/server/log"
 	"github.com/hashicorp/raft"
 )
 

diff --git a/pkg/store/store_test.go → server/store/store_test.go b/pkg/store/store_test.go → server/store/store_test.go
diff --git a/pkg/store/transport.go → server/store/transport.go b/pkg/store/transport.go → server/store/transport.go
diff --git a/pkg/store/util.go → server/store/util.go b/pkg/store/util.go → server/store/util.go
diff --git a/pkg/transport/tcp/tcp.go → server/transport/tcp/tcp.go b/pkg/transport/tcp/tcp.go → server/transport/tcp/tcp.go
diff --git a/pkg/utils/http.go → server/utils/http.go b/pkg/utils/http.go → server/utils/http.go