add pubsub to dbmem

ethanndickson · ethanndickson · commit fabe2d1e8ec9 · 2024-10-04T11:40:25.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -691,8 +691,8 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			var pubsubWatchdogTimeout <-chan struct{}
 			if vals.InMemoryDatabase {
 				// This is only used for testing.
-				options.Database = dbmem.New()
 				options.Pubsub = pubsub.NewInMemory()
+				options.Database = dbmem.New()
 			} else {
 				sqlDB, dbURL, err := getPostgresDB(ctx, logger, vals.PostgresURL.String(), codersdk.PostgresAuth(vals.PostgresAuth), sqlDriver)
 				if err != nil {
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -7776,7 +7776,7 @@ func (q *FakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWork
 	return workspace, nil
 }
 
-func (q *FakeQuerier) InsertWorkspaceAgent(_ context.Context, arg database.InsertWorkspaceAgentParams) (database.WorkspaceAgent, error) {
+func (q *FakeQuerier) InsertWorkspaceAgent(ctx context.Context, arg database.InsertWorkspaceAgentParams) (database.WorkspaceAgent, error) {
 	if err := validateDatabaseType(arg); err != nil {
 		return database.WorkspaceAgent{}, err
 	}
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000260_workspace_updates.down.sql b/coderd/database/migrations/000260_workspace_updates.down.sql
@@ -1,7 +1 @@
 DROP TYPE agent_id_name_pair;
-
-DROP TRIGGER IF EXISTS new_workspace_notify ON workspaces;
-DROP FUNCTION IF EXISTS new_workspace_notify;
-
-DROP TRIGGER IF EXISTS new_agent_notify ON workspace_agents;
-DROP FUNCTION IF EXISTS new_agent_notify;
diff --git a/coderd/database/migrations/000260_workspace_updates.up.sql b/coderd/database/migrations/000260_workspace_updates.up.sql
@@ -2,72 +2,3 @@ CREATE TYPE agent_id_name_pair AS (
 	id uuid,
 	name text
 );
-
-CREATE FUNCTION new_workspace_notify() RETURNS trigger
-	LANGUAGE plpgsql
-AS $$
-DECLARE
-BEGIN
-	-- Notify for new workspaces & ownership transfers
-	IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND NEW.owner_id <> OLD.owner_id) THEN
-		-- Write to the notification channel `new_workspace:owner_id`
-		-- with the workspace id as the payload.
-		PERFORM pg_notify('new_workspace:' || NEW.owner_id, NEW.id::text);
-	END IF;
-	RETURN NEW;
-END;
-$$;
-
-CREATE TRIGGER new_workspace_notify
-	AFTER INSERT OR UPDATE ON workspaces
-	FOR EACH ROW
-EXECUTE FUNCTION new_workspace_notify();
-
-
-CREATE FUNCTION new_agent_notify() RETURNS trigger
-	LANGUAGE plpgsql
-AS $$
-DECLARE
-	workspace_owner_id uuid;
-BEGIN
-	SELECT workspaces.owner_id
-	INTO workspace_owner_id
-	FROM
-		workspaces
-	WHERE
-		workspaces.id = (
-			SELECT
-				workspace_id
-			FROM
-				workspace_builds
-			WHERE
-				workspace_builds.job_id = (
-					SELECT
-						job_id
-					FROM
-						workspace_resources
-					WHERE
-						workspace_resources.id = (
-							SELECT
-								resource_id
-							FROM
-								workspace_agents
-							WHERE
-								workspace_agents.id = NEW.id
-						)
-				)
-		);
-	-- Agents might not belong to a workspace (template imports)
-	IF workspace_owner_id IS NOT NULL THEN
-		-- Write to the notification channel `new_agent:workspace_owner_id`
-		PERFORM pg_notify('new_agent:' || workspace_owner_id, '');
-	END IF;
-	RETURN NEW;
-END;
-$$;
-
-
-CREATE TRIGGER new_agent_notify
-	AFTER INSERT ON workspace_agents
-	FOR EACH ROW
-EXECUTE FUNCTION new_agent_notify();

Original file line number	Diff line number	Diff line change
`@@ -7776,7 +7776,7 @@ func (q *FakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWork`
`7776`	`7776`	`return workspace, nil`
`7777`	`7777`	`}`
`7778`	`7778`
`7779`		`-func (q *FakeQuerier) InsertWorkspaceAgent(_ context.Context, arg database.InsertWorkspaceAgentParams) (database.WorkspaceAgent, error) {`
	`7779`	`+func (q *FakeQuerier) InsertWorkspaceAgent(ctx context.Context, arg database.InsertWorkspaceAgentParams) (database.WorkspaceAgent, error) {`
`7780`	`7780`	`if err := validateDatabaseType(arg); err != nil {`
`7781`	`7781`	`return database.WorkspaceAgent{}, err`
`7782`	`7782`	`}`