github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44492 from CaoShuFeng/namer

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 44837, 44779, 44492)

remove duplicate code from restful namer

The deleted codes have the same logic with function ObjectName.

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-24 07:56:02 -07:00 committed by GitHub
commit 7e42d3848e
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/namer.go
View File

@ -46,7 +46,7 @@ type ScopeNamer interface {
// GenerateLink creates an encoded URI for a given runtime object that represents the canonical path // GenerateLink creates an encoded URI for a given runtime object that represents the canonical path
// and query. // and query.
GenerateLink(req *http.Request, obj runtime.Object) (uri string, err error) GenerateLink(req *http.Request, obj runtime.Object) (uri string, err error)
// GenerateLink creates an encoded URI for a list that represents the canonical path and query. // GenerateListLink creates an encoded URI for a list that represents the canonical path and query.
GenerateListLink(req *http.Request) (uri string, err error) GenerateListLink(req *http.Request) (uri string, err error)
} }
@ -91,22 +91,19 @@ func (n ContextBasedNaming) Name(req *http.Request) (namespace, name string, err
} }
func (n ContextBasedNaming) GenerateLink(req *http.Request, obj runtime.Object) (uri string, err error) { func (n ContextBasedNaming) GenerateLink(req *http.Request, obj runtime.Object) (uri string, err error) {
namespace, name, err := n.ObjectName(obj)
if err != nil {
return "", err
}
requestInfo, ok := request.RequestInfoFrom(n.GetContext(req)) requestInfo, ok := request.RequestInfoFrom(n.GetContext(req))
if !ok { if !ok {
return "", fmt.Errorf("missing requestInfo") return "", fmt.Errorf("missing requestInfo")
} }
if len(namespace) == 0 && len(name) == 0 { namespace, name, err := n.ObjectName(obj)
if len(requestInfo.Name) == 0 { if err == errEmptyName && len(requestInfo.Name) > 0 {
return "", errEmptyName
}
namespace = requestInfo.Namespace
name = requestInfo.Name name = requestInfo.Name
} else if err != nil {
return "", err
}
if len(namespace) == 0 && len(requestInfo.Namespace) > 0 {
namespace = requestInfo.Namespace
} }
if n.ClusterScoped { if n.ClusterScoped {