From d985e01035367640d190d8957cbb76799e27e93a Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Thu, 19 Jul 2018 23:46:38 -0700
Subject: [PATCH] Add type before and after

---
 types/mapper.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/mapper.go b/types/mapper.go
index d67ede73..397c1f31 100644
--- a/types/mapper.go
+++ b/types/mapper.go
@@ -82,12 +82,18 @@ func (t *typeMapper) FromInternal(data map[string]interface{}) {
 		}
 	}
 
+	// Attempt to set type so mappers are aware of it
 	if _, ok := data["type"]; !ok && data != nil {
 		data["type"] = t.typeName
 	}
 
 	Mappers(t.Mappers).FromInternal(data)
 
+	// Ensure if there is no type we set one
+	if _, ok := data["type"]; !ok && data != nil {
+		data["type"] = t.typeName
+	}
+
 	if data != nil && t.root {
 		if _, ok := data["id"]; ok {
 			if namespace != "" {