kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120416 from ardaguclu/move-interactive-delete-beta 

KEP-3895: Promote interactive delete to beta

Kubernetes-commit: 68d55bc4fb441971a1200f390012b245250ad572
This commit is contained in:
Kubernetes Publisher 2023-10-23 12:30:44 +02:00
parent 98ee3cbdfe 55333c0817
commit 382968b0b0
3 changed files with 63 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cmd/delete/delete_flags.go
View File

@ -160,10 +160,8 @@ func (f *DeleteFlags) AddFlags(cmd *cobra.Command) {
if f.Raw != nil {
cmd.Flags().StringVar(f.Raw, "raw", *f.Raw, "Raw URI to DELETE to the server. Uses the transport specified by the kubeconfig file.")
}
if cmdutil.InteractiveDelete.IsEnabled() {
if f.Interactive != nil {
cmd.Flags().BoolVarP(f.Interactive, "interactive", "i", *f.Interactive, "If true, delete resource only when user confirms. This flag is in Alpha.")
}
if f.Interactive != nil {
cmd.Flags().BoolVarP(f.Interactive, "interactive", "i", *f.Interactive, "If true, delete resource only when user confirms. This flag is in Alpha.")
}
}

110
pkg/cmd/delete/delete_test.go
View File

@ -54,41 +54,37 @@ func TestDeleteFlagValidation(t *testing.T) {
defer f.Cleanup()
tests := []struct {
flags DeleteFlags
enableAlphas []cmdutil.FeatureGate
args [][]string
expectedErr string
flags DeleteFlags
args [][]string
expectedErr string
}{
{
flags: DeleteFlags{
Raw: pointer.String("test"),
Interactive: pointer.Bool(true),
},
enableAlphas: []cmdutil.FeatureGate{cmdutil.InteractiveDelete},
expectedErr: "--interactive can not be used with --raw",
expectedErr: "--interactive can not be used with --raw",
},
}
for _, test := range tests {
cmd := fakecmd()
cmdtesting.WithAlphaEnvs(test.enableAlphas, t, func(t *testing.T) {
deleteOptions, err := test.flags.ToOptions(nil, genericiooptions.NewTestIOStreamsDiscard())
if err != nil {
t.Fatalf("unexpected error creating delete options: %s", err)
}
deleteOptions.Filenames = []string{"../../../testdata/redis-master-controller.yaml"}
err = deleteOptions.Complete(f, nil, cmd)
if err != nil {
t.Fatalf("unexpected error creating delete options: %s", err)
}
err = deleteOptions.Validate()
if err == nil {
t.Fatalf("missing expected error")
}
if test.expectedErr != err.Error() {
t.Errorf("expected error %s, got %s", test.expectedErr, err)
}
})
deleteOptions, err := test.flags.ToOptions(nil, genericiooptions.NewTestIOStreamsDiscard())
if err != nil {
t.Fatalf("unexpected error creating delete options: %s", err)
}
deleteOptions.Filenames = []string{"../../../testdata/redis-master-controller.yaml"}
err = deleteOptions.Complete(f, nil, cmd)
if err != nil {
t.Fatalf("unexpected error creating delete options: %s", err)
}
err = deleteOptions.Validate()
if err == nil {
t.Fatalf("missing expected error")
}
if test.expectedErr != err.Error() {
t.Errorf("expected error %s, got %s", test.expectedErr, err)
}
}
}
@ -362,34 +358,50 @@ func TestDeleteObjectWithInteractive(t *testing.T) {
}),
}
cmdtesting.WithAlphaEnvs([]cmdutil.FeatureGate{cmdutil.InteractiveDelete}, t, func(t *testing.T) {
streams, in, buf, _ := genericiooptions.NewTestIOStreams()
fmt.Fprint(in, "y")
cmd := NewCmdDelete(tf, streams)
cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
cmd.Flags().Set("output", "name")
cmd.Flags().Set("interactive", "true")
cmd.Run(cmd, []string{})
streams, in, buf, _ := genericiooptions.NewTestIOStreams()
fmt.Fprint(in, "y")
cmd := NewCmdDelete(tf, streams)
err := cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
if err != nil {
t.Errorf("unexpected error %v", err)
}
err = cmd.Flags().Set("output", "name")
if err != nil {
t.Errorf("unexpected error %v", err)
}
err = cmd.Flags().Set("interactive", "true")
if err != nil {
t.Errorf("unexpected error %v", err)
}
cmd.Run(cmd, []string{})
if buf.String() != "You are about to delete the following 1 resource(s):\nreplicationcontroller/redis-master\nDo you want to continue? (y/n): replicationcontroller/redis-master\n" {
t.Errorf("unexpected output: %s", buf.String())
}
if buf.String() != "You are about to delete the following 1 resource(s):\nreplicationcontroller/redis-master\nDo you want to continue? (y/n): replicationcontroller/redis-master\n" {
t.Errorf("unexpected output: %s", buf.String())
}
streams, in, buf, _ = genericiooptions.NewTestIOStreams()
fmt.Fprint(in, "n")
cmd = NewCmdDelete(tf, streams)
cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
cmd.Flags().Set("output", "name")
cmd.Flags().Set("interactive", "true")
cmd.Run(cmd, []string{})
streams, in, buf, _ = genericiooptions.NewTestIOStreams()
fmt.Fprint(in, "n")
cmd = NewCmdDelete(tf, streams)
err = cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
if err != nil {
t.Errorf("unexpected error %v", err)
}
err = cmd.Flags().Set("output", "name")
if err != nil {
t.Errorf("unexpected error %v", err)
}
err = cmd.Flags().Set("interactive", "true")
if err != nil {
t.Errorf("unexpected error %v", err)
}
cmd.Run(cmd, []string{})
if buf.String() != "You are about to delete the following 1 resource(s):\nreplicationcontroller/redis-master\nDo you want to continue? (y/n): deletion is cancelled\n" {
t.Errorf("unexpected output: %s", buf.String())
}
if buf.String() == ": replicationcontroller/redis-master\n" {
t.Errorf("unexpected output: %s", buf.String())
}
})
if buf.String() != "You are about to delete the following 1 resource(s):\nreplicationcontroller/redis-master\nDo you want to continue? (y/n): deletion is cancelled\n" {
t.Errorf("unexpected output: %s", buf.String())
}
if buf.String() == ": replicationcontroller/redis-master\n" {
t.Errorf("unexpected output: %s", buf.String())
}
}
func TestGracePeriodScenarios(t *testing.T) {

1
pkg/cmd/util/helpers.go
View File

@ -427,7 +427,6 @@ type FeatureGate string
const (
ApplySet FeatureGate = "KUBECTL_APPLYSET"
CmdPluginAsSubcommand FeatureGate = "KUBECTL_ENABLE_CMD_SHADOW"
InteractiveDelete FeatureGate = "KUBECTL_INTERACTIVE_DELETE"
)
func (f FeatureGate) IsEnabled() bool {