From af64e10400f8533a0c48ecdf5ab9b7fbf329e14e Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 26 Mar 2018 18:26:55 -0400 Subject: Vendor in lots of kubernetes stuff to shrink image size Signed-off-by: Daniel J Walsh Closes: #554 Approved by: mheon --- vendor/github.com/ulule/deepcopier/deepcopier.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'vendor/github.com/ulule/deepcopier') diff --git a/vendor/github.com/ulule/deepcopier/deepcopier.go b/vendor/github.com/ulule/deepcopier/deepcopier.go index 8cccb5b78..8a6c70b55 100644 --- a/vendor/github.com/ulule/deepcopier/deepcopier.go +++ b/vendor/github.com/ulule/deepcopier/deepcopier.go @@ -124,6 +124,12 @@ func process(dst interface{}, src interface{}, args ...Options) error { // Valuer -> ptr if isNullableType(srcFieldType.Type) && dstFieldValue.Kind() == reflect.Ptr && force { + // We have same nullable type on both sides + if srcFieldValue.Type().AssignableTo(dstFieldType.Type) { + dstFieldValue.Set(srcFieldValue) + continue + } + v, _ := srcFieldValue.Interface().(driver.Valuer).Value() if v == nil { continue @@ -143,6 +149,12 @@ func process(dst interface{}, src interface{}, args ...Options) error { // Valuer -> value if isNullableType(srcFieldType.Type) { + // We have same nullable type on both sides + if srcFieldValue.Type().AssignableTo(dstFieldType.Type) { + dstFieldValue.Set(srcFieldValue) + continue + } + if force { v, _ := srcFieldValue.Interface().(driver.Valuer).Value() if v == nil { -- cgit v1.2.3-54-g00ecf