refactor: rename route/provider/types to provider

This commit is contained in:
yusing 2025-06-04 23:13:42 +08:00
parent e39407886d
commit e82480a639
3 changed files with 18 additions and 18 deletions

View file

@ -11,7 +11,7 @@ import (
"github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/agent/pkg/agent"
"github.com/yusing/go-proxy/internal/gperr" "github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/route" "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/route/routes"
"github.com/yusing/go-proxy/internal/task" "github.com/yusing/go-proxy/internal/task"
W "github.com/yusing/go-proxy/internal/watcher" W "github.com/yusing/go-proxy/internal/watcher"
@ -22,8 +22,7 @@ type (
Provider struct { Provider struct {
ProviderImpl ProviderImpl
t types.ProviderType t provider.Type
routes route.Routes
watcher W.Watcher watcher W.Watcher
} }
@ -43,7 +42,8 @@ const (
var ErrEmptyProviderName = errors.New("empty provider name") var ErrEmptyProviderName = errors.New("empty provider name")
func newProvider(t types.ProviderType) *Provider {
func newProvider(t provider.Type) *Provider {
return &Provider{t: t} return &Provider{t: t}
} }
@ -52,7 +52,7 @@ func NewFileProvider(filename string) (p *Provider, err error) {
if name == "" { if name == "" {
return nil, ErrEmptyProviderName return nil, ErrEmptyProviderName
} }
p = newProvider(types.ProviderTypeFile) p = newProvider(provider.ProviderTypeFile)
p.ProviderImpl, err = FileProviderImpl(filename) p.ProviderImpl, err = FileProviderImpl(filename)
if err != nil { if err != nil {
return nil, err return nil, err
@ -62,14 +62,14 @@ func NewFileProvider(filename string) (p *Provider, err error) {
} }
func NewDockerProvider(name string, dockerHost string) *Provider { func NewDockerProvider(name string, dockerHost string) *Provider {
p := newProvider(types.ProviderTypeDocker) p := newProvider(provider.ProviderTypeDocker)
p.ProviderImpl = DockerProviderImpl(name, dockerHost) p.ProviderImpl = DockerProviderImpl(name, dockerHost)
p.watcher = p.NewWatcher() p.watcher = p.NewWatcher()
return p return p
} }
func NewAgentProvider(cfg *agent.AgentConfig) *Provider { func NewAgentProvider(cfg *agent.AgentConfig) *Provider {
p := newProvider(types.ProviderTypeAgent) p := newProvider(provider.ProviderTypeAgent)
agent := &AgentProvider{ agent := &AgentProvider{
AgentConfig: cfg, AgentConfig: cfg,
docker: DockerProviderImpl(cfg.Name(), cfg.FakeDockerHost()), docker: DockerProviderImpl(cfg.Name(), cfg.FakeDockerHost()),
@ -79,7 +79,7 @@ func NewAgentProvider(cfg *agent.AgentConfig) *Provider {
return p return p
} }
func (p *Provider) GetType() types.ProviderType { func (p *Provider) GetType() provider.Type {
return p.t return p.t
} }

View file

@ -2,7 +2,7 @@ package provider
import ( import (
R "github.com/yusing/go-proxy/internal/route" 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" route "github.com/yusing/go-proxy/internal/route/types"
"github.com/yusing/go-proxy/internal/watcher/health" "github.com/yusing/go-proxy/internal/watcher/health"
) )
@ -20,7 +20,7 @@ type (
Total uint16 `json:"total"` Total uint16 `json:"total"`
RPs RouteStats `json:"reverse_proxies"` RPs RouteStats `json:"reverse_proxies"`
Streams RouteStats `json:"streams"` Streams RouteStats `json:"streams"`
Type types.ProviderType `json:"type"` Type provider.Type `json:"type"`
} }
) )

View file

@ -1,9 +1,9 @@
package types package provider
type ProviderType string type Type string
const ( const (
ProviderTypeDocker ProviderType = "docker" ProviderTypeDocker Type = "docker"
ProviderTypeFile ProviderType = "file" ProviderTypeFile Type = "file"
ProviderTypeAgent ProviderType = "agent" ProviderTypeAgent Type = "agent"
) )