In pkg/kubectl/describe.go function Matches support unordered types matches.

The argument of function need to be matched. It did not support unorder matches. This is a TODO and I fix it.(line 1763 in pkg/kubectl/describe.go) I use a map to solve it which could compare two types array's difference.

In pkg/kubectl/describe.go function Matches support unordered types matches.
a5a2b94c · Weixu Zhuang · e99243fd · a5a2b94c
Commit a5a2b94c authored Nov 20, 2015 by Weixu Zhuang
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

describe.go pkg/kubectl/describe.go +7 -2

No files found.
--- a/pkg/kubectl/describe.go
+++ b/pkg/kubectl/describe.go
@@ -1732,13 +1732,18 @@ type typeFunc struct {
 }

 // Matches returns true when the passed types exactly match the Extra list.
-// TODO: allow unordered types to be matched and reorderd.
 func (fn typeFunc) Matches(types []reflect.Type) bool {
 	if len(fn.Extra) != len(types) {
 		return false
 	}
+	// reorder the items in array types and fn.Extra
+	// convert the type into string and sort them, check if they are matched
+	varMap := make(map[reflect.Type]bool)
+	for i := range fn.Extra {
+		varMap[fn.Extra[i]] = true
+	}
 	for i := range types {
-		if fn.Extra[i] != types[i] {
+		if _, found := varMap[types[i]]; !found {
 			return false
 		}
 	}