Skip to content

fix: match project gv #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zachsmith1 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −5
Open

fix: match project gv #445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pkg/server/filters/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ func ProjectRouterWithRequestInfo(next http.Handler, rir reqinfo.RequestInfoReso
)

return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
idx := strings.Index(r.URL.Path, projectsSeg)
if idx < 0 {
// Only intercept requests that target the valid parent API group/version:
// /apis/<resourcemanagerGV>/projects/<id>/control-plane/...
parentPrefix := "/apis/" + resourcemanagerv1alpha1.GroupVersion.String() + projectsSeg
if !strings.HasPrefix(r.URL.Path, parentPrefix) {
next.ServeHTTP(w, r)
return
}

tail := r.URL.Path[idx+len(projectsSeg):] // "<id>/control-plane/..."
tail := strings.TrimPrefix(r.URL.Path, parentPrefix) // "<id>/control-plane/..."
slash := strings.IndexByte(tail, '/')
if slash < 0 || !strings.HasPrefix(tail[slash:], controlPlaneSeg+"/") {
next.ServeHTTP(w, r)
Expand All @@ -40,8 +42,7 @@ func ProjectRouterWithRequestInfo(next http.Handler, rir reqinfo.RequestInfoReso
projID := tail[:slash]

// Drop ".../projects/<id>/control-plane"
newPath := "/" + strings.TrimPrefix(
r.URL.Path[idx+len(projectsSeg)+slash+len(controlPlaneSeg):], "/")
newPath := "/" + strings.TrimPrefix(tail[slash+len(controlPlaneSeg):], "/")

// Clone request, stash project, and rewrite URL bits
r2 := r.Clone(projctx.WithProject(r.Context(), projID))
Expand Down
Loading