correcting some behaviors for $DOCKER_HOST, now uses container's private IP instead of localhost

internal/proxy/fields/host.go

@@ -4,8 +4,10 @@ import (
 	E "github.com/yusing/go-proxy/internal/error"
 )
 
-type Host string
-type Subdomain = Alias
+type (
+	Host      string
+	Subdomain = Alias
+)
 
 func ValidateHost[String ~string](s String) (Host, E.NestedError) {
 	return Host(s), nil

internal/proxy/fields/path_pattern.go

@@ -6,8 +6,12 @@ import (
 	E "github.com/yusing/go-proxy/internal/error"
 )
 
-type PathPattern string
-type PathPatterns = []PathPattern
+type (
+	PathPattern  string
+	PathPatterns = []PathPattern
+)
+
+var pathPattern = regexp.MustCompile(`^(/[-\w./]*({\$\})?|((GET|POST|DELETE|PUT|HEAD|OPTION) /[-\w./]*({\$\})?))$`)
 
 func NewPathPattern(s string) (PathPattern, E.NestedError) {
 	if len(s) == 0 {
@@ -25,13 +29,11 @@ func ValidatePathPatterns(s []string) (PathPatterns, E.NestedError) {
 	}
 	pp := make(PathPatterns, len(s))
 	for i, v := range s {
-		if pattern, err := NewPathPattern(v); err.HasError() {
+		pattern, err := NewPathPattern(v)
+		if err != nil {
 			return nil, err
-		} else {
-			pp[i] = pattern
 		}
+		pp[i] = pattern
 	}
 	return pp, nil
 }
-
-var pathPattern = regexp.MustCompile(`^(/[-\w./]*({\$\})?|((GET|POST|DELETE|PUT|HEAD|OPTION) /[-\w./]*({\$\})?))$`)

internal/proxy/provider/docker.go

@@ -1,15 +1,15 @@
 package provider
 
 import (
-	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"github.com/docker/docker/client"
 	"github.com/sirupsen/logrus"
+	"github.com/yusing/go-proxy/internal/common"
 	D "github.com/yusing/go-proxy/internal/docker"
 	E "github.com/yusing/go-proxy/internal/error"
-
 	R "github.com/yusing/go-proxy/internal/route"
 	"github.com/yusing/go-proxy/internal/types"
 	W "github.com/yusing/go-proxy/internal/watcher"
@@ -17,23 +17,24 @@ import (
 )
 
 type DockerProvider struct {
-	name, dockerHost, hostname string
-	ExplicitOnly               bool
+	name, dockerHost string
+	ExplicitOnly     bool
 }
 
-var AliasRefRegex = regexp.MustCompile(`#\d+`)
-var AliasRefRegexOld = regexp.MustCompile(`\$\d+`)
+var (
+	AliasRefRegex    = regexp.MustCompile(`#\d+`)
+	AliasRefRegexOld = regexp.MustCompile(`\$\d+`)
+)
 
 func DockerProviderImpl(name, dockerHost string, explicitOnly bool) (ProviderImpl, E.NestedError) {
-	hostname, err := D.ParseDockerHostname(dockerHost)
-	if err.HasError() {
-		return nil, err
+	if dockerHost == common.DockerHostFromEnv {
+		dockerHost = common.GetEnv("DOCKER_HOST", client.DefaultDockerHost)
 	}
-	return &DockerProvider{name, dockerHost, hostname, explicitOnly}, nil
+	return &DockerProvider{name, dockerHost, explicitOnly}, nil
 }
 
 func (p *DockerProvider) String() string {
-	return fmt.Sprintf("docker: %s", p.name)
+	return "docker: " + p.name
 }
 
 func (p *DockerProvider) NewWatcher() W.Watcher {
@@ -49,7 +50,7 @@ func (p *DockerProvider) LoadRoutesImpl() (routes R.Routes, err E.NestedError) {
 		return routes, E.FailWith("connect to docker", err)
 	}
 
-	errors := E.NewBuilder("errors when parse docker labels")
+	errors := E.NewBuilder("errors in docker labels")
 
 	for _, c := range info.Containers {
 		container := D.FromDocker(&c, p.dockerHost)
@@ -80,7 +81,7 @@ func (p *DockerProvider) LoadRoutesImpl() (routes R.Routes, err E.NestedError) {
 	return routes, errors.Build()
 }
 
-func (p *DockerProvider) shouldIgnore(container D.Container) bool {
+func (p *DockerProvider) shouldIgnore(container *D.Container) bool {
 	return container.IsExcluded ||
 		!container.IsExplicit && p.ExplicitOnly ||
 		!container.IsExplicit && container.IsDatabase ||
@@ -172,8 +173,8 @@ func (p *DockerProvider) OnEvent(event W.Event, routes R.Routes) (res EventResul
 }
 
 // Returns a list of proxy entries for a container.
-// Always non-nil
-func (p *DockerProvider) entriesFromContainerLabels(container D.Container) (entries types.RawEntries, _ E.NestedError) {
+// Always non-nil.
+func (p *DockerProvider) entriesFromContainerLabels(container *D.Container) (entries types.RawEntries, _ E.NestedError) {
 	entries = types.NewProxyEntries()
 
 	if p.shouldIgnore(container) {
@@ -183,9 +184,8 @@ func (p *DockerProvider) entriesFromContainerLabels(container D.Container) (entr
 	// init entries map for all aliases
 	for _, a := range container.Aliases {
 		entries.Store(a, &types.RawEntry{
-			Alias:           a,
-			Host:            p.hostname,
-			ProxyProperties: container.ProxyProperties,
+			Alias:     a,
+			Container: container,
 		})
 	}
 
@@ -202,11 +202,11 @@ func (p *DockerProvider) entriesFromContainerLabels(container D.Container) (entr
 	return entries, errors.Build().Subject(container.ContainerName)
 }
 
-func (p *DockerProvider) applyLabel(container D.Container, entries types.RawEntries, key, val string) (res E.NestedError) {
+func (p *DockerProvider) applyLabel(container *D.Container, entries types.RawEntries, key, val string) (res E.NestedError) {
 	b := E.NewBuilder("errors in label %s", key)
 	defer b.To(&res)
 
-	refErr := E.NewBuilder("errors parsing alias references")
+	refErr := E.NewBuilder("errors in alias references")
 	replaceIndexRef := func(ref string) string {
 		index, err := strconv.Atoi(ref[1:])
 		if err != nil {
@@ -231,7 +231,7 @@ func (p *DockerProvider) applyLabel(container D.Container, entries types.RawEntr
 		// apply label for all aliases
 		entries.RangeAll(func(a string, e *types.RawEntry) {
 			if err = D.ApplyLabel(e, lbl); err.HasError() {
-				b.Add(err.Subjectf("alias %s", lbl.Target))
+				b.Add(err)
 			}
 		})
 	} else {
@@ -250,7 +250,7 @@ func (p *DockerProvider) applyLabel(container D.Container, entries types.RawEntr
 			return
 		}
 		if err = D.ApplyLabel(config, lbl); err.HasError() {
-			b.Add(err.Subjectf("alias %s", lbl.Target))
+			b.Add(err)
 		}
 	}
 	return

internal/proxy/provider/docker_test.go

@@ -10,7 +10,6 @@ import (
 	E "github.com/yusing/go-proxy/internal/error"
 	P "github.com/yusing/go-proxy/internal/proxy"
 	T "github.com/yusing/go-proxy/internal/proxy/fields"
-
 	. "github.com/yusing/go-proxy/internal/utils/testing"
 )
 
@@ -60,7 +59,8 @@ func TestApplyLabelFieldValidity(t *testing.T) {
 		},
 		Ports: []types.Port{
 			{Type: "tcp", PrivatePort: 4567, PublicPort: 8888},
-		}}, ""))
+		},
+	}, ""))
 	ExpectNoError(t, err.Error())
 
 	a, ok := entries.Load("a")
@@ -116,8 +116,8 @@ func TestApplyLabel(t *testing.T) {
 		Ports: []types.Port{
 			{Type: "tcp", PrivatePort: 3333, PublicPort: 1111},
 			{Type: "tcp", PrivatePort: 4444, PublicPort: 1234},
-		}}, "",
-	))
+		},
+	}, ""))
 	a, ok := entries.Load("a")
 	ExpectTrue(t, ok)
 	b, ok := entries.Load("b")
@@ -152,7 +152,8 @@ func TestApplyLabelWithRef(t *testing.T) {
 			{Type: "tcp", PrivatePort: 3333, PublicPort: 9999},
 			{Type: "tcp", PrivatePort: 4444, PublicPort: 5555},
 			{Type: "tcp", PrivatePort: 1111, PublicPort: 2222},
-		}}, ""))
+		},
+	}, ""))
 	a, ok := entries.Load("a")
 	ExpectTrue(t, ok)
 	b, ok := entries.Load("b")
