Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4525 from heyitsanthony/fix-tls-proxy

Browse Source 
e2e: tls proxy tests
This commit is contained in:
Anthony Romano 2016-02-14 16:17:32 -08:00
commit 0662db11ed
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
e2e/etcd_test.go
View File

@ -70,7 +70,6 @@ var (
isPeerTLS: false, isPeerTLS: false,
initialToken: "new", initialToken: "new",
} }
// TODO: this does not work now
defaultConfigWithProxyTLS = etcdProcessClusterConfig{ defaultConfigWithProxyTLS = etcdProcessClusterConfig{
clusterSize: 3, clusterSize: 3,
proxySize: 1, proxySize: 1,
@ -78,12 +77,23 @@ var (
isPeerTLS: true, isPeerTLS: true,
initialToken: "new", initialToken: "new",
} }
defaultConfigWithProxyPeerTLS = etcdProcessClusterConfig{
clusterSize: 3,
proxySize: 1,
isClientTLS: false,
isPeerTLS: true,
initialToken: "new",
}
) )
func TestBasicOpsNoTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfig) } func TestBasicOpsNoTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfig) }
func TestBasicOpsAllTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigTLS) } func TestBasicOpsAllTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigTLS) }
func TestBasicOpsPeerTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigPeerTLS) } func TestBasicOpsPeerTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigPeerTLS) }
func TestBasicOpsClientTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigClientTLS) } func TestBasicOpsClientTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigClientTLS) }
func TestBasicOpsProxyNoTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigWithProxy) }
func TestBasicOpsProxyTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigWithProxyTLS) }
func TestBasicOpsProxyPeerTLS(t *testing.T) { testBasicOpsPutGet(t, &defaultConfigWithProxyPeerTLS) }
func testBasicOpsPutGet(t *testing.T, cfg *etcdProcessClusterConfig) { func testBasicOpsPutGet(t *testing.T, cfg *etcdProcessClusterConfig) {
defer testutil.AfterTest(t) defer testutil.AfterTest(t)
@ -219,7 +229,6 @@ func newEtcdProcess(cfg *etcdProcessConfig) (*etcdProcess, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
child.Capture()
return &etcdProcess{cfg: cfg, proc: child, donec: make(chan struct{})}, nil return &etcdProcess{cfg: cfg, proc: child, donec: make(chan struct{})}, nil
} }
@ -252,22 +261,8 @@ func (cfg *etcdProcessClusterConfig) etcdProcessConfigs() []*etcdProcessConfig {
"--initial-cluster-token", cfg.initialToken, "--initial-cluster-token", cfg.initialToken,
"--data-dir", dataDirPath, "--data-dir", dataDirPath,
} }
if cfg.isClientTLS {
tlsClientArgs := []string{ args = append(args, cfg.tlsArgs()...)
"--cert-file", certPath,
"--key-file", privateKeyPath,
"--ca-file", caPath,
}
args = append(args, tlsClientArgs...)
}
if cfg.isPeerTLS {
tlsPeerArgs := []string{
"--peer-cert-file", certPath,
"--peer-key-file", privateKeyPath,
"--peer-ca-file", caPath,
}
args = append(args, tlsPeerArgs...)
}
etcdCfgs[i] = &etcdProcessConfig{ etcdCfgs[i] = &etcdProcessConfig{
args: args, args: args,
@ -286,6 +281,7 @@ func (cfg *etcdProcessClusterConfig) etcdProcessConfigs() []*etcdProcessConfig {
"--listen-client-urls", curl.String(), "--listen-client-urls", curl.String(),
"--data-dir", dataDirPath, "--data-dir", dataDirPath,
} }
args = append(args, cfg.tlsArgs()...)
etcdCfgs[cfg.clusterSize+i] = &etcdProcessConfig{ etcdCfgs[cfg.clusterSize+i] = &etcdProcessConfig{
args: args, args: args,
dataDirPath: dataDirPath, dataDirPath: dataDirPath,
@ -302,6 +298,26 @@ func (cfg *etcdProcessClusterConfig) etcdProcessConfigs() []*etcdProcessConfig {
return etcdCfgs return etcdCfgs
} }
func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
if cfg.isClientTLS {
tlsClientArgs := []string{
"--cert-file", certPath,
"--key-file", privateKeyPath,
"--ca-file", caPath,
}
args = append(args, tlsClientArgs...)
}
if cfg.isPeerTLS {
tlsPeerArgs := []string{
"--peer-cert-file", certPath,
"--peer-key-file", privateKeyPath,
"--peer-ca-file", caPath,
}
args = append(args, tlsPeerArgs...)
}
return args
}
func (epc *etcdProcessCluster) Close() (err error) { func (epc *etcdProcessCluster) Close() (err error) {
for _, p := range epc.procs { for _, p := range epc.procs {
if p == nil { if p == nil {