From f9bca7bc7df013d3ec134008a5f06fce6947707d Mon Sep 17 00:00:00 2001
From: kargakis <mkargaki@redhat.com>
Date: Thu, 3 Sep 2015 15:44:03 +0200
Subject: [PATCH] handle structs

---
 pkg/conversion/queryparams/convert.go      | 18 ++++++++++++++++--
 pkg/conversion/queryparams/convert_test.go |  6 +++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkg/conversion/queryparams/convert.go b/pkg/conversion/queryparams/convert.go
index 9be5f581e61..450a43001a2 100644
--- a/pkg/conversion/queryparams/convert.go
+++ b/pkg/conversion/queryparams/convert.go
@@ -54,6 +54,10 @@ func isPointerKind(kind reflect.Kind) bool {
 	return kind == reflect.Ptr
 }
 
+func isStructKind(kind reflect.Kind) bool {
+	return kind == reflect.Struct
+}
+
 func isValueKind(kind reflect.Kind) bool {
 	switch kind {
 	case reflect.String, reflect.Bool, reflect.Int, reflect.Int8, reflect.Int16,
@@ -105,9 +109,17 @@ func Convert(obj runtime.Object) (url.Values, error) {
 		return nil, fmt.Errorf("expecting a pointer or interface")
 	}
 	st := sv.Type()
-	if st.Kind() != reflect.Struct {
+	if !isStructKind(st.Kind()) {
 		return nil, fmt.Errorf("expecting a pointer to a struct")
 	}
+
+	// Check all object fields
+	convertStruct(result, st, sv)
+
+	return result, nil
+}
+
+func convertStruct(result url.Values, st reflect.Type, sv reflect.Value) {
 	for i := 0; i < st.NumField(); i++ {
 		field := sv.Field(i)
 		tag, omitempty := jsonTag(st.Field(i))
@@ -123,6 +135,7 @@ func Convert(obj runtime.Object) (url.Values, error) {
 				field = reflect.Indirect(field)
 			}
 		}
+
 		switch {
 		case isValueKind(kind):
 			addParam(result, tag, omitempty, field)
@@ -130,7 +143,8 @@ func Convert(obj runtime.Object) (url.Values, error) {
 			if isValueKind(ft.Elem().Kind()) {
 				addListOfParams(result, tag, omitempty, field)
 			}
+		case isStructKind(kind) && !(zeroValue(field) && omitempty):
+			convertStruct(result, ft, field)
 		}
 	}
-	return result, nil
 }
diff --git a/pkg/conversion/queryparams/convert_test.go b/pkg/conversion/queryparams/convert_test.go
index e068f0d9b08..c409756e44a 100644
--- a/pkg/conversion/queryparams/convert_test.go
+++ b/pkg/conversion/queryparams/convert_test.go
@@ -111,12 +111,12 @@ func TestConvert(t *testing.T) {
 		},
 		{
 			input: &foo{
-				Str: "ignore embedded struct",
+				Str: "don't ignore embedded struct",
 				Foobar: bar{
 					Float1: 5.0,
 				},
 			},
-			expected: url.Values{"str": {"ignore embedded struct"}},
+			expected: url.Values{"str": {"don't ignore embedded struct"}, "float1": {"5"}, "float2": {"0"}},
 		},
 		{
 			// Ignore untagged fields
@@ -149,7 +149,7 @@ func TestConvert(t *testing.T) {
 			input: &baz{
 				Bptr: boolp(true),
 			},
-			expected: url.Values{"ptr": {"<nil>"}, "bptr": {"true"}},
+			expected: url.Values{"ptr": {""}, "bptr": {"true"}},
 		},
 		{
 			input: &baz{