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 #14608 from veshij/auth

Browse Source 
[e2e] Fix AuthEnable/Disable e2e test implementations
This commit is contained in:
Benjamin Wang 2022-10-22 08:19:05 +08:00 committed by GitHub
commit 3b4c255444
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,15 +466,33 @@ 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(ctl.cmdArgs(args...), nil)
return &resp, err 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(ctl.cmdArgs(args...), nil)
return &resp, err 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) {