From e82480a639d315af5b2f7810fb3c56439ae9f0ce Mon Sep 17 00:00:00 2001 From: yusing Date: Wed, 4 Jun 2025 23:13:42 +0800 Subject: [PATCH] refactor: rename route/provider/types to provider --- internal/route/provider/provider.go | 16 ++++++++-------- internal/route/provider/stats.go | 10 +++++----- internal/route/provider/types/provider_type.go | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/route/provider/provider.go b/internal/route/provider/provider.go index 258f7d3..f1f65cc 100644 --- a/internal/route/provider/provider.go +++ b/internal/route/provider/provider.go @@ -11,7 +11,7 @@ import ( "github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/internal/gperr" "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/route/provider/types" + provider "github.com/yusing/go-proxy/internal/route/provider/types" "github.com/yusing/go-proxy/internal/route/routes" "github.com/yusing/go-proxy/internal/task" W "github.com/yusing/go-proxy/internal/watcher" @@ -22,8 +22,7 @@ type ( Provider struct { ProviderImpl - t types.ProviderType - routes route.Routes + t provider.Type watcher W.Watcher } @@ -43,7 +42,8 @@ const ( var ErrEmptyProviderName = errors.New("empty provider name") -func newProvider(t types.ProviderType) *Provider { + +func newProvider(t provider.Type) *Provider { return &Provider{t: t} } @@ -52,7 +52,7 @@ func NewFileProvider(filename string) (p *Provider, err error) { if name == "" { return nil, ErrEmptyProviderName } - p = newProvider(types.ProviderTypeFile) + p = newProvider(provider.ProviderTypeFile) p.ProviderImpl, err = FileProviderImpl(filename) if err != nil { return nil, err @@ -62,14 +62,14 @@ func NewFileProvider(filename string) (p *Provider, err error) { } func NewDockerProvider(name string, dockerHost string) *Provider { - p := newProvider(types.ProviderTypeDocker) + p := newProvider(provider.ProviderTypeDocker) p.ProviderImpl = DockerProviderImpl(name, dockerHost) p.watcher = p.NewWatcher() return p } func NewAgentProvider(cfg *agent.AgentConfig) *Provider { - p := newProvider(types.ProviderTypeAgent) + p := newProvider(provider.ProviderTypeAgent) agent := &AgentProvider{ AgentConfig: cfg, docker: DockerProviderImpl(cfg.Name(), cfg.FakeDockerHost()), @@ -79,7 +79,7 @@ func NewAgentProvider(cfg *agent.AgentConfig) *Provider { return p } -func (p *Provider) GetType() types.ProviderType { +func (p *Provider) GetType() provider.Type { return p.t } diff --git a/internal/route/provider/stats.go b/internal/route/provider/stats.go index ebc2b57..fb05eba 100644 --- a/internal/route/provider/stats.go +++ b/internal/route/provider/stats.go @@ -2,7 +2,7 @@ package provider import ( R "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/route/provider/types" + provider "github.com/yusing/go-proxy/internal/route/provider/types" route "github.com/yusing/go-proxy/internal/route/types" "github.com/yusing/go-proxy/internal/watcher/health" ) @@ -17,10 +17,10 @@ type ( NumUnknown uint16 `json:"unknown"` } ProviderStats struct { - Total uint16 `json:"total"` - RPs RouteStats `json:"reverse_proxies"` - Streams RouteStats `json:"streams"` - Type types.ProviderType `json:"type"` + Total uint16 `json:"total"` + RPs RouteStats `json:"reverse_proxies"` + Streams RouteStats `json:"streams"` + Type provider.Type `json:"type"` } ) diff --git a/internal/route/provider/types/provider_type.go b/internal/route/provider/types/provider_type.go index 6447e39..2f90347 100644 --- a/internal/route/provider/types/provider_type.go +++ b/internal/route/provider/types/provider_type.go @@ -1,9 +1,9 @@ -package types +package provider -type ProviderType string +type Type string const ( - ProviderTypeDocker ProviderType = "docker" - ProviderTypeFile ProviderType = "file" - ProviderTypeAgent ProviderType = "agent" + ProviderTypeDocker Type = "docker" + ProviderTypeFile Type = "file" + ProviderTypeAgent Type = "agent" )