From 1eaa5c41f932d28aaace3459ad8537672e5131c8 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sun, 7 Dec 2014 21:20:08 -0500
Subject: [PATCH] RawExtension was not properly marshalled

MarshalJSON can't use a pointer to a struct for RawExtension:

http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go
---
 pkg/runtime/extension.go      |  4 +++-
 pkg/runtime/extension_test.go | 39 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 pkg/runtime/extension_test.go

diff --git a/pkg/runtime/extension.go b/pkg/runtime/extension.go
index 8f94f2b578f..982a4c4f69e 100644
--- a/pkg/runtime/extension.go
+++ b/pkg/runtime/extension.go
@@ -26,6 +26,8 @@ func (re *RawExtension) UnmarshalJSON(in []byte) error {
 	return nil
 }
 
-func (re *RawExtension) MarshalJSON() ([]byte, error) {
+// Marshal may get called on pointers or values, so implement MarshalJSON on value.
+// http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go
+func (re RawExtension) MarshalJSON() ([]byte, error) {
 	return re.RawJSON, nil
 }
diff --git a/pkg/runtime/extension_test.go b/pkg/runtime/extension_test.go
new file mode 100644
index 00000000000..07c0f9401ed
--- /dev/null
+++ b/pkg/runtime/extension_test.go
@@ -0,0 +1,39 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package runtime_test
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+)
+
+func TestEmbeddedRawExtensionMarshal(t *testing.T) {
+	type test struct {
+		Ext runtime.RawExtension
+	}
+
+	extension := test{Ext: runtime.RawExtension{RawJSON: []byte(`{"foo":"bar"}`)}}
+	data, err := json.Marshal(extension)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if string(data) != `{"Ext":{"foo":"bar"}}` {
+		t.Errorf("unexpected data: %s", string(data))
+	}
+}