Use userInfo for Originating-Identity so extras is correct. (openshift#1702)

Author: shawn-hurley

Diff for: pkg/controller/controller_test.go

@@ -347,7 +347,7 @@ const testOriginatingIdentityValue = `{
 	"username": "fakeusername",
 	"uid": "fakeuid",
 	"groups": ["fakegroup1"],
-	"fakekey": ["fakevalue"]
+        "extra": {"fakekey": ["fakevalue"]}
 }`
 
 var testOriginatingIdentity = &osb.OriginatingIdentity{

Diff for: pkg/controller/originating_identity.go

@@ -25,23 +25,13 @@ import (
 
 const (
 	originatingIdentityPlatform = "kubernetes"
-	originatingIdentityUsername = "username"
-	originatingIdentityUID      = "uid"
-	originatingIdentityGroups   = "groups"
 )
 
 func buildOriginatingIdentity(userInfo *v1beta1.UserInfo) (*osb.OriginatingIdentity, error) {
 	if userInfo == nil {
 		return nil, nil
 	}
-	oiFields := map[string]interface{}{}
-	oiFields[originatingIdentityUsername] = userInfo.Username
-	oiFields[originatingIdentityUID] = userInfo.UID
-	oiFields[originatingIdentityGroups] = userInfo.Groups
-	for k, v := range userInfo.Extra {
-		oiFields[k] = v
-	}
-	oiValue, err := json.Marshal(oiFields)
+	oiValue, err := json.Marshal(userInfo)
 	if err != nil {
 		return nil, err
 	}

Diff for: pkg/controller/originating_identity_test.go

@@ -17,6 +17,9 @@ limitations under the License.
 package controller
 
 import (
+	"encoding/json"
+	"fmt"
+	"reflect"
 	"testing"
 
 	"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
@@ -33,7 +36,7 @@ func TestBuildOriginatingIdentity(t *testing.T) {
 
 	e := osb.OriginatingIdentity{
 		Platform: "kubernetes",
-		Value:    `{"foo":["bar","baz"],"groups":["stuff-dev","main-eng"],"uid":"abcd-1234","username":"[email protected]"}`,
+		Value:    `{extra: {"foo":["bar","baz"]},"groups":["stuff-dev","main-eng"],"uid":"abcd-1234","username":"[email protected]"}`,
 	}
 
 	g, err := buildOriginatingIdentity(&userInfo)
@@ -46,7 +49,28 @@ func TestBuildOriginatingIdentity(t *testing.T) {
 		t.Fatalf("Unexpected Platform, %s", expectedGot(e.Platform, g.Platform))
 	}
 
-	if e.Value != g.Value {
-		t.Fatalf("Unexpected Value, %s", expectedGot(e.Value, g.Value))
+	var retUserInfo v1beta1.UserInfo
+	err = json.Unmarshal([]byte(g.Value), &retUserInfo)
+	if err != nil {
+		t.Fatalf("Unexpected Error, %+v", err)
+	}
+
+	if userInfo.Username != retUserInfo.Username {
+		t.Fatalf("Unexpected Value Username, %s", expectedGot(userInfo.Username, retUserInfo.Username))
+	}
+	if userInfo.UID != retUserInfo.UID {
+		t.Fatalf("Unexpected Value UID, %s", expectedGot(userInfo.UID, retUserInfo.UID))
+	}
+
+	if !reflect.DeepEqual(userInfo.Groups, retUserInfo.Groups) {
+		t.Fatalf("Unexpected Value Groups, %s", expectedGot(fmt.Sprintf("%#v", userInfo.Groups), fmt.Sprintf("%#v", retUserInfo.Groups)))
+	}
+
+	if extras, ok := retUserInfo.Extra["foo"]; !ok {
+		t.Fatalf("Unexpected Value extras, %s", expectedGot(fmt.Sprintf("%#v", userInfo.Extra), fmt.Sprintf("%#v", retUserInfo.Extra)))
+	} else {
+		if !reflect.DeepEqual(extras, userInfo.Extra["foo"]) {
+			t.Fatalf("Unexpected Value extras, %s", expectedGot(fmt.Sprintf("%#v", userInfo.Extra), fmt.Sprintf("%#v", retUserInfo.Extra)))
+		}
 	}
 }