Skip to content
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 rootfs/etc/nginx/lua/balancer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ local function get_implementation(backend)
end

local function resolve_external_names(original_backend)
if not original_backend.endpoints or
#original_backend.endpoints == 0 then
return original_backend
end
local backend = util.deepcopy(original_backend)
local endpoints = {}
for _, endpoint in ipairs(backend.endpoints) do
Expand Down
34 changes: 34 additions & 0 deletions rootfs/etc/nginx/lua/test/balancer_test.lua
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,40 @@ describe("Balancer", function()
assert.stub(mock_instance.sync).was_called_with(mock_instance, expected_backend)
end)

it("sets balancer to nil when service is of type External name and DNS could not resolve", function()
backend = {
name = "example2-com", service = { spec = { ["type"] = "ExternalName" } },
endpoints = {
{ address = "example2.com", port = "80", maxFails = 0, failTimeout = 0 }
}
}

helpers.mock_resty_dns_query(nil, { errcode = 3, errstr = "NXDNS: no such host (mock)" })
local mock_instance = { sync = function(backend) end }
setmetatable(mock_instance, implementation)
implementation.new = function(self, backend) return mock_instance end
local s = spy.on(implementation, "new")
assert.has_no.errors(function() balancer.sync_backend(backend) end)
assert.spy(s).was_not_called()
assert.is_nil(balancer.get_balancer_by_upstream_name(backend.name))
end)

it("sets balancer to nil when service is of type External name and endpoints in nil (omitted by go calling POST /configuration/backends)", function()
backend = {
name = "example-com", service = { spec = { ["type"] = "ExternalName" } },
endpoints = nil
}

helpers.mock_resty_dns_query(nil, { errcode = 3, errstr = "NXDNS: no such host (mock)" })
local mock_instance = { sync = function(backend) end }
setmetatable(mock_instance, implementation)
implementation.new = function(self, backend) return mock_instance end
local s = spy.on(implementation, "new")
assert.has_no.errors(function() balancer.sync_backend(backend) end)
assert.spy(s).was_not_called()
assert.is_nil(balancer.get_balancer_by_upstream_name(backend.name))
end)

it("wraps IPv6 addresses into square brackets", function()
local backend = {
name = "example-com",
Expand Down