From 1b8f4e0b7d9107eaa352e08da7c91626e98074cd Mon Sep 17 00:00:00 2001
From: juanvallejo <jvallejo@redhat.com>
Date: Tue, 17 Jan 2017 18:13:23 -0500
Subject: [PATCH] update check for "all" resources

---
 pkg/kubectl/resource/builder.go      |  7 ++++---
 pkg/kubectl/resource/builder_test.go | 10 +++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkg/kubectl/resource/builder.go b/pkg/kubectl/resource/builder.go
index 0b56a8db9e7..1914065241d 100644
--- a/pkg/kubectl/resource/builder.go
+++ b/pkg/kubectl/resource/builder.go
@@ -806,12 +806,13 @@ func HasNames(args []string) (bool, error) {
 
 // MultipleTypesRequested returns true if the provided args contain multiple resource kinds
 func MultipleTypesRequested(args []string) bool {
+	if len(args) == 1 && args[0] == "all" {
+		return true
+	}
+
 	args = normalizeMultipleResourcesArgs(args)
 	rKinds := sets.NewString()
 	for _, arg := range args {
-		if arg == "all" {
-			return true
-		}
 		rTuple, found, err := splitResourceTypeName(arg)
 		if err != nil {
 			continue
diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go
index 786637a36ab..2dd9a69ac2f 100644
--- a/pkg/kubectl/resource/builder_test.go
+++ b/pkg/kubectl/resource/builder_test.go
@@ -1254,6 +1254,14 @@ func TestMultipleTypesRequested(t *testing.T) {
 			args: []string{"rc"},
 			expectedMultipleTypes: false,
 		},
+		{
+			args: []string{"pod,all"},
+			expectedMultipleTypes: true,
+		},
+		{
+			args: []string{"all,rc,pod"},
+			expectedMultipleTypes: true,
+		},
 		{
 			args: []string{"rc,pod,svc"},
 			expectedMultipleTypes: true,
@@ -1286,7 +1294,7 @@ func TestMultipleTypesRequested(t *testing.T) {
 	for _, test := range tests {
 		hasMultipleTypes := MultipleTypesRequested(test.args)
 		if hasMultipleTypes != test.expectedMultipleTypes {
-			t.Errorf("expected HasName to return %v for %s", test.expectedMultipleTypes, test.args)
+			t.Errorf("expected MultipleTypesRequested to return %v for %s", test.expectedMultipleTypes, test.args)
 		}
 	}
 }