DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3980 from aledbf/refactor-isiterable

Browse source 
Refactor isIterable
This commit is contained in:
Kubernetes Prow Robot 2019-04-09 16:50:12 -07:00 committed by GitHub
commit 10c0df55c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal/sets/match.go
View file

@ -24,18 +24,19 @@ type equalFunction func(e1, e2 interface{}) bool
// Compare checks if the parameters are iterable and contains the same elements // Compare checks if the parameters are iterable and contains the same elements
func Compare(listA, listB interface{}, eq equalFunction) bool { func Compare(listA, listB interface{}, eq equalFunction) bool {
a := reflect.ValueOf(listA) ok := isIterable(listA)
ok := isIterable(a)
if !ok { if !ok {
return false return false
} }
b := reflect.ValueOf(listB) ok = isIterable(listB)
ok = isIterable(b)
if !ok { if !ok {
return false return false
} }
a := reflect.ValueOf(listA)
b := reflect.ValueOf(listB)
if a.IsNil() && b.IsNil() { if a.IsNil() && b.IsNil() {
return true return true
} }
@ -91,9 +92,9 @@ func StringElementsMatch(a, b []string) bool {
return Compare(a, b, compareStrings) return Compare(a, b, compareStrings)
} }
func isIterable(obj reflect.Value) bool { func isIterable(obj interface{}) bool {
switch reflect.TypeOf(obj).Kind() { switch reflect.TypeOf(obj).Kind() {
case reflect.Struct, reflect.Slice, reflect.Array: case reflect.Slice, reflect.Array:
return true return true
default: default:
return false return false