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

e2e: test auto tls

Browse Source
This commit is contained in:
Anthony Romano 2016-02-09 11:52:01 -08:00
parent e9b2bd751d
commit d1ee12566b
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
e2e/etcd_test.go
View File

@ -43,6 +43,12 @@ var (
isPeerTLS: false, isPeerTLS: false,
initialToken: "new", initialToken: "new",
} }
configAutoTLS = etcdProcessClusterConfig{
clusterSize: 3,
isPeerTLS: true,
isPeerAutoTLS: true,
initialToken: "new",
}
configTLS = etcdProcessClusterConfig{ configTLS = etcdProcessClusterConfig{
clusterSize: 3, clusterSize: 3,
proxySize: 0, proxySize: 0,
@ -94,6 +100,7 @@ func configStandalone(cfg etcdProcessClusterConfig) *etcdProcessClusterConfig {
} }
func TestBasicOpsNoTLS(t *testing.T) { testBasicOpsPutGet(t, &configNoTLS) } func TestBasicOpsNoTLS(t *testing.T) { testBasicOpsPutGet(t, &configNoTLS) }
func TestBasicOpsAutoTLS(t *testing.T) { testBasicOpsPutGet(t, &configAutoTLS) }
func TestBasicOpsAllTLS(t *testing.T) { testBasicOpsPutGet(t, &configTLS) } func TestBasicOpsAllTLS(t *testing.T) { testBasicOpsPutGet(t, &configTLS) }
func TestBasicOpsPeerTLS(t *testing.T) { testBasicOpsPutGet(t, &configPeerTLS) } func TestBasicOpsPeerTLS(t *testing.T) { testBasicOpsPutGet(t, &configPeerTLS) }
func TestBasicOpsClientTLS(t *testing.T) { testBasicOpsPutGet(t, &configClientTLS) } func TestBasicOpsClientTLS(t *testing.T) { testBasicOpsPutGet(t, &configClientTLS) }
@ -170,11 +177,12 @@ type etcdProcessConfig struct {
} }
type etcdProcessClusterConfig struct { type etcdProcessClusterConfig struct {
clusterSize int clusterSize int
proxySize int proxySize int
isClientTLS bool isClientTLS bool
isPeerTLS bool isPeerTLS bool
initialToken string isPeerAutoTLS bool
initialToken string
} }
// newEtcdProcessCluster launches a new cluster from etcd processes, returning // newEtcdProcessCluster launches a new cluster from etcd processes, returning
@ -325,12 +333,16 @@ func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
args = append(args, tlsClientArgs...) args = append(args, tlsClientArgs...)
} }
if cfg.isPeerTLS { if cfg.isPeerTLS {
tlsPeerArgs := []string{ if cfg.isPeerAutoTLS {
"--peer-cert-file", certPath, args = append(args, "--peer-auto-tls=true")
"--peer-key-file", privateKeyPath, } else {
"--peer-ca-file", caPath, tlsPeerArgs := []string{
"--peer-cert-file", certPath,
"--peer-key-file", privateKeyPath,
"--peer-ca-file", caPath,
}
args = append(args, tlsPeerArgs...)
} }
args = append(args, tlsPeerArgs...)
} }
return args return args
} }