github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-26 23:24:32 +00:00
Code Issues Projects Releases Wiki Activity

Make Request#RequestURI honor configured context root

Browse Source 
Kubernetes-commit: 5677f7ab0b1b1ab22a71d01e4a710bf0f5e633aa
This commit is contained in:
Jordan Liggitt
2025-04-03 12:51:46 -04:00
committed by Kubernetes Publisher
parent 7aa362d5dd
commit 25d4fa6ba8
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rest/request.go
View File

@@ -378,8 +378,9 @@ func (r *Request) NamespaceIfScoped(namespace string, scoped bool) *Request {
return r
}
// AbsPath overwrites an existing path with the segments provided. Trailing slashes are preserved
// when a single segment is passed.
// AbsPath overwrites an existing path with the segments provided.
// Trailing slashes are preserved when a single segment is passed.
// Any path in the request's REST client's base URL is preserved as a prefix.
func (r *Request) AbsPath(segments ...string) *Request {
if r.err != nil {
return r
@@ -392,8 +393,8 @@ func (r *Request) AbsPath(segments ...string) *Request {
return r
}
// RequestURI overwrites existing path and parameters with the value of the provided server relative
// URI.
// RequestURI overwrites existing path and parameters with the value of the provided server relative URI.
// This is equivalent to clearing params, then calling AbsPath() + Param() for each query parameter.
func (r *Request) RequestURI(uri string) *Request {
if r.err != nil {
return r
@@ -403,14 +404,17 @@ func (r *Request) RequestURI(uri string) *Request {
r.err = err
return r
}
r.pathPrefix = locator.Path
// AbsPath handles prepending r.c.base.Path, if set
r.AbsPath(locator.Path)
if len(locator.Query()) > 0 {
if r.params == nil {
r.params = make(url.Values)
}
// clear any existing params
r.params = make(url.Values)
for k, v := range locator.Query() {
r.params[k] = v
}
} else {
// clear any existing params
r.params = nil
}
return r
}