fix(api): url wildcard param (#17)

* fix(api): url wildcard param * fix: unit test failing due to unset route context --------- Co-authored-by: Niklas Treml <[email protected]>
telekom · Nov 24, 2023 · 2ea017e · 2ea017e
1 parent 2fadcf4
commit 2ea017e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/pkg/checks/roundtrip.go b/pkg/checks/roundtrip.go
@@ -47,7 +47,7 @@ func (rt *RoundTrip) Run(ctx context.Context) (Result, error) {
 
 func (rt *RoundTrip) Startup(ctx context.Context, cResult chan<- Result) error {
 	// TODO register http handler for this check
-	http.HandleFunc("/rtt", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("rtt", func(w http.ResponseWriter, r *http.Request) {
 		// TODO handle
 	})
 
@@ -58,7 +58,7 @@ func (rt *RoundTrip) Startup(ctx context.Context, cResult chan<- Result) error {
 // Shutdown is called once when the check is unregistered or sparrow shuts down
 
 func (rt *RoundTrip) Shutdown(ctx context.Context) error {
-	http.Handle("/rtt", http.NotFoundHandler())
+	http.Handle("rtt", http.NotFoundHandler())
 
 	return nil
 }
@@ -78,11 +78,11 @@ func (rt *RoundTrip) Schema() (*openapi3.SchemaRef, error) {
 }
 
 func (rt *RoundTrip) RegisterHandler(ctx context.Context, router *api.RoutingTree) {
-	router.Add(http.MethodGet, "/rtt", rt.handleRoundtrip)
+	router.Add(http.MethodGet, "rtt", rt.handleRoundtrip)
 }
 
 func (rt *RoundTrip) DeregisterHandler(ctx context.Context, router *api.RoutingTree) {
-	router.Remove(http.MethodGet, "/rtt")
+	router.Remove(http.MethodGet, "rtt")
 }
 
 func (rt *RoundTrip) handleRoundtrip(w http.ResponseWriter, r *http.Request) {

diff --git a/pkg/sparrow/api.go b/pkg/sparrow/api.go
@@ -187,7 +187,7 @@ func (s *Sparrow) getOpenapi(w http.ResponseWriter, r *http.Request) {
 // Returns a 404 if no handler is registered for the request
 func (s *Sparrow) handleChecks(w http.ResponseWriter, r *http.Request) {
 	method := r.Method
-	path := r.URL.Path
+	path := chi.URLParam(r, "*")
 
 	handler, ok := s.routingTree.Get(method, path)
 	if !ok {

diff --git a/pkg/sparrow/api_test.go b/pkg/sparrow/api_test.go
@@ -194,6 +194,15 @@ func TestSparrow_getCheckMetrics(t *testing.T) {
 	}
 }
 
+func addRouteParams(r *http.Request, values map[string]string) *http.Request {
+	rctx := chi.NewRouteContext()
+	for k, v := range values {
+		rctx.URLParams.Add(k, v)
+	}
+
+	return r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, rctx))
+}
+
 func TestSparrow_handleChecks(t *testing.T) {
 	type route struct {
 		Method  string
@@ -224,7 +233,7 @@ func TestSparrow_handleChecks(t *testing.T) {
 		wantCode int
 	}{
 		{name: "no check handlers", fields: fields{routingTree: api.NewRoutingTree()}, args: args{w: httptest.NewRecorder(), r: httptest.NewRequest(http.MethodGet, "/v1/notfound", bytes.NewBuffer([]byte{}))}, wantCode: http.StatusNotFound, want: []byte(http.StatusText(http.StatusNotFound))},
-		{name: "has check handlers", fields: fields{routingTree: api.NewRoutingTree(), routes: []route{{Method: http.MethodGet, Path: "/v1/test", Handler: func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("test")) }}}}, args: args{w: httptest.NewRecorder(), r: httptest.NewRequest(http.MethodGet, "/v1/test", bytes.NewBuffer([]byte{}))}, wantCode: http.StatusOK, want: []byte("test")},
+		{name: "has check handlers", fields: fields{routingTree: api.NewRoutingTree(), routes: []route{{Method: http.MethodGet, Path: "/v1/test", Handler: func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("test")) }}}}, args: args{w: httptest.NewRecorder(), r: addRouteParams(httptest.NewRequest(http.MethodGet, "/v1/test", bytes.NewBuffer([]byte{})), map[string]string{"*": "/v1/test"})}, wantCode: http.StatusOK, want: []byte("test")},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {