chore(deps): migrate to spanemuboost v0.3.3 with LazyEmulator (#560)

chore(deps): migrate to spanemuboost v0.3.3 with LazyEmulator

Upgrade spanemuboost v0.3.2 → v0.3.3 and migrate integration tests
to use LazyEmulator for deferred emulator initialization.

Key changes:
- Replace eager RunEmulator in TestMain with package-level LazyEmulator
- Emulator starts only when first integration test needs it
- Use new Clients.ClientOptions() and Clients.URI() accessors to
  eliminate *Emulator references from test helpers
- Remove initializeSession's *Emulator parameter
- Set non-zero exit code on emulator cleanup failure

Author: apstndb

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/apstndb/gsqlutils v0.0.0-20250517013444-d2334c88d6ae
 	github.com/apstndb/lox v0.0.0-20241212132733-62f24606dc82
 	github.com/apstndb/memebridge v0.5.0
-	github.com/apstndb/spanemuboost v0.3.2
+	github.com/apstndb/spanemuboost v0.3.3
 	github.com/apstndb/spannerplan v0.1.3
 	github.com/apstndb/spantype v0.3.8
 	github.com/apstndb/spanvalue v0.1.8

go.sum

@@ -2485,8 +2485,8 @@ github.com/apstndb/lox v0.0.0-20241212132733-62f24606dc82 h1:l54uIOgcH4r0lTg8xKR
 github.com/apstndb/lox v0.0.0-20241212132733-62f24606dc82/go.mod h1:PbqzTjsPq7Xhn8D7Vk8g/em15kd8vvEL1Y2xkI9CgGs=
 github.com/apstndb/memebridge v0.5.0 h1:WaWD0Wp3Yw1BZwyvT4bIf2XsXAA+vq9ZNxUKXXV/vZQ=
 github.com/apstndb/memebridge v0.5.0/go.mod h1:fPrWYKcg5/eaavD6RovT9qeq8K7bDhgLKOcGhqg6zo4=
-github.com/apstndb/spanemuboost v0.3.2 h1:Z09MqWIxOx/v5kzzpz3ZxteiHE4PEsogZBwAI7wY+9Y=
-github.com/apstndb/spanemuboost v0.3.2/go.mod h1:uNXjl80HX4S8hK68HCobxRrNEBLhzE+EVxkwOGuwdRM=
+github.com/apstndb/spanemuboost v0.3.3 h1:auQLIR7FUdqujOPjQBrW8kiOQBG419w4pHQTrs5vEaI=
+github.com/apstndb/spanemuboost v0.3.3/go.mod h1:uNXjl80HX4S8hK68HCobxRrNEBLhzE+EVxkwOGuwdRM=
 github.com/apstndb/spannerplan v0.1.3 h1:nFzTEvRL4yMzQeFdtWp3V0VaUidNA/o3T7HyIYIGk/U=
 github.com/apstndb/spannerplan v0.1.3/go.mod h1:iPN9r9R2AknoFnBFqA232cUO+2ZkHpk4Q1qeSAU9xEM=
 github.com/apstndb/spantype v0.3.8 h1:xy43Cclc2Hz6SL+3tZYuozOqJv6AML4Mv8cASgYo1O0=

internal/mycli/integration_mcp_test.go

@@ -214,10 +214,10 @@ func testRunMCPWithNonExistentDatabase(t *testing.T) {
 	ctx := t.Context()
 
 	// First, create a real instance to test non-existent database
-	clients := spanemuboost.SetupClients(t, emulator, spanemuboost.WithRandomInstanceID())
+	clients := spanemuboost.SetupClients(t, lazyEmu, spanemuboost.WithRandomInstanceID())
 
 	// Create system variables with non-existent database in an existing instance
-	host, port, err := parseEndpoint(emulator.URI())
+	host, port, err := parseEndpoint(clients.URI())
 	if err != nil {
 		t.Fatalf("Failed to parse emulator URI: %v", err)
 	}
@@ -237,7 +237,7 @@ func testRunMCPWithNonExistentDatabase(t *testing.T) {
 		Params: make(map[string]ast.Node),
 	}
 
-	sessionNonExistent, err := NewSession(ctx, &sysVarsNonExistent, emulator.ClientOptions()...)
+	sessionNonExistent, err := NewSession(ctx, &sysVarsNonExistent, clients.ClientOptions()...)
 	if err != nil {
 		t.Fatalf("Failed to create session for non-existent database test: %v", err)
 	}

internal/mycli/integration_test.go

@@ -127,7 +127,7 @@ func dmlResult(n int) *Result {
 	return &Result{AffectedRows: n, IsExecutedDML: true}
 }
 
-var emulator *spanemuboost.Emulator
+var lazyEmu = spanemuboost.NewLazyEmulator(spanemuboost.EnableInstanceAutoConfigOnly())
 
 func TestMain(m *testing.M) {
 	// Clear Spanner-related environment variables that could interfere with tests.
@@ -138,33 +138,18 @@ func TestMain(m *testing.M) {
 	_ = os.Unsetenv("SPANNER_DATABASE_ID")
 	flag.Parse()
 
-	// Skip emulator setup in short mode
-	if testing.Short() {
-		os.Exit(m.Run())
-	}
-
-	emu, err := spanemuboost.RunEmulator(context.Background(),
-		spanemuboost.EnableInstanceAutoConfigOnly(),
-	)
-	if err != nil {
-		// testing.M doesn't have output method
-		slog.Error("failed to create emulator", "err", err)
-		os.Exit(1)
-	}
-
-	defer func() {
-		if err := emu.Close(); err != nil {
-			slog.Error("failed to close emulator container in TestMain", "error", err)
+	code := m.Run()
+	if err := lazyEmu.Close(); err != nil { // no-op if no test used the emulator
+		slog.Error("failed to close emulator container in TestMain", "error", err)
+		if code == 0 {
+			code = 1
 		}
-	}()
-
-	emulator = emu
-
-	os.Exit(m.Run())
+	}
+	os.Exit(code)
 }
 
-func initializeSession(ctx context.Context, emulator *spanemuboost.Emulator, clients *spanemuboost.Clients) (session *Session, err error) {
-	options := emulator.ClientOptions()
+func initializeSession(ctx context.Context, clients *spanemuboost.Clients) (session *Session, err error) {
+	options := clients.ClientOptions()
 	sysVars := &systemVariables{
 		Connection: ConnectionVars{
 			Project:  clients.ProjectID,
@@ -232,10 +217,10 @@ func initializeWithDB(t *testing.T, database string, ddls, dmls []string) (clien
 		spanemuboost.WithSetupRawDMLs(dmls),
 	)
 
-	clients = spanemuboost.SetupClients(t, emulator, options...)
+	clients = spanemuboost.SetupClients(t, lazyEmu, options...)
 
 	var err error
-	session, err = initializeSession(ctx, emulator, clients)
+	session, err = initializeSession(ctx, clients)
 	if err != nil {
 		t.Fatalf("failed to create test session: err=%s", err)
 	}
@@ -254,7 +239,7 @@ func initializeAdminSession(t *testing.T) (clients *spanemuboost.Clients, sessio
 
 	// Admin-only mode: create instance without database
 	// Always use instance-level isolation for all tests
-	clients = spanemuboost.SetupClients(t, emulator,
+	clients = spanemuboost.SetupClients(t, lazyEmu,
 		spanemuboost.WithRandomInstanceID(), // Instance-level isolation for all tests
 		spanemuboost.EnableInstanceAutoConfigOnly(),
 	)
@@ -284,7 +269,7 @@ func initializeAdminSession(t *testing.T) (clients *spanemuboost.Clients, sessio
 	sysVars.ensureRegistry()
 
 	var err error
-	session, err = NewAdminSession(ctx, sysVars, emulator.ClientOptions()...)
+	session, err = NewAdminSession(ctx, sysVars, clients.ClientOptions()...)
 	if err != nil {
 		t.Fatalf("failed to create admin session: err=%s", err)
 	}

internal/mycli/session_slow_test.go

@@ -35,15 +35,13 @@ func TestRequestPriority(t *testing.T) {
 	ctx := t.Context()
 
 	// Use shared emulator with a random instance ID for isolation
-	clients := spanemuboost.SetupClients(t, emulator,
+	clients := spanemuboost.SetupClients(t, lazyEmu,
 		spanemuboost.WithRandomInstanceID(),
 		spanemuboost.WithProjectID(project),
 		spanemuboost.WithDatabaseID(database),
 		spanemuboost.EnableAutoConfig(),
 		spanemuboost.WithSetupDDLs(sliceOf("CREATE TABLE t1 (Id INT64) PRIMARY KEY (Id)")),
 	)
-	_ = clients // clients not directly used, but ensures proper setup
-
 	var recorder requestRecorder
 	unaryInterceptor, streamInterceptor := recordRequestsInterceptors(&recorder)
 	opts := []grpc.DialOption{
@@ -52,7 +50,7 @@ func TestRequestPriority(t *testing.T) {
 		grpc.WithStreamInterceptor(streamInterceptor),
 	}
 
-	conn, err := grpc.NewClient(emulator.URI(), opts...)
+	conn, err := grpc.NewClient(clients.URI(), opts...)
 	if err != nil {
 		t.Fatalf("failed to dial: %v", err)
 	}
@@ -164,15 +162,13 @@ func TestIsolationLevel(t *testing.T) {
 	ctx := t.Context()
 
 	// Use shared emulator with a random instance ID for isolation
-	clients := spanemuboost.SetupClients(t, emulator,
+	clients := spanemuboost.SetupClients(t, lazyEmu,
 		spanemuboost.WithRandomInstanceID(),
 		spanemuboost.WithProjectID(project),
 		spanemuboost.WithDatabaseID(database),
 		spanemuboost.EnableAutoConfig(),
 		spanemuboost.WithSetupDDLs(sliceOf("CREATE TABLE t1 (Id INT64) PRIMARY KEY (Id)")),
 	)
-	_ = clients // clients not directly used, but ensures proper setup
-
 	var recorder requestRecorder
 	unaryInterceptor, streamInterceptor := recordRequestsInterceptors(&recorder)
 	opts := []grpc.DialOption{
@@ -181,7 +177,7 @@ func TestIsolationLevel(t *testing.T) {
 		grpc.WithStreamInterceptor(streamInterceptor),
 	}
 
-	conn, err := grpc.NewClient(emulator.URI(), opts...)
+	conn, err := grpc.NewClient(clients.URI(), opts...)
 	if err != nil {
 		t.Fatalf("failed to dial: %v", err)
 	}