2013-12-23 21:52:10 +00:00
|
|
|
package agent
|
|
|
|
|
2014-02-07 19:49:51 +00:00
|
|
|
import (
|
|
|
|
"bytes"
|
2017-04-27 08:29:39 +00:00
|
|
|
"crypto/tls"
|
2014-02-07 19:49:51 +00:00
|
|
|
"encoding/base64"
|
2017-06-04 09:38:29 +00:00
|
|
|
"errors"
|
2014-02-07 19:49:51 +00:00
|
|
|
"io/ioutil"
|
2015-06-05 11:44:42 +00:00
|
|
|
"net"
|
2014-02-07 19:49:51 +00:00
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
"reflect"
|
2015-01-05 20:30:03 +00:00
|
|
|
"strings"
|
2014-02-07 19:49:51 +00:00
|
|
|
"testing"
|
|
|
|
"time"
|
2016-01-29 19:42:34 +00:00
|
|
|
|
2017-06-15 16:46:06 +00:00
|
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
2017-05-12 13:41:13 +00:00
|
|
|
"github.com/hashicorp/consul/testutil"
|
2017-05-15 19:49:13 +00:00
|
|
|
"github.com/pascaldekloe/goe/verify"
|
2014-02-07 19:49:51 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestConfigEncryptBytes(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2014-02-07 19:49:51 +00:00
|
|
|
// Test with some input
|
|
|
|
src := []byte("abc")
|
|
|
|
c := &Config{
|
|
|
|
EncryptKey: base64.StdEncoding.EncodeToString(src),
|
|
|
|
}
|
|
|
|
|
|
|
|
result, err := c.EncryptBytes()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !bytes.Equal(src, result) {
|
|
|
|
t.Fatalf("bad: %#v", result)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Test with no input
|
|
|
|
c = &Config{}
|
|
|
|
result, err = c.EncryptBytes()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(result) > 0 {
|
|
|
|
t.Fatalf("bad: %#v", result)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestDecodeConfig(t *testing.T) {
|
2017-06-04 09:38:29 +00:00
|
|
|
tests := []struct {
|
2017-07-28 20:01:32 +00:00
|
|
|
desc string
|
|
|
|
in string
|
|
|
|
c *Config
|
|
|
|
err error
|
|
|
|
parseTemplateErr error
|
2017-06-04 09:38:29 +00:00
|
|
|
}{
|
|
|
|
// special flows
|
|
|
|
{
|
|
|
|
in: `{"bad": "no way jose"}`,
|
|
|
|
err: errors.New("Config has invalid keys: bad"),
|
|
|
|
},
|
2017-07-28 20:01:32 +00:00
|
|
|
{
|
|
|
|
in: `{"advertise_addr":"unix:///path/to/file"}`,
|
|
|
|
parseTemplateErr: errors.New("Failed to parse Advertise address: unix:///path/to/file"),
|
|
|
|
c: &Config{AdvertiseAddr: "unix:///path/to/file"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"advertise_addr_wan":"unix:///path/to/file"}`,
|
|
|
|
parseTemplateErr: errors.New("Failed to parse Advertise WAN address: unix:///path/to/file"),
|
|
|
|
c: &Config{AdvertiseAddrWan: "unix:///path/to/file"},
|
|
|
|
},
|
2017-07-28 22:18:10 +00:00
|
|
|
{
|
|
|
|
in: `{"addresses":{"http":"notunix://blah"}}`,
|
2017-07-28 22:52:35 +00:00
|
|
|
parseTemplateErr: errors.New("Failed to parse HTTP address, \"notunix://blah\" is not a valid IP address or socket"),
|
2017-07-28 22:18:10 +00:00
|
|
|
c: &Config{Addresses: AddressConfig{HTTP: "notunix://blah"}},
|
|
|
|
},
|
|
|
|
|
2017-07-28 20:01:32 +00:00
|
|
|
// happy flows in alphabetical order
|
2017-06-04 09:38:29 +00:00
|
|
|
{
|
|
|
|
in: `{"acl_agent_master_token":"a"}`,
|
|
|
|
c: &Config{ACLAgentMasterToken: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_agent_token":"a"}`,
|
|
|
|
c: &Config{ACLAgentToken: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_datacenter":"a"}`,
|
|
|
|
c: &Config{ACLDatacenter: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_default_policy":"a"}`,
|
|
|
|
c: &Config{ACLDefaultPolicy: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_down_policy":"a"}`,
|
|
|
|
c: &Config{ACLDownPolicy: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_enforce_version_8":true}`,
|
|
|
|
c: &Config{ACLEnforceVersion8: Bool(true)},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_master_token":"a"}`,
|
|
|
|
c: &Config{ACLMasterToken: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_replication_token":"a"}`,
|
2017-08-03 22:39:31 +00:00
|
|
|
c: &Config{
|
|
|
|
EnableACLReplication: true,
|
|
|
|
ACLReplicationToken: "a",
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_token":"a"}`,
|
|
|
|
c: &Config{ACLToken: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"acl_ttl":"2s"}`,
|
|
|
|
c: &Config{ACLTTL: 2 * time.Second, ACLTTLRaw: "2s"},
|
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"addresses":{"dns":"1.2.3.4"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{DNS: "1.2.3.4"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"addresses":{"dns":"{{\"1.2.3.4\"}}"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{DNS: "1.2.3.4"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"addresses":{"http":"1.2.3.4"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{HTTP: "1.2.3.4"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"addresses":{"http":"unix:///var/foo/bar"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{HTTP: "unix:///var/foo/bar"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"addresses":{"http":"{{\"1.2.3.4\"}}"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{HTTP: "1.2.3.4"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"addresses":{"https":"1.2.3.4"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{HTTPS: "1.2.3.4"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"addresses":{"https":"unix:///var/foo/bar"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{HTTPS: "unix:///var/foo/bar"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"addresses":{"https":"{{\"1.2.3.4\"}}"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{HTTPS: "1.2.3.4"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"addresses":{"rpc":"a"}}`,
|
|
|
|
c: &Config{Addresses: AddressConfig{RPC: "a"}},
|
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"advertise_addr":"1.2.3.4"}`,
|
|
|
|
c: &Config{AdvertiseAddr: "1.2.3.4"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"advertise_addr":"{{\"1.2.3.4\"}}"}`,
|
|
|
|
c: &Config{AdvertiseAddr: "1.2.3.4"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"advertise_addr_wan":"1.2.3.4"}`,
|
|
|
|
c: &Config{AdvertiseAddrWan: "1.2.3.4"},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"advertise_addr_wan":"{{\"1.2.3.4\"}}"}`,
|
|
|
|
c: &Config{AdvertiseAddrWan: "1.2.3.4"},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"advertise_addrs":{"rpc":"1.2.3.4:5678"}}`,
|
|
|
|
c: &Config{
|
|
|
|
AdvertiseAddrs: AdvertiseAddrsConfig{
|
|
|
|
RPC: &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 5678},
|
|
|
|
RPCRaw: "1.2.3.4:5678",
|
2015-01-14 01:52:17 +00:00
|
|
|
},
|
2014-10-24 02:22:25 +00:00
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"advertise_addrs":{"serf_lan":"1.2.3.4:5678"}}`,
|
|
|
|
c: &Config{
|
|
|
|
AdvertiseAddrs: AdvertiseAddrsConfig{
|
|
|
|
SerfLan: &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 5678},
|
|
|
|
SerfLanRaw: "1.2.3.4:5678",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"advertise_addrs":{"serf_wan":"1.2.3.4:5678"}}`,
|
|
|
|
c: &Config{
|
|
|
|
AdvertiseAddrs: AdvertiseAddrsConfig{
|
|
|
|
SerfWan: &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 5678},
|
|
|
|
SerfWanRaw: "1.2.3.4:5678",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"atlas_acl_token":"a"}`,
|
|
|
|
c: &Config{DeprecatedAtlasACLToken: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"atlas_endpoint":"a"}`,
|
|
|
|
c: &Config{DeprecatedAtlasEndpoint: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"atlas_infrastructure":"a"}`,
|
|
|
|
c: &Config{DeprecatedAtlasInfrastructure: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"atlas_join":true}`,
|
|
|
|
c: &Config{DeprecatedAtlasJoin: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"atlas_token":"a"}`,
|
|
|
|
c: &Config{DeprecatedAtlasToken: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"autopilot":{"cleanup_dead_servers":true}}`,
|
|
|
|
c: &Config{Autopilot: Autopilot{CleanupDeadServers: Bool(true)}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"autopilot":{"disable_upgrade_migration":true}}`,
|
|
|
|
c: &Config{Autopilot: Autopilot{DisableUpgradeMigration: Bool(true)}},
|
|
|
|
},
|
2017-07-18 02:05:24 +00:00
|
|
|
{
|
|
|
|
in: `{"autopilot":{"upgrade_version_tag":"rev"}}`,
|
|
|
|
c: &Config{Autopilot: Autopilot{UpgradeVersionTag: "rev"}},
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
{
|
|
|
|
in: `{"autopilot":{"last_contact_threshold":"2s"}}`,
|
|
|
|
c: &Config{Autopilot: Autopilot{LastContactThreshold: Duration(2 * time.Second), LastContactThresholdRaw: "2s"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"autopilot":{"max_trailing_logs":10}}`,
|
|
|
|
c: &Config{Autopilot: Autopilot{MaxTrailingLogs: Uint64(10)}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"autopilot":{"server_stabilization_time":"2s"}}`,
|
|
|
|
c: &Config{Autopilot: Autopilot{ServerStabilizationTime: Duration(2 * time.Second), ServerStabilizationTimeRaw: "2s"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"autopilot":{"cleanup_dead_servers":true}}`,
|
|
|
|
c: &Config{Autopilot: Autopilot{CleanupDeadServers: Bool(true)}},
|
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"bind_addr":"1.2.3.4"}`,
|
|
|
|
c: &Config{BindAddr: "1.2.3.4"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"bind_addr":"{{\"1.2.3.4\"}}"}`,
|
|
|
|
c: &Config{BindAddr: "1.2.3.4"},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"bootstrap":true}`,
|
|
|
|
c: &Config{Bootstrap: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"bootstrap_expect":3}`,
|
|
|
|
c: &Config{BootstrapExpect: 3},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ca_file":"a"}`,
|
|
|
|
c: &Config{CAFile: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ca_path":"a"}`,
|
|
|
|
c: &Config{CAPath: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"check_update_interval":"2s"}`,
|
|
|
|
c: &Config{CheckUpdateInterval: 2 * time.Second, CheckUpdateIntervalRaw: "2s"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"cert_file":"a"}`,
|
|
|
|
c: &Config{CertFile: "a"},
|
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"client_addr":"1.2.3.4"}`,
|
|
|
|
c: &Config{ClientAddr: "1.2.3.4"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"client_addr":"{{\"1.2.3.4\"}}"}`,
|
|
|
|
c: &Config{ClientAddr: "1.2.3.4"},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"data_dir":"a"}`,
|
|
|
|
c: &Config{DataDir: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"datacenter":"a"}`,
|
|
|
|
c: &Config{Datacenter: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"disable_coordinates":true}`,
|
|
|
|
c: &Config{DisableCoordinates: true},
|
|
|
|
},
|
|
|
|
{
|
2017-06-24 16:36:53 +00:00
|
|
|
in: `{"disable_host_node_id":false}`,
|
|
|
|
c: &Config{DisableHostNodeID: Bool(false)},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"allow_stale":true}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{AllowStale: Bool(true)}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"disable_compression":true}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{DisableCompression: true}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"enable_truncate":true}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{EnableTruncate: true}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"max_stale":"2s"}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{MaxStale: 2 * time.Second, MaxStaleRaw: "2s"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"node_ttl":"2s"}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{NodeTTL: 2 * time.Second, NodeTTLRaw: "2s"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"only_passing":true}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{OnlyPassing: true}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"recursor_timeout":"2s"}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{RecursorTimeout: 2 * time.Second, RecursorTimeoutRaw: "2s"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"service_ttl":{"*":"2s","a":"456s"}}}`,
|
|
|
|
c: &Config{
|
|
|
|
DNSConfig: DNSConfig{
|
|
|
|
ServiceTTL: map[string]time.Duration{"*": 2 * time.Second, "a": 456 * time.Second},
|
|
|
|
ServiceTTLRaw: map[string]string{"*": "2s", "a": "456s"},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dns_config":{"udp_answer_limit":123}}`,
|
|
|
|
c: &Config{DNSConfig: DNSConfig{UDPAnswerLimit: 123}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"disable_anonymous_signature":true}`,
|
|
|
|
c: &Config{DisableAnonymousSignature: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"disable_remote_exec":false}`,
|
|
|
|
c: &Config{DisableRemoteExec: Bool(false)},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"disable_update_check":true}`,
|
|
|
|
c: &Config{DisableUpdateCheck: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dogstatsd_addr":"a"}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{DogStatsdAddr: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"dogstatsd_tags":["a:b","c:d"]}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{DogStatsdTags: []string{"a:b", "c:d"}}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"domain":"a"}`,
|
|
|
|
c: &Config{Domain: "a"},
|
|
|
|
},
|
2017-08-03 22:39:31 +00:00
|
|
|
{
|
|
|
|
in: `{"enable_acl_replication":true}`,
|
|
|
|
c: &Config{EnableACLReplication: true},
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
{
|
|
|
|
in: `{"enable_debug":true}`,
|
|
|
|
c: &Config{EnableDebug: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"enable_syslog":true}`,
|
|
|
|
c: &Config{EnableSyslog: true},
|
|
|
|
},
|
2017-06-15 22:24:04 +00:00
|
|
|
{
|
|
|
|
in: `{"disable_keyring_file":true}`,
|
|
|
|
c: &Config{DisableKeyringFile: true},
|
|
|
|
},
|
2017-07-17 18:20:35 +00:00
|
|
|
{
|
|
|
|
in: `{"enable_script_checks":true}`,
|
|
|
|
c: &Config{EnableScriptChecks: true},
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
{
|
|
|
|
in: `{"encrypt_verify_incoming":true}`,
|
|
|
|
c: &Config{EncryptVerifyIncoming: Bool(true)},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"encrypt_verify_outgoing":true}`,
|
|
|
|
c: &Config{EncryptVerifyOutgoing: Bool(true)},
|
|
|
|
},
|
2017-07-10 20:51:25 +00:00
|
|
|
{
|
|
|
|
in: `{"http_config":{"block_endpoints":["a","b","c","d"]}}`,
|
|
|
|
c: &Config{HTTPConfig: HTTPConfig{BlockEndpoints: []string{"a", "b", "c", "d"}}},
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
{
|
|
|
|
in: `{"http_api_response_headers":{"a":"b","c":"d"}}`,
|
2017-06-16 11:58:19 +00:00
|
|
|
c: &Config{HTTPConfig: HTTPConfig{ResponseHeaders: map[string]string{"a": "b", "c": "d"}}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"http_config":{"response_headers":{"a":"b","c":"d"}}}`,
|
|
|
|
c: &Config{HTTPConfig: HTTPConfig{ResponseHeaders: map[string]string{"a": "b", "c": "d"}}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"key_file":"a"}`,
|
|
|
|
c: &Config{KeyFile: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"leave_on_terminate":true}`,
|
|
|
|
c: &Config{LeaveOnTerm: Bool(true)},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"log_level":"a"}`,
|
|
|
|
c: &Config{LogLevel: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"node_id":"a"}`,
|
|
|
|
c: &Config{NodeID: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"node_meta":{"a":"b","c":"d"}}`,
|
|
|
|
c: &Config{Meta: map[string]string{"a": "b", "c": "d"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"node_name":"a"}`,
|
|
|
|
c: &Config{NodeName: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"performance": { "raft_multiplier": 3 }}`,
|
|
|
|
c: &Config{Performance: Performance{RaftMultiplier: 3}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"performance": { "raft_multiplier": 11 }}`,
|
|
|
|
err: errors.New("Performance.RaftMultiplier must be <= 10"),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"pid_file":"a"}`,
|
|
|
|
c: &Config{PidFile: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ports":{"dns":1234}}`,
|
|
|
|
c: &Config{Ports: PortConfig{DNS: 1234}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ports":{"http":1234}}`,
|
|
|
|
c: &Config{Ports: PortConfig{HTTP: 1234}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ports":{"https":1234}}`,
|
|
|
|
c: &Config{Ports: PortConfig{HTTPS: 1234}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ports":{"serf_lan":1234}}`,
|
|
|
|
c: &Config{Ports: PortConfig{SerfLan: 1234}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ports":{"serf_wan":1234}}`,
|
|
|
|
c: &Config{Ports: PortConfig{SerfWan: 1234}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ports":{"server":1234}}`,
|
|
|
|
c: &Config{Ports: PortConfig{Server: 1234}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ports":{"rpc":1234}}`,
|
|
|
|
c: &Config{Ports: PortConfig{RPC: 1234}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"raft_protocol":3}`,
|
|
|
|
c: &Config{RaftProtocol: 3},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"reconnect_timeout":"4h"}`,
|
|
|
|
err: errors.New("ReconnectTimeoutLan must be >= 8h0m0s"),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"reconnect_timeout":"8h"}`,
|
|
|
|
c: &Config{ReconnectTimeoutLan: 8 * time.Hour, ReconnectTimeoutLanRaw: "8h"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"reconnect_timeout_wan":"4h"}`,
|
|
|
|
err: errors.New("ReconnectTimeoutWan must be >= 8h0m0s"),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"reconnect_timeout_wan":"8h"}`,
|
|
|
|
c: &Config{ReconnectTimeoutWan: 8 * time.Hour, ReconnectTimeoutWanRaw: "8h"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"recursor":"a"}`,
|
|
|
|
c: &Config{DNSRecursor: "a", DNSRecursors: []string{"a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"recursors":["a","b"]}`,
|
|
|
|
c: &Config{DNSRecursors: []string{"a", "b"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"rejoin_after_leave":true}`,
|
|
|
|
c: &Config{RejoinAfterLeave: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_interval":"2s"}`,
|
|
|
|
c: &Config{RetryInterval: 2 * time.Second, RetryIntervalRaw: "2s"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_interval_wan":"2s"}`,
|
|
|
|
c: &Config{RetryIntervalWan: 2 * time.Second, RetryIntervalWanRaw: "2s"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join":["a","b"]}`,
|
|
|
|
c: &Config{RetryJoin: []string{"a", "b"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_azure":{"client_id":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=azure client_id=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_azure":{"tag_name":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=azure tag_name=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_azure":{"tag_value":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=azure tag_value=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_azure":{"secret_access_key":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=azure secret_access_key=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_azure":{"subscription_id":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=azure subscription_id=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_azure":{"tenant_id":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=azure tenant_id=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_ec2":{"access_key_id":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=aws access_key_id=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_ec2":{"region":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=aws region=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_ec2":{"tag_key":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=aws tag_key=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_ec2":{"tag_value":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=aws tag_value=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_ec2":{"secret_access_key":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=aws secret_access_key=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_gce":{"credentials_file":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=gce credentials_file=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_gce":{"project_name":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=gce project_name=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_gce":{"tag_value":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=gce tag_value=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_gce":{"zone_pattern":"a"}}`,
|
2017-07-15 21:15:59 +00:00
|
|
|
c: &Config{RetryJoin: []string{"provider=gce zone_pattern=a"}},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_join_wan":["a","b"]}`,
|
|
|
|
c: &Config{RetryJoinWan: []string{"a", "b"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_max":123}`,
|
|
|
|
c: &Config{RetryMaxAttempts: 123},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"retry_max_wan":123}`,
|
|
|
|
c: &Config{RetryMaxAttemptsWan: 123},
|
|
|
|
},
|
|
|
|
{
|
2017-07-28 13:40:22 +00:00
|
|
|
in: `{"serf_lan_bind":"1.2.3.4"}`,
|
|
|
|
c: &Config{SerfLanBindAddr: "1.2.3.4"},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
2017-07-28 20:01:32 +00:00
|
|
|
in: `{"serf_lan_bind":"unix:///var/foo/bar"}`,
|
|
|
|
c: &Config{SerfLanBindAddr: "unix:///var/foo/bar"},
|
|
|
|
parseTemplateErr: errors.New("Failed to parse Serf LAN address: unix:///var/foo/bar"),
|
2017-07-28 13:40:22 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"serf_lan_bind":"{{\"1.2.3.4\"}}"}`,
|
|
|
|
c: &Config{SerfLanBindAddr: "1.2.3.4"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"serf_wan_bind":"1.2.3.4"}`,
|
|
|
|
c: &Config{SerfWanBindAddr: "1.2.3.4"},
|
|
|
|
},
|
|
|
|
{
|
2017-07-28 20:01:32 +00:00
|
|
|
in: `{"serf_wan_bind":"unix:///var/foo/bar"}`,
|
|
|
|
c: &Config{SerfWanBindAddr: "unix:///var/foo/bar"},
|
|
|
|
parseTemplateErr: errors.New("Failed to parse Serf WAN address: unix:///var/foo/bar"),
|
2017-07-28 13:40:22 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"serf_wan_bind":"{{\"1.2.3.4\"}}"}`,
|
|
|
|
c: &Config{SerfWanBindAddr: "1.2.3.4"},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"server":true}`,
|
|
|
|
c: &Config{Server: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"server_name":"a"}`,
|
|
|
|
c: &Config{ServerName: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"session_ttl_min":"2s"}`,
|
|
|
|
c: &Config{SessionTTLMin: 2 * time.Second, SessionTTLMinRaw: "2s"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"skip_leave_on_interrupt":true}`,
|
|
|
|
c: &Config{SkipLeaveOnInt: Bool(true)},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"start_join":["a","b"]}`,
|
|
|
|
c: &Config{StartJoin: []string{"a", "b"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"start_join_wan":["a","b"]}`,
|
|
|
|
c: &Config{StartJoinWan: []string{"a", "b"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"statsd_addr":"a"}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{StatsdAddr: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"statsite_addr":"a"}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{StatsiteAddr: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"statsite_prefix":"a"}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{StatsitePrefix: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"syslog_facility":"a"}`,
|
|
|
|
c: &Config{SyslogFacility: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_api_app":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusAPIApp: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_api_token":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusAPIToken: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_api_url":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusAPIURL: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_broker_id":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusBrokerID: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_broker_select_tag":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusBrokerSelectTag: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_check_display_name":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusCheckDisplayName: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_check_force_metric_activation":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusCheckForceMetricActivation: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_check_id":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusCheckID: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_check_instance_id":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusCheckInstanceID: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_check_search_tag":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusCheckSearchTag: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_check_tags":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusCheckTags: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_submission_interval":"2s"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusSubmissionInterval: "2s"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"circonus_submission_url":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{CirconusCheckSubmissionURL: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"disable_hostname":true}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{DisableHostname: true}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"dogstatsd_addr":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{DogStatsdAddr: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"dogstatsd_tags":["a","b"]}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{DogStatsdTags: []string{"a", "b"}}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"statsd_address":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{StatsdAddr: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"statsite_address":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{StatsiteAddr: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"telemetry":{"statsite_prefix":"a"}}`,
|
|
|
|
c: &Config{Telemetry: Telemetry{StatsitePrefix: "a"}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"tls_cipher_suites":"TLS_RSA_WITH_AES_256_CBC_SHA"}`,
|
|
|
|
c: &Config{
|
|
|
|
TLSCipherSuites: []uint16{tls.TLS_RSA_WITH_AES_256_CBC_SHA},
|
|
|
|
TLSCipherSuitesRaw: "TLS_RSA_WITH_AES_256_CBC_SHA",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"tls_min_version":"a"}`,
|
|
|
|
c: &Config{TLSMinVersion: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"tls_prefer_server_cipher_suites":true}`,
|
|
|
|
c: &Config{TLSPreferServerCipherSuites: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"translate_wan_addrs":true}`,
|
|
|
|
c: &Config{TranslateWanAddrs: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ui":true}`,
|
|
|
|
c: &Config{EnableUI: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"ui_dir":"a"}`,
|
|
|
|
c: &Config{UIDir: "a"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"unix_sockets":{"user":"a"}}`,
|
|
|
|
c: &Config{UnixSockets: UnixSocketConfig{UnixSocketPermissions{Usr: "a"}}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"unix_sockets":{"group":"a"}}`,
|
|
|
|
c: &Config{UnixSockets: UnixSocketConfig{UnixSocketPermissions{Grp: "a"}}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"unix_sockets":{"mode":"a"}}`,
|
|
|
|
c: &Config{UnixSockets: UnixSocketConfig{UnixSocketPermissions{Perms: "a"}}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"verify_incoming":true}`,
|
|
|
|
c: &Config{VerifyIncoming: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"verify_incoming_https":true}`,
|
|
|
|
c: &Config{VerifyIncomingHTTPS: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"verify_incoming_rpc":true}`,
|
|
|
|
c: &Config{VerifyIncomingRPC: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"verify_outgoing":true}`,
|
|
|
|
c: &Config{VerifyOutgoing: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"verify_server_hostname":true}`,
|
|
|
|
c: &Config{VerifyServerHostname: true},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: `{"watches":[{"type":"a","prefix":"b","handler":"c"}]}`,
|
|
|
|
c: &Config{
|
|
|
|
Watches: []map[string]interface{}{
|
|
|
|
map[string]interface{}{
|
|
|
|
"type": "a",
|
|
|
|
"prefix": "b",
|
|
|
|
"handler": "c",
|
|
|
|
},
|
|
|
|
},
|
2015-02-02 08:30:44 +00:00
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
2014-10-24 02:22:25 +00:00
|
|
|
|
2017-06-04 09:38:29 +00:00
|
|
|
// complex flows
|
|
|
|
{
|
|
|
|
desc: "single service with check",
|
|
|
|
in: `{
|
|
|
|
"service": {
|
|
|
|
"ID": "a",
|
|
|
|
"Name": "b",
|
|
|
|
"Tags": ["c", "d"],
|
|
|
|
"Address": "e",
|
|
|
|
"Token": "f",
|
|
|
|
"Port": 123,
|
|
|
|
"EnableTagOverride": true,
|
|
|
|
"Check": {
|
|
|
|
"CheckID": "g",
|
|
|
|
"Name": "h",
|
|
|
|
"Status": "i",
|
|
|
|
"Notes": "j",
|
|
|
|
"Script": "k",
|
|
|
|
"HTTP": "l",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"a":["b"], "c":["d", "e"]},
|
|
|
|
"Method": "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
"TCP": "m",
|
|
|
|
"DockerContainerID": "n",
|
|
|
|
"Shell": "o",
|
|
|
|
"TLSSkipVerify": true,
|
|
|
|
"Interval": "2s",
|
|
|
|
"Timeout": "3s",
|
|
|
|
"TTL": "4s",
|
|
|
|
"DeregisterCriticalServiceAfter": "5s"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}`,
|
|
|
|
c: &Config{
|
2017-06-15 16:46:06 +00:00
|
|
|
Services: []*structs.ServiceDefinition{
|
|
|
|
&structs.ServiceDefinition{
|
2017-06-04 09:38:29 +00:00
|
|
|
ID: "a",
|
|
|
|
Name: "b",
|
|
|
|
Tags: []string{"c", "d"},
|
|
|
|
Address: "e",
|
|
|
|
Port: 123,
|
|
|
|
Token: "f",
|
|
|
|
EnableTagOverride: true,
|
2017-06-15 16:46:06 +00:00
|
|
|
Check: structs.CheckType{
|
2017-06-04 09:38:29 +00:00
|
|
|
CheckID: "g",
|
|
|
|
Name: "h",
|
|
|
|
Status: "i",
|
|
|
|
Notes: "j",
|
|
|
|
Script: "k",
|
|
|
|
HTTP: "l",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"a": []string{"b"}, "c": []string{"d", "e"}},
|
|
|
|
Method: "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "m",
|
|
|
|
DockerContainerID: "n",
|
|
|
|
Shell: "o",
|
|
|
|
TLSSkipVerify: true,
|
|
|
|
Interval: 2 * time.Second,
|
|
|
|
Timeout: 3 * time.Second,
|
|
|
|
TTL: 4 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 5 * time.Second,
|
|
|
|
},
|
2015-01-14 01:52:17 +00:00
|
|
|
},
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
desc: "single service with multiple checks",
|
|
|
|
in: `{
|
|
|
|
"service": {
|
|
|
|
"ID": "a",
|
|
|
|
"Name": "b",
|
|
|
|
"Tags": ["c", "d"],
|
|
|
|
"Address": "e",
|
|
|
|
"Token": "f",
|
|
|
|
"Port": 123,
|
|
|
|
"EnableTagOverride": true,
|
|
|
|
"Checks": [
|
|
|
|
{
|
|
|
|
"CheckID": "g",
|
|
|
|
"Name": "h",
|
|
|
|
"Status": "i",
|
|
|
|
"Notes": "j",
|
|
|
|
"Script": "k",
|
|
|
|
"HTTP": "l",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"a":["b"], "c":["d", "e"]},
|
|
|
|
"Method": "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
"TCP": "m",
|
|
|
|
"DockerContainerID": "n",
|
|
|
|
"Shell": "o",
|
|
|
|
"TLSSkipVerify": true,
|
|
|
|
"Interval": "2s",
|
|
|
|
"Timeout": "3s",
|
|
|
|
"TTL": "4s",
|
|
|
|
"DeregisterCriticalServiceAfter": "5s"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"CheckID": "gg",
|
|
|
|
"Name": "hh",
|
|
|
|
"Status": "ii",
|
|
|
|
"Notes": "jj",
|
|
|
|
"Script": "kk",
|
|
|
|
"HTTP": "ll",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"aa":["bb"], "cc":["dd", "ee"]},
|
|
|
|
"Method": "xx",
|
2017-06-04 09:38:29 +00:00
|
|
|
"TCP": "mm",
|
|
|
|
"DockerContainerID": "nn",
|
|
|
|
"Shell": "oo",
|
|
|
|
"TLSSkipVerify": false,
|
|
|
|
"Interval": "22s",
|
|
|
|
"Timeout": "33s",
|
|
|
|
"TTL": "44s",
|
|
|
|
"DeregisterCriticalServiceAfter": "55s"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
}`,
|
|
|
|
c: &Config{
|
2017-06-15 16:46:06 +00:00
|
|
|
Services: []*structs.ServiceDefinition{
|
|
|
|
&structs.ServiceDefinition{
|
2017-06-04 09:38:29 +00:00
|
|
|
ID: "a",
|
|
|
|
Name: "b",
|
|
|
|
Tags: []string{"c", "d"},
|
|
|
|
Address: "e",
|
|
|
|
Port: 123,
|
|
|
|
Token: "f",
|
|
|
|
EnableTagOverride: true,
|
2017-06-15 16:46:06 +00:00
|
|
|
Checks: []*structs.CheckType{
|
2017-06-04 09:38:29 +00:00
|
|
|
{
|
|
|
|
CheckID: "g",
|
|
|
|
Name: "h",
|
|
|
|
Status: "i",
|
|
|
|
Notes: "j",
|
|
|
|
Script: "k",
|
|
|
|
HTTP: "l",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"a": []string{"b"}, "c": []string{"d", "e"}},
|
|
|
|
Method: "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "m",
|
|
|
|
DockerContainerID: "n",
|
|
|
|
Shell: "o",
|
|
|
|
TLSSkipVerify: true,
|
|
|
|
Interval: 2 * time.Second,
|
|
|
|
Timeout: 3 * time.Second,
|
|
|
|
TTL: 4 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 5 * time.Second,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CheckID: "gg",
|
|
|
|
Name: "hh",
|
|
|
|
Status: "ii",
|
|
|
|
Notes: "jj",
|
|
|
|
Script: "kk",
|
|
|
|
HTTP: "ll",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"aa": []string{"bb"}, "cc": []string{"dd", "ee"}},
|
|
|
|
Method: "xx",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "mm",
|
|
|
|
DockerContainerID: "nn",
|
|
|
|
Shell: "oo",
|
|
|
|
TLSSkipVerify: false,
|
|
|
|
Interval: 22 * time.Second,
|
|
|
|
Timeout: 33 * time.Second,
|
|
|
|
TTL: 44 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 55 * time.Second,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2014-10-26 19:00:11 +00:00
|
|
|
},
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
desc: "multiple services with check",
|
|
|
|
in: `{
|
|
|
|
"services": [
|
|
|
|
{
|
|
|
|
"ID": "a",
|
|
|
|
"Name": "b",
|
|
|
|
"Tags": ["c", "d"],
|
|
|
|
"Address": "e",
|
|
|
|
"Token": "f",
|
|
|
|
"Port": 123,
|
|
|
|
"EnableTagOverride": true,
|
|
|
|
"Check": {
|
|
|
|
"CheckID": "g",
|
|
|
|
"Name": "h",
|
|
|
|
"Status": "i",
|
|
|
|
"Notes": "j",
|
|
|
|
"Script": "k",
|
|
|
|
"HTTP": "l",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"a":["b"], "c":["d", "e"]},
|
|
|
|
"Method": "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
"TCP": "m",
|
|
|
|
"DockerContainerID": "n",
|
|
|
|
"Shell": "o",
|
|
|
|
"TLSSkipVerify": true,
|
|
|
|
"Interval": "2s",
|
|
|
|
"Timeout": "3s",
|
|
|
|
"TTL": "4s",
|
|
|
|
"DeregisterCriticalServiceAfter": "5s"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"ID": "aa",
|
|
|
|
"Name": "bb",
|
|
|
|
"Tags": ["cc", "dd"],
|
|
|
|
"Address": "ee",
|
|
|
|
"Token": "ff",
|
|
|
|
"Port": 246,
|
|
|
|
"EnableTagOverride": false,
|
|
|
|
"Check": {
|
|
|
|
"CheckID": "gg",
|
|
|
|
"Name": "hh",
|
|
|
|
"Status": "ii",
|
|
|
|
"Notes": "jj",
|
|
|
|
"Script": "kk",
|
|
|
|
"HTTP": "ll",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"aa":["bb"], "cc":["dd", "ee"]},
|
|
|
|
"Method": "xx",
|
2017-06-04 09:38:29 +00:00
|
|
|
"TCP": "mm",
|
|
|
|
"DockerContainerID": "nn",
|
|
|
|
"Shell": "oo",
|
|
|
|
"TLSSkipVerify": false,
|
|
|
|
"Interval": "22s",
|
|
|
|
"Timeout": "33s",
|
|
|
|
"TTL": "44s",
|
|
|
|
"DeregisterCriticalServiceAfter": "55s"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}`,
|
|
|
|
c: &Config{
|
2017-06-15 16:46:06 +00:00
|
|
|
Services: []*structs.ServiceDefinition{
|
|
|
|
&structs.ServiceDefinition{
|
2017-06-04 09:38:29 +00:00
|
|
|
ID: "a",
|
|
|
|
Name: "b",
|
|
|
|
Tags: []string{"c", "d"},
|
|
|
|
Address: "e",
|
|
|
|
Port: 123,
|
|
|
|
Token: "f",
|
|
|
|
EnableTagOverride: true,
|
2017-06-15 16:46:06 +00:00
|
|
|
Check: structs.CheckType{
|
2017-06-04 09:38:29 +00:00
|
|
|
CheckID: "g",
|
|
|
|
Name: "h",
|
|
|
|
Status: "i",
|
|
|
|
Notes: "j",
|
|
|
|
Script: "k",
|
|
|
|
HTTP: "l",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"a": []string{"b"}, "c": []string{"d", "e"}},
|
|
|
|
Method: "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "m",
|
|
|
|
DockerContainerID: "n",
|
|
|
|
Shell: "o",
|
|
|
|
TLSSkipVerify: true,
|
|
|
|
Interval: 2 * time.Second,
|
|
|
|
Timeout: 3 * time.Second,
|
|
|
|
TTL: 4 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 5 * time.Second,
|
|
|
|
},
|
|
|
|
},
|
2017-06-15 16:46:06 +00:00
|
|
|
&structs.ServiceDefinition{
|
2017-06-04 09:38:29 +00:00
|
|
|
ID: "aa",
|
|
|
|
Name: "bb",
|
|
|
|
Tags: []string{"cc", "dd"},
|
|
|
|
Address: "ee",
|
|
|
|
Port: 246,
|
|
|
|
Token: "ff",
|
|
|
|
EnableTagOverride: false,
|
2017-06-15 16:46:06 +00:00
|
|
|
Check: structs.CheckType{
|
2017-06-04 09:38:29 +00:00
|
|
|
CheckID: "gg",
|
|
|
|
Name: "hh",
|
|
|
|
Status: "ii",
|
|
|
|
Notes: "jj",
|
|
|
|
Script: "kk",
|
|
|
|
HTTP: "ll",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"aa": []string{"bb"}, "cc": []string{"dd", "ee"}},
|
|
|
|
Method: "xx",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "mm",
|
|
|
|
DockerContainerID: "nn",
|
|
|
|
Shell: "oo",
|
|
|
|
TLSSkipVerify: false,
|
|
|
|
Interval: 22 * time.Second,
|
|
|
|
Timeout: 33 * time.Second,
|
|
|
|
TTL: 44 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 55 * time.Second,
|
|
|
|
},
|
|
|
|
},
|
2014-10-26 19:00:11 +00:00
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
{
|
|
|
|
desc: "single check",
|
|
|
|
in: `{
|
|
|
|
"check": {
|
|
|
|
"id": "a",
|
|
|
|
"name": "b",
|
|
|
|
"notes": "c",
|
|
|
|
"service_id": "x",
|
|
|
|
"token": "y",
|
|
|
|
"status": "z",
|
|
|
|
"script": "d",
|
|
|
|
"shell": "e",
|
|
|
|
"http": "f",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"a":["b"], "c":["d", "e"]},
|
|
|
|
"Method": "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
"tcp": "g",
|
|
|
|
"docker_container_id": "h",
|
|
|
|
"tls_skip_verify": true,
|
|
|
|
"interval": "2s",
|
|
|
|
"timeout": "3s",
|
|
|
|
"ttl": "4s",
|
|
|
|
"deregister_critical_service_after": "5s"
|
|
|
|
}
|
|
|
|
}`,
|
|
|
|
c: &Config{
|
2017-06-15 16:46:06 +00:00
|
|
|
Checks: []*structs.CheckDefinition{
|
|
|
|
&structs.CheckDefinition{
|
2017-06-04 09:38:29 +00:00
|
|
|
ID: "a",
|
|
|
|
Name: "b",
|
|
|
|
Notes: "c",
|
|
|
|
ServiceID: "x",
|
|
|
|
Token: "y",
|
|
|
|
Status: "z",
|
|
|
|
Script: "d",
|
|
|
|
Shell: "e",
|
|
|
|
HTTP: "f",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"a": []string{"b"}, "c": []string{"d", "e"}},
|
|
|
|
Method: "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "g",
|
|
|
|
DockerContainerID: "h",
|
|
|
|
TLSSkipVerify: true,
|
|
|
|
Interval: 2 * time.Second,
|
|
|
|
Timeout: 3 * time.Second,
|
|
|
|
TTL: 4 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 5 * time.Second,
|
|
|
|
},
|
2014-10-26 19:00:11 +00:00
|
|
|
},
|
|
|
|
},
|
2017-06-04 09:38:29 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
desc: "multiple checks",
|
|
|
|
in: `{
|
|
|
|
"checks": [
|
|
|
|
{
|
|
|
|
"id": "a",
|
|
|
|
"name": "b",
|
|
|
|
"notes": "c",
|
|
|
|
"service_id": "d",
|
|
|
|
"token": "e",
|
|
|
|
"status": "f",
|
|
|
|
"script": "g",
|
|
|
|
"shell": "h",
|
|
|
|
"http": "i",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"a":["b"], "c":["d", "e"]},
|
|
|
|
"Method": "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
"tcp": "j",
|
|
|
|
"docker_container_id": "k",
|
|
|
|
"tls_skip_verify": true,
|
|
|
|
"interval": "2s",
|
|
|
|
"timeout": "3s",
|
|
|
|
"ttl": "4s",
|
|
|
|
"deregister_critical_service_after": "5s"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "aa",
|
|
|
|
"name": "bb",
|
|
|
|
"notes": "cc",
|
|
|
|
"service_id": "dd",
|
|
|
|
"token": "ee",
|
|
|
|
"status": "ff",
|
|
|
|
"script": "gg",
|
|
|
|
"shell": "hh",
|
|
|
|
"http": "ii",
|
2017-06-06 23:11:56 +00:00
|
|
|
"Header": {"aa":["bb"], "cc":["dd", "ee"]},
|
|
|
|
"Method": "xx",
|
2017-06-04 09:38:29 +00:00
|
|
|
"tcp": "jj",
|
|
|
|
"docker_container_id": "kk",
|
|
|
|
"tls_skip_verify": false,
|
|
|
|
"interval": "22s",
|
|
|
|
"timeout": "33s",
|
|
|
|
"ttl": "44s",
|
|
|
|
"deregister_critical_service_after": "55s"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}`,
|
|
|
|
c: &Config{
|
2017-06-15 16:46:06 +00:00
|
|
|
Checks: []*structs.CheckDefinition{
|
|
|
|
&structs.CheckDefinition{
|
2017-06-04 09:38:29 +00:00
|
|
|
ID: "a",
|
|
|
|
Name: "b",
|
|
|
|
Notes: "c",
|
|
|
|
ServiceID: "d",
|
|
|
|
Token: "e",
|
|
|
|
Status: "f",
|
|
|
|
Script: "g",
|
|
|
|
Shell: "h",
|
|
|
|
HTTP: "i",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"a": []string{"b"}, "c": []string{"d", "e"}},
|
|
|
|
Method: "x",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "j",
|
|
|
|
DockerContainerID: "k",
|
|
|
|
TLSSkipVerify: true,
|
|
|
|
Interval: 2 * time.Second,
|
|
|
|
Timeout: 3 * time.Second,
|
|
|
|
TTL: 4 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 5 * time.Second,
|
|
|
|
},
|
2017-06-15 16:46:06 +00:00
|
|
|
&structs.CheckDefinition{
|
2017-06-04 09:38:29 +00:00
|
|
|
ID: "aa",
|
|
|
|
Name: "bb",
|
|
|
|
Notes: "cc",
|
|
|
|
ServiceID: "dd",
|
|
|
|
Token: "ee",
|
|
|
|
Status: "ff",
|
|
|
|
Script: "gg",
|
|
|
|
Shell: "hh",
|
|
|
|
HTTP: "ii",
|
2017-06-06 23:11:56 +00:00
|
|
|
Header: map[string][]string{"aa": []string{"bb"}, "cc": []string{"dd", "ee"}},
|
|
|
|
Method: "xx",
|
2017-06-04 09:38:29 +00:00
|
|
|
TCP: "jj",
|
|
|
|
DockerContainerID: "kk",
|
|
|
|
TLSSkipVerify: false,
|
|
|
|
Interval: 22 * time.Second,
|
|
|
|
Timeout: 33 * time.Second,
|
|
|
|
TTL: 44 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 55 * time.Second,
|
|
|
|
},
|
2015-02-02 08:30:44 +00:00
|
|
|
},
|
|
|
|
},
|
2014-10-24 02:22:25 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2017-06-04 09:38:29 +00:00
|
|
|
for _, tt := range tests {
|
|
|
|
desc := tt.desc
|
|
|
|
if desc == "" {
|
|
|
|
desc = tt.in
|
|
|
|
}
|
|
|
|
t.Run(desc, func(t *testing.T) {
|
|
|
|
c, err := DecodeConfig(strings.NewReader(tt.in))
|
|
|
|
if got, want := err, tt.err; !reflect.DeepEqual(got, want) {
|
|
|
|
t.Fatalf("got error %v want %v", got, want)
|
|
|
|
}
|
2017-07-28 20:01:32 +00:00
|
|
|
err = c.ResolveTmplAddrs()
|
|
|
|
if got, want := err, tt.parseTemplateErr; !reflect.DeepEqual(got, want) {
|
|
|
|
t.Fatalf("got error %v on ResolveTmplAddrs, expected %v", err, want)
|
2017-07-28 13:40:22 +00:00
|
|
|
}
|
2017-06-04 09:38:29 +00:00
|
|
|
got, want := c, tt.c
|
|
|
|
verify.Values(t, "", got, want)
|
|
|
|
})
|
2014-10-24 02:22:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-04 09:38:29 +00:00
|
|
|
func TestDecodeConfig_VerifyUniqueListeners(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2017-06-04 09:38:29 +00:00
|
|
|
tests := []struct {
|
|
|
|
desc string
|
|
|
|
in string
|
|
|
|
err error
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
"http_dns1",
|
|
|
|
`{"addresses": {"http": "0.0.0.0", "dns": "127.0.0.1"}, "ports": {"dns": 8000}}`,
|
|
|
|
nil,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"http_dns IP identical",
|
|
|
|
`{"addresses": {"http": "0.0.0.0", "dns": "0.0.0.0"}, "ports": {"http": 8000, "dns": 8000}}`,
|
|
|
|
errors.New("HTTP address already configured for DNS"),
|
|
|
|
},
|
2014-02-07 19:49:51 +00:00
|
|
|
}
|
|
|
|
|
2017-06-04 09:38:29 +00:00
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.desc, func(t *testing.T) {
|
|
|
|
c, err := DecodeConfig(strings.NewReader(tt.in))
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("got error %v want nil", err)
|
|
|
|
}
|
2016-08-16 07:05:55 +00:00
|
|
|
|
pkg refactor
command/agent/* -> agent/*
command/consul/* -> agent/consul/*
command/agent/command{,_test}.go -> command/agent{,_test}.go
command/base/command.go -> command/base.go
command/base/* -> command/*
commands.go -> command/commands.go
The script which did the refactor is:
(
cd $GOPATH/src/github.com/hashicorp/consul
git mv command/agent/command.go command/agent.go
git mv command/agent/command_test.go command/agent_test.go
git mv command/agent/flag_slice_value{,_test}.go command/
git mv command/agent .
git mv command/base/command.go command/base.go
git mv command/base/config_util{,_test}.go command/
git mv commands.go command/
git mv consul agent
rmdir command/base/
gsed -i -e 's|package agent|package command|' command/agent{,_test}.go
gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go
gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go
gsed -i -e 's|package main|package command|' command/commands.go
gsed -i -e 's|base.Command|BaseCommand|' command/commands.go
gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go
gsed -i -e 's|base\.||' command/commands.go
gsed -i -e 's|command\.||' command/commands.go
gsed -i -e 's|command|c|' main.go
gsed -i -e 's|range Commands|range command.Commands|' main.go
gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go
gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go
gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go
gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go
gsed -i -e 's|base.Command|BaseCommand|' command/*.go
gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go
gsed -i -e 's|base\.||' command/*_test.go
gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go
gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go
gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go
gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go
gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go
gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go
gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go
gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go
gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go
gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go
gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go
gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go
gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go
gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go
gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go
gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go
gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile
gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go
# fix imports
f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f
goimports -w $f
f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f
goimports -w $f
goimports -w command/*.go main.go
)
2017-06-09 22:28:28 +00:00
|
|
|
err = c.VerifyUniqueListeners()
|
2017-06-04 09:38:29 +00:00
|
|
|
if got, want := err, tt.err; !reflect.DeepEqual(got, want) {
|
|
|
|
t.Fatalf("got error %v want %v", got, want)
|
|
|
|
}
|
|
|
|
})
|
2016-08-16 07:05:55 +00:00
|
|
|
}
|
2014-02-07 19:49:51 +00:00
|
|
|
}
|
|
|
|
|
2017-06-04 09:38:29 +00:00
|
|
|
func TestDefaultConfig(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2015-10-22 22:29:13 +00:00
|
|
|
|
2017-06-04 09:38:29 +00:00
|
|
|
// ACL flag for Consul version 0.8 features (broken out since we will
|
|
|
|
// eventually remove this).
|
|
|
|
config := DefaultConfig()
|
|
|
|
if *config.ACLEnforceVersion8 != true {
|
|
|
|
t.Fatalf("bad: %#v", config)
|
2015-10-22 22:29:13 +00:00
|
|
|
}
|
2016-08-16 07:05:55 +00:00
|
|
|
|
2017-06-04 09:38:29 +00:00
|
|
|
// Remote exec is disabled by default.
|
|
|
|
if *config.DisableRemoteExec != true {
|
|
|
|
t.Fatalf("bad: %#v", config)
|
2016-08-16 07:05:55 +00:00
|
|
|
}
|
2014-02-07 19:49:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMergeConfig(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2014-02-07 19:49:51 +00:00
|
|
|
a := &Config{
|
2014-06-09 20:00:32 +00:00
|
|
|
Bootstrap: false,
|
2014-06-20 00:08:48 +00:00
|
|
|
BootstrapExpect: 0,
|
2014-06-09 20:00:32 +00:00
|
|
|
Datacenter: "dc1",
|
|
|
|
DataDir: "/tmp/foo",
|
|
|
|
Domain: "basic",
|
|
|
|
LogLevel: "debug",
|
2017-01-18 06:20:11 +00:00
|
|
|
NodeID: "bar",
|
2014-06-09 20:00:32 +00:00
|
|
|
NodeName: "foo",
|
|
|
|
ClientAddr: "127.0.0.1",
|
|
|
|
BindAddr: "127.0.0.1",
|
|
|
|
AdvertiseAddr: "127.0.0.1",
|
|
|
|
Server: false,
|
2016-09-01 06:39:11 +00:00
|
|
|
LeaveOnTerm: new(bool),
|
2016-04-01 00:45:14 +00:00
|
|
|
SkipLeaveOnInt: new(bool),
|
2014-06-09 20:00:32 +00:00
|
|
|
EnableDebug: false,
|
|
|
|
CheckUpdateIntervalRaw: "8m",
|
2014-10-12 18:20:33 +00:00
|
|
|
RetryIntervalRaw: "10s",
|
2014-11-19 21:38:58 +00:00
|
|
|
RetryIntervalWanRaw: "10s",
|
2017-07-15 21:15:59 +00:00
|
|
|
DeprecatedRetryJoinEC2: RetryJoinEC2{
|
2016-11-01 22:20:23 +00:00
|
|
|
Region: "us-east-1",
|
|
|
|
TagKey: "Key1",
|
|
|
|
TagValue: "Value1",
|
|
|
|
AccessKeyID: "nope",
|
|
|
|
SecretAccessKey: "nope",
|
|
|
|
},
|
2015-10-08 19:45:45 +00:00
|
|
|
Telemetry: Telemetry{
|
|
|
|
DisableHostname: false,
|
|
|
|
StatsdAddr: "nope",
|
|
|
|
StatsiteAddr: "nope",
|
|
|
|
StatsitePrefix: "nope",
|
|
|
|
DogStatsdAddr: "nope",
|
|
|
|
DogStatsdTags: []string{"nope"},
|
|
|
|
},
|
2017-01-05 22:10:26 +00:00
|
|
|
Meta: map[string]string{
|
|
|
|
"key": "value1",
|
|
|
|
},
|
2014-02-07 19:49:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
b := &Config{
|
2016-08-25 00:33:53 +00:00
|
|
|
Performance: Performance{
|
|
|
|
RaftMultiplier: 99,
|
|
|
|
},
|
2014-06-20 00:08:48 +00:00
|
|
|
Bootstrap: true,
|
|
|
|
BootstrapExpect: 3,
|
|
|
|
Datacenter: "dc2",
|
|
|
|
DataDir: "/tmp/bar",
|
2014-10-31 19:19:41 +00:00
|
|
|
DNSRecursors: []string{"127.0.0.2:1001"},
|
2014-06-08 22:35:15 +00:00
|
|
|
DNSConfig: DNSConfig{
|
2016-08-30 20:40:43 +00:00
|
|
|
AllowStale: Bool(false),
|
2016-08-11 23:24:44 +00:00
|
|
|
EnableTruncate: true,
|
|
|
|
DisableCompression: true,
|
|
|
|
MaxStale: 30 * time.Second,
|
|
|
|
NodeTTL: 10 * time.Second,
|
2014-06-08 22:35:15 +00:00
|
|
|
ServiceTTL: map[string]time.Duration{
|
|
|
|
"api": 10 * time.Second,
|
|
|
|
},
|
2016-09-02 04:53:33 +00:00
|
|
|
UDPAnswerLimit: 4,
|
|
|
|
RecursorTimeout: 30 * time.Second,
|
2014-06-08 22:35:15 +00:00
|
|
|
},
|
2017-04-13 05:05:38 +00:00
|
|
|
Domain: "other",
|
|
|
|
LogLevel: "info",
|
|
|
|
NodeID: "bar",
|
2017-06-24 16:36:53 +00:00
|
|
|
DisableHostNodeID: Bool(false),
|
2017-04-13 05:05:38 +00:00
|
|
|
NodeName: "baz",
|
|
|
|
ClientAddr: "127.0.0.2",
|
|
|
|
BindAddr: "127.0.0.2",
|
|
|
|
AdvertiseAddr: "127.0.0.2",
|
|
|
|
AdvertiseAddrWan: "127.0.0.2",
|
2014-04-11 22:46:55 +00:00
|
|
|
Ports: PortConfig{
|
|
|
|
DNS: 1,
|
|
|
|
HTTP: 2,
|
|
|
|
SerfLan: 4,
|
|
|
|
SerfWan: 5,
|
|
|
|
Server: 6,
|
2014-11-14 19:39:19 +00:00
|
|
|
HTTPS: 7,
|
2014-04-11 22:46:55 +00:00
|
|
|
},
|
2014-09-02 19:42:14 +00:00
|
|
|
Addresses: AddressConfig{
|
2014-11-14 19:39:19 +00:00
|
|
|
DNS: "127.0.0.1",
|
|
|
|
HTTP: "127.0.0.2",
|
|
|
|
HTTPS: "127.0.0.4",
|
2014-09-02 19:42:14 +00:00
|
|
|
},
|
2017-02-24 04:32:13 +00:00
|
|
|
Server: true,
|
|
|
|
LeaveOnTerm: Bool(true),
|
|
|
|
SkipLeaveOnInt: Bool(true),
|
|
|
|
RaftProtocol: 3,
|
|
|
|
Autopilot: Autopilot{
|
2017-03-01 22:04:40 +00:00
|
|
|
CleanupDeadServers: Bool(true),
|
|
|
|
LastContactThreshold: Duration(time.Duration(10)),
|
|
|
|
MaxTrailingLogs: Uint64(10),
|
|
|
|
ServerStabilizationTime: Duration(time.Duration(100)),
|
2017-02-22 20:53:32 +00:00
|
|
|
},
|
2014-06-09 20:00:32 +00:00
|
|
|
EnableDebug: true,
|
|
|
|
VerifyIncoming: true,
|
|
|
|
VerifyOutgoing: true,
|
|
|
|
CAFile: "test/ca.pem",
|
|
|
|
CertFile: "test/cert.pem",
|
|
|
|
KeyFile: "test/key.pem",
|
2017-02-01 20:52:04 +00:00
|
|
|
TLSMinVersion: "tls12",
|
2017-06-15 16:46:06 +00:00
|
|
|
Checks: []*structs.CheckDefinition{nil},
|
|
|
|
Services: []*structs.ServiceDefinition{nil},
|
2014-06-09 20:00:32 +00:00
|
|
|
StartJoin: []string{"1.1.1.1"},
|
2014-11-17 22:14:59 +00:00
|
|
|
StartJoinWan: []string{"1.1.1.1"},
|
2017-04-21 00:02:42 +00:00
|
|
|
EnableUI: true,
|
|
|
|
UIDir: "/opt/consul-ui",
|
2014-06-09 20:00:32 +00:00
|
|
|
EnableSyslog: true,
|
|
|
|
RejoinAfterLeave: true,
|
2014-10-12 18:20:33 +00:00
|
|
|
RetryJoin: []string{"1.1.1.1"},
|
|
|
|
RetryIntervalRaw: "10s",
|
|
|
|
RetryInterval: 10 * time.Second,
|
2014-11-17 22:14:59 +00:00
|
|
|
RetryJoinWan: []string{"1.1.1.1"},
|
|
|
|
RetryIntervalWanRaw: "10s",
|
|
|
|
RetryIntervalWan: 10 * time.Second,
|
2016-04-11 06:31:16 +00:00
|
|
|
ReconnectTimeoutLanRaw: "24h",
|
|
|
|
ReconnectTimeoutLan: 24 * time.Hour,
|
|
|
|
ReconnectTimeoutWanRaw: "36h",
|
|
|
|
ReconnectTimeoutWan: 36 * time.Hour,
|
2017-07-17 18:20:35 +00:00
|
|
|
EnableScriptChecks: true,
|
2014-06-09 20:00:32 +00:00
|
|
|
CheckUpdateInterval: 8 * time.Minute,
|
|
|
|
CheckUpdateIntervalRaw: "8m",
|
2016-12-14 07:21:14 +00:00
|
|
|
ACLToken: "1111",
|
|
|
|
ACLAgentMasterToken: "2222",
|
|
|
|
ACLAgentToken: "3333",
|
|
|
|
ACLMasterToken: "4444",
|
2014-08-05 18:05:55 +00:00
|
|
|
ACLDatacenter: "dc2",
|
2014-08-05 22:03:47 +00:00
|
|
|
ACLTTL: 15 * time.Second,
|
|
|
|
ACLTTLRaw: "15s",
|
2014-08-05 18:05:55 +00:00
|
|
|
ACLDownPolicy: "deny",
|
2014-08-05 22:03:47 +00:00
|
|
|
ACLDefaultPolicy: "deny",
|
2016-08-03 05:04:11 +00:00
|
|
|
ACLReplicationToken: "8765309",
|
2016-12-02 03:14:08 +00:00
|
|
|
ACLEnforceVersion8: Bool(true),
|
2014-08-21 18:52:36 +00:00
|
|
|
Watches: []map[string]interface{}{
|
|
|
|
map[string]interface{}{
|
|
|
|
"type": "keyprefix",
|
|
|
|
"prefix": "foo/",
|
|
|
|
"handler": "foobar",
|
|
|
|
},
|
|
|
|
},
|
2017-03-30 16:25:12 +00:00
|
|
|
DisableRemoteExec: Bool(true),
|
2015-10-08 19:45:45 +00:00
|
|
|
Telemetry: Telemetry{
|
|
|
|
StatsiteAddr: "127.0.0.1:7250",
|
|
|
|
StatsitePrefix: "stats_prefix",
|
|
|
|
StatsdAddr: "127.0.0.1:7251",
|
|
|
|
DisableHostname: true,
|
|
|
|
DogStatsdAddr: "127.0.0.1:7254",
|
|
|
|
DogStatsdTags: []string{"tag_1:val_1", "tag_2:val_2"},
|
|
|
|
},
|
2017-01-05 22:10:26 +00:00
|
|
|
Meta: map[string]string{
|
|
|
|
"key": "value2",
|
|
|
|
},
|
2014-09-02 21:23:43 +00:00
|
|
|
DisableUpdateCheck: true,
|
|
|
|
DisableAnonymousSignature: true,
|
2017-06-16 11:58:19 +00:00
|
|
|
HTTPConfig: HTTPConfig{
|
2017-07-10 20:51:25 +00:00
|
|
|
BlockEndpoints: []string{
|
|
|
|
"/v1/agent/self",
|
|
|
|
"/v1/acl",
|
|
|
|
},
|
2017-06-16 11:58:19 +00:00
|
|
|
ResponseHeaders: map[string]string{
|
|
|
|
"Access-Control-Allow-Origin": "*",
|
|
|
|
},
|
2014-12-28 04:53:19 +00:00
|
|
|
},
|
2015-01-21 02:53:18 +00:00
|
|
|
UnixSockets: UnixSocketConfig{
|
2015-01-21 04:30:59 +00:00
|
|
|
UnixSocketPermissions{
|
|
|
|
Usr: "500",
|
|
|
|
Grp: "500",
|
|
|
|
Perms: "0700",
|
|
|
|
},
|
2015-01-20 22:32:15 +00:00
|
|
|
},
|
2017-07-15 21:15:59 +00:00
|
|
|
DeprecatedRetryJoinEC2: RetryJoinEC2{
|
2016-11-01 22:20:23 +00:00
|
|
|
Region: "us-east-2",
|
|
|
|
TagKey: "Key2",
|
|
|
|
TagValue: "Value2",
|
|
|
|
AccessKeyID: "foo",
|
|
|
|
SecretAccessKey: "bar",
|
|
|
|
},
|
|
|
|
SessionTTLMinRaw: "1000s",
|
|
|
|
SessionTTLMin: 1000 * time.Second,
|
2015-06-05 11:44:42 +00:00
|
|
|
AdvertiseAddrs: AdvertiseAddrsConfig{
|
|
|
|
SerfLan: &net.TCPAddr{},
|
|
|
|
SerfLanRaw: "127.0.0.5:1231",
|
|
|
|
SerfWan: &net.TCPAddr{},
|
|
|
|
SerfWanRaw: "127.0.0.5:1232",
|
|
|
|
RPC: &net.TCPAddr{},
|
|
|
|
RPCRaw: "127.0.0.5:1233",
|
|
|
|
},
|
2014-02-07 19:49:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
c := MergeConfig(a, b)
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(c, b) {
|
2014-11-19 21:38:58 +00:00
|
|
|
t.Fatalf("should be equal %#v %#v", c, b)
|
2014-02-07 19:49:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestReadConfigPaths_badPath(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2014-02-07 19:49:51 +00:00
|
|
|
_, err := ReadConfigPaths([]string{"/i/shouldnt/exist/ever/rainbows"})
|
|
|
|
if err == nil {
|
|
|
|
t.Fatal("should have err")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestReadConfigPaths_file(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2017-05-12 13:41:13 +00:00
|
|
|
tf := testutil.TempFile(t, "consul")
|
2014-02-07 19:49:51 +00:00
|
|
|
tf.Write([]byte(`{"node_name":"bar"}`))
|
|
|
|
tf.Close()
|
|
|
|
defer os.Remove(tf.Name())
|
|
|
|
|
|
|
|
config, err := ReadConfigPaths([]string{tf.Name()})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.NodeName != "bar" {
|
|
|
|
t.Fatalf("bad: %#v", config)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestReadConfigPaths_dir(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2017-05-12 13:41:13 +00:00
|
|
|
td := testutil.TempDir(t, "consul")
|
2014-02-07 19:49:51 +00:00
|
|
|
defer os.RemoveAll(td)
|
|
|
|
|
2017-05-12 13:41:13 +00:00
|
|
|
err := ioutil.WriteFile(filepath.Join(td, "a.json"),
|
2014-02-07 19:49:51 +00:00
|
|
|
[]byte(`{"node_name": "bar"}`), 0644)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
err = ioutil.WriteFile(filepath.Join(td, "b.json"),
|
|
|
|
[]byte(`{"node_name": "baz"}`), 0644)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// A non-json file, shouldn't be read
|
|
|
|
err = ioutil.WriteFile(filepath.Join(td, "c"),
|
|
|
|
[]byte(`{"node_name": "bad"}`), 0644)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
2016-02-09 15:49:41 +00:00
|
|
|
// An empty file shouldn't be read
|
|
|
|
err = ioutil.WriteFile(filepath.Join(td, "d.json"),
|
|
|
|
[]byte{}, 0664)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
2014-02-07 19:49:51 +00:00
|
|
|
config, err := ReadConfigPaths([]string{td})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.NodeName != "baz" {
|
|
|
|
t.Fatalf("bad: %#v", config)
|
|
|
|
}
|
|
|
|
}
|
2015-01-13 17:24:52 +00:00
|
|
|
|
|
|
|
func TestUnixSockets(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2017-05-11 18:43:56 +00:00
|
|
|
if p := socketPath("unix:///path/to/socket"); p != "/path/to/socket" {
|
|
|
|
t.Fatalf("bad: %q", p)
|
2015-01-13 17:24:52 +00:00
|
|
|
}
|
2017-05-11 18:43:56 +00:00
|
|
|
if p := socketPath("notunix://blah"); p != "" {
|
|
|
|
t.Fatalf("bad: %q", p)
|
2015-01-13 17:50:17 +00:00
|
|
|
}
|
2015-01-13 17:24:52 +00:00
|
|
|
}
|
2017-05-15 19:49:13 +00:00
|
|
|
|
|
|
|
func TestCheckDefinitionToCheckType(t *testing.T) {
|
2017-05-21 07:54:40 +00:00
|
|
|
t.Parallel()
|
2017-06-15 16:46:06 +00:00
|
|
|
got := &structs.CheckDefinition{
|
2017-05-15 19:49:13 +00:00
|
|
|
ID: "id",
|
|
|
|
Name: "name",
|
|
|
|
Status: "green",
|
|
|
|
Notes: "notes",
|
|
|
|
|
|
|
|
ServiceID: "svcid",
|
|
|
|
Token: "tok",
|
|
|
|
Script: "/bin/foo",
|
|
|
|
HTTP: "someurl",
|
|
|
|
TCP: "host:port",
|
|
|
|
Interval: 1 * time.Second,
|
|
|
|
DockerContainerID: "abc123",
|
|
|
|
Shell: "/bin/ksh",
|
|
|
|
TLSSkipVerify: true,
|
|
|
|
Timeout: 2 * time.Second,
|
|
|
|
TTL: 3 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 4 * time.Second,
|
|
|
|
}
|
2017-06-15 16:46:06 +00:00
|
|
|
want := &structs.CheckType{
|
2017-05-15 19:49:13 +00:00
|
|
|
CheckID: "id",
|
|
|
|
Name: "name",
|
|
|
|
Status: "green",
|
|
|
|
Notes: "notes",
|
|
|
|
|
|
|
|
Script: "/bin/foo",
|
|
|
|
HTTP: "someurl",
|
|
|
|
TCP: "host:port",
|
|
|
|
Interval: 1 * time.Second,
|
|
|
|
DockerContainerID: "abc123",
|
|
|
|
Shell: "/bin/ksh",
|
|
|
|
TLSSkipVerify: true,
|
|
|
|
Timeout: 2 * time.Second,
|
|
|
|
TTL: 3 * time.Second,
|
|
|
|
DeregisterCriticalServiceAfter: 4 * time.Second,
|
|
|
|
}
|
|
|
|
verify.Values(t, "", got.CheckType(), want)
|
|
|
|
}
|