[e2e] Fix AuthEnable/Disable e2e test implementations
Signed-off-by: Oleg Guba <oleg@dropbox.com>dependabot/go_modules/go.uber.org/atomic-1.10.0
parent
bf6a1d7264
commit
a39374f33a
|
@ -466,15 +466,41 @@ func (ctl *EtcdctlV3) AlarmDisarm(ctx context.Context, _ *clientv3.AlarmMember)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ctl *EtcdctlV3) AuthEnable(ctx context.Context) (*clientv3.AuthEnableResponse, error) {
|
func (ctl *EtcdctlV3) AuthEnable(ctx context.Context) (*clientv3.AuthEnableResponse, error) {
|
||||||
var resp clientv3.AuthEnableResponse
|
args := []string{"auth", "enable"}
|
||||||
err := ctl.spawnJsonCmd(ctx, &resp, "auth", "enable")
|
cmd, err := SpawnCmd(append(ctl.cmdArgs(), args...), nil)
|
||||||
return &resp, err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
err = cmd.Send(strings.Join(args, " "))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer cmd.Close()
|
||||||
|
|
||||||
|
_, err = cmd.ExpectWithContext(ctx, "Authentication Enabled")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &clientv3.AuthEnableResponse{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ctl *EtcdctlV3) AuthDisable(ctx context.Context) (*clientv3.AuthDisableResponse, error) {
|
func (ctl *EtcdctlV3) AuthDisable(ctx context.Context) (*clientv3.AuthDisableResponse, error) {
|
||||||
var resp clientv3.AuthDisableResponse
|
args := []string{"auth", "disable"}
|
||||||
err := ctl.spawnJsonCmd(ctx, &resp, "auth", "disable")
|
cmd, err := SpawnCmd(append(ctl.cmdArgs(), args...), nil)
|
||||||
return &resp, err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
err = cmd.Send(strings.Join(args, " "))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer cmd.Close()
|
||||||
|
|
||||||
|
_, err = cmd.ExpectWithContext(ctx, "Authentication Disabled")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &clientv3.AuthDisableResponse{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ctl *EtcdctlV3) AuthStatus(ctx context.Context) (*clientv3.AuthStatusResponse, error) {
|
func (ctl *EtcdctlV3) AuthStatus(ctx context.Context) (*clientv3.AuthStatusResponse, error) {
|
||||||
|
|
Loading…
Reference in New Issue