[configuration] support passing configuration in Data URLs #593
Conversation
| @@ -33,6 +34,8 @@ function _M.load(host) | |||
| env.set('THREESCALE_CONFIG_FILE', uri.path) | |||
| elseif scheme == 'http' or scheme == 'https' then | |||
| env.set('THREESCALE_PORTAL_ENDPOINT', uri) | |||
| elseif scheme == 'data' then | |||
There was a problem hiding this comment.
I could probably get away without the change in 3scale/lua-resty-url#7.
Just by using the new regex in the data_url loader and expose another method .match that verifies it is data url. Or just execute the loader and return the value if it returns something. That is probably wise.
And 3scale/lua-resty-url#7 for the future with proper benchmark.
mikz
force-pushed
the
apicast-cloud-hosted-fixes
branch
from
c3776d5 to
de397cb
Compare
mikz
changed the title
gateway/config/development.lua
Outdated
| configuration_loader = 'lazy', | ||
| configuration_cache = 0, | ||
| configuration = [[data:application/json;charset=utf-8;base64,eyJzZXJ2aWNlcyI6W3siaWQiOjEyMzQsImJhY2tlbmRfdmVyc2lvbiI6MSwicHJveHkiOnsiYXBpX2JhY2tlbmQiOiJodHRwOi8vMTI3LjAuMC4xOjgwODEiLCJob3N0bmFtZV9yZXdyaXRlIjoiZWNobyIsImhvc3RzIjpbImxvY2FsaG9zdCIsIjEyNy4wLjAuMSJdLCJiYWNrZW5kIjp7ImVuZHBvaW50IjoiaHR0cDovLzEyNy4wLjAuMTo4MDgxIiwiaG9zdCI6ImVjaG8ifSwicG9saWN5X2NoYWluIjpbeyJuYW1lIjoiYXBpY2FzdC5wb2xpY3kuYXBpY2FzdCJ9XSwicHJveHlfcnVsZXMiOlt7Imh0dHBfbWV0aG9kIjoiR0VUIiwicGF0dGVybiI6Ii8iLCJtZXRyaWNfc3lzdGVtX25hbWUiOiJoaXRzIiwiZGVsdGEiOjF9LHsiaHR0cF9tZXRob2QiOiJQT1NUIiwicGF0dGVybiI6Ii8iLCJtZXRyaWNfc3lzdGVtX25hbWUiOiJoaXRzIiwiZGVsdGEiOjF9LHsiaHR0cF9tZXRob2QiOiJQVVQiLCJwYXR0ZXJuIjoiLyIsIm1ldHJpY19zeXN0ZW1fbmFtZSI6ImhpdHMiLCJkZWx0YSI6MX1dfX1dfQ==]] |
There was a problem hiding this comment.
I probably should create the data url here from a lua table -> json -> base64 so it is obvious what configuration is inside.
| @@ -1,7 +1,8 @@ | |||
| return { | |||
| worker_processes = '1', | |||
| master_process = 'off', | |||
| lua_code_cache = 'off', | |||
| lua_code_cache = 'on', | |||
There was a problem hiding this comment.
Otherwise ngx.ctx can't be shared between requests and fails horribly.
mikz
force-pushed
the
apicast-cloud-hosted-fixes
branch
from
de397cb to
cb3f6f1
Compare
mikz
force-pushed
the
apicast-cloud-hosted-fixes
branch
from
cb3f6f1 to
6592772
Compare
gateway/src/resty/mime.lua
Outdated
|
|
||
| local self = {} | ||
|
|
||
| -- The RFC defines that the type can include upper and lower-case chars. |
There was a problem hiding this comment.
Would be good to have a link to the RFC here for reference.
gateway/src/resty/mime.lua
Outdated
|
|
||
|
|
||
| function _M.new(media_type) | ||
| local match = re_split(media_type, [[\s*;\s*]], 'oj', nil, 2) |
There was a problem hiding this comment.
Probably good to explain why we're deleting whitespaces around ';'.
mikz
force-pushed
the
apicast-cloud-hosted-fixes
branch
2 times, most recently
from
d821eb5 to
ede3cad
Compare
gateway/src/resty/mime.lua
Outdated
| function _M:parameter(name) | ||
| local parameters = self.parameters | ||
|
|
||
| local matches = re_match(parameters, format([[%s=(?:"(.+?)"|([^\s;"]+))\s*(?:;|$)]], name), 'oji') |
There was a problem hiding this comment.
How about extracting that regex into its own var?
Maybe even explain in a line or two its purpose.
gateway/config/development.lua
Outdated
| configuration_loader = 'lazy', | ||
| configuration_cache = 0, | ||
| configuration = string.format([[data:application/json,%s]],ngx.escape_uri(configuration)), |
There was a problem hiding this comment.
Can you add a link here to https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs ?
mikz
force-pushed
the
apicast-cloud-hosted-fixes
branch
from
ede3cad to
33ee21e
Compare
| assert.same(config, loader.call(url)) | ||
| end) | ||
|
|
||
| it('accepts bug ignores charset in the data url', function() |
| @@ -0,0 +1,58 @@ | |||
| local MimeType = require('resty.mime') | |||
There was a problem hiding this comment.
I think we need a module description explaining its purpose.
Data URLs can be passed as the configuration url. https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
mikz
force-pushed
the
apicast-cloud-hosted-fixes
branch
from
33ee21e to
a05d330
Compare
When APIcast is started with the development (
--dev) environment and there is no other configuration passed (THREESCALE_PORTAL_ENDPOINTorAPICAST_CONFIGURATION) it is going to default to service with echo policy defined in https://github.com/3scale/apicast/blob/6592772bac74d8fca8e148693f1b7f61e1b51a25/gateway/config/development.lua#L3-L18As a side effect it is possible now pass the whole configuration in Data URL.