mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #14608 from veshij/auth
[e2e] Fix AuthEnable/Disable e2e test implementations
This commit is contained in:
commit
3b4c255444
@ -466,15 +466,33 @@ func (ctl *EtcdctlV3) AlarmDisarm(ctx context.Context, _ *clientv3.AlarmMember)
|
||||
}
|
||||
|
||||
func (ctl *EtcdctlV3) AuthEnable(ctx context.Context) (*clientv3.AuthEnableResponse, error) {
|
||||
var resp clientv3.AuthEnableResponse
|
||||
err := ctl.spawnJsonCmd(ctx, &resp, "auth", "enable")
|
||||
return &resp, err
|
||||
args := []string{"auth", "enable"}
|
||||
cmd, err := SpawnCmd(ctl.cmdArgs(args...), nil)
|
||||
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) {
|
||||
var resp clientv3.AuthDisableResponse
|
||||
err := ctl.spawnJsonCmd(ctx, &resp, "auth", "disable")
|
||||
return &resp, err
|
||||
args := []string{"auth", "disable"}
|
||||
cmd, err := SpawnCmd(ctl.cmdArgs(args...), nil)
|
||||
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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user