refactory: move pkg and plugin to internal directory since they're no…

…t public packages Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
aeraki-mesh · Jul 29, 2023 · 3a5033d · 3a5033d
1 parent eace397
commit 3a5033d
Show file tree

Hide file tree

Showing 78 changed files with 77 additions and 76 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -24,9 +24,9 @@ jobs:
         with:
           go-version: 1.19
       - name: Build
-        run: go build -race  ./...
+        run: go build -race  ./internal/...
       - name: Test
-        run: go test -race  `go list ./... | grep -v e2e`
+        run: go test -race  `go list ./internal/... | grep -v e2e`
   go-lint:
     name: go-lint
     runs-on: ubuntu-latest
@@ -36,7 +36,7 @@ jobs:
       - name: golint
         uses: Jerome1337/golint-action@v1.0.2
         with:
-          golint-path: './...'
+          golint-path: './internal/...'
       - name: Setup Go
         uses: actions/setup-go@v1
         with:

diff --git a/Makefile b/Makefile
@@ -56,7 +56,7 @@ uninstall-demo-brpc:
 	bash demo/uninstall-demo.sh brpc
 test: style-check
 	$(GOMOD) tidy
-	$(GOTEST) -race  `go list ./pkg/... ./plugin/... | grep -v e2e`
+	$(GOTEST) -race  `go list ./internal/... | grep -v e2e`
 build: test
 	CGO_ENABLED=0 GOOS=$(IMAGE_OS) GOARCH=$(IMAGE_ARCH) $(GOBUILD) -o $(OUT)/$(IMAGE_ARCH)/$(IMAGE_OS)/$(IMAGE_NAME) $(MAIN_PATH)
 docker-build: build
@@ -72,10 +72,10 @@ cross_build_images:
 clean:
 	rm -rf $(OUT)
 style-check:
-	gofmt -l -d ./pkg ./plugin
-	goimports -l -d ./pkg ./plugin
+	gofmt -l -d ./internal
+	goimports -l -d ./internal
 lint:
-	golint ./pkg/... ./plugin/...
+	golint ./internal/...
 	golangci-lint run --tests="false"
 e2e-dubbo:
 	go test -v github.com/aeraki-mesh/aeraki/test/e2e/dubbo/...

diff --git a/cmd/aeraki/main.go b/cmd/aeraki/main.go
@@ -23,14 +23,14 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/aeraki-mesh/aeraki/pkg/bootstrap"
-	"github.com/aeraki-mesh/aeraki/pkg/config/constants"
-	"github.com/aeraki-mesh/aeraki/pkg/envoyfilter"
-	"github.com/aeraki-mesh/aeraki/pkg/model/protocol"
-	"github.com/aeraki-mesh/aeraki/plugin/kafka"
-	"github.com/aeraki-mesh/aeraki/plugin/metaprotocol"
-	"github.com/aeraki-mesh/aeraki/plugin/thrift"
-	"github.com/aeraki-mesh/aeraki/plugin/zookeeper"
+	"github.com/aeraki-mesh/aeraki/internal/bootstrap"
+	"github.com/aeraki-mesh/aeraki/internal/config/constants"
+	"github.com/aeraki-mesh/aeraki/internal/envoyfilter"
+	"github.com/aeraki-mesh/aeraki/internal/model/protocol"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/kafka"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/metaprotocol"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/thrift"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/zookeeper"
 
 	"istio.io/pkg/log"
 )

