refactor: Remove consul sdk dep

Some postgres test uses a helper function from the consul sdk to get a
free network port to start a postgres container instance; to reduce
code dependencies, we let the container runtime to select a free port.

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Author: mbrandenburger

go.mod

@@ -19,7 +19,6 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/websocket v1.5.3
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
-	github.com/hashicorp/consul/sdk v0.16.1
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20250510200036-435a7f1a780a
 	github.com/hyperledger/fabric-chaincode-go/v2 v2.3.0
 	github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0

go.sum

@@ -1054,8 +1054,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4Zs
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I=
-github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg=
-github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

integration/nwo/fsc/fsc.go

@@ -9,6 +9,7 @@ package fsc
 import (
 	"bytes"
 	"cmp"
+	"context"
 	"fmt"
 	"io"
 	"net"
@@ -213,19 +214,20 @@ func (p *Platform) Members() []grouper.Member {
 
 func (p *Platform) PreRun() {
 	// Start DBs
-	configs := map[string]*postgres2.ContainerConfig{}
+	configs := make(map[string]*postgres2.ContainerConfig)
+	// update data sources
 	for _, node := range p.Peers {
 		for _, sqlOpts := range node.Options.GetPostgresPersistences() {
 			if _, ok := configs[sqlOpts.DataSource]; !ok {
-				c, err := postgres2.ReadDataSource(sqlOpts.DataSource)
+				c, err := postgres2.ConfigFromDataSource(sqlOpts.DataSource)
 				gomega.Expect(err).ToNot(gomega.HaveOccurred())
 				configs[sqlOpts.DataSource] = c
 			}
 
 		}
 	}
 	logger.Infof("Starting DBs for following data sources: [%s]...", logging.Keys(configs))
-	closeF, err := postgres2.StartPostgresWithFmt(collections.Values(configs))
+	closeF, err := postgres2.StartMultiplePostgres(context.TODO(), collections.Values(configs))
 	gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to start dbs")
 	p.cleanDB = closeF
 }

platform/fabric/services/storage/vault/helpers.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package vault
 
 import (
+	"context"
 	"fmt"
 	"path"
 
@@ -33,14 +34,14 @@ func OpenSqliteVault(key, tempDir string) (driver.VaultStore, error) {
 }
 
 func OpenPostgresVault(name string) (driver.VaultStore, func(), error) {
-	postgresConfig := postgres3.DefaultConfig(fmt.Sprintf("%s-db", name))
-	terminate, err := postgres3.StartPostgresWithFmt([]*postgres3.ContainerConfig{postgresConfig})
+	cfg := postgres3.DefaultConfig(fmt.Sprintf("%s-db", name))
+	terminate, pgConnStr, err := postgres3.StartPostgres(context.TODO(), cfg, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	cp := postgres3.NewConfigProvider(testing.MockConfig(postgres3.Config{
-		DataSource:   postgresConfig.DataSource(),
+		DataSource:   pgConnStr,
 		MaxOpenConns: 50,
 	}))
 	persistence, err := postgres2.NewPersistenceWithOpts(cp, postgres3.NewDbProvider(), "", postgres2.NewVaultStore)

platform/view/services/storage/driver/sql/postgres/bench_test.go

@@ -16,11 +16,7 @@ import (
 )
 
 func BenchmarkReadExistingPostgres(b *testing.B) {
-	terminate, pgConnStr, err := StartPostgres(b, false)
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer terminate()
+	pgConnStr := setupDB(b)
 	cp := NewConfigProvider(testing2.MockConfig(Config{
 		DataSource:   pgConnStr,
 		MaxOpenConns: 50,
@@ -35,12 +31,7 @@ func BenchmarkReadExistingPostgres(b *testing.B) {
 }
 
 func BenchmarkReadNonExistingPostgres(b *testing.B) {
-	terminate, pgConnStr, err := StartPostgres(b, false)
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer terminate()
-
+	pgConnStr := setupDB(b)
 	cp := NewConfigProvider(testing2.MockConfig(Config{
 		DataSource:   pgConnStr,
 		MaxOpenConns: 50,
@@ -55,12 +46,7 @@ func BenchmarkReadNonExistingPostgres(b *testing.B) {
 }
 
 func BenchmarkWriteOnePostgres(b *testing.B) {
-	terminate, pgConnStr, err := StartPostgres(b, false)
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer terminate()
-
+	pgConnStr := setupDB(b)
 	cp := NewConfigProvider(testing2.MockConfig(Config{
 		DataSource:   pgConnStr,
 		MaxOpenConns: 50,
@@ -75,11 +61,7 @@ func BenchmarkWriteOnePostgres(b *testing.B) {
 }
 
 func BenchmarkWriteManyPostgres(b *testing.B) {
-	terminate, pgConnStr, err := StartPostgres(b, false)
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer terminate()
+	pgConnStr := setupDB(b)
 	cp := NewConfigProvider(testing2.MockConfig(Config{
 		DataSource:   pgConnStr,
 		MaxOpenConns: 50,
@@ -94,11 +76,7 @@ func BenchmarkWriteManyPostgres(b *testing.B) {
 }
 
 func BenchmarkWriteManyPostgresWithIdle(b *testing.B) {
-	terminate, pgConnStr, err := StartPostgres(b, false)
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer terminate()
+	pgConnStr := setupDB(b)
 	cp := NewConfigProvider(testing2.MockConfig(Config{
 		DataSource:   pgConnStr,
 		MaxOpenConns: 50,

platform/view/services/storage/driver/sql/postgres/sql_test.go

@@ -16,13 +16,20 @@ import (
 	_ "modernc.org/sqlite"
 )
 
-func TestPostgres(t *testing.T) {
-	t.Log("starting postgres")
-	terminate, pgConnStr, err := StartPostgres(t, false)
+func setupDB(tb testing.TB) string {
+	tb.Helper()
+
+	terminate, pgConnStr, err := StartPostgres(tb.Context(), ConfigFromEnv(), nil)
 	if err != nil {
-		t.Fatal(err)
+		tb.Fatal(err)
 	}
-	defer terminate()
+	tb.Cleanup(terminate)
+
+	return pgConnStr
+}
+
+func TestPostgres(t *testing.T) {
+	pgConnStr := setupDB(t)
 	t.Log("postgres ready")
 
 	cp := NewConfigProvider(testing2.MockConfig(Config{