chore: try using postgres testcontainer to wrap pgbouncer

Author: tstirrat15

cmd/spicedb/integration/migrate_integration_test.go

@@ -1,4 +1,4 @@
-//go:build docker && image
+// //go:build docker && image
 
 package integration_test
 
@@ -41,7 +41,7 @@ func TestMigrate(t *testing.T) {
 		t.Run(engineKey, func(t *testing.T) {
 			engineKey := engineKey
 
-			r := testdatastore.RunDatastoreEngineWithBridge(t, engineKey, bridgeNetworkName)
+			r := testdatastore.RunDatastoreEngine(t, engineKey)
 			db := r.NewDatabase(t)
 
 			envVars := map[string]string{}
@@ -55,6 +55,7 @@ func TestMigrate(t *testing.T) {
 			}
 
 			// Run the migrate command and wait for it to complete.
+			// TODO:
 			container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 				ContainerRequest: testcontainers.ContainerRequest{
 					Image:    "authzed/spicedb:ci",
@@ -65,9 +66,7 @@ func TestMigrate(t *testing.T) {
 				Started: true,
 			})
 			require.NoError(t, err)
-			t.Cleanup(func() {
-				_ = container.Terminate(ctx)
-			})
+			testcontainers.CleanupContainer(t, container)
 
 			// Ensure the command completed successfully.
 			state, err := container.State(ctx)
@@ -76,6 +75,7 @@ func TestMigrate(t *testing.T) {
 			if state.ExitCode != 0 {
 				stream := new(bytes.Buffer)
 
+				// TODO: use logs
 				logReader, lerr := container.Logs(ctx)
 				require.NoError(t, lerr)
 				defer logReader.Close()

cmd/spicedb/integration/schemawatch_integration_test.go

@@ -1,4 +1,4 @@
-//go:build docker && image
+// //go:build docker && image
 
 package integration_test
 
@@ -45,7 +45,7 @@ func TestSchemaWatch(t *testing.T) {
 				_ = net.Remove(ctx)
 			})
 
-			engine := testdatastore.RunDatastoreEngineWithBridge(t, driverName, bridgeNetworkName)
+			engine := testdatastore.RunDatastoreEngine(t, driverName)
 
 			envVars := map[string]string{}
 			if wev, ok := engine.(testdatastore.RunningEngineForTestWithEnvVars); ok {
@@ -79,6 +79,7 @@ func TestSchemaWatch(t *testing.T) {
 			require.Equal(t, 0, exitCode.ExitCode)
 
 			// Run a serve and immediately close, ensuring it shuts down gracefully.
+			// TODO;
 			serveContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 				ContainerRequest: testcontainers.ContainerRequest{
 					Image:    "authzed/spicedb:ci",
@@ -89,14 +90,13 @@ func TestSchemaWatch(t *testing.T) {
 				Started: true,
 			})
 			require.NoError(t, err)
-			t.Cleanup(func() {
-				_ = serveContainer.Terminate(ctx)
-			})
+			testcontainers.CleanupContainer(t, serveContainer)
 
 			ww := &watchingWriter{make(chan bool, 1), "starting watching cache"}
 
 			// Grab logs and ensure schema watch has started before graceful shutdown.
 			go (func() {
+				// TODO: do logging directly
 				logReader, err := serveContainer.Logs(ctx)
 				if err != nil {
 					assert.NoError(t, err)
@@ -107,15 +107,14 @@ func TestSchemaWatch(t *testing.T) {
 				assert.NoError(t, err)
 			})()
 
+			// TODO: what?
 			select {
 			case <-ww.c:
 				break
 
 			case <-time.After(10 * time.Second):
 				require.Fail(t, "timed out waiting for schema watch to run")
 			}
-
-			require.True(t, gracefulShutdown(ctx, serveContainer))
 		})
 	}
 }

cmd/spicedb/integration/serve_integration_test.go

@@ -1,4 +1,4 @@
-//go:build docker && image
+// //go:build docker && image
 
 package integration_test
 
@@ -26,11 +26,13 @@ import (
 
 	testdatastore "github.com/authzed/spicedb/internal/testserver/datastore"
 	"github.com/authzed/spicedb/pkg/datastore"
+	"github.com/authzed/spicedb/pkg/migrate"
 )
 
 func TestServe(t *testing.T) {
 	requireParent := require.New(t)
 
+	// TODO: 
 	tester, err := newTester(t,
 		testcontainers.ContainerRequest{
 			Image:        "authzed/spicedb:ci",
@@ -112,7 +114,7 @@ func gracefulShutdown(ctx context.Context, container testcontainers.Container) b
 }
 
 func TestGracefulShutdownInMemory(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	// Run a serve and immediately close, ensuring it shuts down gracefully.
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
@@ -154,17 +156,15 @@ func TestGracefulShutdown(t *testing.T) {
 
 	for driverName, awaitGC := range engines {
 		t.Run(driverName, func(t *testing.T) {
-			ctx := context.Background()
-			bridgeNetworkName := fmt.Sprintf("bridge-%s", uuid.New().String())
+			ctx := t.Context()
 
-			// Create a bridge network for testing.
-			net, err := network.New(ctx, network.WithDriver("bridge"), network.WithLabels(map[string]string{"name": bridgeNetworkName}))
+			// Create a network for testing.
+			net, err := network.New(ctx)
 			require.NoError(t, err)
-			t.Cleanup(func() {
-				_ = net.Remove(ctx)
-			})
+			testcontainers.CleanupNetwork(t, net)
 
-			engine := testdatastore.RunDatastoreEngineWithBridge(t, driverName, bridgeNetworkName)
+			// TODO: figure out how to supply the network in this case.
+			engine := testdatastore.RunDatastoreEngine(t, driverName)
 
 			envVars := map[string]string{}
 			if wev, ok := engine.(testdatastore.RunningEngineForTestWithEnvVars); ok {
@@ -177,20 +177,18 @@ func TestGracefulShutdown(t *testing.T) {
 			}
 
 			// Run the migrate command and wait for it to complete.
+			// TODO: probably handled by spicedb testcontainer
 			db := engine.NewDatabase(t)
 			migrateContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 				ContainerRequest: testcontainers.ContainerRequest{
 					Image:    "authzed/spicedb:ci",
 					Cmd:      []string{"migrate", "head", "--datastore-engine", driverName, "--datastore-conn-uri", db},
-					Networks: []string{bridgeNetworkName},
 					Env:      envVars,
 				},
 				Started: true,
 			})
 			require.NoError(t, err)
-			t.Cleanup(func() {
-				_ = migrateContainer.Terminate(ctx)
-			})
+			testcontainers.CleanupContainer(t, migrateContainer)
 
 			// Ensure the command completed successfully.
 			exitCode, err := migrateContainer.State(ctx)
@@ -202,15 +200,12 @@ func TestGracefulShutdown(t *testing.T) {
 				ContainerRequest: testcontainers.ContainerRequest{
 					Image:    "authzed/spicedb:ci",
 					Cmd:      []string{"serve", "--grpc-preshared-key", "firstkey", "--datastore-engine", driverName, "--datastore-conn-uri", db, "--datastore-gc-interval", "1s", "--telemetry-endpoint", ""},
-					Networks: []string{bridgeNetworkName},
 					Env:      envVars,
 				},
 				Started: true,
 			})
 			require.NoError(t, err)
-			t.Cleanup(func() {
-				_ = serveContainer.Terminate(ctx)
-			})
+			testcontainers.CleanupContainer(t, serveContainer)
 
 			if awaitGC {
 				ww := &watchingWriter{make(chan bool, 1), "running garbage collection worker"}

cmd/spicedb/integration/servetesting_integration_test.go

@@ -1,4 +1,4 @@
-//go:build docker && image
+// //go:build docker && image
 
 package integration_test
 
@@ -190,6 +190,7 @@ const retryCount = 8
 func newTester(t *testing.T, containerReq testcontainers.ContainerRequest, token string, withExistingSchema bool) (*spicedbHandle, error) {
 	ctx := context.Background()
 
+	// TODO:
 	for i := 0; i < retryCount; i++ {
 		container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 			ContainerRequest: containerReq,

cmd/spicedb/integration/servetesting_race_test.go

@@ -33,7 +33,7 @@ func TestCheckPermissionOnTesterNoFlakes(t *testing.T) {
 				{
 					HostFilePath:      path.Join(basepath, "testdata/bootstrap.yaml"),
 					ContainerFilePath: "/mnt/spicedb_bootstrap.yaml",
-					FileMode:          0644,
+					FileMode:          0o644,
 				},
 			},
 			ExposedPorts: []string{"50051/tcp", "50052/tcp", "8443/tcp", "8444/tcp"},

go.mod

@@ -412,6 +412,7 @@ require (
 	github.com/stoewer/go-strcase v1.3.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/testcontainers/testcontainers-go/modules/mysql v0.40.0 // indirect
 	github.com/tetafro/godot v1.5.4 // indirect
 	github.com/tetratelabs/wazero v1.9.0 // indirect
 	github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect

go.sum

@@ -1719,6 +1719,8 @@ github.com/testcontainers/testcontainers-go v0.40.0 h1:pSdJYLOVgLE8YdUY2FHQ1Fxu+
 github.com/testcontainers/testcontainers-go v0.40.0/go.mod h1:FSXV5KQtX2HAMlm7U3APNyLkkap35zNLxukw9oBi/MY=
 github.com/testcontainers/testcontainers-go/modules/cockroachdb v0.40.0 h1:UNYfrnFV9mkO93Sw6hqRA5KbE9DsAvDeYKD4GDConiE=
 github.com/testcontainers/testcontainers-go/modules/cockroachdb v0.40.0/go.mod h1:O8By1J/1y726YYk7obTIXxfv2OzonVe+ORq9Z+K+fDg=
+github.com/testcontainers/testcontainers-go/modules/mysql v0.40.0 h1:P9Txfy5Jothx2wFdcus0QoSmX/PKSIXZxrTbZPVJswA=
+github.com/testcontainers/testcontainers-go/modules/mysql v0.40.0/go.mod h1:oZPHHqJqXG7FD8OB/yWH7gLnDvZUlFHAVJNrGftL+eg=
 github.com/testcontainers/testcontainers-go/modules/postgres v0.40.0 h1:s2bIayFXlbDFexo96y+htn7FzuhpXLYJNnIuglNKqOk=
 github.com/testcontainers/testcontainers-go/modules/postgres v0.40.0/go.mod h1:h+u/2KoREGTnTl9UwrQ/g+XhasAT8E6dClclAADeXoQ=
 github.com/tetafro/godot v1.5.4 h1:u1ww+gqpRLiIA16yF2PV1CV1n/X3zhyezbNXC3E14Sg=

internal/datastore/crdb/crdb_test.go

@@ -76,8 +76,8 @@ func crdbTestVersion() string {
 
 func TestCRDBDatastoreWithoutIntegrity(t *testing.T) {
 	t.Parallel()
-	b := testdatastore.RunCRDBForTesting(t, "", crdbTestVersion())
-	test.All(t, test.DatastoreTesterFunc(func(_ testing.TB, revisionQuantization, gcInterval, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) {
+	b := testdatastore.RunCRDBForTesting(t, crdbTestVersion())
+ 	test.All(t, test.DatastoreTesterFunc(func(revisionQuantization, gcInterval, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) {
 		ctx := context.Background()
 		ds := b.NewDatastore(t, func(engine, uri string) datastore.Datastore {
 			ds, err := NewCRDBDatastore(
@@ -140,7 +140,7 @@ func TestCRDBDatastoreWithFollowerReads(t *testing.T) {
 	followerReadDelay := time.Duration(4.8 * float64(time.Second))
 	gcWindow := 100 * time.Second
 
-	engine := testdatastore.RunCRDBForTesting(t, "", crdbTestVersion())
+	engine := testdatastore.RunCRDBForTesting(t, crdbTestVersion())
 
 	quantizationDurations := []time.Duration{
 		0 * time.Second,
@@ -203,7 +203,7 @@ var defaultKeyForTesting = proxy.KeyConfig{
 
 func TestCRDBDatastoreWithIntegrity(t *testing.T) { //nolint:tparallel
 	t.Parallel()
-	b := testdatastore.RunCRDBForTesting(t, "", crdbTestVersion())
+	b := testdatastore.RunCRDBForTesting(t, crdbTestVersion())
 
 	test.All(t, test.DatastoreTesterFunc(func(_ testing.TB, revisionQuantization, gcInterval, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) {
 		ctx := context.Background()
@@ -303,7 +303,6 @@ func TestWatchFeatureDetection(t *testing.T) {
 		},
 	}
 	for _, tt := range cases {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			ctx, cancel := context.WithCancel(context.Background())
@@ -455,6 +454,7 @@ func newCRDBWithUser(t *testing.T) (adminConn *pgx.Conn, connStrings map[provisi
 	}))
 	require.NoError(t, rootCertFile.Close())
 
+	// TODO: fix
 	container, err := cockroachdb.Run(t.Context(),
 		"cockroachdb/cockroach:v"+crdbTestVersion(),
 		cockroachdb.WithInsecure(),
@@ -479,8 +479,9 @@ func newCRDBWithUser(t *testing.T) (adminConn *pgx.Conn, connStrings map[provisi
 
 	// Retry connection
 	maxRetries := 10
+	// TODO: require.EventuallyWithT
 	for i := 0; i < maxRetries; i++ {
-		_, err = pgxpool.New(context.Background(), fmt.Sprintf("postgres://root@localhost:%[1]s/defaultdb?sslmode=verify-full&sslrootcert=%[2]s/ca.crt&sslcert=%[2]s/client.root.crt&sslkey=%[2]s/client.root.key", port, certDir))
+		_, err = pgxpool.New(t.Context(), fmt.Sprintf("postgres://root@localhost:%[1]s/defaultdb?sslmode=verify-full&sslrootcert=%[2]s/ca.crt&sslcert=%[2]s/client.root.crt&sslkey=%[2]s/client.root.key", port, certDir))
 		if err == nil {
 			break
 		}

internal/datastore/crdb/pool_test.go

@@ -25,7 +25,7 @@ const (
 var testUserNS = namespace.Namespace(testUserNamespace)
 
 func TestTxReset(t *testing.T) {
-	b := testdatastore.RunCRDBForTesting(t, "", crdbTestVersion())
+	b := testdatastore.RunCRDBForTesting(t, crdbTestVersion())
 
 	cases := []struct {
 		name        string
@@ -97,7 +97,6 @@ func TestTxReset(t *testing.T) {
 		},
 	}
 	for _, tt := range cases {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := t.Context()
 

internal/datastore/mysql/datastore_test.go

@@ -121,14 +121,13 @@ func TestMySQLDatastoreDSNWithoutParseTime(t *testing.T) {
 }
 
 func TestMySQL8Datastore(t *testing.T) {
-	b := testdatastore.RunMySQLForTestingWithOptions(t, testdatastore.MySQLTesterOptions{MigrateForNewDatastore: true}, "")
 	dst := datastoreTester{b: b}
 	test.AllWithExceptions(t, test.DatastoreTesterFunc(dst.createDatastore), test.WithCategories(test.WatchSchemaCategory, test.WatchCheckpointsCategory), true)
 	additionalMySQLTests(t, b)
 }
 
 func TestMySQLRevisionTimestamps(t *testing.T) {
-	b := testdatastore.RunMySQLForTestingWithOptions(t, testdatastore.MySQLTesterOptions{MigrateForNewDatastore: true}, "")
+	b := testdatastore.RunMySQLForTestingWithOptions(t, testdatastore.MySQLTesterOptions{MigrateForNewDatastore: true})
 	t.Run("TransactionTimestamps", createDatastoreTest(b, TransactionTimestampsTest, defaultOptions...))
 }
 
@@ -845,7 +844,7 @@ func TestMySQLWithAWSIAMCredentialsProvider(t *testing.T) {
 
 func datastoreDB(t *testing.T, migrate bool) *sql.DB {
 	var databaseURI string
-	testdatastore.RunMySQLForTestingWithOptions(t, testdatastore.MySQLTesterOptions{MigrateForNewDatastore: migrate}, "").NewDatastore(t, func(engine, uri string) datastore.Datastore {
+	testdatastore.RunMySQLForTestingWithOptions(t, testdatastore.MySQLTesterOptions{MigrateForNewDatastore: migrate}).NewDatastore(t, func(engine, uri string) datastore.Datastore {
 		databaseURI = uri
 		return nil
 	})