Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[remote_v2] ability to load configuration from custom path #323

Merged
merged 1 commit into from
Mar 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased

### Added

- Support for loading configration from custom URL [PR #323](https://github.com/3scale/apicast/pull/323)

## [3.0.0-beta3] - 2017-03-20

### Changed
Expand Down
2 changes: 1 addition & 1 deletion apicast/src/configuration_loader.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ local _M = {
}

function _M.load(host)
return mock_loader.call() or file_loader.call() or remote_loader_v2.call() or remote_loader_v1.call(host)
return mock_loader.call() or file_loader.call() or remote_loader_v2:call(host) or remote_loader_v1.call(host)
end

function _M.boot(host)
Expand Down
57 changes: 57 additions & 0 deletions apicast/src/configuration_loader/remote_v2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ local setmetatable = setmetatable
local format = string.format
local ipairs = ipairs
local insert = table.insert
local encode_args = ngx.encode_args

local resty_url = require 'resty.url'
local http_ng = require "resty.http_ng"
Expand All @@ -28,14 +29,70 @@ function _M.new(url, options)
}
}

local path = resty_url.split(endpoint or '')

return setmetatable({
endpoint = endpoint,
path = path and path[6],
options = opts,
http_client = http_client
}, mt)
end

function _M:index(host)
local http_client = self.http_client

if not http_client then
return nil, 'not initialized'
end

local path = self.path

if not path then
return nil, 'wrong endpoint url'
end

local env = resty_env.get('THREESCALE_DEPLOYMENT_ENV')

if not env then
return nil, 'missing environment'
end

local url = resty_url.join(self.endpoint, '/', env, '.json?', encode_args({ host = host }))
local res, err = http_client.get(url)

if not res and err then
ngx.log(ngx.DEBUG, 'index get error: ', err, ' url: ', url)
return nil, err
end

ngx.log(ngx.DEBUG, 'index get status: ', res.status, ' url: ', url)

if res.status == 200 then
local json = cjson.decode(res.body)

local configs = {}

local proxy_configs = json.proxy_configs or {}

for i=1, #proxy_configs do
configs[i] = proxy_configs[i].proxy_config.content
end

return cjson.encode({ services = configs })
else
return nil, 'invalid status'
end
end

function _M:call(environment)
if self == _M then
local host = environment
local index = _M.new():index(host)

if index then return index end
end

if not self then
return _M.new():call()
end
Expand Down
28 changes: 28 additions & 0 deletions spec/configuration_loader/remote_v2_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,34 @@ describe('Configuration Rmote Loader V2', function()
end)
end)


describe(':index', function()
before_each(function()
loader = _M.new('http://example.com/something/with/path', { client = test_backend })
end)

it('returns configuration for all services', function()
env.set('THREESCALE_DEPLOYMENT_ENV', 'production')
test_backend.expect{ url = 'http://example.com/something/with/path/production.json?host=foobar.example.com' }.
respond_with{ status = 200, body = cjson.encode({ proxy_configs = {
{
proxy_config = {
version = 42,
environment = 'staging',
content = { id = 2, backend_version = 2 }
}
}
}})}

local config = assert(loader:index('foobar.example.com'))

assert.truthy(config)
assert.equals('string', type(config))

assert.equals(1, #(cjson.decode(config).services))
end)
end)

describe('.call', function()
it('gets environment from ENV', function()
local _, err = loader.call()
Expand Down