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 #16037 from chaochn47/uds_e2e_test

Browse Source 
add uds test cases into e2e TestAuthority
This commit is contained in:
Benjamin Wang 2023-06-12 14:45:59 +08:00 committed by GitHub
commit 20c4247d2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 76 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/embed/etcd.go
View File

@ -630,10 +630,10 @@ func configureClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err erro
for _, u := range append(cfg.ListenClientUrls, cfg.ListenClientHttpUrls...) {
if u.Scheme == "http" || u.Scheme == "unix" {
if !cfg.ClientTLSInfo.Empty() {
cfg.logger.Warn("scheme is HTTP while key and cert files are present; ignoring key and cert files", zap.String("client-url", u.String()))
cfg.logger.Warn("scheme is http or unix while key and cert files are present; ignoring key and cert files", zap.String("client-url", u.String()))
}
if cfg.ClientTLSInfo.ClientCertAuth {
cfg.logger.Warn("scheme is HTTP while --client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("client-url", u.String()))
cfg.logger.Warn("scheme is http or unix while --client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("client-url", u.String()))
}
}
if (u.Scheme == "https" || u.Scheme == "unixs") && cfg.ClientTLSInfo.Empty() {

31
tests/e2e/ctl_v3_grpc_test.go
View File

@ -33,11 +33,39 @@ import (
func TestAuthority(t *testing.T) {
tcs := []struct {
name string
useUnix bool
useTLS bool
useInsecureTLS bool
clientURLPattern string
expectAuthorityPattern string
}{
{
name: "unix:path",
useUnix: true,
clientURLPattern: "unix:localhost:${MEMBER_PORT}",
expectAuthorityPattern: "localhost:${MEMBER_PORT}",
},
{
name: "unix://absolute_path",
useUnix: true,
clientURLPattern: "unix://localhost:${MEMBER_PORT}",
expectAuthorityPattern: "localhost:${MEMBER_PORT}",
},
// "unixs" is not standard schema supported by etcd
{
name: "unixs:absolute_path",
useUnix: true,
useTLS: true,
clientURLPattern: "unixs:localhost:${MEMBER_PORT}",
expectAuthorityPattern: "localhost:${MEMBER_PORT}",
},
{
name: "unixs://absolute_path",
useUnix: true,
useTLS: true,
clientURLPattern: "unixs://localhost:${MEMBER_PORT}",
expectAuthorityPattern: "localhost:${MEMBER_PORT}",
},
{
name: "http://domain[:port]",
clientURLPattern: "http://localhost:${MEMBER_PORT}",
@ -90,6 +118,9 @@ func TestAuthority(t *testing.T) {
cfg.Client.AutoTLS = tc.useInsecureTLS
// Enable debug mode to get logs with http2 headers (including authority)
cfg.EnvVars = map[string]string{"GODEBUG": "http2debug=2"}
if tc.useUnix {
cfg.BaseClientScheme = "unix"
}
epc, err := e2e.NewEtcdProcessCluster(context.TODO(), t, e2e.WithConfig(cfg))
if err != nil {

2
tests/e2e/ctl_v3_test.go
View File

@ -54,7 +54,7 @@ func TestClusterVersion(t *testing.T) {
e2e.BeforeTest(t)
cfg := e2e.NewConfig(
e2e.WithSnapshotCount(3),
e2e.WithBaseScheme("unix"), // to avoid port conflict)
e2e.WithBasePeerScheme("unix"), // to avoid port conflict)
e2e.WithRollingStart(tt.rollingStart),
)

4
tests/e2e/etcd_release_upgrade_test.go
View File

@ -38,7 +38,7 @@ func TestReleaseUpgrade(t *testing.T) {
epc, err := e2e.NewEtcdProcessCluster(context.TODO(), t,
e2e.WithVersion(e2e.LastVersion),
e2e.WithSnapshotCount(3),
e2e.WithBaseScheme("unix"), // to avoid port conflict
e2e.WithBasePeerScheme("unix"), // to avoid port conflict
)
if err != nil {
t.Fatalf("could not start etcd process cluster (%v)", err)
@ -120,7 +120,7 @@ func TestReleaseUpgradeWithRestart(t *testing.T) {
epc, err := e2e.NewEtcdProcessCluster(context.TODO(), t,
e2e.WithVersion(e2e.LastVersion),
e2e.WithSnapshotCount(10),
e2e.WithBaseScheme("unix"),
e2e.WithBasePeerScheme("unix"),
)
if err != nil {

1
tests/e2e/utils.go
View File

@ -59,6 +59,7 @@ func newClient(t *testing.T, entpoints []string, cfg e2e.ClientConfig) *clientv3
return c
}
// tlsInfo follows the Client-to-server communication in https://etcd.io/docs/v3.6/op-guide/security/#basic-setup
func tlsInfo(t testing.TB, cfg e2e.ClientConfig) (*transport.TLSInfo, error) {
switch cfg.ConnectionType {
case e2e.ClientNonTLS, e2e.ClientTLSAndNonTLS:

43
tests/framework/e2e/cluster.go
View File

@ -143,8 +143,11 @@ type EtcdProcessClusterConfig struct {
ClusterSize int
BaseScheme string
BasePort int
// BasePeerScheme specifies scheme of --listen-peer-urls and --initial-advertise-peer-urls
BasePeerScheme string
BasePort int
// BaseClientScheme specifies scheme of --listen-client-urls, --listen-client-http-urls and --initial-advertise-client-urls
BaseClientScheme string
MetricsURLScheme string
@ -240,14 +243,18 @@ func WithClusterSize(size int) EPClusterOption {
return func(c *EtcdProcessClusterConfig) { c.ClusterSize = size }
}
func WithBaseScheme(scheme string) EPClusterOption {
return func(c *EtcdProcessClusterConfig) { c.BaseScheme = scheme }
func WithBasePeerScheme(scheme string) EPClusterOption {
return func(c *EtcdProcessClusterConfig) { c.BasePeerScheme = scheme }
}
func WithBasePort(port int) EPClusterOption {
return func(c *EtcdProcessClusterConfig) { c.BasePort = port }
}
func WithBaseClientScheme(scheme string) EPClusterOption {
return func(c *EtcdProcessClusterConfig) { c.BaseClientScheme = scheme }
}
func WithClientConnType(clientConnType ClientConnType) EPClusterOption {
return func(c *EtcdProcessClusterConfig) { c.Client.ConnectionType = clientConnType }
}
@ -418,21 +425,11 @@ func StartEtcdProcessCluster(ctx context.Context, epc *EtcdProcessCluster, cfg *
}
func (cfg *EtcdProcessClusterConfig) ClientScheme() string {
if cfg.Client.ConnectionType == ClientTLS {
return "https"
}
return "http"
return setupScheme(cfg.BaseClientScheme, cfg.Client.ConnectionType == ClientTLS)
}
func (cfg *EtcdProcessClusterConfig) PeerScheme() string {
peerScheme := cfg.BaseScheme
if peerScheme == "" {
peerScheme = "http"
}
if cfg.IsPeerTLS {
peerScheme += "s"
}
return peerScheme
return setupScheme(cfg.BasePeerScheme, cfg.IsPeerTLS)
}
func (cfg *EtcdProcessClusterConfig) EtcdAllServerProcessConfigs(tb testing.TB) []*EtcdServerProcessConfig {
@ -475,10 +472,10 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
clientHttpPort := port + 4
if cfg.Client.ConnectionType == ClientTLSAndNonTLS {
curl = clientURL(clientPort, ClientNonTLS)
curls = []string{curl, clientURL(clientPort, ClientTLS)}
curl = clientURL(cfg.ClientScheme(), clientPort, ClientNonTLS)
curls = []string{curl, clientURL(cfg.ClientScheme(), clientPort, ClientTLS)}
} else {
curl = clientURL(clientPort, cfg.Client.ConnectionType)
curl = clientURL(cfg.ClientScheme(), clientPort, cfg.Client.ConnectionType)
curls = []string{curl}
}
@ -523,7 +520,7 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
}
var clientHttpUrl string
if cfg.ClientHttpSeparate {
clientHttpUrl = clientURL(clientHttpPort, cfg.Client.ConnectionType)
clientHttpUrl = clientURL(cfg.ClientScheme(), clientHttpPort, cfg.Client.ConnectionType)
args = append(args, "--listen-client-http-urls", clientHttpUrl)
}
@ -656,13 +653,13 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
}
}
func clientURL(port int, connType ClientConnType) string {
func clientURL(scheme string, port int, connType ClientConnType) string {
curlHost := fmt.Sprintf("localhost:%d", port)
switch connType {
case ClientNonTLS:
return (&url.URL{Scheme: "http", Host: curlHost}).String()
return (&url.URL{Scheme: scheme, Host: curlHost}).String()
case ClientTLS:
return (&url.URL{Scheme: "https", Host: curlHost}).String()
return (&url.URL{Scheme: ToTLS(scheme), Host: curlHost}).String()
default:
panic(fmt.Sprintf("Unsupported connection type %v", connType))
}

18
tests/framework/e2e/util.go
View File

@ -130,8 +130,24 @@ func CloseWithTimeout(p *expect.ExpectProcess, d time.Duration) error {
return fmt.Errorf("took longer than %v to Close process %+v", d, p)
}
func setupScheme(s string, isTLS bool) string {
if s == "" {
s = "http"
}
if isTLS {
s = ToTLS(s)
}
return s
}
func ToTLS(s string) string {
return strings.Replace(s, "http://", "https://", 1)
if strings.Contains(s, "http") && !strings.Contains(s, "https") {
return strings.Replace(s, "http", "https", 1)
}
if strings.Contains(s, "unix") && !strings.Contains(s, "unixs") {
return strings.Replace(s, "unix", "unixs", 1)
}
return s
}
func SkipInShortMode(t testing.TB) {

3
tests/framework/integration/cluster.go
View File

@ -191,6 +191,7 @@ func SchemeFromTLSInfo(tls *transport.TLSInfo) string {
return URLSchemeTLS
}
// fillClusterForMembers fills up Member.InitialPeerURLsMap from each member's [name, scheme and PeerListeners address]
func (c *Cluster) fillClusterForMembers() error {
if c.Cfg.DiscoveryURL != "" {
// Cluster will be discovered
@ -239,7 +240,7 @@ func (c *Cluster) Launch(t testutil.TB) {
}
}
// ProtoMembers returns a list of all active members as client.Members
// ProtoMembers returns a list of all active members as etcdserverpb.Member
func (c *Cluster) ProtoMembers() []*pb.Member {
var ms []*pb.Member
for _, m := range c.Members {