diff --git a/pkg/bootstrap/aeraki_ca.go → internal/bootstrap/aeraki_ca.go b/pkg/bootstrap/aeraki_ca.go → internal/bootstrap/aeraki_ca.go
@@ -17,7 +17,7 @@ package bootstrap
 import (
 	"crypto/tls"
 
-	"github.com/aeraki-mesh/aeraki/pkg/ca"
+	"github.com/aeraki-mesh/aeraki/internal/ca"
 )
 
 func (s *Server) initRootCA() error {

diff --git a/pkg/bootstrap/mesh_config.go → internal/bootstrap/mesh_config.go b/pkg/bootstrap/mesh_config.go → internal/bootstrap/mesh_config.go
diff --git a/pkg/bootstrap/options.go → internal/bootstrap/options.go b/pkg/bootstrap/options.go → internal/bootstrap/options.go
@@ -15,8 +15,8 @@
 package bootstrap
 
 import (
-	"github.com/aeraki-mesh/aeraki/pkg/envoyfilter"
-	"github.com/aeraki-mesh/aeraki/pkg/model/protocol"
+	"github.com/aeraki-mesh/aeraki/internal/envoyfilter"
+	"github.com/aeraki-mesh/aeraki/internal/model/protocol"
 )
 
 // AerakiArgs provides all of the configuration parameters for the Aeraki service.

diff --git a/pkg/bootstrap/server.go → internal/bootstrap/server.go b/pkg/bootstrap/server.go → internal/bootstrap/server.go
@@ -46,15 +46,15 @@ import (
 
 	aerakischeme "github.com/aeraki-mesh/client-go/pkg/clientset/versioned/scheme"
 
-	"github.com/aeraki-mesh/aeraki/pkg/controller/istio"
-	"github.com/aeraki-mesh/aeraki/pkg/controller/kube"
-	"github.com/aeraki-mesh/aeraki/pkg/envoyfilter"
-	"github.com/aeraki-mesh/aeraki/pkg/leaderelection"
-	"github.com/aeraki-mesh/aeraki/pkg/model/protocol"
-	"github.com/aeraki-mesh/aeraki/pkg/util"
-	"github.com/aeraki-mesh/aeraki/pkg/xds"
-	"github.com/aeraki-mesh/aeraki/plugin/dubbo"
-	"github.com/aeraki-mesh/aeraki/plugin/redis"
+	"github.com/aeraki-mesh/aeraki/internal/controller/istio"
+	"github.com/aeraki-mesh/aeraki/internal/controller/kube"
+	"github.com/aeraki-mesh/aeraki/internal/envoyfilter"
+	"github.com/aeraki-mesh/aeraki/internal/leaderelection"
+	"github.com/aeraki-mesh/aeraki/internal/model/protocol"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/dubbo"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/redis"
+	"github.com/aeraki-mesh/aeraki/internal/util"
+	"github.com/aeraki-mesh/aeraki/internal/xds"
 )
 
 var (

diff --git a/pkg/bootstrap/validation.go → internal/bootstrap/validation.go b/pkg/bootstrap/validation.go → internal/bootstrap/validation.go
@@ -17,8 +17,8 @@ package bootstrap
 import (
 	"istio.io/pkg/log"
 
-	"github.com/aeraki-mesh/aeraki/pkg/webhook/validation/scheme"
-	"github.com/aeraki-mesh/aeraki/pkg/webhook/validation/server"
+	"github.com/aeraki-mesh/aeraki/internal/webhook/validation/scheme"
+	"github.com/aeraki-mesh/aeraki/internal/webhook/validation/server"
 )
 
 func (s *Server) initConfigValidation(args *AerakiArgs) error {

diff --git a/pkg/bootstrap/webhook.go → internal/bootstrap/webhook.go b/pkg/bootstrap/webhook.go → internal/bootstrap/webhook.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/aeraki-mesh/aeraki/pkg/webhook/validation"
+	"github.com/aeraki-mesh/aeraki/internal/webhook/validation"
 )
 
 // initSSecureWebhookServer handles initialization for the HTTPS webhook server.

diff --git a/pkg/ca/certificate.go → internal/ca/certificate.go b/pkg/ca/certificate.go → internal/ca/certificate.go
diff --git a/pkg/ca/istio_ca.go → internal/ca/istio_ca.go b/pkg/ca/istio_ca.go → internal/ca/istio_ca.go
diff --git a/pkg/config/constants/constants.go → internal/config/constants/constants.go b/pkg/config/constants/constants.go → internal/config/constants/constants.go
diff --git a/pkg/controller/istio/controller.go → internal/controller/istio/controller.go b/pkg/controller/istio/controller.go → internal/controller/istio/controller.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 
 	"istio.io/istio/pkg/security"
 
@@ -36,7 +36,7 @@ import (
 	citadel "istio.io/istio/security/pkg/nodeagent/caclient/providers/citadel"
 	"istio.io/pkg/log"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model/protocol"
+	"github.com/aeraki-mesh/aeraki/internal/model/protocol"
 )
 
 const (

diff --git a/pkg/controller/kube/dubbo.go → internal/controller/kube/dubbo.go b/pkg/controller/kube/dubbo.go → internal/controller/kube/dubbo.go
diff --git a/pkg/controller/kube/manager.go → internal/controller/kube/manager.go b/pkg/controller/kube/manager.go → internal/controller/kube/manager.go
diff --git a/pkg/controller/kube/metaprotocol.go → internal/controller/kube/metaprotocol.go b/pkg/controller/kube/metaprotocol.go → internal/controller/kube/metaprotocol.go
@@ -20,7 +20,7 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	metaprotocolmodel "github.com/aeraki-mesh/aeraki/pkg/model/metaprotocol"
+	metaprotocolmodel "github.com/aeraki-mesh/aeraki/internal/model/metaprotocol"
 
 	"istio.io/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/controller"

diff --git a/pkg/controller/kube/metarouter.go → internal/controller/kube/metarouter.go b/pkg/controller/kube/metarouter.go → internal/controller/kube/metarouter.go
diff --git a/pkg/controller/kube/namesapce.go → internal/controller/kube/namesapce.go b/pkg/controller/kube/namesapce.go → internal/controller/kube/namesapce.go
@@ -20,7 +20,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 
-	"github.com/aeraki-mesh/aeraki/pkg/config/constants"
+	"github.com/aeraki-mesh/aeraki/internal/config/constants"
 
 	"istio.io/pkg/log"
 	v1 "k8s.io/api/core/v1"

diff --git a/pkg/controller/kube/redis.go → internal/controller/kube/redis.go b/pkg/controller/kube/redis.go → internal/controller/kube/redis.go
diff --git a/pkg/controller/kube/serviceentry.go → internal/controller/kube/serviceentry.go b/pkg/controller/kube/serviceentry.go → internal/controller/kube/serviceentry.go
@@ -22,8 +22,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 
-	"github.com/aeraki-mesh/aeraki/pkg/config/constants"
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/config/constants"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 
 	istionapi "istio.io/api/networking/v1alpha3"
 	networking "istio.io/client-go/pkg/apis/networking/v1alpha3"

diff --git a/pkg/controller/kube/serviceetnry_test.go → ...rnal/controller/kube/serviceetnry_test.go b/pkg/controller/kube/serviceetnry_test.go → ...rnal/controller/kube/serviceetnry_test.go
diff --git a/...ntroller/kube/sidecar_bootstrap_config.go → ...ntroller/kube/sidecar_bootstrap_config.go b/...ntroller/kube/sidecar_bootstrap_config.go → ...ntroller/kube/sidecar_bootstrap_config.go
diff --git a/pkg/envoyfilter/controller.go → internal/envoyfilter/controller.go b/pkg/envoyfilter/controller.go → internal/envoyfilter/controller.go
@@ -37,9 +37,9 @@ import (
 	"github.com/aeraki-mesh/api/metaprotocol/v1alpha1"
 	metaprotocol "github.com/aeraki-mesh/client-go/pkg/apis/metaprotocol/v1alpha1"
 
-	"github.com/aeraki-mesh/aeraki/pkg/config/constants"
-	"github.com/aeraki-mesh/aeraki/pkg/model"
-	"github.com/aeraki-mesh/aeraki/pkg/model/protocol"
+	"github.com/aeraki-mesh/aeraki/internal/config/constants"
+	"github.com/aeraki-mesh/aeraki/internal/model"
+	"github.com/aeraki-mesh/aeraki/internal/model/protocol"
 )
 
 const (

diff --git a/pkg/envoyfilter/generator.go → internal/envoyfilter/generator.go b/pkg/envoyfilter/generator.go → internal/envoyfilter/generator.go
@@ -15,7 +15,7 @@
 package envoyfilter
 
 import (
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 // Generator generates protocol specified envoyfilters

diff --git a/pkg/envoyfilter/network_filter.go → internal/envoyfilter/network_filter.go b/pkg/envoyfilter/network_filter.go → internal/envoyfilter/network_filter.go
@@ -29,7 +29,7 @@ import (
 	networking "istio.io/api/networking/v1alpha3"
 	"istio.io/pkg/log"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 var generatorLog = log.RegisterScope("aeraki-generator", "aeraki generator", 0)

diff --git a/pkg/envoyfilter/network_filter_test.go → internal/envoyfilter/network_filter_test.go b/pkg/envoyfilter/network_filter_test.go → internal/envoyfilter/network_filter_test.go
@@ -22,7 +22,7 @@ import (
 
 	networking "istio.io/api/networking/v1alpha3"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 func Test_inboudEnvoyFilterWorkloadSelector(t *testing.T) {

diff --git a/pkg/leaderelection/leaderelection.go → internal/leaderelection/leaderelection.go b/pkg/leaderelection/leaderelection.go → internal/leaderelection/leaderelection.go
diff --git a/pkg/leaderelection/leaderelection_test.go → ...nal/leaderelection/leaderelection_test.go b/pkg/leaderelection/leaderelection_test.go → ...nal/leaderelection/leaderelection_test.go
diff --git a/pkg/model/config.go → internal/model/config.go b/pkg/model/config.go → internal/model/config.go
diff --git a/...odel/metaprotocol/application_protocol.go → ...odel/metaprotocol/application_protocol.go b/...odel/metaprotocol/application_protocol.go → ...odel/metaprotocol/application_protocol.go
diff --git a/pkg/model/protocol/instance.go → internal/model/protocol/instance.go b/pkg/model/protocol/instance.go → internal/model/protocol/instance.go
diff --git a/pkg/model/protocol/instance_test.go → internal/model/protocol/instance_test.go b/pkg/model/protocol/instance_test.go → internal/model/protocol/instance_test.go
@@ -17,7 +17,7 @@ package protocol_test
 import (
 	"testing"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model/protocol"
+	"github.com/aeraki-mesh/aeraki/internal/model/protocol"
 )
 
 func Test_getLayer7ProtocolFromPortName(t *testing.T) {

diff --git a/pkg/model/utils.go → internal/model/utils.go b/pkg/model/utils.go → internal/model/utils.go
diff --git a/plugin/dubbo/authz/builder/builder.go → ...nal/plugin/dubbo/authz/builder/builder.go b/plugin/dubbo/authz/builder/builder.go → ...nal/plugin/dubbo/authz/builder/builder.go
@@ -32,7 +32,7 @@ import (
 	"istio.io/istio/pilot/pkg/security/trustdomain"
 	"istio.io/pkg/log"
 
-	authzmodel "github.com/aeraki-mesh/aeraki/plugin/dubbo/authz/model"
+	authzmodel "github.com/aeraki-mesh/aeraki/internal/plugin/dubbo/authz/model"
 )
 
 var (

diff --git a/plugin/dubbo/authz/matcher/cidr.go → internal/plugin/dubbo/authz/matcher/cidr.go b/plugin/dubbo/authz/matcher/cidr.go → internal/plugin/dubbo/authz/matcher/cidr.go
diff --git a/plugin/dubbo/authz/matcher/cidr_test.go → ...l/plugin/dubbo/authz/matcher/cidr_test.go b/plugin/dubbo/authz/matcher/cidr_test.go → ...l/plugin/dubbo/authz/matcher/cidr_test.go
diff --git a/plugin/dubbo/authz/matcher/header.go → ...rnal/plugin/dubbo/authz/matcher/header.go b/plugin/dubbo/authz/matcher/header.go → ...rnal/plugin/dubbo/authz/matcher/header.go
diff --git a/plugin/dubbo/authz/matcher/header_test.go → ...plugin/dubbo/authz/matcher/header_test.go b/plugin/dubbo/authz/matcher/header_test.go → ...plugin/dubbo/authz/matcher/header_test.go
diff --git a/plugin/dubbo/authz/matcher/metadata.go → ...al/plugin/dubbo/authz/matcher/metadata.go b/plugin/dubbo/authz/matcher/metadata.go → ...al/plugin/dubbo/authz/matcher/metadata.go
diff --git a/plugin/dubbo/authz/matcher/metadata_test.go → ...ugin/dubbo/authz/matcher/metadata_test.go b/plugin/dubbo/authz/matcher/metadata_test.go → ...ugin/dubbo/authz/matcher/metadata_test.go
diff --git a/plugin/dubbo/authz/matcher/string.go → ...rnal/plugin/dubbo/authz/matcher/string.go b/plugin/dubbo/authz/matcher/string.go → ...rnal/plugin/dubbo/authz/matcher/string.go
diff --git a/plugin/dubbo/authz/matcher/string_test.go → ...plugin/dubbo/authz/matcher/string_test.go b/plugin/dubbo/authz/matcher/string_test.go → ...plugin/dubbo/authz/matcher/string_test.go
diff --git a/plugin/dubbo/authz/model/generator.go → ...nal/plugin/dubbo/authz/model/generator.go b/plugin/dubbo/authz/model/generator.go → ...nal/plugin/dubbo/authz/model/generator.go
@@ -22,7 +22,7 @@ import (
 
 	"istio.io/istio/pkg/spiffe"
 
-	"github.com/aeraki-mesh/aeraki/plugin/dubbo/authz/matcher"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/dubbo/authz/matcher"
 )
 
 type generator interface {

diff --git a/plugin/dubbo/authz/model/model.go → internal/plugin/dubbo/authz/model/model.go b/plugin/dubbo/authz/model/model.go → internal/plugin/dubbo/authz/model/model.go
diff --git a/plugin/dubbo/authz/model/permission.go → ...al/plugin/dubbo/authz/model/permission.go b/plugin/dubbo/authz/model/permission.go → ...al/plugin/dubbo/authz/model/permission.go
diff --git a/plugin/dubbo/authz/model/principal.go → ...nal/plugin/dubbo/authz/model/principal.go b/plugin/dubbo/authz/model/principal.go → ...nal/plugin/dubbo/authz/model/principal.go
diff --git a/plugin/dubbo/dubboproxy.go → internal/plugin/dubbo/dubboproxy.go b/plugin/dubbo/dubboproxy.go → internal/plugin/dubbo/dubboproxy.go
@@ -21,8 +21,8 @@ import (
 
 	dubbov1alpha1 "github.com/aeraki-mesh/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
-	"github.com/aeraki-mesh/aeraki/plugin/dubbo/authz/builder"
+	"github.com/aeraki-mesh/aeraki/internal/model"
+	"github.com/aeraki-mesh/aeraki/internal/plugin/dubbo/authz/builder"
 )
 
 func buildOutboundProxy(context *model.EnvoyFilterContext) *dubbo.DubboProxy {

diff --git a/plugin/dubbo/generator.go → internal/plugin/dubbo/generator.go b/plugin/dubbo/generator.go → internal/plugin/dubbo/generator.go
@@ -22,8 +22,8 @@ import (
 
 	"istio.io/pkg/log"
 
-	"github.com/aeraki-mesh/aeraki/pkg/envoyfilter"
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/envoyfilter"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 var generatorLog = log.RegisterScope("dubbo-generator", "dubbo generator", 0)

diff --git a/plugin/dubbo/route.go → internal/plugin/dubbo/route.go b/plugin/dubbo/route.go → internal/plugin/dubbo/route.go
@@ -23,7 +23,7 @@ import (
 	"github.com/golang/protobuf/ptypes/wrappers"
 	networking "istio.io/api/networking/v1alpha3"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 var (

diff --git a/plugin/kafka/generator.go → internal/plugin/kafka/generator.go b/plugin/kafka/generator.go → internal/plugin/kafka/generator.go
@@ -15,8 +15,8 @@
 package kafka
 
 import (
-	"github.com/aeraki-mesh/aeraki/pkg/envoyfilter"
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/envoyfilter"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 // Generator defines a kafka envoyfilter Generator

diff --git a/plugin/kafka/kafkafilter.go → internal/plugin/kafka/kafkafilter.go b/plugin/kafka/kafkafilter.go → internal/plugin/kafka/kafkafilter.go
@@ -17,7 +17,7 @@ package kafka
 import (
 	kafka "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/kafka_broker/v3"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 func buildOutboundProxy(context *model.EnvoyFilterContext) *kafka.KafkaBroker {

diff --git a/plugin/metaprotocol/accesslog.go → internal/plugin/metaprotocol/accesslog.go b/plugin/metaprotocol/accesslog.go → internal/plugin/metaprotocol/accesslog.go
@@ -19,7 +19,7 @@ import (
 	"istio.io/istio/pkg/util/protomarshal"
 	"istio.io/pkg/log"
 
-	"github.com/aeraki-mesh/aeraki/pkg/util/protoconv"
+	"github.com/aeraki-mesh/aeraki/internal/util/protoconv"
 
 	accesslog "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3"
 	envoyconfig "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"

diff --git a/plugin/metaprotocol/filters.go → internal/plugin/metaprotocol/filters.go b/plugin/metaprotocol/filters.go → internal/plugin/metaprotocol/filters.go
@@ -36,7 +36,7 @@ import (
 	userapi "github.com/aeraki-mesh/api/metaprotocol/v1alpha1"
 	mpclient "github.com/aeraki-mesh/client-go/pkg/apis/metaprotocol/v1alpha1"
 
-	"github.com/aeraki-mesh/aeraki/pkg/xds"
+	"github.com/aeraki-mesh/aeraki/internal/xds"
 )
 
 func buildOutboundFilters(host string) []*mpdataplane.MetaProtocolFilter {

diff --git a/plugin/metaprotocol/generator.go → internal/plugin/metaprotocol/generator.go b/plugin/metaprotocol/generator.go → internal/plugin/metaprotocol/generator.go
@@ -20,9 +20,9 @@ import (
 	istionetworking "istio.io/api/networking/v1alpha3"
 	"istio.io/pkg/log"
 
-	"github.com/aeraki-mesh/aeraki/pkg/envoyfilter"
-	"github.com/aeraki-mesh/aeraki/pkg/model"
-	"github.com/aeraki-mesh/aeraki/pkg/model/protocol"
+	"github.com/aeraki-mesh/aeraki/internal/envoyfilter"
+	"github.com/aeraki-mesh/aeraki/internal/model"
+	"github.com/aeraki-mesh/aeraki/internal/model/protocol"
 )
 
 var generatorLog = log.RegisterScope("metaprotocol-generator", "metaprotocol generator", 0)

diff --git a/plugin/metaprotocol/metaprotocolproxy.go → .../plugin/metaprotocol/metaprotocolproxy.go b/plugin/metaprotocol/metaprotocolproxy.go → .../plugin/metaprotocol/metaprotocolproxy.go
@@ -21,8 +21,8 @@ import (
 	envoytype "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	istionetworking "istio.io/api/networking/v1alpha3"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
-	metaprotocolmodel "github.com/aeraki-mesh/aeraki/pkg/model/metaprotocol"
+	"github.com/aeraki-mesh/aeraki/internal/model"
+	metaprotocolmodel "github.com/aeraki-mesh/aeraki/internal/model/metaprotocol"
 )
 
 const (

diff --git a/plugin/metaprotocol/route.go → internal/plugin/metaprotocol/route.go b/plugin/metaprotocol/route.go → internal/plugin/metaprotocol/route.go
@@ -19,7 +19,7 @@ import (
 
 	metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/config/route/v1alpha"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 func buildInboundRouteConfig(context *model.EnvoyFilterContext,

diff --git a/plugin/redis/generator.go → internal/plugin/redis/generator.go b/plugin/redis/generator.go → internal/plugin/redis/generator.go
@@ -38,8 +38,8 @@ import (
 	"istio.io/pkg/log"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
-	"github.com/aeraki-mesh/aeraki/pkg/envoyfilter"
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/envoyfilter"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 var generatorLog = log.RegisterScope("redis-generator", "redis generator", 0)

diff --git a/plugin/redis/inbound.go → internal/plugin/redis/inbound.go b/plugin/redis/inbound.go → internal/plugin/redis/inbound.go
@@ -17,7 +17,7 @@ package redis
 import (
 	redis "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/redis_proxy/v3"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 func (g *Generator) buildInboundProxy(context *model.EnvoyFilterContext) *redis.RedisProxy {

diff --git a/plugin/redis/outbound.go → internal/plugin/redis/outbound.go b/plugin/redis/outbound.go → internal/plugin/redis/outbound.go
@@ -32,7 +32,7 @@ import (
 
 	"github.com/aeraki-mesh/client-go/pkg/apis/redis/v1alpha1"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 
 	redis "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/redis_proxy/v3"
 )

diff --git a/plugin/redis/outboundcluster.go → internal/plugin/redis/outboundcluster.go b/plugin/redis/outboundcluster.go → internal/plugin/redis/outboundcluster.go
@@ -37,7 +37,7 @@ import (
 	endpoint "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	redis "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/redis_proxy/v3"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 // nolint: funlen,gocyclo

diff --git a/plugin/redis/util.go → internal/plugin/redis/util.go b/plugin/redis/util.go → internal/plugin/redis/util.go
@@ -28,7 +28,7 @@ import (
 
 	spec "github.com/aeraki-mesh/api/redis/v1alpha1"
 
-	"github.com/aeraki-mesh/aeraki/pkg/model"
+	"github.com/aeraki-mesh/aeraki/internal/model"
 )
 
 func getOrCreateIstioMetadata(cluster *cluster.Cluster) *structpb.Struct {