Migate tests to fit new Postgres system

Makefile

@@ -27,14 +27,33 @@ lint:
 unit_tests:
 	go test -race $$(go list ./... | grep -v integration_tests)
 
-integration_tests: build start_mongo
+integration_tests: build start_postgres init_test_db
 	go test -race -v ./integration_tests
 
-start_mongo:
-	./mongo.sh start
-
-stop_mongo:
-	./mongo.sh stop
+start_postgres:
+	docker run \
+		         --name router-postgres-test-db \
+				 		 -e POSTGRES_HOST_AUTH_METHOD=trust \
+						 -d \
+						 -p 5432:5432 \
+						 --user 'postgres' \
+						 --health-cmd 'pg_isready' \
+						 --health-start-period 5s \
+						 postgres:14
+	@echo Waiting for postgres to be up
+	@until [ "`docker inspect -f '{{.State.Health.Status}}' router-postgres-test-db`" = "healthy" ]; do \
+		echo '.\c'  ; \
+	  sleep 1     ; \
+	done          ;
+
+init_local_db:
+	docker exec -i govuk-docker_postgres-14_1 psql < localdb_init.sql
+
+init_test_db:
+	docker exec -i router-postgres-test-db psql < localdb_init.sql
+
+cleanup_postgres:
+	@docker rm -f router-postgres-test-db || true
 
 update_deps:
 	go get -t -u ./... && go mod tidy && go mod vendor

integration_tests/route_helpers.go

