Merge pull request #57381 from niuzhenguo/get-raw-cleanup

Automatic merge from submit-queue (batch tested with PRs 52912, 57381). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add more validators when run kubectl get with --raw **What this PR does / why we need it**: 1. Make --raw and --output mutually exclusive for kubectl get cmd 2. Add url/ParseRequestURI check for the specified raw URI **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #57379 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57381 from niuzhenguo/get-raw-cleanup
b04c28e8 · Kubernetes Submit Queue · GitHub · 1a341f6b · 8a7f8bc0 · b04c28e8
Unverified Commit b04c28e8 authored Jan 15, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

get.go pkg/kubectl/cmd/resource/get.go +12 -2

No files found.
--- a/pkg/kubectl/cmd/resource/get.go
+++ b/pkg/kubectl/cmd/resource/get.go
@@ -25,6 +25,8 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"

+	"net/url"
+
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -216,8 +218,16 @@ func (options *GetOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args 

 // Validate checks the set of flags provided by the user.
 func (options *GetOptions) Validate(cmd *cobra.Command) error {
-	if len(options.Raw) > 0 && (options.Watch || options.WatchOnly || len(options.LabelSelector) > 0 || options.Export) {
-		return fmt.Errorf("--raw may not be specified with other flags that filter the server request or alter the output")
+	if len(options.Raw) > 0 {
+		if options.Watch || options.WatchOnly || len(options.LabelSelector) > 0 || options.Export {
+			return fmt.Errorf("--raw may not be specified with other flags that filter the server request or alter the output")
+		}
+		if len(cmdutil.GetFlagString(cmd, "output")) > 0 {
+			return cmdutil.UsageErrorf(cmd, "--raw and --output are mutually exclusive")
+		}
+		if _, err := url.ParseRequestURI(options.Raw); err != nil {
+			return cmdutil.UsageErrorf(cmd, "--raw must be a valid URL path: %v", err)
+		}
 	}
 	if cmdutil.GetFlagBool(cmd, "show-labels") {
 		outputOption := cmd.Flags().Lookup("output").Value.String()