From 2906f85227beea5c86872e0d5ca310672a63ffbf Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Mon, 22 Jun 2015 17:52:55 -0700
Subject: [PATCH] allow conversions.Scheme to expose intermidiate versioned api
 object

---
 pkg/conversion/decode.go | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkg/conversion/decode.go b/pkg/conversion/decode.go
index 2fed94cfc5b..6a0577c1853 100644
--- a/pkg/conversion/decode.go
+++ b/pkg/conversion/decode.go
@@ -22,31 +22,38 @@ import (
 	"fmt"
 )
 
+func (s *Scheme) DecodeToVersionedObject(data []byte) (obj interface{}, version, kind string, err error) {
+	version, kind, err = s.DataVersionAndKind(data)
+	if err != nil {
+		return
+	}
+	if version == "" && s.InternalVersion != "" {
+		return nil, "", "", fmt.Errorf("version not set in '%s'", string(data))
+	}
+	if kind == "" {
+		return nil, "", "", fmt.Errorf("kind not set in '%s'", string(data))
+	}
+	obj, err = s.NewObject(version, kind)
+	if err != nil {
+		return nil, "", "", err
+	}
+
+	if err := json.Unmarshal(data, obj); err != nil {
+		return nil, "", "", err
+	}
+	return
+}
+
 // Decode converts a JSON string back into a pointer to an api object.
 // Deduces the type based upon the fields added by the MetaInsertionFactory
 // technique. The object will be converted, if necessary, into the
 // s.InternalVersion type before being returned. Decode will not decode
 // objects without version set unless InternalVersion is also "".
 func (s *Scheme) Decode(data []byte) (interface{}, error) {
-	version, kind, err := s.DataVersionAndKind(data)
+	obj, version, kind, err := s.DecodeToVersionedObject(data)
 	if err != nil {
 		return nil, err
 	}
-	if version == "" && s.InternalVersion != "" {
-		return nil, fmt.Errorf("version not set in '%s'", string(data))
-	}
-	if kind == "" {
-		return nil, fmt.Errorf("kind not set in '%s'", string(data))
-	}
-	obj, err := s.NewObject(version, kind)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, obj); err != nil {
-		return nil, err
-	}
-
 	// Version and Kind should be blank in memory.
 	if err := s.SetVersionAndKind("", "", obj); err != nil {
 		return nil, err