fix: construct db dsn in Go runtime

TBD54566975 · Nov 22, 2024 · 240c16a · 240c16a
1 parent 0a5f94f
commit 240c16a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/go-runtime/server/database.go b/go-runtime/server/database.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"os"
 	"reflect"
 	"time"
 
@@ -47,11 +48,17 @@ func InitDatabase(ref reflection.Ref, dbtype string, protoDBtype modulecontext.D
 		DBType: dbtype,
 		DB: once.Once(func(ctx context.Context) (*sql.DB, error) {
 			logger := log.FromContext(ctx)
-
-			provider := modulecontext.FromContext(ctx).CurrentContext()
-			dsn, testDB, err := provider.GetDatabase(ref.Name, protoDBtype)
-			if err != nil {
-				return nil, fmt.Errorf("failed to get database %q: %w", ref.Name, err)
+			var dsn string
+			if protoDBtype == modulecontext.DBTypePostgres {
+				proxyAddress := os.Getenv("PG_PROXY_ADDRESS")
+				dsn = "postgres://" + proxyAddress + "/" + ref.Name
+			} else {
+				provider := modulecontext.FromContext(ctx).CurrentContext()
+				d, _, err := provider.GetDatabase(ref.Name, protoDBtype)
+				if err != nil {
+					return nil, fmt.Errorf("failed to get database %q: %w", ref.Name, err)
+				}
+				dsn = d
 			}
 
 			logger.Debugf("Opening database: %s", ref.Name)
@@ -71,7 +78,7 @@ func InitDatabase(ref reflection.Ref, dbtype string, protoDBtype modulecontext.D
 				return nil, fmt.Errorf("failed to register database metrics: %w", err)
 			}
 			db.SetConnMaxIdleTime(time.Minute)
-			if testDB {
+			if os.Getenv("FTL_INTEGRATION_TEST") == "true" {
 				// In tests we always close the connections, as the DB being clean might invalidate pooled connections
 				db.SetMaxIdleConns(0)
 			} else {

diff --git a/internal/integration/harness.go b/internal/integration/harness.go
@@ -218,6 +218,7 @@ func run(t *testing.T, actionsOrOptions ...ActionOrOption) {
 	for key, value := range opts.envars {
 		t.Setenv(key, value)
 	}
+	t.Setenv("FTL_INTEGRATION_TEST", "true")
 
 	cwd, err := os.Getwd()
 	assert.NoError(t, err)

diff --git a/internal/modulecontext/module_context.go b/internal/modulecontext/module_context.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 	"sync"
 	"time"
@@ -160,10 +159,6 @@ func (m ModuleContext) GetSecret(name string, value any) error {
 func (m ModuleContext) GetDatabase(name string, dbType DBType) (string, bool, error) {
 	db, ok := m.databases[name]
 	if !ok {
-		if dbType == DBTypePostgres {
-			proxyAddress := os.Getenv("PG_PROXY_ADDRESS")
-			return "postgres://" + proxyAddress + "/" + name, false, nil
-		}
 		return "", false, fmt.Errorf("missing DSN for database %s", name)
 	}
 	if db.DBType != dbType {