Merge pull request #111 from flanksource/fix-postgrest-forward

fix: postgrest forward traffic

cmd/server.go

@@ -28,31 +28,15 @@ var Serve = &cobra.Command{
 		db.HTTPEndpoint = publicEndpoint + "/db"
 		go db.StartPostgrest()
 
-		url, err := url.Parse("http://localhost:3000")
-		if err != nil {
-			e.Logger.Fatal(err)
-		}
-
 		if logger.IsTraceEnabled() {
 			e.Use(middleware.Logger())
 		}
-
+		forward(e, "/db", db.PostgRESTEndpoint())
 		e.GET("/health", func(c echo.Context) error {
 			return c.String(http.StatusOK, "OK")
 		})
 		e.GET("/query", query.Handler)
 
-		e.Group("/db").Use(middleware.ProxyWithConfig(middleware.ProxyConfig{
-			Rewrite: map[string]string{
-				"^/db/*": "/$1",
-			},
-			Balancer: middleware.NewRoundRobinBalancer([]*middleware.ProxyTarget{
-				{
-					URL: url,
-				},
-			}),
-		}))
-
 		// Run this in a goroutine to make it non-blocking for server start
 		go startScraperCron(args)
 
@@ -95,6 +79,23 @@ func startScraperCron(configFiles []string) {
 
 }
 
+func forward(e *echo.Echo, prefix string, target string) {
+	targetURL, err := url.Parse(target)
+	if err != nil {
+		e.Logger.Fatal(err)
+	}
+	e.Group(prefix).Use(middleware.ProxyWithConfig(middleware.ProxyConfig{
+		Rewrite: map[string]string{
+			fmt.Sprintf("^%s/*", prefix): "/$1",
+		},
+		Balancer: middleware.NewRoundRobinBalancer([]*middleware.ProxyTarget{
+			{
+				URL: targetURL,
+			},
+		}),
+	}))
+}
+
 func init() {
 	ServerFlags(Serve.Flags())
 }

db/postgrest.go

@@ -1,13 +1,22 @@
 package db
 
 import (
+	"fmt"
+	"strconv"
+
 	"github.com/flanksource/commons/deps"
 	"github.com/flanksource/commons/logger"
 )
 
 // PostgRESTVersion ...
 var PostgRESTVersion = "v9.0.0"
 
+var PostgRESTServerPort = 3000
+
+func PostgRESTEndpoint() string {
+	return fmt.Sprintf("http://localhost:%d", PostgRESTServerPort)
+}
+
 // GoOffline ...
 func GoOffline() error {
 	return getBinary()("--help")
@@ -19,6 +28,7 @@ func getBinary() deps.BinaryFunc {
 		"PGRST_DB_SCHEMA":                Schema,
 		"PGRST_DB_ANON_ROLE":             "postgrest_api",
 		"PGRST_OPENAPI_SERVER_PROXY_URI": HTTPEndpoint,
+		"PGRST_DB_PORT":                  strconv.Itoa(PostgRESTServerPort),
 		"PGRST_LOG_LEVEL":                LogLevel,
 	})
 }