Connect to search db hosts directly

Author: rowanseymour

.github/workflows/ci.yml

@@ -6,9 +6,11 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
+    container:
+      image: node:18
     strategy:
       matrix:
-        searchdb-port: [9207, 9208, 9201]
+        searchdb-host: [elastic7, elastic8, opensearch1]
       fail-fast: false
 
     services:
@@ -18,26 +20,18 @@ jobs:
           POSTGRES_DB: indexer_test
           POSTGRES_USER: indexer_test
           POSTGRES_PASSWORD: temba
-        ports:
-          - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       elastic7:
         image: elasticsearch:7.17.9
-        ports:
-          - 9207:9200
         env:
           discovery.type: single-node
       elastic8:
         image: elasticsearch:8.13.4
-        ports:
-          - 9208:9200
         env:
           discovery.type: single-node
           xpack.security.enabled: false
       opensearch1:
         image: opensearchproject/opensearch:1.3.16
-        ports:
-          - 9201:9200
         env:
           discovery.type: single-node
           plugins.security.disabled: true
@@ -53,7 +47,8 @@ jobs:
 
       - name: Setup environment
         run: |
-          echo "INDEXER_ELASTIC_URL=http://localhost:${{ matrix.searchdb-port }}" >> "$GITHUB_ENV"
+          echo "INDEXER_DB=postgres://indexer_test:temba@postgres:5432/indexer_test?sslmode=disable" >> "$GITHUB_ENV"
+          echo "INDEXER_ELASTIC_URL=http://${{ matrix.searchdb-host }}:9200" >> "$GITHUB_ENV"
 
       - name: Run tests
         run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...

indexers/base_test.go

@@ -23,13 +23,18 @@ import (
 
 const aliasName = "indexer_test"
 
+func getenv(key, def string) string {
+	val := os.Getenv(key)
+	if val == "" {
+		return def
+	}
+	return val
+}
+
 func setup(t *testing.T) (*indexer.Config, *sql.DB) {
 	cfg := indexer.NewDefaultConfig()
-	cfg.DB = "postgres://indexer_test:temba@localhost:5432/indexer_test?sslmode=disable"
-	cfg.ElasticURL = os.Getenv("INDEXER_ELASTIC_URL")
-	if cfg.ElasticURL == "" {
-		cfg.ElasticURL = "http://localhost:9200"
-	}
+	cfg.DB = getenv("INDEXER_DB", "postgres://indexer_test:temba@localhost:5432/indexer_test?sslmode=disable")
+	cfg.ElasticURL = getenv("INDEXER_ELASTIC_URL", "http://localhost:9200")
 
 	testDB, err := os.ReadFile("../testdb.sql")
 	require.NoError(t, err)