From a39374f33a7fa77ce2ec1de5af98c60436da7dab Mon Sep 17 00:00:00 2001 From: Oleg Guba Date: Thu, 20 Oct 2022 19:15:31 -0400 Subject: [PATCH 1/3] [e2e] Fix AuthEnable/Disable e2e test implementations Signed-off-by: Oleg Guba --- tests/framework/e2e/etcdctl.go | 38 ++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/tests/framework/e2e/etcdctl.go b/tests/framework/e2e/etcdctl.go index 024bd9d74..f55ed964b 100644 --- a/tests/framework/e2e/etcdctl.go +++ b/tests/framework/e2e/etcdctl.go @@ -466,15 +466,41 @@ 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(append(ctl.cmdArgs(), args...), nil) + 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) { - var resp clientv3.AuthDisableResponse - err := ctl.spawnJsonCmd(ctx, &resp, "auth", "disable") - return &resp, err + args := []string{"auth", "disable"} + cmd, err := SpawnCmd(append(ctl.cmdArgs(), args...), nil) + 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) { From 24831a02423068d4cfd329fc54c2a70128dbb643 Mon Sep 17 00:00:00 2001 From: Oleg Guba Date: Thu, 20 Oct 2022 21:18:40 -0700 Subject: [PATCH 2/3] Update tests/framework/e2e/etcdctl.go address comment Co-authored-by: Benjamin Wang Signed-off-by: Oleg Guba --- tests/framework/e2e/etcdctl.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/framework/e2e/etcdctl.go b/tests/framework/e2e/etcdctl.go index f55ed964b..1de0550aa 100644 --- a/tests/framework/e2e/etcdctl.go +++ b/tests/framework/e2e/etcdctl.go @@ -486,11 +486,7 @@ func (ctl *EtcdctlV3) AuthEnable(ctx context.Context) (*clientv3.AuthEnableRespo func (ctl *EtcdctlV3) AuthDisable(ctx context.Context) (*clientv3.AuthDisableResponse, error) { args := []string{"auth", "disable"} - cmd, err := SpawnCmd(append(ctl.cmdArgs(), args...), nil) - if err != nil { - return nil, err - } - err = cmd.Send(strings.Join(args, " ")) + cmd, err := SpawnCmd(ctl.cmdArgs(args...), nil) if err != nil { return nil, err } From 44bc007494d4ca2ee804f9043f5ea49c47dd0f5c Mon Sep 17 00:00:00 2001 From: Oleg Guba Date: Thu, 20 Oct 2022 21:18:48 -0700 Subject: [PATCH 3/3] Update tests/framework/e2e/etcdctl.go address comment Co-authored-by: Benjamin Wang Signed-off-by: Oleg Guba --- tests/framework/e2e/etcdctl.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/framework/e2e/etcdctl.go b/tests/framework/e2e/etcdctl.go index 1de0550aa..a3f4b4dc1 100644 --- a/tests/framework/e2e/etcdctl.go +++ b/tests/framework/e2e/etcdctl.go @@ -467,11 +467,7 @@ func (ctl *EtcdctlV3) AlarmDisarm(ctx context.Context, _ *clientv3.AlarmMember) func (ctl *EtcdctlV3) AuthEnable(ctx context.Context) (*clientv3.AuthEnableResponse, error) { args := []string{"auth", "enable"} - cmd, err := SpawnCmd(append(ctl.cmdArgs(), args...), nil) - if err != nil { - return nil, err - } - err = cmd.Send(strings.Join(args, " ")) + cmd, err := SpawnCmd(ctl.cmdArgs(args...), nil) if err != nil { return nil, err }