Oct 8, 2025 · Oct 8, 2025
diff --git a/coderd/database/dbtestutil/broker.go b/coderd/database/dbtestutil/broker.go
 b.uuid=uuid.New()
 ctx,cancel:=context.WithTimeout(context.Background(),20*time.Second)
 defercancel()
 b.cleanerFD,err=startCleaner(ctx,b.uuid,coderTestingParams.DSN())
 b.cleanerFD,err=startCleaner(ctx,t,b.uuid,coderTestingParams.DSN())
 iferr!=nil {
 returnxerrors.Errorf("start test db cleaner: %w",err)
 }
diff --git a/coderd/database/dbtestutil/cleaner.go b/coderd/database/dbtestutil/cleaner.go
 "fmt"
 "io"
 "os"
 "os/exec"
 "os/signal"
 "time"


 // startCleaner starts the cleaner in a subprocess. holdThis is an opaque reference that needs to be kept from being
 // garbage collected until we are done with all test databases (e.g. the end of the process).
 func startCleaner(ctx context.Context, parentUUID uuid.UUID, dsn string) (holdThis any, err error) {
 cmd :=exec.Command("go", "run", "github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
 func startCleaner(ctx context.Context,t TBSubset,parentUUID uuid.UUID, dsn string) (holdThis any, err error) {
 cmd :=cleanerCmd(t)
 cmd.Env = append(os.Environ(),
 fmt.Sprintf("%s=%s", envCleanerParentUUID, parentUUID.String()),
 fmt.Sprintf("%s=%s", envCleanerDSN, dsn),
diff --git a/coderd/database/dbtestutil/cleaner_posix.go b/coderd/database/dbtestutil/cleaner_posix.go
 //go:build !windows

 package dbtestutil

 import (
 "os/exec"
 "path/filepath"
 "time"
 )

 const timeFormat = "2006-01-02 15:04:05.000"

 // cleanerCmd builds the cleaner binary in a temporary directory and returns a command to execute it. We can do this on
 // POSIX because it's OK to delete the temporary directory after the test: the binary can still run. This is not
 // possible on Windows because cleaning the temporary directory will fail if the binary is still running.
 // c.f. cleaner_windows.go.
 func cleanerCmd(t TBSubset) *exec.Cmd {
 start := time.Now()
 t.Logf("[%s] starting cleaner binary build", start.Format(timeFormat))
 tempDir := t.TempDir()
 cleanerBinary := filepath.Join(tempDir, "cleaner")

 buildCmd := exec.Command("go", "build", "-o", cleanerBinary, "github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
 output, err := buildCmd.CombinedOutput()
 if err != nil {
 t.Logf("failed to build cleaner binary: %v", err)
 t.Logf("output: %s", string(output))
 // Fall back to go run if build fails
 return exec.Command("go", "run", "github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
 }
 t.Logf("[%s] cleaner binary %s built in %s", time.Now().Format(timeFormat), cleanerBinary, time.Since(start))

 return exec.Command(cleanerBinary)
 }
diff --git a/coderd/database/dbtestutil/cleaner_windows.go b/coderd/database/dbtestutil/cleaner_windows.go
 //go:build windows

 package dbtestutil

 import"os/exec"

 // cleanerCmd returns a command to execute the cleaner binary. We do this with go run on Windows because we can't
 // delete the temporary directory after the test: the binary will still be running. c.f. cleaner_posix.go.
 funccleanerCmd(_TBSubset)*exec.Cmd {
 returnexec.Command("go","run","github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
 }
diff --git a/coderd/database/dbtestutil/postgres.go b/coderd/database/dbtestutil/postgres.go
 Cleanup(func())
 Helper()
 Logf(formatstring,args...any)
 TempDir()string
 }

 // Open creates a new PostgreSQL database instance.
diff --git a/coderd/database/gen/dump/main.go b/coderd/database/gen/dump/main.go
 _,_=fmt.Printf(format,args...)
 }

 func (*mockTB)TempDir()string {
 panic("not implemented")
 }

 funcmain() {
 t:=&mockTB{}
 deferfunc() {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -150,7 +150,7 @@ func (b *Broker) init(t TBSubset) error {
		b.uuid=uuid.New()
		ctx,cancel:=context.WithTimeout(context.Background(),20*time.Second)
		defercancel()
		b.cleanerFD,err=startCleaner(ctx,b.uuid,coderTestingParams.DSN())
		b.cleanerFD,err=startCleaner(ctx,t,b.uuid,coderTestingParams.DSN())
		iferr!=nil {
		returnxerrors.Errorf("start test db cleaner: %w",err)
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,6 @@ import (
		"fmt"
		"io"
		"os"
		"os/exec"
		"os/signal"
		"time"

Expand DownExpand Up		@@ -39,8 +38,8 @@ func init() {

		// startCleaner starts the cleaner in a subprocess. holdThis is an opaque reference that needs to be kept from being
		// garbage collected until we are done with all test databases (e.g. the end of the process).
		func startCleaner(ctx context.Context, parentUUID uuid.UUID, dsn string) (holdThis any, err error) {
		cmd :=exec.Command("go", "run", "github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
		func startCleaner(ctx context.Context,t TBSubset,parentUUID uuid.UUID, dsn string) (holdThis any, err error) {
		cmd :=cleanerCmd(t)
		cmd.Env = append(os.Environ(),
		fmt.Sprintf("%s=%s", envCleanerParentUUID, parentUUID.String()),
		fmt.Sprintf("%s=%s", envCleanerDSN, dsn),
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,34 @@
		//go:build !windows

		package dbtestutil

		import (
		"os/exec"
		"path/filepath"
		"time"
		)

		const timeFormat = "2006-01-02 15:04:05.000"

		// cleanerCmd builds the cleaner binary in a temporary directory and returns a command to execute it. We can do this on
		// POSIX because it's OK to delete the temporary directory after the test: the binary can still run. This is not
		// possible on Windows because cleaning the temporary directory will fail if the binary is still running.
		// c.f. cleaner_windows.go.
		func cleanerCmd(t TBSubset) *exec.Cmd {
		start := time.Now()
		t.Logf("[%s] starting cleaner binary build", start.Format(timeFormat))
		tempDir := t.TempDir()
		cleanerBinary := filepath.Join(tempDir, "cleaner")

		buildCmd := exec.Command("go", "build", "-o", cleanerBinary, "github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
		output, err := buildCmd.CombinedOutput()
		if err != nil {
		t.Logf("failed to build cleaner binary: %v", err)
		t.Logf("output: %s", string(output))
		// Fall back to go run if build fails
		return exec.Command("go", "run", "github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
		}
		t.Logf("[%s] cleaner binary %s built in %s", time.Now().Format(timeFormat), cleanerBinary, time.Since(start))

		return exec.Command(cleanerBinary)
		}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,11 @@
		//go:build windows

		package dbtestutil

		import"os/exec"

		// cleanerCmd returns a command to execute the cleaner binary. We do this with go run on Windows because we can't
		// delete the temporary directory after the test: the binary will still be running. c.f. cleaner_posix.go.
		funccleanerCmd(_TBSubset)*exec.Cmd {
		returnexec.Command("go","run","github.com/coder/coder/v2/coderd/database/dbtestutil/cleanercmd")
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -166,6 +166,7 @@ type TBSubset interface {
		Cleanup(func())
		Helper()
		Logf(formatstring,args...any)
		TempDir()string
		}

		// Open creates a new PostgreSQL database instance.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,6 +35,10 @@ func (*mockTB) Logf(format string, args ...any) {
		_,_=fmt.Printf(format,args...)
		}

		func (*mockTB)TempDir()string {
		panic("not implemented")
		}

		funcmain() {
		t:=&mockTB{}
		deferfunc() {
Expand Down