Merge pull request kubernetes#114937 from seans3/export-delete-option

k8s-ci-robot · web-flow · commit 5cbd6960c805 · 2023-01-10T06:59:28.000-08:00
Exports WarningPrinter field in DeleteOptions
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani.go
@@ -63,7 +63,7 @@ type CanIOptions struct {
 	List           bool
 
 	genericclioptions.IOStreams
-	warningPrinter *printers.WarningPrinter
+	WarningPrinter *printers.WarningPrinter
 }
 
 var (
@@ -145,7 +145,10 @@ func NewCmdCanI(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C
 
 // Complete completes all the required options
 func (o *CanIOptions) Complete(f cmdutil.Factory, args []string) error {
-	o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	// Set default WarningPrinter if not already set.
+	if o.WarningPrinter == nil {
+		o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	}
 
 	if o.List {
 		if len(args) != 0 {
@@ -206,8 +209,8 @@ func (o *CanIOptions) Validate() error {
 		return nil
 	}
 
-	if o.warningPrinter == nil {
-		return fmt.Errorf("warningPrinter can not be used without initialization")
+	if o.WarningPrinter == nil {
+		return fmt.Errorf("WarningPrinter can not be used without initialization")
 	}
 
 	if o.NonResourceURL != "" {
@@ -218,18 +221,18 @@ func (o *CanIOptions) Validate() error {
 			return fmt.Errorf("NonResourceURL and ResourceName can not specified together")
 		}
 		if !isKnownNonResourceVerb(o.Verb) {
-			o.warningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))
+			o.WarningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))
 		}
 	} else if !o.Resource.Empty() && !o.AllNamespaces && o.DiscoveryClient != nil {
 		if namespaced, err := isNamespaced(o.Resource, o.DiscoveryClient); err == nil && !namespaced {
 			if len(o.Resource.Group) == 0 {
-				o.warningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped\n", o.Resource.Resource))
+				o.WarningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped\n", o.Resource.Resource))
 			} else {
-				o.warningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped in group '%s'\n", o.Resource.Resource, o.Resource.Group))
+				o.WarningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped in group '%s'\n", o.Resource.Resource, o.Resource.Group))
 			}
 		}
 		if !isKnownResourceVerb(o.Verb) {
-			o.warningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))
+			o.WarningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))
 		}
 	}
 
