e2e: test auto tls

This commit is contained in:
Anthony Romano 2016-02-09 11:52:01 -08:00
parent e9b2bd751d
commit d1ee12566b

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) }
@ -174,6 +181,7 @@ type etcdProcessClusterConfig struct {
proxySize int proxySize int
isClientTLS bool isClientTLS bool
isPeerTLS bool isPeerTLS bool
isPeerAutoTLS bool
initialToken string initialToken string
} }
@ -325,6 +333,9 @@ func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
args = append(args, tlsClientArgs...) args = append(args, tlsClientArgs...)
} }
if cfg.isPeerTLS { if cfg.isPeerTLS {
if cfg.isPeerAutoTLS {
args = append(args, "--peer-auto-tls=true")
} else {
tlsPeerArgs := []string{ tlsPeerArgs := []string{
"--peer-cert-file", certPath, "--peer-cert-file", certPath,
"--peer-key-file", privateKeyPath, "--peer-key-file", privateKeyPath,
@ -332,6 +343,7 @@ func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
} }
args = append(args, tlsPeerArgs...) args = append(args, tlsPeerArgs...)
} }
}
return args return args
} }