diff --git a/ingress/origin_request_config.go b/ingress/origin_request_config.go index 3180fd80..a71607a6 100644 --- a/ingress/origin_request_config.go +++ b/ingress/origin_request_config.go @@ -49,7 +49,7 @@ func originRequestFromSingeRule(c *cli.Context) OriginRequestConfig { var noTLSVerify bool var disableChunkedEncoding bool var bastionMode bool - var proxyAddress string + var proxyAddress = defaultProxyAddress var proxyPort uint var proxyType string if flag := ProxyConnectTimeoutFlag; c.IsSet(flag) { diff --git a/ingress/origin_request_config_test.go b/ingress/origin_request_config_test.go index ab33896f..524b9857 100644 --- a/ingress/origin_request_config_test.go +++ b/ingress/origin_request_config_test.go @@ -1,11 +1,13 @@ package ingress import ( + "flag" "testing" "time" "github.com/cloudflare/cloudflared/cmd/cloudflared/config" "github.com/stretchr/testify/require" + "github.com/urfave/cli/v2" "gopkg.in/yaml.v2" ) @@ -182,3 +184,19 @@ ingress: } 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) +}