@@ -317,9 +320,9 @@ func (o *CanIOptions) resourceFor(mapper meta.RESTMapper, resourceArg string) sc
 		if err != nil {
 			if !nonStandardResourceNames.Has(groupResource.String()) {
 				if len(groupResource.Group) == 0 {
-					o.warningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s'\n", groupResource.Resource))
+					o.WarningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s'\n", groupResource.Resource))
 				} else {
-					o.warningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s' in group '%s'\n", groupResource.Resource, groupResource.Group))
+					o.WarningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s' in group '%s'\n", groupResource.Resource, groupResource.Group))
 				}
 			}
 			return schema.GroupVersionResource{Resource: resourceArg}
@@ -331,7 +334,7 @@ func (o *CanIOptions) resourceFor(mapper meta.RESTMapper, resourceArg string) sc
 
 func (o *CanIOptions) printStatus(status authorizationv1.SubjectRulesReviewStatus) error {
 	if status.Incomplete {
-		o.warningPrinter.Print(fmt.Sprintf("the list may be incomplete: %v", status.EvaluationError))
+		o.WarningPrinter.Print(fmt.Sprintf("the list may be incomplete: %v", status.EvaluationError))
 	}
 
 	breakdownRules := []rbacv1.PolicyRule{}
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go
@@ -293,7 +293,7 @@ func TestRunResourceFor(t *testing.T) {
 
 			ioStreams, _, _, buf := genericclioptions.NewTestIOStreams()
 			test.o.IOStreams = ioStreams
-			test.o.warningPrinter = printers.NewWarningPrinter(test.o.IOStreams.ErrOut, printers.WarningPrinterOptions{Color: false})
+			test.o.WarningPrinter = printers.NewWarningPrinter(test.o.IOStreams.ErrOut, printers.WarningPrinterOptions{Color: false})
 
 			restMapper, err := tf.ToRESTMapper()
 			if err != nil {
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/debug/debug.go b/staging/src/k8s.io/kubectl/pkg/cmd/debug/debug.go
@@ -130,7 +130,7 @@ type DebugOptions struct {
 	podClient corev1client.CoreV1Interface
 
 	genericclioptions.IOStreams
-	warningPrinter *printers.WarningPrinter
+	WarningPrinter *printers.WarningPrinter
 
 	applier ProfileApplier
 }
@@ -224,8 +224,10 @@ func (o *DebugOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
 	o.attachChanged = cmd.Flags().Changed("attach")
 	o.shareProcessedChanged = cmd.Flags().Changed("share-processes")
 
-	// Warning printer
-	o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	// Set default WarningPrinter
+	if o.WarningPrinter == nil {
+		o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	}
 	o.applier, err = NewProfileApplier(o.Profile)
 	if err != nil {
 		return err
@@ -307,9 +309,9 @@ func (o *DebugOptions) Validate() error {
 		return fmt.Errorf("-i/--stdin is required for containers with -t/--tty=true")
 	}
 
-	// warningPrinter
-	if o.warningPrinter == nil {
-		return fmt.Errorf("warningPrinter can not be used without initialization")
+	// WarningPrinter
+	if o.WarningPrinter == nil {
+		return fmt.Errorf("WarningPrinter can not be used without initialization")
 	}
 
 	return nil
@@ -764,7 +766,7 @@ func (o *DebugOptions) waitForContainer(ctx context.Context, ns, podName, contai
 				return true, nil
 			}
 			if !o.Quiet && s.State.Waiting != nil && s.State.Waiting.Message != "" {
-				o.warningPrinter.Print(fmt.Sprintf("container %s: %s", containerName, s.State.Waiting.Message))
+				o.WarningPrinter.Print(fmt.Sprintf("container %s: %s", containerName, s.State.Waiting.Message))
 			}
 			return false, nil
 		})
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/debug/debug_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/debug/debug_test.go
@@ -1598,7 +1598,8 @@ func TestCompleteAndValidate(t *testing.T) {
 				t.Fatalf("CompleteAndValidate got error: '%v', wantError: %v", gotError, tc.wantError)
 			}
 
-			if diff := cmp.Diff(tc.wantOpts, opts, cmpFilter, cmpopts.IgnoreUnexported(DebugOptions{})); diff != "" {
+			if diff := cmp.Diff(tc.wantOpts, opts, cmpFilter, cmpopts.IgnoreFields(DebugOptions{},
+				"attachChanged", "shareProcessedChanged", "podClient", "WarningPrinter", "applier")); diff != "" {
 				t.Error("CompleteAndValidate unexpected diff in generated object: (-want +got):\n", diff)
 			}
 		})
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go
@@ -133,7 +133,7 @@ type DeleteOptions struct {
 	Result        *resource.Result
 
 	genericclioptions.IOStreams
-	warningPrinter *printers.WarningPrinter
+	WarningPrinter *printers.WarningPrinter
 }
 
 func NewCmdDelete(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
@@ -226,7 +226,10 @@ func (o *DeleteOptions) Complete(f cmdutil.Factory, args []string, cmd *cobra.Co
 		}
 	}
 
-	o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	// Set default WarningPrinter if not already set.
+	if o.WarningPrinter == nil {
+		o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	}
 
 	return nil
 }
@@ -242,13 +245,13 @@ func (o *DeleteOptions) Validate() error {
 	if o.DeleteAll && len(o.FieldSelector) > 0 {
 		return fmt.Errorf("cannot set --all and --field-selector at the same time")
 	}
-	if o.warningPrinter == nil {
-		return fmt.Errorf("warningPrinter can not be used without initialization")
+	if o.WarningPrinter == nil {
+		return fmt.Errorf("WarningPrinter can not be used without initialization")
 	}
 
 	switch {
 	case o.GracePeriod == 0 && o.ForceDeletion:
-		o.warningPrinter.Print("Immediate deletion does not wait for confirmation that the running resource has been terminated. The resource may continue to run on the cluster indefinitely.")
+		o.WarningPrinter.Print("Immediate deletion does not wait for confirmation that the running resource has been terminated. The resource may continue to run on the cluster indefinitely.")
 	case o.GracePeriod > 0 && o.ForceDeletion:
 		return fmt.Errorf("--force and --grace-period greater than 0 cannot be specified together")
 	}
@@ -312,7 +315,7 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error {
 		options.PropagationPolicy = &o.CascadingStrategy
 
 		if warnClusterScope && info.Mapping.Scope.Name() == meta.RESTScopeNameRoot {
-			o.warningPrinter.Print("deleting cluster-scoped resources, not scoped to the provided namespace")
+			o.WarningPrinter.Print("deleting cluster-scoped resources, not scoped to the provided namespace")
 			warnClusterScope = false
 		}
 
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain.go b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain.go
@@ -49,7 +49,7 @@ type DrainCmdOptions struct {
 	nodeInfos []*resource.Info
 
 	genericclioptions.IOStreams
-	warningPrinter *printers.WarningPrinter
+	WarningPrinter *printers.WarningPrinter
 }
 
 var (
@@ -254,7 +254,10 @@ func (o *DrainCmdOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
 		return printer.PrintObj, nil
 	}
 
-	o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	// Set default WarningPrinter if not already set.
+	if o.WarningPrinter == nil {
+		o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	}
 
 	builder := f.NewBuilder().
 		WithScheme(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...).
@@ -336,7 +339,7 @@ func (o *DrainCmdOptions) deleteOrEvictPodsSimple(nodeInfo *resource.Info) error
 		return utilerrors.NewAggregate(errs)
 	}
 	if warnings := list.Warnings(); warnings != "" {
-		o.warningPrinter.Print(warnings)
+		o.WarningPrinter.Print(warnings)
 	}
 	if o.drainer.DryRunStrategy == cmdutil.DryRunClient {
 		for _, pod := range list.Pods() {
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go
@@ -130,7 +130,7 @@ type EnvOptions struct {
 	clientset              *kubernetes.Clientset
 
 	genericclioptions.IOStreams
-	warningPrinter *printers.WarningPrinter
+	WarningPrinter *printers.WarningPrinter
 }
 
 // NewEnvOptions returns an EnvOptions indicating all containers in the selected
@@ -207,7 +207,7 @@ func contains(key string, keyList []string) bool {
 func (o *EnvOptions) keyToEnvName(key string) string {
 	envName := strings.ToUpper(validEnvNameRegexp.ReplaceAllString(key, "_"))
 	if envName != key {
-		o.warningPrinter.Print(fmt.Sprintf("key %s transferred to %s", key, envName))
+		o.WarningPrinter.Print(fmt.Sprintf("key %s transferred to %s", key, envName))
 	}
 	return envName
 }
@@ -247,7 +247,10 @@ func (o *EnvOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []stri
 		return err
 	}
 	o.builder = f.NewBuilder
-	o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	// Set default WarningPrinter if not already set.
+	if o.WarningPrinter == nil {
+		o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})
+	}
 
 	return nil
 }
@@ -266,8 +269,8 @@ func (o *EnvOptions) Validate() error {
 	if len(o.Keys) > 0 && len(o.From) == 0 {
 		return fmt.Errorf("when specifying --keys, a configmap or secret must be provided with --from")
 	}
-	if o.warningPrinter == nil {
-		return fmt.Errorf("warningPrinter can not be used without initialization")
+	if o.WarningPrinter == nil {
+		return fmt.Errorf("WarningPrinter can not be used without initialization")
 	}
 	return nil
 }
@@ -421,7 +424,7 @@ func (o *EnvOptions) RunEnv() error {
 						}
 					}
 
-					o.warningPrinter.Print(fmt.Sprintf("%s/%s does not have any containers matching %q", objKind, objName, o.ContainerSelector))
+					o.WarningPrinter.Print(fmt.Sprintf("%s/%s does not have any containers matching %q", objKind, objName, o.ContainerSelector))
 				}
 				return nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ type CanIOptions struct {`
`63`	`63`	`List bool`
`64`	`64`
`65`	`65`	`genericclioptions.IOStreams`
`66`		`- warningPrinter *printers.WarningPrinter`
	`66`	`+ WarningPrinter *printers.WarningPrinter`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`var (`
`@@ -145,7 +145,10 @@ func NewCmdCanI(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C`
`145`	`145`
`146`	`146`	`// Complete completes all the required options`
`147`	`147`	`func (o *CanIOptions) Complete(f cmdutil.Factory, args []string) error {`
`148`		`- o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`148`	`+ // Set default WarningPrinter if not already set.`
	`149`	`+ if o.WarningPrinter == nil {`
	`150`	`+ o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`151`	`+ }`
`149`	`152`
`150`	`153`	`if o.List {`
`151`	`154`	`if len(args) != 0 {`
`@@ -206,8 +209,8 @@ func (o *CanIOptions) Validate() error {`
`206`	`209`	`return nil`
`207`	`210`	`}`
`208`	`211`
`209`		`- if o.warningPrinter == nil {`
`210`		`- return fmt.Errorf("warningPrinter can not be used without initialization")`
	`212`	`+ if o.WarningPrinter == nil {`
	`213`	`+ return fmt.Errorf("WarningPrinter can not be used without initialization")`
`211`	`214`	`}`
`212`	`215`
`213`	`216`	`if o.NonResourceURL != "" {`
`@@ -218,18 +221,18 @@ func (o *CanIOptions) Validate() error {`
`218`	`221`	`return fmt.Errorf("NonResourceURL and ResourceName can not specified together")`
`219`	`222`	`}`
`220`	`223`	`if !isKnownNonResourceVerb(o.Verb) {`
`221`		`- o.warningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))`
	`224`	`+ o.WarningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))`
`222`	`225`	`}`
`223`	`226`	`} else if !o.Resource.Empty() && !o.AllNamespaces && o.DiscoveryClient != nil {`
`224`	`227`	`if namespaced, err := isNamespaced(o.Resource, o.DiscoveryClient); err == nil && !namespaced {`
`225`	`228`	`if len(o.Resource.Group) == 0 {`
`226`		`- o.warningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped\n", o.Resource.Resource))`
	`229`	`+ o.WarningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped\n", o.Resource.Resource))`
`227`	`230`	`} else {`
`228`		`- o.warningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped in group '%s'\n", o.Resource.Resource, o.Resource.Group))`
	`231`	`+ o.WarningPrinter.Print(fmt.Sprintf("resource '%s' is not namespace scoped in group '%s'\n", o.Resource.Resource, o.Resource.Group))`
`229`	`232`	`}`
`230`	`233`	`}`
`231`	`234`	`if !isKnownResourceVerb(o.Verb) {`
`232`		`- o.warningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))`
	`235`	`+ o.WarningPrinter.Print(fmt.Sprintf("verb '%s' is not a known verb\n", o.Verb))`
`233`	`236`	`}`
`234`	`237`	`}`
`235`	`238`
`@@ -317,9 +320,9 @@ func (o *CanIOptions) resourceFor(mapper meta.RESTMapper, resourceArg string) sc`
`317`	`320`	`if err != nil {`
`318`	`321`	`if !nonStandardResourceNames.Has(groupResource.String()) {`
`319`	`322`	`if len(groupResource.Group) == 0 {`
`320`		`- o.warningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s'\n", groupResource.Resource))`
	`323`	`+ o.WarningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s'\n", groupResource.Resource))`
`321`	`324`	`} else {`
`322`		`- o.warningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s' in group '%s'\n", groupResource.Resource, groupResource.Group))`
	`325`	`+ o.WarningPrinter.Print(fmt.Sprintf("the server doesn't have a resource type '%s' in group '%s'\n", groupResource.Resource, groupResource.Group))`
`323`	`326`	`}`
`324`	`327`	`}`
`325`	`328`	`return schema.GroupVersionResource{Resource: resourceArg}`
`@@ -331,7 +334,7 @@ func (o *CanIOptions) resourceFor(mapper meta.RESTMapper, resourceArg string) sc`
`331`	`334`
`332`	`335`	`func (o *CanIOptions) printStatus(status authorizationv1.SubjectRulesReviewStatus) error {`
`333`	`336`	`if status.Incomplete {`
`334`		`- o.warningPrinter.Print(fmt.Sprintf("the list may be incomplete: %v", status.EvaluationError))`
	`337`	`+ o.WarningPrinter.Print(fmt.Sprintf("the list may be incomplete: %v", status.EvaluationError))`
`335`	`338`	`}`
`336`	`339`
`337`	`340`	`breakdownRules := []rbacv1.PolicyRule{}`
Original file line number	Diff line number	Diff line change
`@@ -1598,7 +1598,8 @@ func TestCompleteAndValidate(t *testing.T) {`
`1598`	`1598`	`t.Fatalf("CompleteAndValidate got error: '%v', wantError: %v", gotError, tc.wantError)`
`1599`	`1599`	`}`
`1600`	`1600`
`1601`		`- if diff := cmp.Diff(tc.wantOpts, opts, cmpFilter, cmpopts.IgnoreUnexported(DebugOptions{})); diff != "" {`
	`1601`	`+ if diff := cmp.Diff(tc.wantOpts, opts, cmpFilter, cmpopts.IgnoreFields(DebugOptions{},`
	`1602`	`+ "attachChanged", "shareProcessedChanged", "podClient", "WarningPrinter", "applier")); diff != "" {`
`1602`	`1603`	`t.Error("CompleteAndValidate unexpected diff in generated object: (-want +got):\n", diff)`
`1603`	`1604`	`}`
`1604`	`1605`	`})`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ type DeleteOptions struct {`
`133`	`133`	`Result *resource.Result`
`134`	`134`
`135`	`135`	`genericclioptions.IOStreams`
`136`		`- warningPrinter *printers.WarningPrinter`
	`136`	`+ WarningPrinter *printers.WarningPrinter`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`func NewCmdDelete(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {`
`@@ -226,7 +226,10 @@ func (o DeleteOptions) Complete(f cmdutil.Factory, args []string, cmd cobra.Co`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`- o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`229`	`+ // Set default WarningPrinter if not already set.`
	`230`	`+ if o.WarningPrinter == nil {`
	`231`	`+ o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`232`	`+ }`
`230`	`233`
`231`	`234`	`return nil`
`232`	`235`	`}`
`@@ -242,13 +245,13 @@ func (o *DeleteOptions) Validate() error {`
`242`	`245`	`if o.DeleteAll && len(o.FieldSelector) > 0 {`
`243`	`246`	`return fmt.Errorf("cannot set --all and --field-selector at the same time")`
`244`	`247`	`}`
`245`		`- if o.warningPrinter == nil {`
`246`		`- return fmt.Errorf("warningPrinter can not be used without initialization")`
	`248`	`+ if o.WarningPrinter == nil {`
	`249`	`+ return fmt.Errorf("WarningPrinter can not be used without initialization")`
`247`	`250`	`}`
`248`	`251`
`249`	`252`	`switch {`
`250`	`253`	`case o.GracePeriod == 0 && o.ForceDeletion:`
`251`		`- o.warningPrinter.Print("Immediate deletion does not wait for confirmation that the running resource has been terminated. The resource may continue to run on the cluster indefinitely.")`
	`254`	`+ o.WarningPrinter.Print("Immediate deletion does not wait for confirmation that the running resource has been terminated. The resource may continue to run on the cluster indefinitely.")`
`252`	`255`	`case o.GracePeriod > 0 && o.ForceDeletion:`
`253`	`256`	`return fmt.Errorf("--force and --grace-period greater than 0 cannot be specified together")`
`254`	`257`	`}`
`@@ -312,7 +315,7 @@ func (o DeleteOptions) DeleteResult(r resource.Result) error {`
`312`	`315`	`options.PropagationPolicy = &o.CascadingStrategy`
`313`	`316`
`314`	`317`	`if warnClusterScope && info.Mapping.Scope.Name() == meta.RESTScopeNameRoot {`
`315`		`- o.warningPrinter.Print("deleting cluster-scoped resources, not scoped to the provided namespace")`
	`318`	`+ o.WarningPrinter.Print("deleting cluster-scoped resources, not scoped to the provided namespace")`
`316`	`319`	`warnClusterScope = false`
`317`	`320`	`}`
`318`	`321`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ type DrainCmdOptions struct {`
`49`	`49`	`nodeInfos []*resource.Info`
`50`	`50`
`51`	`51`	`genericclioptions.IOStreams`
`52`		`- warningPrinter *printers.WarningPrinter`
	`52`	`+ WarningPrinter *printers.WarningPrinter`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`var (`
`@@ -254,7 +254,10 @@ func (o DrainCmdOptions) Complete(f cmdutil.Factory, cmd cobra.Command, args [`
`254`	`254`	`return printer.PrintObj, nil`
`255`	`255`	`}`
`256`	`256`
`257`		`- o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`257`	`+ // Set default WarningPrinter if not already set.`
	`258`	`+ if o.WarningPrinter == nil {`
	`259`	`+ o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`260`	`+ }`
`258`	`261`
`259`	`262`	`builder := f.NewBuilder().`
`260`	`263`	`WithScheme(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...).`
`@@ -336,7 +339,7 @@ func (o DrainCmdOptions) deleteOrEvictPodsSimple(nodeInfo resource.Info) error`
`336`	`339`	`return utilerrors.NewAggregate(errs)`
`337`	`340`	`}`
`338`	`341`	`if warnings := list.Warnings(); warnings != "" {`
`339`		`- o.warningPrinter.Print(warnings)`
	`342`	`+ o.WarningPrinter.Print(warnings)`
`340`	`343`	`}`
`341`	`344`	`if o.drainer.DryRunStrategy == cmdutil.DryRunClient {`
`342`	`345`	`for _, pod := range list.Pods() {`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ type EnvOptions struct {`
`130`	`130`	`clientset *kubernetes.Clientset`
`131`	`131`
`132`	`132`	`genericclioptions.IOStreams`
`133`		`- warningPrinter *printers.WarningPrinter`
	`133`	`+ WarningPrinter *printers.WarningPrinter`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// NewEnvOptions returns an EnvOptions indicating all containers in the selected`
`@@ -207,7 +207,7 @@ func contains(key string, keyList []string) bool {`
`207`	`207`	`func (o *EnvOptions) keyToEnvName(key string) string {`
`208`	`208`	`envName := strings.ToUpper(validEnvNameRegexp.ReplaceAllString(key, "_"))`
`209`	`209`	`if envName != key {`
`210`		`- o.warningPrinter.Print(fmt.Sprintf("key %s transferred to %s", key, envName))`
	`210`	`+ o.WarningPrinter.Print(fmt.Sprintf("key %s transferred to %s", key, envName))`
`211`	`211`	`}`
`212`	`212`	`return envName`
`213`	`213`	`}`
`@@ -247,7 +247,10 @@ func (o EnvOptions) Complete(f cmdutil.Factory, cmd cobra.Command, args []stri`
`247`	`247`	`return err`
`248`	`248`	`}`
`249`	`249`	`o.builder = f.NewBuilder`
`250`		`- o.warningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`250`	`+ // Set default WarningPrinter if not already set.`
	`251`	`+ if o.WarningPrinter == nil {`
	`252`	`+ o.WarningPrinter = printers.NewWarningPrinter(o.ErrOut, printers.WarningPrinterOptions{Color: term.AllowsColorOutput(o.ErrOut)})`
	`253`	`+ }`
`251`	`254`
`252`	`255`	`return nil`
`253`	`256`	`}`
`@@ -266,8 +269,8 @@ func (o *EnvOptions) Validate() error {`
`266`	`269`	`if len(o.Keys) > 0 && len(o.From) == 0 {`
`267`	`270`	`return fmt.Errorf("when specifying --keys, a configmap or secret must be provided with --from")`
`268`	`271`	`}`
`269`		`- if o.warningPrinter == nil {`
`270`		`- return fmt.Errorf("warningPrinter can not be used without initialization")`
	`272`	`+ if o.WarningPrinter == nil {`
	`273`	`+ return fmt.Errorf("WarningPrinter can not be used without initialization")`
`271`	`274`	`}`
`272`	`275`	`return nil`
`273`	`276`	`}`
`@@ -421,7 +424,7 @@ func (o *EnvOptions) RunEnv() error {`
`421`	`424`	`}`
`422`	`425`	`}`
`423`	`426`
`424`		`- o.warningPrinter.Print(fmt.Sprintf("%s/%s does not have any containers matching %q", objKind, objName, o.ContainerSelector))`
	`427`	`+ o.WarningPrinter.Print(fmt.Sprintf("%s/%s does not have any containers matching %q", objKind, objName, o.ContainerSelector))`
`425`	`428`	`}`
`426`	`429`	`return nil`
`427`	`430`	`}`