fix migrations

coder · coadler · Sep 21, 2023 · Aug 25, 2023 · Aug 25, 2023 · Aug 25, 2023
commit 618b0e0fdd20e22e5937d0223d484239622e1ab1
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -768,7 +768,10 @@ func (q *querier) DeleteTailnetClient(ctx context.Context, arg database.DeleteTa
 }
 
 func (q *querier) DeleteTailnetClientSubscription(ctx context.Context, arg database.DeleteTailnetClientSubscriptionParams) (database.DeleteTailnetClientSubscriptionRow, error) {
-	panic("not implemented")
+	if err := q.authorizeContext(ctx, rbac.ActionDelete, rbac.ResourceTailnetCoordinator); err != nil {
+		return database.DeleteTailnetClientSubscriptionRow{}, err
+	}
+	return q.db.DeleteTailnetClientSubscription(ctx, arg)
 }
 
 func (q *querier) GetAPIKeyByID(ctx context.Context, id string) (database.APIKey, error) {
@@ -2783,7 +2786,10 @@ func (q *querier) UpsertTailnetClient(ctx context.Context, arg database.UpsertTa
 }
 
 func (q *querier) UpsertTailnetClientSubscription(ctx context.Context, arg database.UpsertTailnetClientSubscriptionParams) error {
-	panic("not implemented")
+	if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTailnetCoordinator); err != nil {
+		return err
+	}
+	return q.db.UpsertTailnetClientSubscription(ctx, arg)
 }
 
 func (q *querier) UpsertTailnetCoordinator(ctx context.Context, id uuid.UUID) (database.TailnetCoordinator, error) {

diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -909,13 +909,8 @@ func (*FakeQuerier) DeleteTailnetClient(context.Context, database.DeleteTailnetC
 	return database.DeleteTailnetClientRow{}, ErrUnimplemented
 }
 
-func (q *FakeQuerier) DeleteTailnetClientSubscription(ctx context.Context, arg database.DeleteTailnetClientSubscriptionParams) (database.DeleteTailnetClientSubscriptionRow, error) {
-	err := validateDatabaseType(arg)
-	if err != nil {
-		return database.DeleteTailnetClientSubscriptionRow{}, err
-	}
-
-	panic("not implemented")
+func (*FakeQuerier) DeleteTailnetClientSubscription(context.Context, database.DeleteTailnetClientSubscriptionParams) (database.DeleteTailnetClientSubscriptionRow, error) {
+	return database.DeleteTailnetClientSubscriptionRow{}, ErrUnimplemented
 }
 
 func (q *FakeQuerier) GetAPIKeyByID(_ context.Context, id string) (database.APIKey, error) {

diff --git a/coderd/database/migrations/000154_pg_coordinator_single_tailnet.down.sql b/coderd/database/migrations/000154_pg_coordinator_single_tailnet.down.sql
diff --git a/coderd/database/migrations/000155_pg_coordinator_single_tailnet.down.sql b/coderd/database/migrations/000155_pg_coordinator_single_tailnet.down.sql
@@ -0,0 +1,39 @@
+BEGIN;
+
+ALTER TABLE
+	tailnet_clients
+ADD COLUMN
+	agent_id uuid;
+
+UPDATE
+	tailnet_clients
+SET
+	-- there's no reason for us to try and preserve data since coordinators will
+	-- have to restart anyways, which will create all of the client mappings.
+	agent_id = '00000000-0000-0000-0000-000000000000'::uuid;
+
+ALTER TABLE
+	tailnet_clients
+ALTER COLUMN
+	agent_id SET NOT NULL;
+
+DROP TABLE tailnet_client_subscriptions;
+DROP FUNCTION tailnet_notify_client_subscription_change;
+
+-- update the tailnet_clients trigger to the old version.
+CREATE OR REPLACE FUNCTION tailnet_notify_client_change() RETURNS trigger
+	LANGUAGE plpgsql
+	AS $$
+BEGIN
+	IF (OLD IS NOT NULL) THEN
+		PERFORM pg_notify('tailnet_client_update', OLD.id || ',' || OLD.agent_id);
+		RETURN NULL;
+	END IF;
+	IF (NEW IS NOT NULL) THEN
+		PERFORM pg_notify('tailnet_client_update', NEW.id || ',' || NEW.agent_id);
+		RETURN NULL;
+	END IF;
+END;
+$$;
+
+COMMIT;
diff --git a/...0154_pg_coordinator_single_tailnet.up.sql → ...0155_pg_coordinator_single_tailnet.up.sql b/...0154_pg_coordinator_single_tailnet.up.sql → ...0155_pg_coordinator_single_tailnet.up.sql
@@ -1,13 +1,13 @@
 BEGIN;
 
 CREATE TABLE tailnet_client_subscriptions (
-    client_id uuid NOT NULL,
+	client_id uuid NOT NULL,
 	coordinator_id uuid NOT NULL,
 	-- this isn't a foreign key since it's more of a list of agents the client
 	-- *wants* to connect to, and they don't necessarily have to currently
 	-- exist in the db.
-    agent_id uuid NOT NULL,
-    updated_at timestamp with time zone NOT NULL,
+	agent_id uuid NOT NULL,
+	updated_at timestamp with time zone NOT NULL,
 	PRIMARY KEY (client_id, coordinator_id, agent_id),
 	FOREIGN KEY (coordinator_id)  REFERENCES tailnet_coordinators (id) ON DELETE CASCADE
 	-- we don't keep a foreign key to the tailnet_clients table since there's
@@ -23,8 +23,7 @@ BEGIN
 	IF (NEW IS NOT NULL) THEN
 		PERFORM pg_notify('tailnet_client_update', NEW.client_id || ',' || NEW.agent_id);
 		RETURN NULL;
-	END IF;
-	IF (OLD IS NOT NULL) THEN
+	ELSIF (OLD IS NOT NULL) THEN
 		PERFORM pg_notify('tailnet_client_update', OLD.client_id || ',' || OLD.agent_id);
 		RETURN NULL;
 	END IF;
@@ -44,10 +43,6 @@ DECLARE
 	var_agent_ids uuid[];
 BEGIN
 	IF (NEW.id IS NOT NULL) THEN
-		IF (NEW.node IS NULL) THEN
-			return NULL;
-		END IF;
-
 		var_client_id = NEW.id;
 		SELECT
 			array_agg(agent_id)
@@ -60,6 +55,7 @@ BEGIN
 			subs.coordinator_id = NEW.coordinator_id;
 	ELSIF (OLD.id IS NOT NULL) THEN
 		-- if new is null and old is not null, that means the row was deleted.
+		-- simulate a foreign key by deleting all of the subscriptions.
 		var_client_id = OLD.id;
 		WITH agent_ids AS (
 			DELETE FROM

diff --git a/coderd/database/migrations/testdata/fixtures/000130_ha_coordinator.up.sql b/coderd/database/migrations/testdata/fixtures/000130_ha_coordinator.up.sql
@@ -18,7 +18,7 @@ VALUES
 	);
 
 INSERT INTO tailnet_agents
-(id, coordinator_id, updated_at, node)
+	(id, coordinator_id, updated_at, node)
 VALUES
 	(
 		'c0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',

diff --git a/coderd/database/migrations/testdata/fixtures/000155_pg_coordinator_single_tailnet.up.sql b/coderd/database/migrations/testdata/fixtures/000155_pg_coordinator_single_tailnet.up.sql
@@ -0,0 +1,9 @@
+INSERT INTO tailnet_client_subscriptions
+	(client_id, agent_id, coordinator_id, updated_at)
+VALUES
+	(
+		'b0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+		'c0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+		'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+		'2023-06-15 10:23:54+00'
+	);
diff --git a/enterprise/tailnet/pgcoord_test.go b/enterprise/tailnet/pgcoord_test.go
@@ -646,7 +646,7 @@ type testConn struct {
 func newTestConn(ids []uuid.UUID) *testConn {
 	a := &testConn{}
 	a.ws, a.serverWS = net.Pipe()
-	a.nodeChan = make(chan []*agpl.Node, 5)
+	a.nodeChan = make(chan []*agpl.Node)
 	a.sendNode, a.errChan = agpl.ServeCoordinator(a.ws, func(nodes []*agpl.Node) error {
 		a.nodeChan <- nodes
 		return nil