From afcc30dca478a0b1488140875598f62d90c78ace Mon Sep 17 00:00:00 2001
From: bkellam <bshizzle1234@gmail.com>
Date: Wed, 19 Nov 2025 14:12:24 -0800
Subject: [PATCH] remove zoekt tenant enforcement

---
 .env.development                                         | 2 --
 Dockerfile                                               | 1 -
 packages/web/src/app/api/(server)/stream_search/route.ts | 9 +++------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.env.development b/.env.development
index ddb981af..04a53752 100644
--- a/.env.development
+++ b/.env.development
@@ -6,8 +6,6 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
 ZOEKT_WEBSERVER_URL="http://localhost:6070"
 # The command to use for generating ctags.
 CTAGS_COMMAND=ctags
-# logging, strict
-SRC_TENANT_ENFORCEMENT_MODE=strict
 
 # Auth.JS
 # You can generate a new secret with:
diff --git a/Dockerfile b/Dockerfile
index 8ece7112..1390914a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -177,7 +177,6 @@ ENV DATA_DIR=/data
 ENV DATA_CACHE_DIR=$DATA_DIR/.sourcebot
 ENV DATABASE_DATA_DIR=$DATA_CACHE_DIR/db
 ENV REDIS_DATA_DIR=$DATA_CACHE_DIR/redis
-ENV SRC_TENANT_ENFORCEMENT_MODE=strict
 ENV SOURCEBOT_PUBLIC_KEY_PATH=/app/public.pem
 
 # Valid values are: debug, info, warn, error
diff --git a/packages/web/src/app/api/(server)/stream_search/route.ts b/packages/web/src/app/api/(server)/stream_search/route.ts
index 231ff712..5331957b 100644
--- a/packages/web/src/app/api/(server)/stream_search/route.ts
+++ b/packages/web/src/app/api/(server)/stream_search/route.ts
@@ -216,9 +216,7 @@ const createSSESearchStream = async (searchRequest: SearchRequest, prisma: Prism
             };
 
             try {
-                // @todo: we should just disable tenant enforcement for now.
                 const metadata = new grpc.Metadata();
-                metadata.add('x-sourcegraph-tenant-id', '1');
 
                 const streamRequest: StreamSearchRequest = {
                     request: searchRequest,
@@ -357,10 +355,9 @@ const createSSESearchStream = async (searchRequest: SearchRequest, prisma: Prism
                                             content: chunk.content.toString('utf-8'),
                                             matchRanges: chunk.ranges.map(convertRange),
                                             contentStart: chunk.content_start ? {
-                                                byteOffset: chunk.content_start.byte_offset ?? 0,
-                                                column: chunk.content_start.column ?? 0,
-                                                lineNumber: chunk.content_start.line_number ?? 0,
-                                                // @nocheckin: Will need to figure out how to handle this case.
+                                                byteOffset: chunk.content_start.byte_offset,
+                                                column: chunk.content_start.column,
+                                                lineNumber: chunk.content_start.line_number,
                                             } : {
                                                 byteOffset: 0,
                                                 column: 0,