2023-03-28 18:39:22 +00:00
|
|
|
// Copyright (c) HashiCorp, Inc.
|
|
|
|
// SPDX-License-Identifier: MPL-2.0
|
|
|
|
|
2018-09-12 16:07:47 +00:00
|
|
|
package structs
|
|
|
|
|
|
|
|
import (
|
|
|
|
"encoding/json"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/require"
|
2022-12-22 20:18:15 +00:00
|
|
|
|
|
|
|
"github.com/hashicorp/consul/api"
|
2018-09-12 16:07:47 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestConnectProxyConfig_ToAPI(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
in ConnectProxyConfig
|
|
|
|
want *api.AgentServiceConnectProxyConfig
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "service",
|
|
|
|
in: ConnectProxyConfig{
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
DestinationServiceID: "web1",
|
|
|
|
LocalServiceAddress: "127.0.0.2",
|
|
|
|
LocalServicePort: 5555,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"foo": "bar",
|
|
|
|
},
|
2019-07-12 21:19:37 +00:00
|
|
|
MeshGateway: MeshGatewayConfig{
|
|
|
|
Mode: MeshGatewayModeLocal,
|
|
|
|
},
|
2018-09-12 16:07:47 +00:00
|
|
|
Upstreams: Upstreams{
|
|
|
|
{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindPort: 1234,
|
2019-07-12 21:19:37 +00:00
|
|
|
MeshGateway: MeshGatewayConfig{
|
|
|
|
Mode: MeshGatewayModeLocal,
|
|
|
|
},
|
2018-09-12 16:07:47 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
DestinationType: UpstreamDestTypePreparedQuery,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindPort: 2345,
|
|
|
|
LocalBindAddress: "127.10.10.10",
|
|
|
|
},
|
|
|
|
},
|
2021-04-13 22:08:41 +00:00
|
|
|
Mode: ProxyModeTransparent,
|
|
|
|
TransparentProxy: TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 808,
|
|
|
|
},
|
2018-09-12 16:07:47 +00:00
|
|
|
},
|
|
|
|
want: &api.AgentServiceConnectProxyConfig{
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
DestinationServiceID: "web1",
|
|
|
|
LocalServiceAddress: "127.0.0.2",
|
|
|
|
LocalServicePort: 5555,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"foo": "bar",
|
|
|
|
},
|
2019-07-12 21:19:37 +00:00
|
|
|
MeshGateway: api.MeshGatewayConfig{
|
|
|
|
Mode: api.MeshGatewayModeLocal,
|
|
|
|
},
|
2018-09-12 16:07:47 +00:00
|
|
|
Upstreams: []api.Upstream{
|
|
|
|
{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindPort: 1234,
|
2019-07-12 21:19:37 +00:00
|
|
|
MeshGateway: api.MeshGatewayConfig{
|
|
|
|
Mode: api.MeshGatewayModeLocal,
|
|
|
|
},
|
2018-09-12 16:07:47 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
DestinationType: UpstreamDestTypePreparedQuery,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindPort: 2345,
|
|
|
|
LocalBindAddress: "127.10.10.10",
|
|
|
|
},
|
|
|
|
},
|
2021-04-13 22:08:41 +00:00
|
|
|
Mode: api.ProxyModeTransparent,
|
|
|
|
TransparentProxy: &api.TransparentProxyConfig{
|
|
|
|
OutboundListenerPort: 808,
|
|
|
|
},
|
2018-09-12 16:07:47 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
require.Equal(t, tt.want, tt.in.ToAPI())
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-15 19:53:35 +00:00
|
|
|
func TestConnectProxyConfig_MarshalJSON(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
in ConnectProxyConfig
|
|
|
|
want string
|
|
|
|
wantErr bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "direct proxy",
|
|
|
|
in: ConnectProxyConfig{
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
DestinationServiceID: "api-1",
|
|
|
|
LocalServiceAddress: "127.0.0.1",
|
|
|
|
LocalServicePort: 8080,
|
|
|
|
Mode: ProxyModeDirect,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"connect_timeout_ms": 5000,
|
|
|
|
},
|
|
|
|
Upstreams: Upstreams{
|
|
|
|
Upstream{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationName: "db",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindPort: 1234,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
MeshGateway: MeshGatewayConfig{Mode: MeshGatewayModeLocal},
|
|
|
|
Expose: ExposeConfig{Checks: true},
|
|
|
|
|
|
|
|
// No transparent proxy config, since proxy is set to "direct" mode.
|
|
|
|
// Field should be omitted from json output.
|
|
|
|
// TransparentProxy: TransparentProxyConfig{},
|
2022-12-22 20:18:15 +00:00
|
|
|
|
|
|
|
// No access logs config provided, so this should be omitted.
|
|
|
|
// AccessLogs: AccessLogsConfig{},
|
2021-06-15 19:53:35 +00:00
|
|
|
},
|
|
|
|
want: `{
|
|
|
|
"DestinationServiceName": "api",
|
|
|
|
"DestinationServiceID": "api-1",
|
|
|
|
"LocalServiceAddress": "127.0.0.1",
|
|
|
|
"LocalServicePort": 8080,
|
|
|
|
"Mode": "direct",
|
|
|
|
"Config": {
|
|
|
|
"connect_timeout_ms": 5000
|
|
|
|
},
|
|
|
|
"Upstreams": [
|
|
|
|
{
|
|
|
|
"DestinationType": "service",
|
|
|
|
"DestinationName": "db",
|
|
|
|
"Datacenter": "dc1",
|
|
|
|
"LocalBindPort": 1234,
|
|
|
|
"MeshGateway": {}
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"MeshGateway": {
|
|
|
|
"Mode": "local"
|
|
|
|
},
|
|
|
|
"Expose": {
|
|
|
|
"Checks": true
|
|
|
|
}
|
|
|
|
}`,
|
|
|
|
wantErr: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "transparent proxy",
|
|
|
|
in: ConnectProxyConfig{
|
|
|
|
DestinationServiceName: "billing",
|
|
|
|
DestinationServiceID: "billing-1",
|
|
|
|
LocalServiceAddress: "127.0.0.1",
|
|
|
|
LocalServicePort: 8080,
|
|
|
|
Mode: ProxyModeTransparent,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"connect_timeout_ms": 5000,
|
|
|
|
},
|
|
|
|
MeshGateway: MeshGatewayConfig{Mode: MeshGatewayModeLocal},
|
|
|
|
Expose: ExposeConfig{Checks: true},
|
|
|
|
TransparentProxy: TransparentProxyConfig{
|
|
|
|
DialedDirectly: true,
|
|
|
|
OutboundListenerPort: 16001,
|
|
|
|
},
|
2022-12-22 20:18:15 +00:00
|
|
|
AccessLogs: AccessLogsConfig{
|
|
|
|
Enabled: true,
|
|
|
|
DisableListenerLogs: true,
|
|
|
|
Type: FileLogSinkType,
|
|
|
|
Path: "/var/log/access.log",
|
|
|
|
},
|
2021-06-15 19:53:35 +00:00
|
|
|
},
|
|
|
|
want: `{
|
|
|
|
"DestinationServiceName": "billing",
|
|
|
|
"DestinationServiceID": "billing-1",
|
|
|
|
"LocalServiceAddress": "127.0.0.1",
|
|
|
|
"LocalServicePort": 8080,
|
|
|
|
"Mode": "transparent",
|
|
|
|
"Config": {
|
|
|
|
"connect_timeout_ms": 5000
|
|
|
|
},
|
|
|
|
"TransparentProxy": {
|
|
|
|
"DialedDirectly": true,
|
|
|
|
"OutboundListenerPort": 16001
|
|
|
|
},
|
|
|
|
"MeshGateway": {
|
|
|
|
"Mode": "local"
|
|
|
|
},
|
|
|
|
"Expose": {
|
|
|
|
"Checks": true
|
2022-12-22 20:18:15 +00:00
|
|
|
},
|
|
|
|
"AccessLogs": {
|
|
|
|
"Enabled": true,
|
|
|
|
"DisableListenerLogs": true,
|
|
|
|
"Type": "file",
|
|
|
|
"Path": "/var/log/access.log"
|
2021-06-15 19:53:35 +00:00
|
|
|
}
|
|
|
|
}`,
|
|
|
|
wantErr: false,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
got, err := tt.in.MarshalJSON()
|
|
|
|
if tt.wantErr {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.Error(t, err)
|
2021-06-15 19:53:35 +00:00
|
|
|
return
|
|
|
|
}
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.JSONEq(t, tt.want, string(got))
|
2021-06-15 19:53:35 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-12 16:07:47 +00:00
|
|
|
func TestUpstream_MarshalJSON(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
in Upstream
|
|
|
|
want string
|
|
|
|
wantErr bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "service",
|
|
|
|
in: Upstream{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindPort: 1234,
|
2020-05-01 00:51:41 +00:00
|
|
|
// Test IngressHosts does not marshal
|
|
|
|
IngressHosts: []string{"test.example.com"},
|
2018-09-12 16:07:47 +00:00
|
|
|
},
|
|
|
|
want: `{
|
|
|
|
"DestinationType": "service",
|
|
|
|
"DestinationName": "foo",
|
|
|
|
"Datacenter": "dc1",
|
|
|
|
"LocalBindPort": 1234,
|
2020-09-24 18:58:52 +00:00
|
|
|
"MeshGateway": {}
|
2018-09-12 16:07:47 +00:00
|
|
|
}`,
|
|
|
|
wantErr: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "pq",
|
|
|
|
in: Upstream{
|
|
|
|
DestinationType: UpstreamDestTypePreparedQuery,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindPort: 1234,
|
|
|
|
},
|
|
|
|
want: `{
|
|
|
|
"DestinationType": "prepared_query",
|
|
|
|
"DestinationName": "foo",
|
|
|
|
"Datacenter": "dc1",
|
|
|
|
"LocalBindPort": 1234,
|
2020-09-24 18:58:52 +00:00
|
|
|
"MeshGateway": {}
|
2018-09-12 16:07:47 +00:00
|
|
|
}`,
|
|
|
|
wantErr: false,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
got, err := json.Marshal(tt.in)
|
|
|
|
if tt.wantErr {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.Error(t, err)
|
2018-09-12 16:07:47 +00:00
|
|
|
return
|
|
|
|
}
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.JSONEq(t, tt.want, string(got))
|
2018-09-12 16:07:47 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestUpstream_UnmarshalJSON(t *testing.T) {
|
|
|
|
tests := []struct {
|
2020-09-24 18:58:52 +00:00
|
|
|
name string
|
|
|
|
json string
|
|
|
|
jsonSnake string
|
|
|
|
want Upstream
|
|
|
|
wantErr bool
|
2018-09-12 16:07:47 +00:00
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "service",
|
|
|
|
json: `{
|
|
|
|
"DestinationType": "service",
|
|
|
|
"DestinationName": "foo",
|
|
|
|
"Datacenter": "dc1"
|
|
|
|
}`,
|
|
|
|
want: Upstream{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
},
|
|
|
|
wantErr: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "pq",
|
|
|
|
json: `{
|
|
|
|
"DestinationType": "prepared_query",
|
|
|
|
"DestinationName": "foo",
|
|
|
|
"Datacenter": "dc1"
|
|
|
|
}`,
|
|
|
|
want: Upstream{
|
|
|
|
DestinationType: UpstreamDestTypePreparedQuery,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
},
|
|
|
|
wantErr: false,
|
|
|
|
},
|
2020-05-01 00:51:41 +00:00
|
|
|
{
|
|
|
|
name: "ingress-hosts-do-not-unmarshal",
|
|
|
|
json: `{
|
|
|
|
"DestinationType": "service",
|
|
|
|
"DestinationName": "foo",
|
|
|
|
"Datacenter": "dc1",
|
|
|
|
"IngressHosts": ["asdf"]
|
|
|
|
}`,
|
|
|
|
want: Upstream{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationName: "foo",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
IngressHosts: nil, // Make sure this doesn't get parsed
|
|
|
|
},
|
|
|
|
wantErr: true,
|
|
|
|
},
|
2020-09-24 18:58:52 +00:00
|
|
|
{
|
|
|
|
name: "kitchen sink",
|
|
|
|
json: `
|
|
|
|
{
|
|
|
|
"DestinationType": "service",
|
|
|
|
"DestinationNamespace": "default",
|
|
|
|
"DestinationName": "bar1",
|
|
|
|
"Datacenter": "dc1",
|
|
|
|
"LocalBindAddress": "127.0.0.2",
|
|
|
|
"LocalBindPort": 6060,
|
|
|
|
"Config": {
|
|
|
|
"x": "y",
|
|
|
|
"z": -2
|
|
|
|
},
|
|
|
|
"MeshGateway": {
|
|
|
|
"Mode": "local"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
jsonSnake: `
|
|
|
|
{
|
|
|
|
"destination_type": "service",
|
|
|
|
"destination_namespace": "default",
|
|
|
|
"destination_name": "bar1",
|
|
|
|
"datacenter": "dc1",
|
|
|
|
"local_bind_address": "127.0.0.2",
|
|
|
|
"local_bind_port": 6060,
|
|
|
|
"config": {
|
|
|
|
"x": "y",
|
|
|
|
"z": -2
|
|
|
|
},
|
|
|
|
"mesh_gateway": {
|
|
|
|
"mode": "local"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
want: Upstream{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationNamespace: "default",
|
|
|
|
DestinationName: "bar1",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindAddress: "127.0.0.2",
|
|
|
|
LocalBindPort: 6060,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"x": "y",
|
|
|
|
"z": float64(-2),
|
|
|
|
},
|
|
|
|
MeshGateway: MeshGatewayConfig{
|
|
|
|
Mode: "local",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2018-09-12 16:07:47 +00:00
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
2020-09-24 18:58:52 +00:00
|
|
|
t.Run("camel", func(t *testing.T) {
|
|
|
|
var got Upstream
|
|
|
|
err := json.Unmarshal([]byte(tt.json), &got)
|
|
|
|
if tt.wantErr {
|
|
|
|
require.Error(t, err)
|
|
|
|
} else {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tt.want, got, "%+v", got)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
if tt.jsonSnake != "" {
|
|
|
|
t.Run("snake", func(t *testing.T) {
|
|
|
|
var got Upstream
|
|
|
|
err := json.Unmarshal([]byte(tt.jsonSnake), &got)
|
|
|
|
if tt.wantErr {
|
|
|
|
require.Error(t, err)
|
|
|
|
} else {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tt.want, got)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestConnectProxyConfig_UnmarshalJSON(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
json string
|
|
|
|
jsonSnake string
|
|
|
|
want ConnectProxyConfig
|
|
|
|
wantErr bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "kitchen sink",
|
|
|
|
json: `
|
|
|
|
{
|
|
|
|
"DestinationServiceName": "foo-name",
|
|
|
|
"DestinationServiceID": "foo-id",
|
|
|
|
"LocalServiceAddress": "127.0.0.1",
|
|
|
|
"LocalServicePort": 5050,
|
|
|
|
"Config": {
|
|
|
|
"a": "b",
|
|
|
|
"v": 42
|
|
|
|
},
|
|
|
|
"Upstreams": [
|
|
|
|
{
|
|
|
|
"DestinationType": "service",
|
|
|
|
"DestinationNamespace": "default",
|
|
|
|
"DestinationName": "bar1",
|
|
|
|
"Datacenter": "dc1",
|
|
|
|
"LocalBindAddress": "127.0.0.2",
|
|
|
|
"LocalBindPort": 6060,
|
|
|
|
"Config": {
|
|
|
|
"x": "y",
|
|
|
|
"z": -2
|
|
|
|
},
|
|
|
|
"MeshGateway": {
|
|
|
|
"Mode": "local"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"DestinationType": "service",
|
|
|
|
"DestinationNamespace": "default",
|
|
|
|
"DestinationName": "bar2",
|
|
|
|
"Datacenter": "dc2",
|
|
|
|
"LocalBindAddress": "127.0.0.2",
|
|
|
|
"LocalBindPort": 6161
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"MeshGateway": {
|
|
|
|
"Mode": "remote"
|
|
|
|
},
|
|
|
|
"Expose": {
|
|
|
|
"Checks": true,
|
|
|
|
"Paths": [
|
|
|
|
{
|
|
|
|
"ListenerPort": 8080,
|
|
|
|
"Path": "/foo",
|
|
|
|
"LocalPathPort": 7070,
|
|
|
|
"Protocol": "http2",
|
|
|
|
"ParsedFromCheck": true
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"ListenerPort": 8181,
|
|
|
|
"Path": "/foo2",
|
|
|
|
"LocalPathPort": 7171,
|
|
|
|
"Protocol": "http",
|
|
|
|
"ParsedFromCheck": false
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
jsonSnake: `
|
|
|
|
{
|
|
|
|
"destination_service_name": "foo-name",
|
|
|
|
"destination_service_id": "foo-id",
|
|
|
|
"local_service_address": "127.0.0.1",
|
|
|
|
"local_service_port": 5050,
|
|
|
|
"config": {
|
|
|
|
"a": "b",
|
|
|
|
"v": 42
|
|
|
|
},
|
|
|
|
"upstreams": [
|
|
|
|
{
|
|
|
|
"destination_type": "service",
|
|
|
|
"destination_namespace": "default",
|
|
|
|
"destination_name": "bar1",
|
|
|
|
"datacenter": "dc1",
|
|
|
|
"local_bind_address": "127.0.0.2",
|
|
|
|
"local_bind_port": 6060,
|
|
|
|
"config": {
|
|
|
|
"x": "y",
|
|
|
|
"z": -2
|
|
|
|
},
|
|
|
|
"mesh_gateway": {
|
|
|
|
"mode": "local"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"destination_type": "service",
|
|
|
|
"destination_namespace": "default",
|
|
|
|
"destination_name": "bar2",
|
|
|
|
"datacenter": "dc2",
|
|
|
|
"local_bind_address": "127.0.0.2",
|
|
|
|
"local_bind_port": 6161
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"mesh_gateway": {
|
|
|
|
"mode": "remote"
|
|
|
|
},
|
|
|
|
"expose": {
|
|
|
|
"checks": true,
|
|
|
|
"paths": [
|
|
|
|
{
|
|
|
|
"listener_port": 8080,
|
|
|
|
"path": "/foo",
|
|
|
|
"local_path_port": 7070,
|
|
|
|
"protocol": "http2",
|
|
|
|
"parsed_from_check": true
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"listener_port": 8181,
|
|
|
|
"path": "/foo2",
|
|
|
|
"local_path_port": 7171,
|
|
|
|
"protocol": "http",
|
|
|
|
"parsed_from_check": false
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
want: ConnectProxyConfig{
|
|
|
|
DestinationServiceName: "foo-name",
|
|
|
|
DestinationServiceID: "foo-id",
|
|
|
|
LocalServiceAddress: "127.0.0.1",
|
|
|
|
LocalServicePort: 5050,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"a": "b",
|
|
|
|
"v": float64(42),
|
|
|
|
},
|
|
|
|
Upstreams: []Upstream{
|
|
|
|
{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationNamespace: "default",
|
|
|
|
DestinationName: "bar1",
|
|
|
|
Datacenter: "dc1",
|
|
|
|
LocalBindAddress: "127.0.0.2",
|
|
|
|
LocalBindPort: 6060,
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
"x": "y",
|
|
|
|
"z": float64(-2),
|
|
|
|
},
|
|
|
|
MeshGateway: MeshGatewayConfig{
|
|
|
|
Mode: "local",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
{
|
|
|
|
DestinationType: UpstreamDestTypeService,
|
|
|
|
DestinationNamespace: "default",
|
|
|
|
DestinationName: "bar2",
|
|
|
|
Datacenter: "dc2",
|
|
|
|
LocalBindAddress: "127.0.0.2",
|
|
|
|
LocalBindPort: 6161,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
MeshGateway: MeshGatewayConfig{
|
|
|
|
Mode: "remote",
|
|
|
|
},
|
|
|
|
Expose: ExposeConfig{
|
|
|
|
Checks: true,
|
|
|
|
Paths: []ExposePath{
|
|
|
|
{
|
|
|
|
ListenerPort: 8080,
|
|
|
|
Path: "/foo",
|
|
|
|
LocalPathPort: 7070,
|
|
|
|
Protocol: "http2",
|
|
|
|
ParsedFromCheck: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
ListenerPort: 8181,
|
|
|
|
Path: "/foo2",
|
|
|
|
LocalPathPort: 7171,
|
|
|
|
Protocol: "http",
|
|
|
|
ParsedFromCheck: false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
t.Run("camel", func(t *testing.T) {
|
|
|
|
//
|
|
|
|
var got ConnectProxyConfig
|
|
|
|
err := json.Unmarshal([]byte(tt.json), &got)
|
|
|
|
if tt.wantErr {
|
|
|
|
require.Error(t, err)
|
|
|
|
} else {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tt.want, got)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
if tt.jsonSnake != "" {
|
|
|
|
t.Run("snake", func(t *testing.T) {
|
|
|
|
//
|
|
|
|
var got ConnectProxyConfig
|
|
|
|
err := json.Unmarshal([]byte(tt.json), &got)
|
|
|
|
if tt.wantErr {
|
|
|
|
require.Error(t, err)
|
|
|
|
} else {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tt.want, got)
|
|
|
|
}
|
|
|
|
})
|
2018-09-12 16:07:47 +00:00
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2019-08-02 03:03:34 +00:00
|
|
|
|
|
|
|
func TestValidateMeshGatewayMode(t *testing.T) {
|
|
|
|
for _, tc := range []struct {
|
|
|
|
modeConstant string
|
|
|
|
modeExplicit string
|
|
|
|
expect MeshGatewayMode
|
|
|
|
ok bool
|
|
|
|
}{
|
|
|
|
{string(MeshGatewayModeNone), "none", MeshGatewayModeNone, true},
|
|
|
|
{string(MeshGatewayModeDefault), "", MeshGatewayModeDefault, true},
|
|
|
|
{string(MeshGatewayModeLocal), "local", MeshGatewayModeLocal, true},
|
|
|
|
{string(MeshGatewayModeRemote), "remote", MeshGatewayModeRemote, true},
|
|
|
|
} {
|
|
|
|
tc := tc
|
|
|
|
|
|
|
|
t.Run(tc.modeConstant+" (constant)", func(t *testing.T) {
|
|
|
|
got, err := ValidateMeshGatewayMode(tc.modeConstant)
|
|
|
|
if tc.ok {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tc.expect, got)
|
|
|
|
} else {
|
|
|
|
require.Error(t, err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
t.Run(tc.modeExplicit+" (explicit)", func(t *testing.T) {
|
|
|
|
got, err := ValidateMeshGatewayMode(tc.modeExplicit)
|
|
|
|
if tc.ok {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tc.expect, got)
|
|
|
|
} else {
|
|
|
|
require.Error(t, err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2021-04-12 15:35:14 +00:00
|
|
|
|
|
|
|
func TestValidateProxyMode(t *testing.T) {
|
|
|
|
for _, tc := range []struct {
|
|
|
|
modeConstant string
|
|
|
|
modeExplicit string
|
|
|
|
expect ProxyMode
|
|
|
|
ok bool
|
|
|
|
}{
|
|
|
|
{string(ProxyModeDefault), "", ProxyModeDefault, true},
|
|
|
|
{string(ProxyModeDirect), "direct", ProxyModeDirect, true},
|
|
|
|
{string(ProxyModeTransparent), "transparent", ProxyModeTransparent, true},
|
|
|
|
} {
|
|
|
|
tc := tc
|
|
|
|
|
|
|
|
t.Run(tc.modeConstant+" (constant)", func(t *testing.T) {
|
|
|
|
got, err := ValidateProxyMode(tc.modeConstant)
|
|
|
|
if tc.ok {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tc.expect, got)
|
|
|
|
} else {
|
|
|
|
require.Error(t, err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
t.Run(tc.modeExplicit+" (explicit)", func(t *testing.T) {
|
|
|
|
got, err := ValidateProxyMode(tc.modeExplicit)
|
|
|
|
if tc.ok {
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, tc.expect, got)
|
|
|
|
} else {
|
|
|
|
require.Error(t, err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|