diff --git a/Makefile b/Makefile index 99a547f..c1cc165 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ install: install -m 0755 -d $(DESTDIR)$(BINDIR) install -m 0755 -d $(DESTDIR)$(CONFDIR) install -m 0755 ./frontier $(DESTDIR)$(BINDIR) - install -m 0755 ./pkg/config/frontier.yaml $(DESTDIR)$(CONFDIR) + install -m 0755 ./pkg/frontier/config/frontier.yaml $(DESTDIR)$(CONFDIR) .PHONY: image image: diff --git a/api/dataplane/v1/service/service_end.go b/api/dataplane/v1/service/service_end.go index 9451048..7368006 100644 --- a/api/dataplane/v1/service/service_end.go +++ b/api/dataplane/v1/service/service_end.go @@ -6,7 +6,7 @@ import ( "encoding/json" "strconv" - "github.com/singchia/frontier/pkg/apis" + "github.com/singchia/frontier/pkg/frontier/apis" "github.com/singchia/geminio" "github.com/singchia/geminio/client" "github.com/singchia/geminio/options" diff --git a/cmd/frontier/main.go b/cmd/frontier/main.go index d06761f..4cd7e14 100644 --- a/cmd/frontier/main.go +++ b/cmd/frontier/main.go @@ -7,11 +7,11 @@ import ( "runtime" "github.com/jumboframes/armorigo/sigaction" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/mq" - "github.com/singchia/frontier/pkg/repo" - "github.com/singchia/frontier/pkg/server" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/mq" + "github.com/singchia/frontier/pkg/frontier/repo" + "github.com/singchia/frontier/pkg/frontier/server" "github.com/singchia/frontier/pkg/utils" "k8s.io/klog/v2" ) diff --git a/images/Dockerfile.controlplane-swagger b/images/Dockerfile.controlplane-swagger index 3f218c3..1a98b12 100644 --- a/images/Dockerfile.controlplane-swagger +++ b/images/Dockerfile.controlplane-swagger @@ -3,4 +3,4 @@ FROM golang:1.18-alpine RUN go install github.com/swaggo/swag/cmd/swag@latest WORKDIR /frontier -CMD swag init -g pkg/controlplane/service/cp_service.go --output docs/swagger/ \ No newline at end of file +CMD swag init -g pkg/frontier/controlplane/service/cp_service.go --output docs/swagger/ \ No newline at end of file diff --git a/pkg/apis/error.go b/pkg/frontier/apis/error.go similarity index 100% rename from pkg/apis/error.go rename to pkg/frontier/apis/error.go diff --git a/pkg/apis/interface.go b/pkg/frontier/apis/interface.go similarity index 97% rename from pkg/apis/interface.go rename to pkg/frontier/apis/interface.go index 74f92cd..d6804e6 100644 --- a/pkg/apis/interface.go +++ b/pkg/frontier/apis/interface.go @@ -3,8 +3,8 @@ package apis import ( "net" - "github.com/singchia/frontier/pkg/repo/dao" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/repo/dao" + "github.com/singchia/frontier/pkg/frontier/repo/model" "github.com/singchia/geminio" ) diff --git a/pkg/apis/proto.go b/pkg/frontier/apis/proto.go similarity index 100% rename from pkg/apis/proto.go rename to pkg/frontier/apis/proto.go diff --git a/pkg/config/config.go b/pkg/frontier/config/config.go similarity index 100% rename from pkg/config/config.go rename to pkg/frontier/config/config.go diff --git a/pkg/config/config.yaml b/pkg/frontier/config/config.yaml similarity index 100% rename from pkg/config/config.yaml rename to pkg/frontier/config/config.yaml diff --git a/pkg/config/config_test.go b/pkg/frontier/config/config_test.go similarity index 100% rename from pkg/config/config_test.go rename to pkg/frontier/config/config_test.go diff --git a/pkg/controlplane/controlplane.go b/pkg/frontier/controlplane/controlplane.go similarity index 92% rename from pkg/controlplane/controlplane.go rename to pkg/frontier/controlplane/controlplane.go index 53eb6ee..7d7c91c 100644 --- a/pkg/controlplane/controlplane.go +++ b/pkg/frontier/controlplane/controlplane.go @@ -7,10 +7,10 @@ import ( "os" "github.com/go-kratos/kratos/v2" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/controlplane/server" - "github.com/singchia/frontier/pkg/controlplane/service" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/controlplane/server" + "github.com/singchia/frontier/pkg/frontier/controlplane/service" "github.com/singchia/frontier/pkg/security" "github.com/soheilhy/cmux" "k8s.io/klog/v2" diff --git a/pkg/controlplane/server/grpc.go b/pkg/frontier/controlplane/server/grpc.go similarity index 100% rename from pkg/controlplane/server/grpc.go rename to pkg/frontier/controlplane/server/grpc.go diff --git a/pkg/controlplane/server/rest.go b/pkg/frontier/controlplane/server/rest.go similarity index 100% rename from pkg/controlplane/server/rest.go rename to pkg/frontier/controlplane/server/rest.go diff --git a/pkg/controlplane/service/cp_service.go b/pkg/frontier/controlplane/service/cp_service.go similarity index 98% rename from pkg/controlplane/service/cp_service.go rename to pkg/frontier/controlplane/service/cp_service.go index d8d3a1b..e6ff799 100644 --- a/pkg/controlplane/service/cp_service.go +++ b/pkg/frontier/controlplane/service/cp_service.go @@ -4,7 +4,7 @@ import ( "context" v1 "github.com/singchia/frontier/api/controlplane/v1" - "github.com/singchia/frontier/pkg/apis" + "github.com/singchia/frontier/pkg/frontier/apis" ) // @title Frontier Swagger API diff --git a/pkg/controlplane/service/edge_service.go b/pkg/frontier/controlplane/service/edge_service.go similarity index 96% rename from pkg/controlplane/service/edge_service.go rename to pkg/frontier/controlplane/service/edge_service.go index 3108789..f2dcd4a 100644 --- a/pkg/controlplane/service/edge_service.go +++ b/pkg/frontier/controlplane/service/edge_service.go @@ -4,8 +4,8 @@ import ( "context" v1 "github.com/singchia/frontier/api/controlplane/v1" - "github.com/singchia/frontier/pkg/repo/dao" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/repo/dao" + "github.com/singchia/frontier/pkg/frontier/repo/model" ) func (cps *ControlPlaneService) listEdges(_ context.Context, req *v1.ListEdgesRequest) (*v1.ListEdgesResponse, error) { diff --git a/pkg/controlplane/service/service_service.go b/pkg/frontier/controlplane/service/service_service.go similarity index 97% rename from pkg/controlplane/service/service_service.go rename to pkg/frontier/controlplane/service/service_service.go index f62a98d..e1cab42 100644 --- a/pkg/controlplane/service/service_service.go +++ b/pkg/frontier/controlplane/service/service_service.go @@ -4,8 +4,8 @@ import ( "context" v1 "github.com/singchia/frontier/api/controlplane/v1" - "github.com/singchia/frontier/pkg/repo/dao" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/repo/dao" + "github.com/singchia/frontier/pkg/frontier/repo/model" ) func (cps *ControlPlaneService) listServices(_ context.Context, req *v1.ListServicesRequest) (*v1.ListServicesResponse, error) { diff --git a/pkg/edgebound/edge_dataplane.go b/pkg/frontier/edgebound/edge_dataplane.go similarity index 100% rename from pkg/edgebound/edge_dataplane.go rename to pkg/frontier/edgebound/edge_dataplane.go diff --git a/pkg/edgebound/edge_dataplane_test.go b/pkg/frontier/edgebound/edge_dataplane_test.go similarity index 92% rename from pkg/edgebound/edge_dataplane_test.go rename to pkg/frontier/edgebound/edge_dataplane_test.go index 78a55c5..5b2769b 100644 --- a/pkg/edgebound/edge_dataplane_test.go +++ b/pkg/frontier/edgebound/edge_dataplane_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/singchia/frontier/api/dataplane/v1/edge" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/repo/dao" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/dao" "github.com/singchia/go-timer/v2" ) diff --git a/pkg/edgebound/edge_manager.go b/pkg/frontier/edgebound/edge_manager.go similarity index 98% rename from pkg/edgebound/edge_manager.go rename to pkg/frontier/edgebound/edge_manager.go index dc761b5..af12c91 100644 --- a/pkg/edgebound/edge_manager.go +++ b/pkg/frontier/edgebound/edge_manager.go @@ -12,8 +12,8 @@ import ( "github.com/jumboframes/armorigo/log" "github.com/jumboframes/armorigo/rproxy" "github.com/jumboframes/armorigo/synchub" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" "github.com/singchia/frontier/pkg/mapmap" "github.com/singchia/frontier/pkg/security" "github.com/singchia/frontier/pkg/utils" diff --git a/pkg/edgebound/edge_manager_test.go b/pkg/frontier/edgebound/edge_manager_test.go similarity index 92% rename from pkg/edgebound/edge_manager_test.go rename to pkg/frontier/edgebound/edge_manager_test.go index d6d7178..aa8e461 100644 --- a/pkg/edgebound/edge_manager_test.go +++ b/pkg/frontier/edgebound/edge_manager_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/singchia/frontier/api/dataplane/v1/edge" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/repo/dao" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/dao" "github.com/singchia/go-timer/v2" ) diff --git a/pkg/edgebound/edge_onoff.go b/pkg/frontier/edgebound/edge_onoff.go similarity index 96% rename from pkg/edgebound/edge_onoff.go rename to pkg/frontier/edgebound/edge_onoff.go index 8455d84..814842e 100644 --- a/pkg/edgebound/edge_onoff.go +++ b/pkg/frontier/edgebound/edge_onoff.go @@ -6,9 +6,9 @@ import ( "time" "github.com/jumboframes/armorigo/synchub" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/repo/dao" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/repo/dao" + "github.com/singchia/frontier/pkg/frontier/repo/model" "github.com/singchia/geminio" "github.com/singchia/geminio/delegate" "k8s.io/klog/v2" diff --git a/pkg/exchange/exchange.go b/pkg/frontier/exchange/exchange.go similarity index 85% rename from pkg/exchange/exchange.go rename to pkg/frontier/exchange/exchange.go index f853409..7183960 100644 --- a/pkg/exchange/exchange.go +++ b/pkg/frontier/exchange/exchange.go @@ -1,8 +1,8 @@ package exchange import ( - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" ) type exchange struct { diff --git a/pkg/exchange/forward.go b/pkg/frontier/exchange/forward.go similarity index 99% rename from pkg/exchange/forward.go rename to pkg/frontier/exchange/forward.go index afd4a8c..4f536eb 100644 --- a/pkg/exchange/forward.go +++ b/pkg/frontier/exchange/forward.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "io" - "github.com/singchia/frontier/pkg/apis" + "github.com/singchia/frontier/pkg/frontier/apis" "github.com/singchia/geminio" "github.com/singchia/geminio/options" "k8s.io/klog/v2" diff --git a/pkg/exchange/oob.go b/pkg/frontier/exchange/oob.go similarity index 98% rename from pkg/exchange/oob.go rename to pkg/frontier/exchange/oob.go index 1431ed8..15b6dc8 100644 --- a/pkg/exchange/oob.go +++ b/pkg/frontier/exchange/oob.go @@ -6,7 +6,7 @@ import ( "encoding/json" "net" - "github.com/singchia/frontier/pkg/apis" + "github.com/singchia/frontier/pkg/frontier/apis" "k8s.io/klog/v2" ) diff --git a/pkg/exchange/stream.go b/pkg/frontier/exchange/stream.go similarity index 100% rename from pkg/exchange/stream.go rename to pkg/frontier/exchange/stream.go diff --git a/pkg/mq/mq_amqp.go b/pkg/frontier/mq/mq_amqp.go similarity index 97% rename from pkg/mq/mq_amqp.go rename to pkg/frontier/mq/mq_amqp.go index aec5484..c50d738 100644 --- a/pkg/mq/mq_amqp.go +++ b/pkg/frontier/mq/mq_amqp.go @@ -6,8 +6,8 @@ import ( "github.com/google/uuid" amqp "github.com/rabbitmq/amqp091-go" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" "k8s.io/klog/v2" ) diff --git a/pkg/mq/mq_kafka.go b/pkg/frontier/mq/mq_kafka.go similarity index 97% rename from pkg/mq/mq_kafka.go rename to pkg/frontier/mq/mq_kafka.go index ab4954b..8d7ad0a 100644 --- a/pkg/mq/mq_kafka.go +++ b/pkg/frontier/mq/mq_kafka.go @@ -4,8 +4,8 @@ import ( "time" "github.com/IBM/sarama" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" "github.com/singchia/geminio" "k8s.io/klog/v2" ) diff --git a/pkg/mq/mq_manager.go b/pkg/frontier/mq/mq_manager.go similarity index 97% rename from pkg/mq/mq_manager.go rename to pkg/frontier/mq/mq_manager.go index c6e8ff6..c416376 100644 --- a/pkg/mq/mq_manager.go +++ b/pkg/frontier/mq/mq_manager.go @@ -4,8 +4,8 @@ import ( "sync" "sync/atomic" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" "github.com/singchia/geminio" "k8s.io/klog/v2" ) diff --git a/pkg/mq/mq_nats.go b/pkg/frontier/mq/mq_nats.go similarity index 94% rename from pkg/mq/mq_nats.go rename to pkg/frontier/mq/mq_nats.go index 014a9c2..f0b6b30 100644 --- a/pkg/mq/mq_nats.go +++ b/pkg/frontier/mq/mq_nats.go @@ -6,8 +6,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" "k8s.io/klog/v2" ) diff --git a/pkg/mq/mq_nsq.go b/pkg/frontier/mq/mq_nsq.go similarity index 87% rename from pkg/mq/mq_nsq.go rename to pkg/frontier/mq/mq_nsq.go index 44a8515..0bdc24f 100644 --- a/pkg/mq/mq_nsq.go +++ b/pkg/frontier/mq/mq_nsq.go @@ -2,8 +2,8 @@ package mq import ( "github.com/nsqio/go-nsq" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" ) type mqNSQ struct { diff --git a/pkg/mq/mq_redis.go b/pkg/frontier/mq/mq_redis.go similarity index 89% rename from pkg/mq/mq_redis.go rename to pkg/frontier/mq/mq_redis.go index d699ce4..6e7335a 100644 --- a/pkg/mq/mq_redis.go +++ b/pkg/frontier/mq/mq_redis.go @@ -4,8 +4,8 @@ import ( "context" "github.com/redis/go-redis/v9" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" ) type mqRedis struct { diff --git a/pkg/mq/mq_service.go b/pkg/frontier/mq/mq_service.go similarity index 95% rename from pkg/mq/mq_service.go rename to pkg/frontier/mq/mq_service.go index 4cbe900..4c61826 100644 --- a/pkg/mq/mq_service.go +++ b/pkg/frontier/mq/mq_service.go @@ -4,7 +4,7 @@ import ( "context" "encoding/binary" - "github.com/singchia/frontier/pkg/apis" + "github.com/singchia/frontier/pkg/frontier/apis" "github.com/singchia/geminio" "github.com/singchia/geminio/options" "k8s.io/klog/v2" diff --git a/pkg/repo/dao/dao.go b/pkg/frontier/repo/dao/dao.go similarity index 93% rename from pkg/repo/dao/dao.go rename to pkg/frontier/repo/dao/dao.go index c491ddb..1aa315d 100644 --- a/pkg/repo/dao/dao.go +++ b/pkg/frontier/repo/dao/dao.go @@ -1,8 +1,8 @@ package dao import ( - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/model" "gorm.io/driver/sqlite" "gorm.io/gorm" "k8s.io/klog/v2" diff --git a/pkg/repo/dao/dao_edge.go b/pkg/frontier/repo/dao/dao_edge.go similarity index 98% rename from pkg/repo/dao/dao_edge.go rename to pkg/frontier/repo/dao/dao_edge.go index 485012d..8504e31 100644 --- a/pkg/repo/dao/dao_edge.go +++ b/pkg/frontier/repo/dao/dao_edge.go @@ -1,7 +1,7 @@ package dao import ( - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/repo/model" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/pkg/repo/dao/dao_edge_test.go b/pkg/frontier/repo/dao/dao_edge_test.go similarity index 97% rename from pkg/repo/dao/dao_edge_test.go rename to pkg/frontier/repo/dao/dao_edge_test.go index d451086..549190a 100644 --- a/pkg/repo/dao/dao_edge_test.go +++ b/pkg/frontier/repo/dao/dao_edge_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/model" ) func TestCreateEdge(t *testing.T) { diff --git a/pkg/repo/dao/dao_service.go b/pkg/frontier/repo/dao/dao_service.go similarity index 99% rename from pkg/repo/dao/dao_service.go rename to pkg/frontier/repo/dao/dao_service.go index 8bca935..9aacb2b 100644 --- a/pkg/repo/dao/dao_service.go +++ b/pkg/frontier/repo/dao/dao_service.go @@ -1,7 +1,7 @@ package dao import ( - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/repo/model" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/pkg/repo/dao/dao_service_test.go b/pkg/frontier/repo/dao/dao_service_test.go similarity index 92% rename from pkg/repo/dao/dao_service_test.go rename to pkg/frontier/repo/dao/dao_service_test.go index 80b30e2..fff4b50 100644 --- a/pkg/repo/dao/dao_service_test.go +++ b/pkg/frontier/repo/dao/dao_service_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/model" ) func TestListServices(t *testing.T) { diff --git a/pkg/repo/dao/utils.go b/pkg/frontier/repo/dao/utils.go similarity index 100% rename from pkg/repo/dao/utils.go rename to pkg/frontier/repo/dao/utils.go diff --git a/pkg/repo/model/model_edge.go b/pkg/frontier/repo/model/model_edge.go similarity index 100% rename from pkg/repo/model/model_edge.go rename to pkg/frontier/repo/model/model_edge.go diff --git a/pkg/repo/model/model_service.go b/pkg/frontier/repo/model/model_service.go similarity index 100% rename from pkg/repo/model/model_service.go rename to pkg/frontier/repo/model/model_service.go diff --git a/pkg/frontier/repo/repo.go b/pkg/frontier/repo/repo.go new file mode 100644 index 0000000..8734be8 --- /dev/null +++ b/pkg/frontier/repo/repo.go @@ -0,0 +1,11 @@ +package repo + +import ( + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/dao" +) + +func NewRepo(config *config.Configuration) (apis.Repo, error) { + return dao.NewDao(config) +} diff --git a/pkg/server/server.go b/pkg/frontier/server/server.go similarity index 81% rename from pkg/server/server.go rename to pkg/frontier/server/server.go index a5f48b2..31b0ec2 100644 --- a/pkg/server/server.go +++ b/pkg/frontier/server/server.go @@ -1,12 +1,12 @@ package server import ( - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/controlplane" - "github.com/singchia/frontier/pkg/edgebound" - "github.com/singchia/frontier/pkg/exchange" - "github.com/singchia/frontier/pkg/servicebound" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/controlplane" + "github.com/singchia/frontier/pkg/frontier/edgebound" + "github.com/singchia/frontier/pkg/frontier/exchange" + "github.com/singchia/frontier/pkg/frontier/servicebound" "github.com/singchia/go-timer/v2" "k8s.io/klog/v2" ) diff --git a/pkg/servicebound/proto.go b/pkg/frontier/servicebound/proto.go similarity index 100% rename from pkg/servicebound/proto.go rename to pkg/frontier/servicebound/proto.go diff --git a/pkg/servicebound/service_dataplane.go b/pkg/frontier/servicebound/service_dataplane.go similarity index 96% rename from pkg/servicebound/service_dataplane.go rename to pkg/frontier/servicebound/service_dataplane.go index 728e6b7..f1bcf05 100644 --- a/pkg/servicebound/service_dataplane.go +++ b/pkg/frontier/servicebound/service_dataplane.go @@ -1,7 +1,7 @@ package servicebound import ( - "github.com/singchia/frontier/pkg/apis" + "github.com/singchia/frontier/pkg/frontier/apis" "github.com/singchia/geminio" "k8s.io/klog/v2" ) diff --git a/pkg/servicebound/service_manager.go b/pkg/frontier/servicebound/service_manager.go similarity index 98% rename from pkg/servicebound/service_manager.go rename to pkg/frontier/servicebound/service_manager.go index 64203c9..db9efa3 100644 --- a/pkg/servicebound/service_manager.go +++ b/pkg/frontier/servicebound/service_manager.go @@ -12,10 +12,10 @@ import ( "github.com/jumboframes/armorigo/log" "github.com/jumboframes/armorigo/synchub" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/model" "github.com/singchia/frontier/pkg/mapmap" - "github.com/singchia/frontier/pkg/repo/model" "github.com/singchia/frontier/pkg/security" "github.com/singchia/frontier/pkg/utils" "github.com/singchia/geminio" diff --git a/pkg/servicebound/service_manager_test.go b/pkg/frontier/servicebound/service_manager_test.go similarity index 92% rename from pkg/servicebound/service_manager_test.go rename to pkg/frontier/servicebound/service_manager_test.go index d6fcdf5..4a94ae9 100644 --- a/pkg/servicebound/service_manager_test.go +++ b/pkg/frontier/servicebound/service_manager_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/singchia/frontier/api/dataplane/v1/service" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/repo/dao" + "github.com/singchia/frontier/pkg/frontier/config" + "github.com/singchia/frontier/pkg/frontier/repo/dao" "github.com/singchia/go-timer/v2" ) diff --git a/pkg/servicebound/service_onoff.go b/pkg/frontier/servicebound/service_onoff.go similarity index 96% rename from pkg/servicebound/service_onoff.go rename to pkg/frontier/servicebound/service_onoff.go index 22948bc..d4f9fde 100644 --- a/pkg/servicebound/service_onoff.go +++ b/pkg/frontier/servicebound/service_onoff.go @@ -6,9 +6,9 @@ import ( "time" "github.com/jumboframes/armorigo/synchub" - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/repo/dao" - "github.com/singchia/frontier/pkg/repo/model" + "github.com/singchia/frontier/pkg/frontier/apis" + "github.com/singchia/frontier/pkg/frontier/repo/dao" + "github.com/singchia/frontier/pkg/frontier/repo/model" "github.com/singchia/geminio" "github.com/singchia/geminio/delegate" "k8s.io/klog/v2" diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go deleted file mode 100644 index 6308c88..0000000 --- a/pkg/repo/repo.go +++ /dev/null @@ -1,11 +0,0 @@ -package repo - -import ( - "github.com/singchia/frontier/pkg/apis" - "github.com/singchia/frontier/pkg/config" - "github.com/singchia/frontier/pkg/repo/dao" -) - -func NewRepo(config *config.Configuration) (apis.Repo, error) { - return dao.NewDao(config) -}