Bump reef to v0.1.11; rename sandbar edgeHost helper to avoid clash with expose
This commit is contained in:
1 parent
5fdeff012c
commit
04c018aded
3 files changed
+6
-6
No files matched your search
@@ -5,7 +5,7 @@ go 1.27.3
|
|||||||
require (
|
require (
|
||||||
git.veillax.com/Veillax/bamboo v0.1.5
|
git.veillax.com/Veillax/bamboo v0.1.5
|
||||||
git.veillax.com/Veillax/blacktip v0.1.9
|
git.veillax.com/Veillax/blacktip v0.1.9
|
||||||
git.veillax.com/Veillax/reef v0.1.10
|
git.veillax.com/Veillax/reef v0.1.11
|
||||||
github.com/emersion/go-msgauth v0.7.0
|
github.com/emersion/go-msgauth v0.7.0
|
||||||
golang.org/x/crypto v0.58.0
|
golang.org/x/crypto v0.58.0
|
||||||
modernc.org/sqlite v1.61.0
|
modernc.org/sqlite v1.61.0
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ git.veillax.com/Veillax/bamboo v0.1.5 h1:i81c75/7wjayP9tOQ3tSnJWTBhvbjAwNBEPhT+3
|
|||||||
git.veillax.com/Veillax/bamboo v0.1.5/go.mod h1:se4kkcP6c3uCGD4HQd+nDLoblS0lN8qa+eFWLo5Horw=
|
git.veillax.com/Veillax/bamboo v0.1.5/go.mod h1:se4kkcP6c3uCGD4HQd+nDLoblS0lN8qa+eFWLo5Horw=
|
||||||
git.veillax.com/Veillax/blacktip v0.1.9 h1:MMkF8GCrN01IWwwii1WM5l+nqIbHsOznyrbG7OvDtoo=
|
git.veillax.com/Veillax/blacktip v0.1.9 h1:MMkF8GCrN01IWwwii1WM5l+nqIbHsOznyrbG7OvDtoo=
|
||||||
git.veillax.com/Veillax/blacktip v0.1.9/go.mod h1:9mYwKMiKXN/P0dpPtdTzG7zf1IeHt/aISa0SQD9rlzY=
|
git.veillax.com/Veillax/blacktip v0.1.9/go.mod h1:9mYwKMiKXN/P0dpPtdTzG7zf1IeHt/aISa0SQD9rlzY=
|
||||||
git.veillax.com/Veillax/reef v0.1.10 h1:b15oD1vyrGOriCHhipQtJ3j7Cy5ForYWvfJkqifLQPg=
|
git.veillax.com/Veillax/reef v0.1.11 h1:kbjgxJpmpp1HRckbW1tqJUm5/ftgvSlmUHAhFXugOlY=
|
||||||
git.veillax.com/Veillax/reef v0.1.10/go.mod h1:ZBUd/BARO5kkpUNTP81TTY1aQXLHFR6bKDhCxckjHso=
|
git.veillax.com/Veillax/reef v0.1.11/go.mod h1:ZBUd/BARO5kkpUNTP81TTY1aQXLHFR6bKDhCxckjHso=
|
||||||
github.com/Microsoft/go-winio v0.6.4 h1:kJF2pamtYCWXf0xAT8sAkwKC0pMl2HYBrRPHAqyUc+g=
|
github.com/Microsoft/go-winio v0.6.4 h1:kJF2pamtYCWXf0xAT8sAkwKC0pMl2HYBrRPHAqyUc+g=
|
||||||
github.com/Microsoft/go-winio v0.6.4/go.mod h1:1xl5JXG4ze/m74GH6Dc4Mwxfc3VL5siRVQjIAlHH07U=
|
github.com/Microsoft/go-winio v0.6.4/go.mod h1:1xl5JXG4ze/m74GH6Dc4Mwxfc3VL5siRVQjIAlHH07U=
|
||||||
github.com/dustin/go-humanize v1.1.0 h1:dbKTrvD0klcbBV/h4AWJdMuZogJACoMlvWIWZ5b2xWg=
|
github.com/dustin/go-humanize v1.1.0 h1:dbKTrvD0klcbBV/h4AWJdMuZogJACoMlvWIWZ5b2xWg=
|
||||||
|
|||||||
+3
-3
@@ -55,10 +55,10 @@ type monitorSpec struct {
|
|||||||
Expect string
|
Expect string
|
||||||
}
|
}
|
||||||
|
|
||||||
// edgeHost is the address visitors reach a resource's edge on: the address it is
|
// sandbarEdgeHost is the address visitors reach a resource's edge on: the address it is
|
||||||
// bound to, else the first public address the edge reported, else the host of its
|
// bound to, else the first public address the edge reported, else the host of its
|
||||||
// tunnel endpoint.
|
// tunnel endpoint.
|
||||||
func edgeHost(e *model.Edge, bind string) string {
|
func sandbarEdgeHost(e *model.Edge, bind string) string {
|
||||||
if ip := net.ParseIP(bind); ip != nil && !ip.IsUnspecified() {
|
if ip := net.ParseIP(bind); ip != nil && !ip.IsUnspecified() {
|
||||||
return bind
|
return bind
|
||||||
}
|
}
|
||||||
@@ -101,7 +101,7 @@ func (s *Server) monitorFor(m *model.Mapping) (monitorSpec, bool) {
|
|||||||
return monitorSpec{}, false
|
return monitorSpec{}, false
|
||||||
}
|
}
|
||||||
if host == "" {
|
if host == "" {
|
||||||
if host = edgeHost(e, m.BindIP); host == "" {
|
if host = sandbarEdgeHost(e, m.BindIP); host == "" {
|
||||||
return monitorSpec{}, false
|
return monitorSpec{}, false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user