Merge pull request #19 from stone-payments/release/v0.4.0

[master] Release/v0.4.0

Author: leoferlopes

CHANGELOG.md

@@ -5,6 +5,10 @@ All changes made on any release of this project should be commented on high leve
 Document model based on [Semantic Versioning](http://semver.org/).
 Examples of how to use this _markdown_ cand be found here [Keep a CHANGELOG](http://keepachangelog.com/).
 
+## [0.4.0](https://github.com/stone-payments/kong-plugin-url-rewrite/tree/v0.4.0) - 2018-12-26
+### Added
+- support to parameter replacing when rewriting URL.
+
 ## [0.3.0](https://github.com/stone-payments/kong-plugin-url-rewrite/tree/v0.3.0) - 2018-10-30
 ### Added
 - Travis CI and deploy stage.

kong-plugin-url-rewrite-0.3.0-1.rockspec kong-plugin-url-rewrite-0.4.0-0.rockspeckong-plugin-url-rewrite-0.3.0-1.rockspec renamed to kong-plugin-url-rewrite-0.4.0-0.rockspec

@@ -1,5 +1,5 @@
 package = "kong-plugin-url-rewrite"
-version = "0.3.0-1"
+version = "0.4.0-0"
 source = {
    url = "git://github.com/stone-payments/kong-plugin-url-rewrite",
 }

url-rewrite/handler.lua

@@ -8,9 +8,22 @@ function URLRewriter:new()
   URLRewriter.super.new(self, "url-rewriter")
 end
 
+function resolveUrlParams(requestParams, url)
+  for paramValue in requestParams do
+    local requestParamValue = ngx.ctx.router_matches.uri_captures[paramValue]
+    url = url:gsub("<" .. paramValue .. ">", requestParamValue)
+  end
+  return url
+end
+
+function getRequestUrlParams(url)
+  return string.gmatch(url, "<(.-)>")
+end
+
 function URLRewriter:access(config)
   URLRewriter.super.access(self)
-  ngx.var.upstream_uri = config.url
+  requestParams = getRequestUrlParams(config.url)
+  ngx.var.upstream_uri = resolveUrlParams(requestParams, config.url)
 end
 
 return URLRewriter

url-rewrite/spec/handler_spec.lua

@@ -3,8 +3,14 @@ local ngx =  {
     log = spy.new(function() end),
     var = {
         upstream_uri = "mock"
+    },
+    ctx = {
+      router_matches = {
+        uri_captures = {}
+      }
     }
 }
+
 _G.ngx = ngx
 
 local URLRewriter = require('../handler')
@@ -25,4 +31,26 @@ describe("TestHandler", function()
     URLRewriter:access(config)
     assert.equal('new_url', ngx.var.upstream_uri)
   end)
+
+  it("should test rewrite of upstream_uri with params", function()
+    URLRewriter:new()
+    ngx.ctx.router_matches.uri_captures["code_parameter"] = "123456"
+    config = {
+        url = "new_url/<code_parameter>"
+    }
+    URLRewriter:access(config)
+    assert.equal('new_url/123456', ngx.var.upstream_uri)
+  end)
+
+  it("should replace url params", function()
+    URLRewriter:new()
+    local mockUrl = "url/<param1>/<param2>"
+    local iter = getRequestUrlParams(mockUrl)
+    ngx.ctx.router_matches.uri_captures["param1"] = 123456
+    ngx.ctx.router_matches.uri_captures["param2"] = "test"
+
+    local result = resolveUrlParams(iter, mockUrl)
+
+    assert.equal("url/123456/test", result)
+  end)
 end)