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

Allow passing client options to Client()

Browse Source 
Signed-off-by: Oleg Guba <oleg@dropbox.com>
This commit is contained in:
Oleg Guba 2022-10-27 14:07:49 -07:00
parent c45f3388ac
commit b22e3ff4eb
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/tests/v3/framework/config"
) )
const EtcdProcessBasePort = 20000 const EtcdProcessBasePort = 20000
@ -473,7 +474,7 @@ func (epc *EtcdProcessCluster) Endpoints(f func(ep EtcdProcess) []string) (ret [
return ret return ret
} }
func (epc *EtcdProcessCluster) CloseProc(ctx context.Context, finder func(EtcdProcess) bool) error { func (epc *EtcdProcessCluster) CloseProc(ctx context.Context, finder func(EtcdProcess) bool, opts ...config.ClientOption) error {
procIndex := -1 procIndex := -1
for i := range epc.Procs { for i := range epc.Procs {
if finder(epc.Procs[i]) { if finder(epc.Procs[i]) {
@ -495,7 +496,7 @@ func (epc *EtcdProcessCluster) CloseProc(ctx context.Context, finder func(EtcdPr
// First remove member from the cluster // First remove member from the cluster
memberCtl := epc.Client() memberCtl := epc.Client(opts...)
memberList, err := memberCtl.MemberList(ctx) memberList, err := memberCtl.MemberList(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to get member list: %w", err) return fmt.Errorf("failed to get member list: %w", err)
@ -522,7 +523,7 @@ func (epc *EtcdProcessCluster) CloseProc(ctx context.Context, finder func(EtcdPr
return proc.Close() return proc.Close()
} }
func (epc *EtcdProcessCluster) StartNewProc(ctx context.Context, tb testing.TB) error { func (epc *EtcdProcessCluster) StartNewProc(ctx context.Context, tb testing.TB, opts ...config.ClientOption) error {
serverCfg := epc.Cfg.EtcdServerProcessConfig(tb, epc.nextSeq) serverCfg := epc.Cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
epc.nextSeq++ epc.nextSeq++
@ -536,7 +537,7 @@ func (epc *EtcdProcessCluster) StartNewProc(ctx context.Context, tb testing.TB)
epc.Cfg.SetInitialOrDiscovery(serverCfg, initialCluster, "existing") epc.Cfg.SetInitialOrDiscovery(serverCfg, initialCluster, "existing")
// First add new member to cluster // First add new member to cluster
memberCtl := epc.Client() memberCtl := epc.Client(opts...)
_, err := memberCtl.MemberAdd(ctx, serverCfg.Name, []string{serverCfg.Purl.String()}) _, err := memberCtl.MemberAdd(ctx, serverCfg.Name, []string{serverCfg.Purl.String()})
if err != nil { if err != nil {
return fmt.Errorf("failed to add new member: %w", err) return fmt.Errorf("failed to add new member: %w", err)
@ -612,8 +613,8 @@ func (epc *EtcdProcessCluster) Stop() (err error) {
return err return err
} }
func (epc *EtcdProcessCluster) Client() *EtcdctlV3 { func (epc *EtcdProcessCluster) Client(opts ...config.ClientOption) *EtcdctlV3 {
etcdctl, err := NewEtcdctl(epc.Cfg, epc.EndpointsV3()) etcdctl, err := NewEtcdctl(epc.Cfg, epc.EndpointsV3(), opts...)
if err != nil { if err != nil {
panic(err) panic(err)
} }

7
tests/framework/e2e/etcdctl.go
View File

@ -72,6 +72,13 @@ func WithAuth(userName, password string) config.ClientOption {
} }
} }
func WithEndpoints(endpoints []string) config.ClientOption {
return func(c any) {
ctl := c.(*EtcdctlV3)
ctl.endpoints = endpoints
}
}
func (ctl *EtcdctlV3) DowngradeEnable(ctx context.Context, version string) error { func (ctl *EtcdctlV3) DowngradeEnable(ctx context.Context, version string) error {
_, err := SpawnWithExpectLines(ctx, ctl.cmdArgs("downgrade", "enable", version), nil, "Downgrade enable success") _, err := SpawnWithExpectLines(ctx, ctl.cmdArgs("downgrade", "enable", version), nil, "Downgrade enable success")
return err return err