DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BuildLogFormatUpstream function was always using the default log-format-upstream,

Browse source
This commit is contained in:
Giancarlo Rubio 2017-03-03 13:02:36 +01:00
parent 0b48d3b24d
commit 1e5081baf2
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
controllers/nginx/pkg/config/config_test.go
View file

@ -9,15 +9,18 @@ func TestBuildLogFormatUpstream(t *testing.T) {
testCases := []struct {
useProxyProtocol bool // use proxy protocol
curLogFormat string
expected string
}{
{true, fmt.Sprintf(logFormatUpstream, "$proxy_protocol_addr")},
{false, fmt.Sprintf(logFormatUpstream, "$remote_addr")},
{true, "", fmt.Sprintf(logFormatUpstream, "$proxy_protocol_addr")},
{false, "", fmt.Sprintf(logFormatUpstream, "$remote_addr")},
{true, "my-log-format", "my-log-format"},
{false, "john-log-format", "john-log-format"},
}
for _, testCase := range testCases {
result := BuildLogFormatUpstream(testCase.useProxyProtocol)
result := BuildLogFormatUpstream(testCase.useProxyProtocol, testCase.curLogFormat)
if result != testCase.expected {
t.Errorf(" expected %v but return %v", testCase.expected, result)