@@ -171,13 +172,14 @@ func TestApplyLabelWithRef(t *testing.T) {
 
 func TestApplyLabelWithRefIndexError(t *testing.T) {
 	var p DockerProvider
-	var c = D.FromDocker(&types.Container{
+	c := D.FromDocker(&types.Container{
 		Names: dummyNames,
 		Labels: map[string]string{
 			D.LabelAliases:    "a,b",
 			"proxy.#1.host":   "localhost",
 			"proxy.#4.scheme": "https",
-		}}, "")
+		},
+	}, "")
 	_, err := p.entriesFromContainerLabels(c)
 	ExpectError(t, E.ErrOutOfRange, err.Error())
 	ExpectTrue(t, strings.Contains(err.String(), "index out of range"))
@@ -187,14 +189,15 @@ func TestApplyLabelWithRefIndexError(t *testing.T) {
 		Labels: map[string]string{
 			D.LabelAliases:  "a,b",
 			"proxy.#0.host": "localhost",
-		}}, ""))
+		},
+	}, ""))
 	ExpectError(t, E.ErrOutOfRange, err.Error())
 	ExpectTrue(t, strings.Contains(err.String(), "index out of range"))
 }
 
 func TestStreamDefaultValues(t *testing.T) {
 	var p DockerProvider
-	var c = D.FromDocker(&types.Container{
+	c := D.FromDocker(&types.Container{
 		Names: dummyNames,
 		Labels: map[string]string{
 			D.LabelAliases:          "a",
@@ -202,7 +205,8 @@ func TestStreamDefaultValues(t *testing.T) {
 		},
 		Ports: []types.Port{
 			{Type: "udp", PrivatePort: 1234, PublicPort: 5678},
-		}}, "",
+		},
+	}, "",
 	)
 	entries, err := p.entriesFromContainerLabels(c)
 	ExpectNoError(t, err.Error())
@@ -228,7 +232,8 @@ func TestExplicitExclude(t *testing.T) {
 			D.LabelAliases:          "a",
 			D.LabelExclude:          "true",
 			"proxy.a.no_tls_verify": "true",
-		}}, ""))
+		},
+	}, ""))
 	ExpectNoError(t, err.Error())
 
 	_, ok := entries.Load("a")

