postgres: support connect_timeout_ms

Author: pavolmarko

internal/versions/versions.json

@@ -1,5 +1,5 @@
 {
-	"api_version": 148,
+	"api_version": 149,
 	"minimum_api_version": 40,
 	"cache_version": 1
 }

universe/db/postgres/exports.fn.cue

@@ -12,6 +12,7 @@ package postgres
 			nanos?:   int
 		}
 		idleInTransactionSessionTimeoutMs?: int
+		connectTimeoutMs?:                  int
 
 		#Definition: {
 			packageName: "namespacelabs.dev/foundation/universe/db/postgres"

universe/db/postgres/provider.pb.go

@@ -12,12 +12,13 @@ import "google/protobuf/duration.proto";
 
 message DatabaseArgs {
     reserved 1, 2;
-    string                   client                              = 7;
-    string                   resource_ref                        = 3;
-    int32                    max_conns                           = 4;  // Set if > 0.
-    string                   max_conns_from_env                  = 6;
-    google.protobuf.Duration max_conns_idle_time                 = 5;
-    int32 idle_in_transaction_session_timeout_ms = 8;
+    string                   client                                 = 7;
+    string                   resource_ref                           = 3;
+    int32                    max_conns                              = 4;  // Set if > 0.
+    string                   max_conns_from_env                     = 6;
+    google.protobuf.Duration max_conns_idle_time                    = 5;
+    int32                    idle_in_transaction_session_timeout_ms = 8;
+    int32                    connect_timeout_ms                     = 9;
 }
 
 message DatabaseReferenceArgs {

universe/db/postgres/provider.proto

@@ -31,6 +31,7 @@ type ConfigOverrides struct {
 	MaxConns                        int32
 	MaxConnIdleTime                 time.Duration
 	IdleInTransactionSessionTimeout time.Duration
+	ConnectTimeout                  time.Duration
 }
 
 func NewDatabaseFromConnectionUri(ctx context.Context, db *postgrespb.DatabaseInstance, connuri string, tp trace.TracerProvider, client string) (*DB, error) {
@@ -62,6 +63,10 @@ func NewDatabaseFromConnectionUriWithOverrides(ctx context.Context, db *postgres
 		if overrides.IdleInTransactionSessionTimeout > 0 {
 			config.ConnConfig.RuntimeParams["idle_in_transaction_session_timeout"] = fmt.Sprintf("%d", overrides.IdleInTransactionSessionTimeout.Milliseconds())
 		}
+
+		if overrides.ConnectTimeout > 0 {
+			config.ConnConfig.ConnectTimeout = overrides.ConnectTimeout
+		}
 	}
 
 	conn, err := pgxpool.NewWithConfig(ctx, config)

universe/db/postgres/resource.go

@@ -56,6 +56,10 @@ func ProvideDatabase(ctx context.Context, db *DatabaseArgs, deps ExtensionDeps)
 		overrides.IdleInTransactionSessionTimeout = time.Millisecond * time.Duration(db.GetIdleInTransactionSessionTimeoutMs())
 	}
 
+	if db.GetConnectTimeoutMs() > 0 {
+		overrides.ConnectTimeout = time.Millisecond * time.Duration(db.GetConnectTimeoutMs())
+	}
+
 	return ConnectToResource(ctx, res, db.ResourceRef, tp, db.GetClient(), overrides)
 }