chore: reintroduce martianurl and namespace bff implementation under …

…bffurl
imranismail · Nov 24, 2020 · da382f5 · da382f5
1 parent e72e3cb
commit da382f5
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 498 deletions.
diff --git a/bffurl/host.go b/bffurl/host.go
diff --git a/bffurl/host_test.go b/bffurl/host_test.go
diff --git a/bffurl/url_filter.go b/bffurl/url_filter.go
@@ -24,10 +24,10 @@ import (
 	"github.com/google/martian/v3/parse"
 )
 
-var noop = martian.Noop("url.Filter")
+var noop = martian.Noop("bffurl.Filter")
 
 func init() {
-	parse.Register("url.Filter", filterFromJSON)
+	parse.Register("bffurl.Filter", filterFromJSON)
 }
 
 // Filter runs modifiers iff the request URL matches all of the segments in url.

diff --git a/bffurl/url_matcher.go b/bffurl/url_matcher.go
@@ -19,6 +19,7 @@ import (
 	"net/url"
 
 	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/martianurl"
 )
 
 // Matcher is a conditional evaluator of request urls to be used in
@@ -65,7 +66,7 @@ func (m *Matcher) matches(r *http.Request) bool {
 	switch {
 	case m.url.Scheme != "" && m.url.Scheme != r.URL.Scheme:
 		return false
-	case m.url.Host != "" && !MatchHost(r.URL.Host, m.url.Host):
+	case m.url.Host != "" && !martianurl.MatchHost(r.URL.Host, m.url.Host):
 		return false
 	case m.url.Path != "" && !m.pattern.Match(r):
 		return false

diff --git a/bffurl/url_modifier.go b/bffurl/url_modifier.go
@@ -42,7 +42,7 @@ type modifierJSON struct {
 }
 
 func init() {
-	parse.Register("url.Modifier", modifierFromJSON)
+	parse.Register("bffurl.Modifier", modifierFromJSON)
 }
 
 // ModifyRequest sets the fields of req.URL to m.Url if they are not the zero value.

diff --git a/bffurl/url_regex_filter.go b/bffurl/url_regex_filter.go