internal/proxy/provider/provider.go

@@ -99,31 +99,21 @@ func (p *Provider) GetType() ProviderType {
 	return p.t
 }
 
-// to work with json marshaller
+// to work with json marshaller.
 func (p *Provider) MarshalText() ([]byte, error) {
 	return []byte(p.String()), nil
 }
 
 func (p *Provider) StartAllRoutes() (res E.NestedError) {
-	errors := E.NewBuilder("errors in routes")
+	errors := E.NewBuilder("errors starting routes")
 	defer errors.To(&res)
 
 	// start watcher no matter load success or not
 	go p.watchEvents()
 
-	nStarted := 0
-	nFailed := 0
-
 	p.routes.RangeAllParallel(func(alias string, r R.Route) {
-		if err := r.Start(); err.HasError() {
-			errors.Add(err.Subject(r))
-			nFailed++
-		} else {
-			nStarted++
-		}
+		errors.Add(r.Start().Subject(r))
 	})
-
-	p.l.Debugf("%d routes started, %d failed", nStarted, nFailed)
 	return
 }
 
@@ -133,20 +123,12 @@ func (p *Provider) StopAllRoutes() (res E.NestedError) {
 		p.watcherCancel = nil
 	}
 
-	errors := E.NewBuilder("errors stopping routes for provider %q", p.name)
+	errors := E.NewBuilder("errors stopping routes")
 	defer errors.To(&res)
 
-	nStopped := 0
-	nFailed := 0
 	p.routes.RangeAllParallel(func(alias string, r R.Route) {
-		if err := r.Stop(); err.HasError() {
-			errors.Add(err.Subject(r))
-			nFailed++
-		} else {
-			nStopped++
-		}
+		errors.Add(r.Stop().Subject(r))
 	})
-	p.l.Debugf("%d routes stopped, %d failed", nStopped, nFailed)
 	return
 }
 
@@ -165,6 +147,9 @@ func (p *Provider) LoadRoutes() E.NestedError {
 		p.l.Infof("loaded %d routes", p.routes.Size())
 		return err
 	}
+	if err == nil {
+		return nil
+	}
 	return E.FailWith("loading routes", err)
 }