From 697592dba77edb295da80ee113d8fb01d306f931 Mon Sep 17 00:00:00 2001
From: Spike Curtis <spike@coder.com>
Date: Tue, 19 Dec 2023 11:44:02 +0400
Subject: [PATCH] fix: avoid converting nil node

---
 enterprise/tailnet/pgcoord.go      |  3 +++
 enterprise/tailnet/pgcoord_test.go | 33 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go
index 8496dfd47dcea..3addbd65b6584 100644
--- a/enterprise/tailnet/pgcoord.go
+++ b/enterprise/tailnet/pgcoord.go
@@ -185,6 +185,9 @@ func (c *pgCoord) Node(id uuid.UUID) *agpl.Node {
 			bestT = m.updatedAt
 		}
 	}
+	if bestN == nil {
+		return nil
+	}
 	node, err := agpl.ProtoToNode(bestN)
 	if err != nil {
 		c.logger.Critical(c.ctx, "failed to convert node", slog.F("node", bestN), slog.Error(err))
diff --git a/enterprise/tailnet/pgcoord_test.go b/enterprise/tailnet/pgcoord_test.go
index a79bb3b12afae..ae9ad509b9799 100644
--- a/enterprise/tailnet/pgcoord_test.go
+++ b/enterprise/tailnet/pgcoord_test.go
@@ -600,6 +600,39 @@ func TestPGCoordinator_Unhealthy(t *testing.T) {
 	}
 }
 
+func TestPGCoordinator_Node_Empty(t *testing.T) {
+	t.Parallel()
+
+	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitSuperLong)
+	defer cancel()
+	ctrl := gomock.NewController(t)
+	mStore := dbmock.NewMockStore(ctrl)
+	ps := pubsub.NewInMemory()
+	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+
+	id := uuid.New()
+	mStore.EXPECT().GetTailnetPeers(gomock.Any(), id).Times(1).Return(nil, nil)
+
+	// extra calls we don't particularly care about for this test
+	mStore.EXPECT().UpsertTailnetCoordinator(gomock.Any(), gomock.Any()).
+		AnyTimes().
+		Return(database.TailnetCoordinator{}, nil)
+	mStore.EXPECT().CleanTailnetCoordinators(gomock.Any()).AnyTimes().Return(nil)
+	mStore.EXPECT().CleanTailnetLostPeers(gomock.Any()).AnyTimes().Return(nil)
+	mStore.EXPECT().CleanTailnetTunnels(gomock.Any()).AnyTimes().Return(nil)
+	mStore.EXPECT().DeleteCoordinator(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
+
+	uut, err := tailnet.NewPGCoord(ctx, logger, ps, mStore)
+	require.NoError(t, err)
+	defer func() {
+		err := uut.Close()
+		require.NoError(t, err)
+	}()
+
+	node := uut.Node(id)
+	require.Nil(t, node)
+}
+
 // TestPGCoordinator_BidirectionalTunnels tests when peers create tunnels to each other.  We don't
 // do this now, but it's schematically possible, so we should make sure it doesn't break anything.
 func TestPGCoordinator_BidirectionalTunnels(t *testing.T) {