2a95701341
* Adds 'limits' field to the upstream configuration of a connect proxy This allows a user to configure the envoy connect proxy with 'max_connections', 'max_queued_requests', and 'max_concurrent_requests'. These values are defined in the local proxy on a per-service instance basis and should thus NOT be thought of as a global-level or even service-level value.
259 lines
5.4 KiB
Go
259 lines
5.4 KiB
Go
package xds
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestParseProxyConfig(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
input map[string]interface{}
|
|
want ProxyConfig
|
|
}{
|
|
{
|
|
name: "defaults - nil",
|
|
input: nil,
|
|
want: ProxyConfig{
|
|
Protocol: "tcp",
|
|
LocalConnectTimeoutMs: 5000,
|
|
},
|
|
},
|
|
{
|
|
name: "defaults - empty",
|
|
input: map[string]interface{}{},
|
|
want: ProxyConfig{
|
|
Protocol: "tcp",
|
|
LocalConnectTimeoutMs: 5000,
|
|
},
|
|
},
|
|
{
|
|
name: "defaults - other stuff",
|
|
input: map[string]interface{}{
|
|
"foo": "bar",
|
|
"envoy_foo": "envoy_bar",
|
|
},
|
|
want: ProxyConfig{
|
|
Protocol: "tcp",
|
|
LocalConnectTimeoutMs: 5000,
|
|
},
|
|
},
|
|
{
|
|
name: "protocol override",
|
|
input: map[string]interface{}{
|
|
"protocol": "http",
|
|
},
|
|
want: ProxyConfig{
|
|
Protocol: "http",
|
|
LocalConnectTimeoutMs: 5000,
|
|
},
|
|
},
|
|
{
|
|
name: "protocol uppercase override",
|
|
input: map[string]interface{}{
|
|
"protocol": "HTTP",
|
|
},
|
|
want: ProxyConfig{
|
|
Protocol: "http",
|
|
LocalConnectTimeoutMs: 5000,
|
|
},
|
|
},
|
|
{
|
|
name: "bind address override, string",
|
|
input: map[string]interface{}{
|
|
"bind_address": "127.0.0.2",
|
|
},
|
|
want: ProxyConfig{
|
|
LocalConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
BindAddress: "127.0.0.2",
|
|
},
|
|
},
|
|
{
|
|
name: "bind port override, string",
|
|
input: map[string]interface{}{
|
|
"bind_port": "8888",
|
|
},
|
|
want: ProxyConfig{
|
|
LocalConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
BindPort: 8888,
|
|
},
|
|
},
|
|
{
|
|
name: "bind port override, int",
|
|
input: map[string]interface{}{
|
|
"bind_port": 8889,
|
|
},
|
|
want: ProxyConfig{
|
|
LocalConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
BindPort: 8889,
|
|
},
|
|
},
|
|
{
|
|
name: "local connect timeout override, string",
|
|
input: map[string]interface{}{
|
|
"local_connect_timeout_ms": "1000",
|
|
},
|
|
want: ProxyConfig{
|
|
LocalConnectTimeoutMs: 1000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "local connect timeout override, float ",
|
|
input: map[string]interface{}{
|
|
"local_connect_timeout_ms": float64(1000.0),
|
|
},
|
|
want: ProxyConfig{
|
|
LocalConnectTimeoutMs: 1000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "local connect timeout override, int ",
|
|
input: map[string]interface{}{
|
|
"local_connect_timeout_ms": 1000,
|
|
},
|
|
want: ProxyConfig{
|
|
LocalConnectTimeoutMs: 1000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := ParseProxyConfig(tt.input)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.want, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseUpstreamConfig(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
input map[string]interface{}
|
|
want UpstreamConfig
|
|
}{
|
|
{
|
|
name: "defaults - nil",
|
|
input: nil,
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "defaults - empty",
|
|
input: map[string]interface{}{},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "defaults - other stuff",
|
|
input: map[string]interface{}{
|
|
"foo": "bar",
|
|
"envoy_foo": "envoy_bar",
|
|
},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "protocol override",
|
|
input: map[string]interface{}{
|
|
"protocol": "http",
|
|
},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 5000,
|
|
Protocol: "http",
|
|
},
|
|
},
|
|
{
|
|
name: "connect timeout override, string",
|
|
input: map[string]interface{}{
|
|
"connect_timeout_ms": "1000",
|
|
},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 1000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "connect timeout override, float ",
|
|
input: map[string]interface{}{
|
|
"connect_timeout_ms": float64(1000.0),
|
|
},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 1000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "connect timeout override, int ",
|
|
input: map[string]interface{}{
|
|
"connect_timeout_ms": 1000,
|
|
},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 1000,
|
|
Protocol: "tcp",
|
|
},
|
|
},
|
|
{
|
|
name: "connect limits map",
|
|
input: map[string]interface{}{
|
|
"limits": map[string]interface{}{
|
|
"max_connections": 50,
|
|
"max_pending_requests": 60,
|
|
"max_concurrent_requests": 70,
|
|
},
|
|
},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
Limits: UpstreamLimits{
|
|
MaxConnections: intPointer(50),
|
|
MaxPendingRequests: intPointer(60),
|
|
MaxConcurrentRequests: intPointer(70),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "connect limits map zero",
|
|
input: map[string]interface{}{
|
|
"limits": map[string]interface{}{
|
|
"max_connections": 0,
|
|
"max_pending_requests": 0,
|
|
"max_concurrent_requests": 0,
|
|
},
|
|
},
|
|
want: UpstreamConfig{
|
|
ConnectTimeoutMs: 5000,
|
|
Protocol: "tcp",
|
|
Limits: UpstreamLimits{
|
|
MaxConnections: intPointer(0),
|
|
MaxPendingRequests: intPointer(0),
|
|
MaxConcurrentRequests: intPointer(0),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := ParseUpstreamConfig(tt.input)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.want, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func intPointer(i int) *int {
|
|
return &i
|
|
}
|