Skip to content

Commit afcc30d

Browse files
remove zoekt tenant enforcement
1 parent d55dd13 commit afcc30d

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

.env.development

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
66
ZOEKT_WEBSERVER_URL="http://localhost:6070"
77
# The command to use for generating ctags.
88
CTAGS_COMMAND=ctags
9-
# logging, strict
10-
SRC_TENANT_ENFORCEMENT_MODE=strict
119

1210
# Auth.JS
1311
# You can generate a new secret with:

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ ENV DATA_DIR=/data
177177
ENV DATA_CACHE_DIR=$DATA_DIR/.sourcebot
178178
ENV DATABASE_DATA_DIR=$DATA_CACHE_DIR/db
179179
ENV REDIS_DATA_DIR=$DATA_CACHE_DIR/redis
180-
ENV SRC_TENANT_ENFORCEMENT_MODE=strict
181180
ENV SOURCEBOT_PUBLIC_KEY_PATH=/app/public.pem
182181

183182
# Valid values are: debug, info, warn, error

packages/web/src/app/api/(server)/stream_search/route.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,7 @@ const createSSESearchStream = async (searchRequest: SearchRequest, prisma: Prism
216216
};
217217

218218
try {
219-
// @todo: we should just disable tenant enforcement for now.
220219
const metadata = new grpc.Metadata();
221-
metadata.add('x-sourcegraph-tenant-id', '1');
222220

223221
const streamRequest: StreamSearchRequest = {
224222
request: searchRequest,
@@ -357,10 +355,9 @@ const createSSESearchStream = async (searchRequest: SearchRequest, prisma: Prism
357355
content: chunk.content.toString('utf-8'),
358356
matchRanges: chunk.ranges.map(convertRange),
359357
contentStart: chunk.content_start ? {
360-
byteOffset: chunk.content_start.byte_offset ?? 0,
361-
column: chunk.content_start.column ?? 0,
362-
lineNumber: chunk.content_start.line_number ?? 0,
363-
// @nocheckin: Will need to figure out how to handle this case.
358+
byteOffset: chunk.content_start.byte_offset,
359+
column: chunk.content_start.column,
360+
lineNumber: chunk.content_start.line_number,
364361
} : {
365362
byteOffset: 0,
366363
column: 0,

0 commit comments

Comments
 (0)