2018-10-03 19:37:53 +00:00
|
|
|
package envoy
|
|
|
|
|
|
|
|
import (
|
2019-04-29 16:27:57 +00:00
|
|
|
"encoding/json"
|
2018-10-09 09:57:26 +00:00
|
|
|
"flag"
|
|
|
|
"io/ioutil"
|
2019-04-29 16:27:57 +00:00
|
|
|
"net/http"
|
|
|
|
"net/http/httptest"
|
2018-10-09 09:57:26 +00:00
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2018-10-03 19:37:53 +00:00
|
|
|
"strings"
|
|
|
|
"testing"
|
2018-10-09 09:57:26 +00:00
|
|
|
|
|
|
|
"github.com/mitchellh/cli"
|
|
|
|
"github.com/stretchr/testify/require"
|
2019-04-29 16:27:57 +00:00
|
|
|
|
|
|
|
"github.com/hashicorp/consul/agent/xds"
|
|
|
|
"github.com/hashicorp/consul/api"
|
2018-10-03 19:37:53 +00:00
|
|
|
)
|
|
|
|
|
2018-10-09 09:57:26 +00:00
|
|
|
var update = flag.Bool("update", false, "update golden files")
|
|
|
|
|
2018-10-03 19:37:53 +00:00
|
|
|
func TestCatalogCommand_noTabs(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
if strings.ContainsRune(New(nil).Help(), '\t') {
|
|
|
|
t.Fatal("help has tabs")
|
|
|
|
}
|
|
|
|
}
|
2018-10-09 09:57:26 +00:00
|
|
|
|
|
|
|
// testSetAndResetEnv sets the env vars passed as KEY=value strings in the
|
|
|
|
// current ENV and returns a func() that will undo it's work at the end of the
|
|
|
|
// test for use with defer.
|
|
|
|
func testSetAndResetEnv(t *testing.T, env []string) func() {
|
|
|
|
old := make(map[string]*string)
|
|
|
|
for _, e := range env {
|
|
|
|
pair := strings.SplitN(e, "=", 2)
|
|
|
|
current := os.Getenv(pair[0])
|
|
|
|
if current != "" {
|
|
|
|
old[pair[0]] = ¤t
|
|
|
|
} else {
|
|
|
|
// save it as a nil so we know to remove again
|
|
|
|
old[pair[0]] = nil
|
|
|
|
}
|
|
|
|
os.Setenv(pair[0], pair[1])
|
|
|
|
}
|
|
|
|
// Return a func that will reset to old values
|
|
|
|
return func() {
|
|
|
|
for k, v := range old {
|
|
|
|
if v == nil {
|
|
|
|
os.Unsetenv(k)
|
|
|
|
} else {
|
|
|
|
os.Setenv(k, *v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// This tests the args we use to generate the template directly because they
|
|
|
|
// encapsulate all the argument and default handling code which is where most of
|
|
|
|
// the logic is. We also allow generating golden files but only for cases that
|
|
|
|
// pass the test of having their template args generated as expected.
|
|
|
|
func TestGenerateConfig(t *testing.T) {
|
|
|
|
cases := []struct {
|
2019-04-29 16:27:57 +00:00
|
|
|
Name string
|
|
|
|
Flags []string
|
|
|
|
Env []string
|
|
|
|
ProxyConfig map[string]interface{}
|
|
|
|
WantArgs BootstrapTplArgs
|
|
|
|
WantErr string
|
2018-10-09 09:57:26 +00:00
|
|
|
}{
|
|
|
|
{
|
|
|
|
Name: "no-args",
|
|
|
|
Flags: []string{},
|
|
|
|
Env: []string{},
|
|
|
|
WantErr: "No proxy ID specified",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "defaults",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy"},
|
|
|
|
Env: []string{},
|
2019-04-29 16:27:57 +00:00
|
|
|
WantArgs: BootstrapTplArgs{
|
2018-10-09 09:57:26 +00:00
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "8502", // Note this is the gRPC port
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "grpc-addr-flag",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy",
|
|
|
|
"-grpc-addr", "localhost:9999"},
|
|
|
|
Env: []string{},
|
2019-04-29 16:27:57 +00:00
|
|
|
WantArgs: BootstrapTplArgs{
|
2018-10-09 09:57:26 +00:00
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
// Should resolve IP, note this might not resolve the same way
|
|
|
|
// everywhere which might make this test brittle but not sure what else
|
|
|
|
// to do.
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "9999",
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "grpc-addr-env",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy"},
|
|
|
|
Env: []string{
|
|
|
|
"CONSUL_GRPC_ADDR=localhost:9999",
|
|
|
|
},
|
2019-04-29 16:27:57 +00:00
|
|
|
WantArgs: BootstrapTplArgs{
|
2018-10-09 09:57:26 +00:00
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
// Should resolve IP, note this might not resolve the same way
|
|
|
|
// everywhere which might make this test brittle but not sure what else
|
|
|
|
// to do.
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "9999",
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
2019-04-29 16:27:57 +00:00
|
|
|
{
|
|
|
|
Name: "custom-bootstrap",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy"},
|
|
|
|
Env: []string{},
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
// Add a completely custom bootstrap template. Never mind if this is
|
|
|
|
// invalid envoy config just as long as it works and gets the variables
|
|
|
|
// interplated.
|
|
|
|
"envoy_bootstrap_json_tpl": `
|
|
|
|
{
|
|
|
|
"admin": {
|
|
|
|
"access_log_path": "/dev/null",
|
|
|
|
"address": {
|
|
|
|
"socket_address": {
|
|
|
|
"address": "{{ .AdminBindAddress }}",
|
|
|
|
"port_value": {{ .AdminBindPort }}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"node": {
|
|
|
|
"cluster": "{{ .ProxyCluster }}",
|
|
|
|
"id": "{{ .ProxyID }}"
|
|
|
|
},
|
|
|
|
custom_field = "foo"
|
|
|
|
}`,
|
|
|
|
},
|
|
|
|
WantArgs: BootstrapTplArgs{
|
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "8502",
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "extra_-single",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy"},
|
|
|
|
Env: []string{},
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
// Add a custom sections with interpolated variables. These are all
|
|
|
|
// invalid config syntax too but we are just testing they have the right
|
|
|
|
// effect.
|
|
|
|
"envoy_extra_static_clusters_json": `
|
|
|
|
{
|
|
|
|
"name": "fake_cluster_1"
|
|
|
|
}`,
|
|
|
|
"envoy_extra_static_listeners_json": `
|
|
|
|
{
|
|
|
|
"name": "fake_listener_1"
|
|
|
|
}`,
|
|
|
|
"envoy_extra_stats_sinks_json": `
|
|
|
|
{
|
|
|
|
"name": "fake_sink_1"
|
|
|
|
}`,
|
|
|
|
},
|
|
|
|
WantArgs: BootstrapTplArgs{
|
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "8502",
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "extra_-multiple",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy"},
|
|
|
|
Env: []string{},
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
// Add a custom sections with interpolated variables. These are all
|
|
|
|
// invalid config syntax too but we are just testing they have the right
|
|
|
|
// effect.
|
|
|
|
"envoy_extra_static_clusters_json": `
|
|
|
|
{
|
|
|
|
"name": "fake_cluster_1"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"name": "fake_cluster_2"
|
|
|
|
}`,
|
|
|
|
"envoy_extra_static_listeners_json": `
|
|
|
|
{
|
|
|
|
"name": "fake_listener_1"
|
|
|
|
},{
|
|
|
|
"name": "fake_listener_2"
|
|
|
|
}`,
|
|
|
|
"envoy_extra_stats_sinks_json": `
|
|
|
|
{
|
|
|
|
"name": "fake_sink_1"
|
|
|
|
} , { "name": "fake_sink_2" }`,
|
|
|
|
},
|
|
|
|
WantArgs: BootstrapTplArgs{
|
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "8502",
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "stats-config-override",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy"},
|
|
|
|
Env: []string{},
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
// Add a custom sections with interpolated variables. These are all
|
|
|
|
// invalid config syntax too but we are just testing they have the right
|
|
|
|
// effect.
|
|
|
|
"envoy_stats_config_json": `
|
|
|
|
{
|
|
|
|
"name": "fake_config"
|
|
|
|
}`,
|
|
|
|
},
|
|
|
|
WantArgs: BootstrapTplArgs{
|
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "8502",
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "zipkin-tracing-config",
|
|
|
|
Flags: []string{"-proxy-id", "test-proxy"},
|
|
|
|
Env: []string{},
|
|
|
|
ProxyConfig: map[string]interface{}{
|
|
|
|
// Add a custom sections with interpolated variables. These are all
|
|
|
|
// invalid config syntax too but we are just testing they have the right
|
|
|
|
// effect.
|
|
|
|
"envoy_tracing_json": `{
|
|
|
|
"http": {
|
|
|
|
"name": "envoy.zipkin",
|
|
|
|
"config": {
|
|
|
|
"collector_cluster": "zipkin",
|
|
|
|
"collector_endpoint": "/api/v1/spans"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}`,
|
|
|
|
// Need to setup the cluster to send that too as well
|
|
|
|
"envoy_extra_static_clusters_json": `{
|
|
|
|
"name": "zipkin",
|
|
|
|
"type": "STRICT_DNS",
|
|
|
|
"connect_timeout": "5s",
|
|
|
|
"load_assignment": {
|
|
|
|
"cluster_name": "zipkin",
|
|
|
|
"endpoints": [
|
|
|
|
{
|
|
|
|
"lb_endpoints": [
|
|
|
|
{
|
|
|
|
"endpoint": {
|
|
|
|
"address": {
|
|
|
|
"socket_address": {
|
|
|
|
"address": "zipkin.service.consul",
|
|
|
|
"port_value": 9411
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
}`,
|
|
|
|
},
|
|
|
|
WantArgs: BootstrapTplArgs{
|
|
|
|
ProxyCluster: "test-proxy",
|
|
|
|
ProxyID: "test-proxy",
|
|
|
|
AgentAddress: "127.0.0.1",
|
|
|
|
AgentPort: "8502",
|
|
|
|
AdminBindAddress: "127.0.0.1",
|
|
|
|
AdminBindPort: "19000",
|
|
|
|
LocalAgentClusterName: xds.LocalAgentClusterName,
|
|
|
|
},
|
|
|
|
},
|
2018-10-09 09:57:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range cases {
|
|
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
|
|
require := require.New(t)
|
|
|
|
|
|
|
|
ui := cli.NewMockUi()
|
|
|
|
c := New(ui)
|
|
|
|
|
2019-04-29 16:27:57 +00:00
|
|
|
// Run a mock agent API that just always returns the proxy config in the
|
|
|
|
// test.
|
|
|
|
srv := httptest.NewServer(testMockAgentProxyConfig(tc.ProxyConfig))
|
|
|
|
defer srv.Close()
|
|
|
|
|
|
|
|
// Set the agent HTTP address in ENV to be our mock
|
|
|
|
tc.Env = append(tc.Env, "CONSUL_HTTP_ADDR="+srv.URL)
|
|
|
|
|
2018-10-09 09:57:26 +00:00
|
|
|
defer testSetAndResetEnv(t, tc.Env)()
|
|
|
|
|
|
|
|
// Run the command
|
|
|
|
args := append([]string{"-bootstrap"}, tc.Flags...)
|
|
|
|
code := c.Run(args)
|
|
|
|
if tc.WantErr == "" {
|
|
|
|
require.Equal(0, code, ui.ErrorWriter.String())
|
|
|
|
} else {
|
|
|
|
require.Equal(1, code, ui.ErrorWriter.String())
|
|
|
|
require.Contains(ui.ErrorWriter.String(), tc.WantErr)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify we handled the env and flags right first to get correct template
|
|
|
|
// args.
|
|
|
|
got, err := c.templateArgs()
|
|
|
|
require.NoError(err) // Error cases should have returned above
|
|
|
|
require.Equal(&tc.WantArgs, got)
|
|
|
|
|
|
|
|
// Actual template output goes to stdout direct to avoid prefix in UI, so
|
|
|
|
// generate it again here to assert on.
|
|
|
|
actual, err := c.generateConfig()
|
|
|
|
require.NoError(err)
|
|
|
|
|
|
|
|
// If we got the arg handling write, verify output
|
|
|
|
golden := filepath.Join("testdata", tc.Name+".golden")
|
|
|
|
if *update {
|
|
|
|
ioutil.WriteFile(golden, actual, 0644)
|
|
|
|
}
|
|
|
|
|
|
|
|
expected, err := ioutil.ReadFile(golden)
|
|
|
|
require.NoError(err)
|
|
|
|
require.Equal(string(expected), string(actual))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2019-04-29 16:27:57 +00:00
|
|
|
|
|
|
|
func testMockAgentProxyConfig(cfg map[string]interface{}) http.HandlerFunc {
|
|
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
// Parse the proxy-id from the end of the URL (blindly assuming it's correct
|
|
|
|
// format)
|
|
|
|
proxyID := strings.TrimPrefix(r.URL.Path, "/v1/agent/service/")
|
|
|
|
serviceID := strings.TrimSuffix(proxyID, "-sidecar-proxy")
|
|
|
|
|
|
|
|
svc := api.AgentService{
|
|
|
|
Kind: api.ServiceKindConnectProxy,
|
|
|
|
ID: proxyID,
|
|
|
|
Service: proxyID,
|
|
|
|
Proxy: &api.AgentServiceConnectProxyConfig{
|
|
|
|
DestinationServiceName: serviceID,
|
|
|
|
DestinationServiceID: serviceID,
|
|
|
|
Config: cfg,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
cfgJSON, err := json.Marshal(svc)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(500)
|
|
|
|
w.Write([]byte(err.Error()))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(cfgJSON)
|
|
|
|
})
|
|
|
|
}
|