TUN-3543: ProxyAddress not using default in single-origin mode

This commit is contained in:
Adam Chalmers 2020-11-13 17:27:55 -06:00
parent 030b768eeb
commit ce7d0572fe
2 changed files with 19 additions and 1 deletions

View File

@ -49,7 +49,7 @@ func originRequestFromSingeRule(c *cli.Context) OriginRequestConfig {
var noTLSVerify bool var noTLSVerify bool
var disableChunkedEncoding bool var disableChunkedEncoding bool
var bastionMode bool var bastionMode bool
var proxyAddress string var proxyAddress = defaultProxyAddress
var proxyPort uint var proxyPort uint
var proxyType string var proxyType string
if flag := ProxyConnectTimeoutFlag; c.IsSet(flag) { if flag := ProxyConnectTimeoutFlag; c.IsSet(flag) {

View File

@ -1,11 +1,13 @@
package ingress package ingress
import ( import (
"flag"
"testing" "testing"
"time" "time"
"github.com/cloudflare/cloudflared/cmd/cloudflared/config" "github.com/cloudflare/cloudflared/cmd/cloudflared/config"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
@ -182,3 +184,19 @@ ingress:
} }
require.Equal(t, expected1, actual1) require.Equal(t, expected1, actual1)
} }
func TestDefaultConfigFromCLI(t *testing.T) {
set := flag.NewFlagSet("contrive", 0)
c := cli.NewContext(nil, set, nil)
expected := OriginRequestConfig{
ConnectTimeout: defaultConnectTimeout,
TLSTimeout: defaultTLSTimeout,
TCPKeepAlive: defaultTCPKeepAlive,
KeepAliveConnections: defaultKeepAliveConnections,
KeepAliveTimeout: defaultKeepAliveTimeout,
ProxyAddress: defaultProxyAddress,
}
actual := originRequestFromSingeRule(c)
require.Equal(t, expected, actual)
}