Merge pull request #62300 from juanvallejo/jvallejo/wire-print-flags-delete-cmd

build/visible_to/BUILD

@@ -332,6 +332,7 @@ package_group(
     name = "pkg_kubectl_validation_CONSUMERS",
     packages = [
         "//pkg/kubectl",
+        "//pkg/kubectl/cmd",
         "//pkg/kubectl/cmd/testing",
         "//pkg/kubectl/cmd/util",
         "//pkg/kubectl/resource",

pkg/kubectl/cmd/BUILD

@@ -25,6 +25,7 @@ go_library(
         "convert.go",
         "cp.go",
         "delete.go",
+        "delete_flags.go",
         "describe.go",
         "diff.go",
         "drain.go",
@@ -86,6 +87,7 @@ go_library(
         "//pkg/kubectl/util:go_default_library",
         "//pkg/kubectl/util/i18n:go_default_library",
         "//pkg/kubectl/util/term:go_default_library",
+        "//pkg/kubectl/validation:go_default_library",
         "//pkg/printers:go_default_library",
         "//pkg/printers/internalversion:go_default_library",
         "//pkg/util/interrupt:go_default_library",

pkg/kubectl/cmd/cmd.go

@@ -305,7 +305,7 @@ func NewKubectlCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob
 			Commands: []*cobra.Command{
 				NewCmdApply("kubectl", f, out, err),
 				NewCmdPatch(f, out),
-				NewCmdReplace(f, out),
+				NewCmdReplace(f, out, err),
 				NewCmdConvert(f, out),
 			},
 		},

pkg/kubectl/cmd/cmd_test.go

@@ -151,192 +151,6 @@ func stringBody(body string) io.ReadCloser {
 	return ioutil.NopCloser(bytes.NewReader([]byte(body)))
 }
 
-func Example_printMultiContainersReplicationControllerWithWide() {
-	tf := cmdtesting.NewTestFactory()
-	defer tf.Cleanup()
-
-	ns := legacyscheme.Codecs
-
-	tf.Client = &fake.RESTClient{
-		NegotiatedSerializer: ns,
-		Client:               nil,
-	}
-	cmd := NewCmdRun(tf, os.Stdin, os.Stdout, os.Stderr)
-	ctrl := &api.ReplicationController{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:              "foo",
-			Labels:            map[string]string{"foo": "bar"},
-			CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
-		},
-		Spec: api.ReplicationControllerSpec{
-			Replicas: 1,
-			Selector: map[string]string{"foo": "bar"},
-			Template: &api.PodTemplateSpec{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{"foo": "bar"},
-				},
-				Spec: api.PodSpec{
-					Containers: []api.Container{
-						{
-							Name:  "foo",
-							Image: "someimage",
-						},
-						{
-							Name:  "foo2",
-							Image: "someimage2",
-						},
-					},
-				},
-			},
-		},
-		Status: api.ReplicationControllerStatus{
-			Replicas: 1,
-		},
-	}
-	cmd.Flags().Set("output", "wide")
-	err := cmdutil.PrintObject(cmd, ctrl, os.Stdout)
-	if err != nil {
-		fmt.Printf("Unexpected error: %v", err)
-	}
-	// Output:
-	// NAME      DESIRED   CURRENT   READY     AGE       CONTAINERS   IMAGES                 SELECTOR
-	// foo       1         1         0         10y       foo,foo2     someimage,someimage2   foo=bar
-}
-
-func Example_printReplicationController() {
-	tf := cmdtesting.NewTestFactory()
-	defer tf.Cleanup()
-
-	ns := legacyscheme.Codecs
-
-	tf.Client = &fake.RESTClient{
-		NegotiatedSerializer: ns,
-		Client:               nil,
-	}
-	cmd := NewCmdRun(tf, os.Stdin, os.Stdout, os.Stderr)
-	ctrl := &api.ReplicationController{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:              "foo",
-			Labels:            map[string]string{"foo": "bar"},
-			CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
-		},
-		Spec: api.ReplicationControllerSpec{
-			Replicas: 1,
-			Selector: map[string]string{"foo": "bar"},
-			Template: &api.PodTemplateSpec{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{"foo": "bar"},
-				},
-				Spec: api.PodSpec{
-					Containers: []api.Container{
-						{
-							Name:  "foo",
-							Image: "someimage",
-						},
-						{
-							Name:  "foo2",
-							Image: "someimage",
-						},
-					},
-				},
-			},
-		},
-		Status: api.ReplicationControllerStatus{
-			Replicas: 1,
-		},
-	}
-	err := cmdutil.PrintObject(cmd, ctrl, os.Stdout)
-	if err != nil {
-		fmt.Printf("Unexpected error: %v", err)
-	}
-	// Output:
-	// NAME      DESIRED   CURRENT   READY     AGE
-	// foo       1         1         0         10y
-}
-
-func Example_printPodWithWideFormat() {
-	tf := cmdtesting.NewTestFactory()
-	defer tf.Cleanup()
-
-	ns := legacyscheme.Codecs
-
-	tf.Client = &fake.RESTClient{
-		NegotiatedSerializer: ns,
-		Client:               nil,
-	}
-	nodeName := "kubernetes-node-abcd"
-	cmd := NewCmdRun(tf, os.Stdin, os.Stdout, os.Stderr)
-	pod := &api.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:              "test1",
-			CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
-		},
-		Spec: api.PodSpec{
-			Containers: make([]api.Container, 2),
-			NodeName:   nodeName,
-		},
-		Status: api.PodStatus{
-			Phase: "podPhase",
-			ContainerStatuses: []api.ContainerStatus{
-				{Ready: true, RestartCount: 3, State: api.ContainerState{Running: &api.ContainerStateRunning{}}},
-				{RestartCount: 3},
-			},
-			PodIP: "10.1.1.3",
-		},
-	}
-	cmd.Flags().Set("output", "wide")
-	err := cmdutil.PrintObject(cmd, pod, os.Stdout)
-	if err != nil {
-		fmt.Printf("Unexpected error: %v", err)
-	}
-	// Output:
-	// NAME      READY     STATUS     RESTARTS   AGE       IP         NODE
-	// test1     1/2       podPhase   6          10y       10.1.1.3   kubernetes-node-abcd
-}
-
-func Example_printPodWithShowLabels() {
-	tf := cmdtesting.NewTestFactory()
-	defer tf.Cleanup()
-
-	ns := legacyscheme.Codecs
-
-	tf.Client = &fake.RESTClient{
-		NegotiatedSerializer: ns,
-		Client:               nil,
-	}
-	nodeName := "kubernetes-node-abcd"
-	cmd := NewCmdRun(tf, os.Stdin, os.Stdout, os.Stderr)
-	pod := &api.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:              "test1",
-			CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
-			Labels: map[string]string{
-				"l1": "key",
-				"l2": "value",
-			},
-		},
-		Spec: api.PodSpec{
-			Containers: make([]api.Container, 2),
-			NodeName:   nodeName,
-		},
-		Status: api.PodStatus{
-			Phase: "podPhase",
-			ContainerStatuses: []api.ContainerStatus{
-				{Ready: true, RestartCount: 3, State: api.ContainerState{Running: &api.ContainerStateRunning{}}},
-				{RestartCount: 3},
-			},
-		},
-	}
-	cmd.Flags().Set("show-labels", "true")
-	err := cmdutil.PrintObject(cmd, pod, os.Stdout)
-	if err != nil {
-		fmt.Printf("Unexpected error: %v", err)
-	}
-	// Output:
-	// NAME      READY     STATUS     RESTARTS   AGE       LABELS
-	// test1     1/2       podPhase   6          10y       l1=key,l2=value
-}
-
 func newAllPhasePodList() *api.PodList {
 	nodeName := "kubernetes-node-abcd"
 	return &api.PodList{
@@ -429,37 +243,6 @@ func newAllPhasePodList() *api.PodList {
 	}
 }
 
-func Example_printPodShowTerminated() {
-	tf := cmdtesting.NewTestFactory()
-	defer tf.Cleanup()
-
-	ns := legacyscheme.Codecs
-
-	tf.Client = &fake.RESTClient{
-		NegotiatedSerializer: ns,
-		Client:               nil,
-	}
-	cmd := NewCmdRun(tf, os.Stdin, os.Stdout, os.Stderr)
-	podList := newAllPhasePodList()
-	printer, err := cmdutil.PrinterForOptions(cmdutil.ExtractCmdPrintOptions(cmd, false))
-	if err != nil {
-		fmt.Printf("Unexpected printer get error: %v\n", err)
-	}
-	for _, pod := range []runtime.Object{podList} {
-		err := printer.PrintObj(pod, os.Stdout)
-		if err != nil {
-			fmt.Printf("Unexpected error: %v", err)
-		}
-	}
-	// Output:
-	// NAME      READY     STATUS      RESTARTS   AGE
-	// test1     1/2       Pending     6          10y
-	// test2     1/2       Running     6          10y
-	// test3     1/2       Succeeded   6          10y
-	// test4     1/2       Failed      6          10y
-	// test5     1/2       Unknown     6          10y
-}
-
 func Example_printServiceWithLabels() {
 	tf := cmdtesting.NewTestFactory()
 	defer tf.Cleanup()

pkg/kubectl/cmd/delete_flags.go

+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"io"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"k8s.io/kubernetes/pkg/kubectl"
+	"k8s.io/kubernetes/pkg/kubectl/resource"
+)
+
+type FileNameFlags struct {
+	Usage string
+
+	Filenames *[]string
+	Recursive *bool
+}
+
+func (o *FileNameFlags) ToOptions() resource.FilenameOptions {
+	options := resource.FilenameOptions{}
+
+	if o.Recursive != nil {
+		options.Recursive = *o.Recursive
+	}
+	if o.Filenames != nil {
+		options.Filenames = *o.Filenames
+	}
+
+	return options
+}
+
+func (o *FileNameFlags) AddFlags(cmd *cobra.Command) {
+	if o.Recursive != nil {
+		cmd.Flags().BoolVarP(o.Recursive, "recursive", "R", *o.Recursive, "Process the directory used in -f, --filename recursively. Useful when you want to manage related manifests organized within the same directory.")
+	}
+	if o.Filenames != nil {
+		kubectl.AddJsonFilenameFlag(cmd, o.Filenames, "Filename, directory, or URL to files "+o.Usage)
+	}
+}
+
+// PrintFlags composes common printer flag structs
+// used for commands requiring deletion logic.
+type DeleteFlags struct {
+	FileNameFlags *FileNameFlags
+
+	All            *bool
+	Cascade        *bool
+	Force          *bool
+	GracePeriod    *int
+	IgnoreNotFound *bool
+	Now            *bool
+	Timeout        *time.Duration
+	Output         *string
+
+	IncludeThirdParty *bool
+}
+
+func (f *DeleteFlags) ToOptions(out, errOut io.Writer) *DeleteOptions {
+	options := &DeleteOptions{
+		Out:    out,
+		ErrOut: errOut,
+	}
+
+	// add filename options
+	if f.FileNameFlags != nil {
+		options.FilenameOptions = f.FileNameFlags.ToOptions()
+	}
+
+	// add output format
+	if f.Output != nil {
+		options.Output = *f.Output
+	}
+
+	if f.All != nil {
+		options.DeleteAll = *f.All
+	}
+	if f.Cascade != nil {
+		options.Cascade = *f.Cascade
+	}
+	if f.Force != nil {
+		options.ForceDeletion = *f.Force
+	}
+	if f.GracePeriod != nil {
+		options.GracePeriod = *f.GracePeriod
+	}
+	if f.IgnoreNotFound != nil {
+		options.IgnoreNotFound = *f.IgnoreNotFound
+	}
+	if f.Now != nil {
+		options.DeleteNow = *f.Now
+	}
+	if f.Timeout != nil {
+		options.Timeout = *f.Timeout
+	}
+
+	if f.IncludeThirdParty != nil {
+		options.Include3rdParty = *f.IncludeThirdParty
+	}
+
+	return options
+}
+
+func (f *DeleteFlags) AddFlags(cmd *cobra.Command) {
+	f.FileNameFlags.AddFlags(cmd)
+
+	if f.All != nil {
+		cmd.Flags().BoolVar(f.All, "all", *f.All, "Delete all resources, including uninitialized ones, in the namespace of the specified resource types.")
+	}
+	if f.Force != nil {
+		cmd.Flags().BoolVar(f.Force, "force", *f.Force, "Only used when grace-period=0. If true, immediately remove resources from API and bypass graceful deletion. Note that immediate deletion of some resources may result in inconsistency or data loss and requires confirmation.")
+	}
+	if f.Cascade != nil {
+		cmd.Flags().BoolVar(f.Cascade, "cascade", *f.Cascade, "If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController).  Default true.")
+	}
+	if f.Now != nil {
+		cmd.Flags().BoolVar(f.Now, "now", *f.Now, "If true, resources are signaled for immediate shutdown (same as --grace-period=1).")
+	}
+	if f.GracePeriod != nil {
+		cmd.Flags().IntVar(f.GracePeriod, "grace-period", *f.GracePeriod, "Period of time in seconds given to the resource to terminate gracefully. Ignored if negative. Set to 1 for immediate shutdown. Can only be set to 0 when --force is true (force deletion).")
+	}
+	if f.Timeout != nil {
+		cmd.Flags().DurationVar(f.Timeout, "timeout", *f.Timeout, "The length of time to wait before giving up on a delete, zero means determine a timeout from the size of the object")
+	}
+	if f.IgnoreNotFound != nil {
+		cmd.Flags().BoolVar(f.IgnoreNotFound, "ignore-not-found", *f.IgnoreNotFound, "Treat \"resource not found\" as a successful delete. Defaults to \"true\" when --all is specified.")
+	}
+
+	if f.Output != nil {
+		cmd.Flags().StringVarP(f.Output, "output", "o", *f.Output, "Output mode. Use \"-o name\" for shorter output (resource/name).")
+	}
+
+	// TODO: this is deprecated. Remove.
+	if f.IncludeThirdParty != nil {
+		cmd.Flags().BoolVar(f.IncludeThirdParty, "include-extended-apis", *f.IncludeThirdParty, "If true, include definitions of new APIs via calls to the API server. [default true]")
+		cmd.Flags().MarkDeprecated("include-extended-apis", "No longer required.")
+	}
+}
+
+// NewDeleteCommandFlags provides default flags and values for use with the "delete" command
+func NewDeleteCommandFlags(usage string) *DeleteFlags {
+	includeThirdParty := true
+	cascade := true
+	gracePeriod := -1
+
+	// setup command defaults
+	all := false
+	force := false
+	ignoreNotFound := false
+	now := false
+	output := ""
+	timeout := time.Duration(0)
+
+	filenames := []string{}
+	recursive := false
+
+	return &DeleteFlags{
+		FileNameFlags: &FileNameFlags{Usage: usage, Filenames: &filenames, Recursive: &recursive},
+
+		Cascade:     &cascade,
+		GracePeriod: &gracePeriod,
+
+		All:            &all,
+		Force:          &force,
+		IgnoreNotFound: &ignoreNotFound,
+		Now:            &now,
+		Timeout:        &timeout,
+		Output:         &output,
+
+		IncludeThirdParty: &includeThirdParty,
+	}
+}
+
+// NewDeleteFlags provides default flags and values for use in commands outside of "delete"
+func NewDeleteFlags(usage string) *DeleteFlags {
+	includeThirdParty := true
+	cascade := true
+	gracePeriod := -1
+
+	force := false
+	timeout := time.Duration(0)
+
+	filenames := []string{}
+	recursive := false
+
+	return &DeleteFlags{
+		FileNameFlags: &FileNameFlags{Usage: usage, Filenames: &filenames, Recursive: &recursive},
+
+		Cascade:     &cascade,
+		GracePeriod: &gracePeriod,
+
+		IncludeThirdParty: &includeThirdParty,
+
+		// add non-defaults
+		Force:   &force,
+		Timeout: &timeout,
+	}
+}

pkg/kubectl/cmd/delete_test.go

@@ -44,12 +44,17 @@ import (
 
 var unstructuredSerializer = dynamic.ContentConfig().NegotiatedSerializer
 
-var fakecmd = &cobra.Command{
-	Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])",
-	DisableFlagsInUseLine: true,
-	Run: func(cmd *cobra.Command, args []string) {
-		cmdutil.CheckErr(cmdutil.ValidateOutputArgs(cmd))
-	},
+func fakecmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])",
+		DisableFlagsInUseLine: true,
+		Run: func(cmd *cobra.Command, args []string) {
+			cmdutil.CheckErr(cmdutil.ValidateOutputArgs(cmd))
+		},
+	}
+
+	cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on, not including uninitialized ones.")
+	return cmd
 }
 
 func TestDeleteObjectByTuple(t *testing.T) {
@@ -366,7 +371,7 @@ func TestDeleteObjectNotFound(t *testing.T) {
 		Cascade:     false,
 		Output:      "name",
 	}
-	err := options.Complete(tf, buf, errBuf, []string{}, fakecmd)
+	err := options.Complete(tf, buf, errBuf, []string{}, fakecmd())
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -448,7 +453,7 @@ func TestDeleteAllNotFound(t *testing.T) {
 		IgnoreNotFound:  false,
 		Output:          "name",
 	}
-	err := options.Complete(tf, buf, errBuf, []string{"services"}, fakecmd)
+	err := options.Complete(tf, buf, errBuf, []string{"services"}, fakecmd())
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -573,7 +578,7 @@ func TestDeleteMultipleObjectContinueOnMissing(t *testing.T) {
 		Cascade:     false,
 		Output:      "name",
 	}
-	err := options.Complete(tf, buf, errBuf, []string{}, fakecmd)
+	err := options.Complete(tf, buf, errBuf, []string{}, fakecmd())
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -749,7 +754,7 @@ func TestResourceErrors(t *testing.T) {
 				Cascade:         false,
 				Output:          "name",
 			}
-			err := options.Complete(tf, buf, errBuf, testCase.args, fakecmd)
+			err := options.Complete(tf, buf, errBuf, testCase.args, fakecmd())
 			if !testCase.errFn(err) {
 				t.Errorf("%s: unexpected error: %v", k, err)
 				return

pkg/kubectl/cmd/replace_test.go

@@ -65,7 +65,7 @@ func TestReplaceObject(t *testing.T) {
 	tf.Namespace = "test"
 	buf := bytes.NewBuffer([]byte{})
 
-	cmd := NewCmdReplace(tf, buf)
+	cmd := NewCmdReplace(tf, buf, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/legacy/redis-master-controller.yaml")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
@@ -136,7 +136,7 @@ func TestReplaceMultipleObject(t *testing.T) {
 	tf.Namespace = "test"
 	buf := bytes.NewBuffer([]byte{})
 
-	cmd := NewCmdReplace(tf, buf)
+	cmd := NewCmdReplace(tf, buf, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/legacy/redis-master-controller.yaml")
 	cmd.Flags().Set("filename", "../../../examples/guestbook/frontend-service.yaml")
 	cmd.Flags().Set("output", "name")
@@ -194,7 +194,7 @@ func TestReplaceDirectory(t *testing.T) {
 	tf.Namespace = "test"
 	buf := bytes.NewBuffer([]byte{})
 
-	cmd := NewCmdReplace(tf, buf)
+	cmd := NewCmdReplace(tf, buf, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/legacy")
 	cmd.Flags().Set("namespace", "test")
 	cmd.Flags().Set("output", "name")
@@ -241,7 +241,7 @@ func TestForceReplaceObjectNotFound(t *testing.T) {
 	tf.Namespace = "test"
 	buf := bytes.NewBuffer([]byte{})
 
-	cmd := NewCmdReplace(tf, buf)
+	cmd := NewCmdReplace(tf, buf, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/legacy/redis-master-controller.yaml")
 	cmd.Flags().Set("force", "true")
 	cmd.Flags().Set("cascade", "false")

pkg/kubectl/cmd/run_test.go

@@ -188,12 +188,29 @@ func TestRunArgsFollowDashRules(t *testing.T) {
 					}, nil
 				}),
 			}
+
 			tf.Namespace = "test"
 			tf.ClientConfigVal = &restclient.Config{}
+
 			cmd := NewCmdRun(tf, os.Stdin, os.Stdout, os.Stderr)
 			cmd.Flags().Set("image", "nginx")
 			cmd.Flags().Set("generator", "run/v1")
-			err := RunRun(tf, os.Stdin, os.Stdout, os.Stderr, cmd, test.args, test.argsLenAtDash)
+
+			deleteFlags := NewDeleteFlags("to use to replace the resource.")
+			opts := &RunOpts{
+				DeleteOptions: deleteFlags.ToOptions(os.Stdout, os.Stderr),
+
+				In:     os.Stdin,
+				Out:    os.Stdout,
+				ErrOut: os.Stderr,
+
+				Image:     "nginx",
+				Generator: "run/v1",
+
+				ArgsLenAtDash: test.argsLenAtDash,
+			}
+
+			err := opts.Run(tf, cmd, test.args)
 			if test.expectError && err == nil {
 				t.Errorf("unexpected non-error (%s)", test.name)
 			}
@@ -335,6 +352,19 @@ func TestGenerateService(t *testing.T) {
 					}
 				}),
 			}
+
+			buff := &bytes.Buffer{}
+			deleteFlags := NewDeleteFlags("to use to replace the resource.")
+			opts := &RunOpts{
+				DeleteOptions: deleteFlags.ToOptions(os.Stdout, os.Stderr),
+
+				Out:    buff,
+				ErrOut: buff,
+
+				Port:   test.port,
+				Record: false,
+			}
+
 			cmd := &cobra.Command{}
 			cmd.Flags().Bool(cmdutil.ApplyAnnotationsFlag, false, "")
 			cmd.Flags().Bool("record", false, "Record current kubectl command in the resource annotation. If set to false, do not record the command. If set to true, record the command. If not set, default to updating the existing annotation value only if one already exists.")
@@ -343,7 +373,7 @@ func TestGenerateService(t *testing.T) {
 			addRunFlags(cmd)
 
 			if !test.expectPOST {
-				cmd.Flags().Set("dry-run", "true")
+				opts.DryRun = true
 			}
 
 			if len(test.port) > 0 {
@@ -351,8 +381,7 @@ func TestGenerateService(t *testing.T) {
 				test.params["port"] = test.port
 			}
 
-			buff := &bytes.Buffer{}
-			_, err := generateService(tf, cmd, test.args, test.serviceGenerator, test.params, "namespace", buff)
+			_, err := opts.generateService(tf, cmd, test.serviceGenerator, test.params, "namespace")
 			if test.expectErr {
 				if err == nil {
 					t.Error("unexpected non-error")
@@ -473,7 +502,12 @@ func TestRunValidations(t *testing.T) {
 			for flagName, flagValue := range test.flags {
 				cmd.Flags().Set(flagName, flagValue)
 			}
-			err := RunRun(tf, inBuf, outBuf, errBuf, cmd, test.args, cmd.ArgsLenAtDash())
+			cmd.Run(cmd, test.args)
+
+			var err error
+			if errBuf.Len() > 0 {
+				err = fmt.Errorf("%v", errBuf.String())
+			}
 			if err != nil && len(test.expectedErr) > 0 {
 				if !strings.Contains(err.Error(), test.expectedErr) {
 					t.Errorf("unexpected error: %v", err)