Merge pull request #2568 from derekwaynecarr/self_link_ns

make selfLink namespace aware

pkg/apiserver/apiserver_test.go

@@ -316,7 +316,8 @@ func TestSimpleList(t *testing.T) {
 	storage["simple"] = &simpleStorage
 	selfLinker := &setTestSelfLinker{
 		t:           t,
-		expectedSet: "/prefix/version/simple",
+		namespace:   "other",
+		expectedSet: "/prefix/version/simple?namespace=other",
 	}
 	handler := Handle(storage, codec, "/prefix", testVersion, selfLinker)
 	server := httptest.NewServer(handler)
@@ -360,8 +361,9 @@ func TestNonEmptyList(t *testing.T) {
 	simpleStorage := SimpleRESTStorage{
 		list: []Simple{
 			{
-				TypeMeta: api.TypeMeta{Kind: "Simple"},
+				TypeMeta:   api.TypeMeta{Kind: "Simple"},
-				Other:    "foo",
+				ObjectMeta: api.ObjectMeta{Namespace: "other"},
+				Other:      "foo",
 			},
 		},
 	}
@@ -394,6 +396,10 @@ func TestNonEmptyList(t *testing.T) {
 	if listOut.Items[0].Other != simpleStorage.list[0].Other {
 		t.Errorf("Unexpected data: %#v, %s", listOut.Items[0], string(body))
 	}
+	expectedSelfLink := "/prefix/version/simple?namespace=other"
+	if listOut.Items[0].ObjectMeta.SelfLink != expectedSelfLink {
+		t.Errorf("Unexpected data: %#v, %s", listOut.Items[0].ObjectMeta.SelfLink, expectedSelfLink)
+	}
 }
 
 func TestGet(t *testing.T) {
@@ -651,11 +657,13 @@ type setTestSelfLinker struct {
 	t           *testing.T
 	expectedSet string
 	name        string
+	namespace   string
 	called      bool
 }
 
-func (s *setTestSelfLinker) Name(runtime.Object) (string, error)   { return s.name, nil }
+func (s *setTestSelfLinker) Namespace(runtime.Object) (string, error) { return s.namespace, nil }
-func (*setTestSelfLinker) SelfLink(runtime.Object) (string, error) { return "", nil }
+func (s *setTestSelfLinker) Name(runtime.Object) (string, error)      { return s.name, nil }
+func (*setTestSelfLinker) SelfLink(runtime.Object) (string, error)    { return "", nil }
 func (s *setTestSelfLinker) SetSelfLink(obj runtime.Object, selfLink string) error {
 	if e, a := s.expectedSet, selfLink; e != a {
 		s.t.Errorf("expected '%v', got '%v'", e, a)
@@ -674,7 +682,8 @@ func TestSyncCreate(t *testing.T) {
 	selfLinker := &setTestSelfLinker{
 		t:           t,
 		name:        "bar",
-		expectedSet: "/prefix/version/foo/bar",
+		namespace:   "other",
+		expectedSet: "/prefix/version/foo/bar?namespace=other",
 	}
 	handler := Handle(map[string]RESTStorage{
 		"foo": &storage,

pkg/apiserver/resthandler.go

@@ -62,7 +62,17 @@ func (h *RESTHandler) setSelfLink(obj runtime.Object, req *http.Request) error {
 	newURL.Path = path.Join(h.canonicalPrefix, req.URL.Path)
 	newURL.RawQuery = ""
 	newURL.Fragment = ""
-	err := h.selfLinker.SetSelfLink(obj, newURL.String())
+	namespace, err := h.selfLinker.Namespace(obj)
+	if err != nil {
+		return err
+	}
+	// TODO Remove this when namespace is in path
+	if len(namespace) > 0 {
+		query := newURL.Query()
+		query.Set("namespace", namespace)
+		newURL.RawQuery = query.Encode()
+	}
+	err = h.selfLinker.SetSelfLink(obj, newURL.String())
 	if err != nil {
 		return err
 	}
@@ -89,10 +99,20 @@ func (h *RESTHandler) setSelfLinkAddName(obj runtime.Object, req *http.Request)
 	if err != nil {
 		return err
 	}
+	namespace, err := h.selfLinker.Namespace(obj)
+	if err != nil {
+		return err
+	}
 	newURL := *req.URL
 	newURL.Path = path.Join(h.canonicalPrefix, req.URL.Path, name)
 	newURL.RawQuery = ""
 	newURL.Fragment = ""
+	// TODO Remove this when namespace is in path
+	if len(namespace) > 0 {
+		query := newURL.Query()
+		query.Set("namespace", namespace)
+		newURL.RawQuery = query.Encode()
+	}
 	return h.selfLinker.SetSelfLink(obj, newURL.String())
 }
 

pkg/runtime/interfaces.go

@@ -59,6 +59,8 @@ type SelfLinker interface {
 
 	// Knowing Name is sometimes necessary to use a SelfLinker.
 	Name(obj Object) (string, error)
+	// Knowing Namespace is sometimes necessary to use a SelfLinker
+	Namespace(obj Object) (string, error)
 }
 
 // All api types must support the Object interface. It's deliberately tiny so that this is not an onerous