coder
diff --git a/‎Makefile
Lines changed: 10 additions & 0 deletions b/‎Makefile
Lines changed: 10 additions & 0 deletions
diff --git a/‎cmd/dbtestbroker/main.go
Lines changed: 35 additions & 0 deletions b/‎cmd/dbtestbroker/main.go
Lines changed: 35 additions & 0 deletions
@@ -636,6 +636,7 @@ GEN_FILES := \
 	provisionersdk/proto/provisioner.pb.go \
 	provisionerd/proto/provisionerd.pb.go \
 	vpn/vpn.pb.go \
+	coderd/database/dbtestutil/broker/broker.pb.go \
 	$(DB_GEN_FILES) \
 	$(SITE_GEN_FILES) \
 	coderd/rbac/object_gen.go \
@@ -683,6 +684,7 @@ gen/mark-fresh:
 		provisionersdk/proto/provisioner.pb.go \
 		provisionerd/proto/provisionerd.pb.go \
 		vpn/vpn.pb.go \
+		coderd/database/dbtestutil/broker/broker.pb.go \
 		coderd/database/dump.sql \
 		$(DB_GEN_FILES) \
 		site/src/api/typesGenerated.ts \
@@ -801,6 +803,14 @@ vpn/vpn.pb.go: vpn/vpn.proto
 		--go_opt=paths=source_relative \
 		./vpn/vpn.proto
 
+coderd/database/dbtestutil/broker/broker.pb.go: coderd/database/dbtestutil/broker/broker.proto
+	protoc \
+		--go_out=. \
+		--go_opt=paths=source_relative \
+		--go-drpc_out=. \
+        --go-drpc_opt=paths=source_relative \
+		./coderd/database/dbtestutil/broker/broker.proto
+
 site/src/api/typesGenerated.ts: site/node_modules/.installed $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go')
 	# -C sets the directory for the go run command
 	go run -C ./scripts/apitypings main.go > $@
 
@@ -0,0 +1,35 @@
+package main
+
+// dbtestbroker is a subprocess used when testing with dbtestutil. It handles cloning Postgres databases for tests and
+// is a separate process so that if the main test process dies (panics, times out, or is killed), we still clean up
+// the test databases and don't leave them in Postgres.
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"os/signal"
+	"time"
+
+	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/v2/coderd/database/dbtestutil/broker"
+)
+
+func main() {
+	connectCtx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
+	defer cancel()
+	server, err := broker.NewService(connectCtx, os.Stdin, os.Stdout)
+	if err != nil {
+		_, _ = fmt.Fprintf(os.Stderr, "\nDBTESTBROKER: %s\n", err.Error())
+		cancel()
+		os.Exit(1)
+	}
+	signalCtx, signalCancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer signalCancel()
+	err = server.Serve(signalCtx)
+	if err != nil && !xerrors.Is(err, context.Canceled) && !xerrors.Is(err, io.EOF) {
+		_, _ = fmt.Fprintf(os.Stderr, "\nDBTESTBROKER: %s\n", err.Error())
+	}
+}