add regular expression matching to --output-http-rewrite-url

[jcw9930]

I extended --output-http-rewrite-url to also accept regular expressions for matching.

[buger]

Hi! Thank you for this change! But i think it will not be full without allowing to use matched parts in resulting url, for example:

/v1/user/([^\/])/ping:/v2/user/$1/ping

So you can use regexp with match groups on left side, and use them on right side.

[jcw9930]

I have now switched to ReplaceAllString and tested with the modified url of
yours (notice the added '+' in the test). Note that when specifiying the
regex on commandline you need to escape $ and put the parameter in quotes.

2014-10-28 15:10 GMT+01:00 Leonid Bugaev notifications@github.com:

Hi! Thank you for this change! But i think it will not be full without
allowing to use matched parts in resulting url, for example:

/v1/user/([^\/])/ping:/v2/user/$1/ping

So you can use regexp with match groups on left side, and use them on
right side.

—
Reply to this email directly or view it on GitHub
#127 (comment).

[buger]

Pls also add tests that explicitly checks if rewrites.Rewrite(url) == /v2/user/joe/ping

[jcw9930]

pushed. does that work for you?

2014-10-28 18:24 GMT+01:00 Leonid Bugaev notifications@github.com:

In settings_url_map_test.go:

@@ -25,3 +24,24 @@ func TestUrlRewriteMap(t *testing.T) {
t.Error("Request url should not have been rewritten, was")
}
}
+
+func TestUrlRewriteMap_2(t *testing.T) {

• var url string

• rewrites := UrlRewriteMap{}

• err := rewrites.Set("/v1/user/([^\/]+)/ping:/v2/user/$1/ping")
• if err != nil {

•   t.Error("Should not error on /v1/user/([^\/]+)/ping:/v2/user/$1/ping")
  

• }

• url = "/v1/user/joe/ping"

Pls also add tests that explicitly checks if rewrites.Rewrite(url) ==
/v2/user/joe/ping

—
Reply to this email directly or view it on GitHub
https://github.com/buger/gor/pull/127/files#r19487611.

[buger]

Thanks! Looks great! I will review it one more time tomorrow and will merge.

[buger]

Did not know about ReplaceAllString function, love go standard lib! :)

[jcw9930]

Please add this small patch, it fixes multiple occurrences in the same path

diff --git a/settings_url_map.go b/settings_url_map.go
index e8fa48a..5453610 100644
--- a/settings_url_map.go
+++ b/settings_url_map.go
@@ -34,7 +34,7 @@ func (r *UrlRewriteMap) Set(value string) error {
 func (r *UrlRewriteMap) Rewrite(path string) string {
        for _, f := range *r {
                if f.src.MatchString(path) {
-                       return f.src.ReplaceAllString(path, f.target)
+                       path = f.src.ReplaceAllString(path, f.target)
                }
        }
        return path

[buger]

Done eb7885c!

Thanks for pointing.