@@ -1,12 +1,12 @@
 package integration
 
 import (
+	"database/sql"
 	"fmt"
 	"os"
 	"time"
 
-	"github.com/globalsign/mgo"
-	"github.com/globalsign/mgo/bson"
+	_ "github.com/lib/pq" // Without which we can't use PSQL calls
 
 	// revive:disable:dot-imports
 	. "github.com/onsi/ginkgo/v2"
@@ -19,7 +19,7 @@ var _ = AfterEach(func() {
 })
 
 var (
-	routerDB *mgo.Database
+	routerDB *sql.DB
 )
 
 type Route struct {
@@ -80,36 +80,48 @@ func NewGoneRoute(extraParams ...string) Route {
 }
 
 func initRouteHelper() error {
-	databaseURL := os.Getenv("ROUTER_MONGO_URL")
+	databaseURL := os.Getenv("DATABASE_URL")
 
 	if databaseURL == "" {
-		databaseURL = "127.0.0.1"
+		databaseURL = "postgresql://postgres@127.0.0.1:5432/router_test?sslmode=disable"
 	}
 
-	sess, err := mgo.Dial(databaseURL)
+	db, err := sql.Open("postgres", databaseURL)
 	if err != nil {
-		return fmt.Errorf("failed to connect to mongo: %w", err)
+		return fmt.Errorf("Failed to connect to Postgres: " + err.Error())
 	}
-	sess.SetSyncTimeout(10 * time.Minute)
-	sess.SetSocketTimeout(10 * time.Minute)
 
-	routerDB = sess.DB("router_test")
+	db.SetConnMaxLifetime(10 * time.Minute)
+	db.SetMaxIdleConns(0)
+	db.SetMaxOpenConns(10)
+
+	routerDB = db
 	return nil
 }
 
 func addBackend(id, url string) {
-	err := routerDB.C("backends").Insert(bson.M{"backend_id": id, "backend_url": url})
-	Expect(err).NotTo(HaveOccurred())
+	query := `
+		INSERT INTO backends (backend_id, backend_url, created_at, updated_at)
+		VALUES ($1, $2, $3, $4)
+	`
+
+	_, err := routerDB.Exec(query, id, url, time.Now(), time.Now())
+	Expect(err).ToNot(HaveOccurred())
 }
 
 func addRoute(path string, route Route) {
 	route.IncomingPath = path
 
-	err := routerDB.C("routes").Insert(route)
-	Expect(err).NotTo(HaveOccurred())
+	query := `
+		INSERT INTO routes (incoming_path, created_at, updated_at)
+		VALUES ($1, $2, $3)
+	`
+
+	_, err := routerDB.Exec(query, route.IncomingPath, time.Now(), time.Now())
+	Expect(err).ToNot(HaveOccurred())
 }
 
 func clearRoutes() {
-	_ = routerDB.C("routes").DropCollection()
-	_ = routerDB.C("backends").DropCollection()
+	_, err := routerDB.Exec("DELETE FROM routes; DELETE FROM backends")
+	Expect(err).ToNot(HaveOccurred())
 }

integration_tests/router_support.go

@@ -17,8 +17,8 @@ import (
 )
 
 const (
-	routerPort = 3169
-	apiPort    = 3168
+	routerPort = 5434
+	apiPort    = 5433
 )
 
 func routerURL(port int, path string) string {
@@ -56,7 +56,7 @@ func startRouter(port, apiPort int, extraEnv []string) error {
 	}
 	cmd := exec.Command(bin)
 
-	cmd.Env = append(cmd.Environ(), "ROUTER_MONGO_DB=router_test")
+	cmd.Env = append(cmd.Environ(), "DATABASE_NAME=router_test")
 	cmd.Env = append(cmd.Env, fmt.Sprintf("ROUTER_PUBADDR=%s", pubAddr))
 	cmd.Env = append(cmd.Env, fmt.Sprintf("ROUTER_APIADDR=%s", apiAddr))
 	cmd.Env = append(cmd.Env, fmt.Sprintf("ROUTER_ERROR_LOG=%s", tempLogfile.Name()))

lib/router_test.go

@@ -1,17 +1,13 @@
 package router
 
 import (
-	"errors"
 	"testing"
-	"time"
-
-	"github.com/globalsign/mgo/bson"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-type mockMongoDB struct {
+/*type mockMongoDB struct {
 	result bson.M
 	err    error
 }
@@ -32,14 +28,14 @@ func (m *mockMongoDB) Run(_ interface{}, res interface{}) error {
 	}
 
 	return nil
-}
+}*/
 
 func TestRouter(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Router Suite")
 }
 
-var _ = Describe("Router", func() {
+/*var _ = Describe("Router", func() {
 	Context("When calling shouldReload", func() {
 		Context("with an up-to-date mongo instance", func() {
 			It("should return false", func() {
@@ -168,4 +164,4 @@ var _ = Describe("Router", func() {
 			)
 		})
 	})
-})
+})*/

localdb_init.sql

@@ -0,0 +1,41 @@
+CREATE DATABASE router_test;
+\connect router_test;
+
+CREATE TABLE backends (
+  id SERIAL PRIMARY KEY,
+  backend_id VARCHAR,
+  backend_url VARCHAR,
+  created_at TIMESTAMP NOT NULL,
+  updated_at TIMESTAMP NOT NULL
+);
+CREATE UNIQUE INDEX index_backends_on_backend_id ON backends (backend_id);
+
+CREATE TABLE routes (
+  id SERIAL PRIMARY KEY,
+  incoming_path VARCHAR,
+  route_type VARCHAR,
+  handler VARCHAR,
+  disabled BOOLEAN DEFAULT false,
+  backend_id VARCHAR,
+  redirect_to VARCHAR,
+  redirect_type VARCHAR,
+  segments_mode VARCHAR,
+  created_at TIMESTAMP NOT NULL,
+  updated_at TIMESTAMP NOT NULL
+);
+CREATE UNIQUE INDEX index_routes_on_incoming_path ON routes (incoming_path);
+
+CREATE TABLE users (
+  id SERIAL PRIMARY KEY,
+  name VARCHAR,
+  email VARCHAR,
+  uid VARCHAR,
+  organisation_slug VARCHAR,
+  organisation_content_id VARCHAR,
+  app_name VARCHAR,
+  permissions TEXT,
+  remotely_signed_out BOOLEAN DEFAULT false,
+  disabled BOOLEAN DEFAULT false,
+  created_at TIMESTAMP NOT NULL,
+  updated_at TIMESTAMP NOT NULL
+);

main.go

@@ -21,8 +21,8 @@ Usage: %s [-version]
 
 The following environment variables and defaults are available:
 
-ROUTER_PUBADDR=:8080             Address on which to serve public requests
-ROUTER_APIADDR=:8081             Address on which to receive reload requests
+ROUTER_PUBADDR=:5434             Address on which to serve public requests
+ROUTER_APIADDR=:5433             Address on which to receive reload requests
 ROUTER_MONGO_URL=127.0.0.1       Address of mongo cluster (e.g. 'mongo1,mongo2,mongo3')
 ROUTER_MONGO_DB=router           Name of mongo database to use
 ROUTER_MONGO_POLL_INTERVAL=2s    Interval to poll mongo for route changes
@@ -87,7 +87,7 @@ func main() {
 	var (
 		pubAddr         = getenv("ROUTER_PUBADDR", ":8080")
 		apiAddr         = getenv("ROUTER_APIADDR", ":8081")
-		databaseURL     = getenv("DATABASE_URL", "postgresql://[email protected]:27017/router?sslmode=disable")
+		databaseURL     = getenv("DATABASE_URL", "postgresql://[email protected]:5432/router_test?sslmode=disable")
 		databaseName    = getenv("DATABASE_NAME", "router")
 		dbPollInterval  = getenv("ROUTER_POLL_INTERVAL", "2s")
 		errorLogFile    = getenv("ROUTER_ERROR_LOG", "STDERR")