Merge pull request #39 from FireTail-io/patch-resource

Fix resource including query string when no OpenAPI spec is used

Author: TheTeaCat

middlewares/http/middleware.go

@@ -61,7 +61,7 @@ func GetMiddleware(options *Options) (func(next http.Handler) http.Handler, erro
 					Headers:      r.Header,
 					Method:       logging.Method(r.Method),
 					IP:           strings.Split(r.RemoteAddr, ":")[0],
-					Resource:     r.URL.RequestURI(), // We'll fill this in later if we have a router
+					Resource:     r.URL.Path, // We'll fill this in later if we have a router
 				},
 			}
 			if r.TLS != nil {

middlewares/http/middleware_test.go

@@ -101,7 +101,7 @@ func TestNoSpec(t *testing.T) {
 				logEntry, err := logging.UnmarshalLogEntry(logs[0])
 				require.Nil(t, err)
 				assert.Equal(t, logEntry.Request.Resource, "/implemented/1")
-				assert.Equal(t, logEntry.Request.URI, "http://example.com/implemented/1")
+				assert.Equal(t, logEntry.Request.URI, "http://example.com/implemented/1?testparam=1")
 				wg.Done()
 			},
 		},
@@ -111,7 +111,7 @@ func TestNoSpec(t *testing.T) {
 	responseRecorder := httptest.NewRecorder()
 
 	request := httptest.NewRequest(
-		"POST", "/implemented/1",
+		"POST", "/implemented/1?testparam=1",
 		io.NopCloser(bytes.NewBuffer([]byte("{\"description\":\"test description\"}"))),
 	)
 	request.Header.Add("Content-Type", "application/json")