Merge pull request kubernetes#6178 from derekwaynecarr/fix_self_link_…

…list Fix self link in listing items in a namespace
duda · Mar 30, 2015 · 795cd38 · 795cd38
2 parents 05452f1 + 265a0e3
commit 795cd38
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 3 deletions.
diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go
@@ -537,9 +537,7 @@ func (n scopeNaming) GenerateLink(req *restful.Request, obj runtime.Object) (pat
 		}
 	}
 	path = strings.Replace(n.itemPath, "{name}", name, 1)
-	if !n.allNamespaces {
-		path = strings.Replace(path, "{"+n.scope.ParamName()+"}", namespace, 1)
-	}
+	path = strings.Replace(path, "{"+n.scope.ParamName()+"}", namespace, 1)
 	return path, "", nil
 }
 

diff --git a/pkg/apiserver/api_installer_test.go b/pkg/apiserver/api_installer_test.go
@@ -0,0 +1,54 @@
+/*
+Copyright 2015 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 apiserver
+
+import (
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
+
+	"github.com/emicklei/go-restful"
+)
+
+func TestScopeNamingGenerateLink(t *testing.T) {
+	selfLinker := &setTestSelfLinker{
+		t:           t,
+		expectedSet: "/api/v1beta3/namespaces/other/services/foo",
+		name:        "foo",
+		namespace:   "other",
+	}
+	s := scopeNaming{
+		meta.RESTScopeNamespace,
+		selfLinker,
+		"/api/v1beta3/namespaces/{namespace}/services/{name}",
+		true,
+	}
+	service := &api.Service{
+		ObjectMeta: api.ObjectMeta{
+			Name:      "foo",
+			Namespace: "other",
+		},
+		TypeMeta: api.TypeMeta{
+			Kind: "Service",
+		},
+	}
+	_, _, err := s.GenerateLink(&restful.Request{}, service)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+}