Fix working directory

Author: kalverra

.github/workflows/mockserver-test.yaml

@@ -10,6 +10,9 @@ on:
 
 jobs:
   test:
+    defaults:
+      run:
+        working-directory: mockserver
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
@@ -23,4 +26,4 @@ jobs:
               - 'mockserver/**'
       - name: Run tests
         if: steps.changes.outputs.src == 'true'
-        run: go test ./mockserver/...
+        run: go test ./...

mockserver/main.go

@@ -33,13 +33,13 @@ func init() {
 
 func main() {
 	defer func() {
-		if err := Save(); err != nil {
+		if err := save(); err != nil {
 			log.Error().Err(err).Msg("Failed to save configuration")
 		}
 	}()
 
-	http.HandleFunc("/register", RegisterRouteHandler)
-	http.HandleFunc("/", DynamicHandler)
+	http.HandleFunc("/register", registerRouteHandler)
+	http.HandleFunc("/", dynamicHandler)
 
 	server := &http.Server{
 		Addr:         ":8080",

mockserver/router.go

@@ -31,8 +31,8 @@ var (
 	routesMu sync.RWMutex             // Protects access to the routes map
 )
 
-// RegisterRouteHandler handles the dynamic route registration.
-func RegisterRouteHandler(w http.ResponseWriter, r *http.Request) {
+// registerRouteHandler handles the dynamic route registration.
+func registerRouteHandler(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodPost {
 		http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
 		return
@@ -58,8 +58,8 @@ func RegisterRouteHandler(w http.ResponseWriter, r *http.Request) {
 	log.Info().Str("Path", route.Path).Str("Method", route.Method).Msg("Route registered")
 }
 
-// DynamicHandler handles all incoming requests and responds based on the registered routes.
-func DynamicHandler(w http.ResponseWriter, r *http.Request) {
+// dynamicHandler handles all incoming requests and responds based on the registered routes.
+func dynamicHandler(w http.ResponseWriter, r *http.Request) {
 	routesMu.RLock()
 	route, exists := routes[r.Method+":"+r.URL.Path]
 	routesMu.RUnlock()
@@ -77,8 +77,8 @@ func DynamicHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// Load loads all registered routes from a file.
-func Load() error {
+// load loads all registered routes from a file.
+func load() error {
 	if _, err := os.Stat(config.SaveFile); os.IsNotExist(err) {
 		log.Debug().Str("Save File", config.SaveFile).Msg("No routes to load")
 		return nil
@@ -103,8 +103,8 @@ func Load() error {
 	return nil
 }
 
-// Save saves all registered routes to a file.
-func Save() error {
+// save saves all registered routes to a file.
+func save() error {
 	start := time.Now()
 	log.Debug().Str("Save File", config.SaveFile).Msg("Saving routes")
 
@@ -123,3 +123,21 @@ func Save() error {
 	log.Debug().Str("Save File", config.SaveFile).Str("Duration", time.Since(start).String()).Msg("Routes saved")
 	return nil
 }
+
+func RegisterRoute(route Route) {
+	routesMu.Lock()
+	routes[route.Method+":"+route.Path] = route
+	routesMu.Unlock()
+}
+
+func CallRoute(method, path string) (int, string, string) {
+	routesMu.RLock()
+	route, exists := routes[method+":"+path]
+	routesMu.RUnlock()
+
+	if !exists {
+		return http.StatusNotFound, "", ""
+	}
+
+	return route.StatusCode, route.ContentType, route.Response
+}

mockserver/router_test.go

@@ -23,7 +23,7 @@ func registerRoute(tb testing.TB, route Route) {
 	req.Header.Set("Content-Type", "application/json")
 
 	rec := httptest.NewRecorder()
-	RegisterRouteHandler(rec, req)
+	registerRouteHandler(rec, req)
 
 	resp := rec.Result()
 	tb.Cleanup(func() {
@@ -74,7 +74,7 @@ func TestRegisteredRoute(t *testing.T) {
 
 			req := httptest.NewRequest(route.Method, route.Path, nil)
 			rec := httptest.NewRecorder()
-			DynamicHandler(rec, req)
+			dynamicHandler(rec, req)
 			resp := rec.Result()
 
 			assert.Equal(t, resp.StatusCode, route.StatusCode)
@@ -92,7 +92,7 @@ func TestUnregisteredRoute(t *testing.T) {
 	req := httptest.NewRequest(http.MethodGet, "/unregistered", nil)
 	rec := httptest.NewRecorder()
 
-	DynamicHandler(rec, req)
+	dynamicHandler(rec, req)
 	resp := rec.Result()
 	defer resp.Body.Close()
 
@@ -128,18 +128,18 @@ func TestSaveLoad(t *testing.T) {
 		os.Remove(filename)
 	})
 
-	err := Save()
+	err := save()
 	require.NoError(t, err)
 	require.FileExists(t, filename)
 
-	err = Load()
+	err = load()
 	require.NoError(t, err)
 
 	for _, route := range routes {
 		req := httptest.NewRequest(route.Method, route.Path, nil)
 		rec := httptest.NewRecorder()
 
-		DynamicHandler(rec, req)
+		dynamicHandler(rec, req)
 		resp := rec.Result()
 
 		assert.Equal(t, resp.StatusCode, route.StatusCode)
@@ -163,7 +163,7 @@ func BenchmarkRegisterRoute(b *testing.B) {
 		body, _ := json.Marshal(route)
 		req := httptest.NewRequest(http.MethodPost, "/register", bytes.NewReader(body))
 		rec := httptest.NewRecorder()
-		RegisterRouteHandler(rec, req)
+		registerRouteHandler(rec, req)
 	}
 }
 
@@ -180,7 +180,7 @@ func BenchmarkRouteResponse(b *testing.B) {
 	rec := httptest.NewRecorder()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		DynamicHandler(rec, req)
+		dynamicHandler(rec, req)
 	}
 }
 
@@ -203,7 +203,7 @@ func BenchmarkSaveRoutes(b *testing.B) {
 
 	b.ResetTimer() // Start measuring time
 	for i := 0; i < b.N; i++ {
-		if err := Save(); err != nil {
+		if err := save(); err != nil {
 			b.Fatalf("SaveRoutes failed: %v", err)
 		}
 	}
@@ -233,7 +233,7 @@ func BenchmarkLoadRoutes(b *testing.B) {
 
 	b.ResetTimer() // Start measuring time
 	for i := 0; i < b.N; i++ {
-		if err := Load(); err != nil {
+		if err := load(); err != nil {
 			b.Fatalf("Load failed: %v", err)
 		}
 	}