remove zoekt tenant enforcement

This commit is contained in:
bkellam 2025-11-19 14:12:24 -08:00
parent d55dd13c1b
commit afcc30dca4
3 changed files with 3 additions and 9 deletions

View file

@ -6,8 +6,6 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
ZOEKT_WEBSERVER_URL="http://localhost:6070" ZOEKT_WEBSERVER_URL="http://localhost:6070"
# The command to use for generating ctags. # The command to use for generating ctags.
CTAGS_COMMAND=ctags CTAGS_COMMAND=ctags
# logging, strict
SRC_TENANT_ENFORCEMENT_MODE=strict
# Auth.JS # Auth.JS
# You can generate a new secret with: # You can generate a new secret with:

View file

@ -177,7 +177,6 @@ ENV DATA_DIR=/data
ENV DATA_CACHE_DIR=$DATA_DIR/.sourcebot ENV DATA_CACHE_DIR=$DATA_DIR/.sourcebot
ENV DATABASE_DATA_DIR=$DATA_CACHE_DIR/db ENV DATABASE_DATA_DIR=$DATA_CACHE_DIR/db
ENV REDIS_DATA_DIR=$DATA_CACHE_DIR/redis ENV REDIS_DATA_DIR=$DATA_CACHE_DIR/redis
ENV SRC_TENANT_ENFORCEMENT_MODE=strict
ENV SOURCEBOT_PUBLIC_KEY_PATH=/app/public.pem ENV SOURCEBOT_PUBLIC_KEY_PATH=/app/public.pem
# Valid values are: debug, info, warn, error # Valid values are: debug, info, warn, error

View file

@ -216,9 +216,7 @@ const createSSESearchStream = async (searchRequest: SearchRequest, prisma: Prism
}; };
try { try {
// @todo: we should just disable tenant enforcement for now.
const metadata = new grpc.Metadata(); const metadata = new grpc.Metadata();
metadata.add('x-sourcegraph-tenant-id', '1');
const streamRequest: StreamSearchRequest = { const streamRequest: StreamSearchRequest = {
request: searchRequest, request: searchRequest,
@ -357,10 +355,9 @@ const createSSESearchStream = async (searchRequest: SearchRequest, prisma: Prism
content: chunk.content.toString('utf-8'), content: chunk.content.toString('utf-8'),
matchRanges: chunk.ranges.map(convertRange), matchRanges: chunk.ranges.map(convertRange),
contentStart: chunk.content_start ? { contentStart: chunk.content_start ? {
byteOffset: chunk.content_start.byte_offset ?? 0, byteOffset: chunk.content_start.byte_offset,
column: chunk.content_start.column ?? 0, column: chunk.content_start.column,
lineNumber: chunk.content_start.line_number ?? 0, lineNumber: chunk.content_start.line_number,
// @nocheckin: Will need to figure out how to handle this case.
} : { } : {
byteOffset: 0, byteOffset: 0,
column: 0, column: 0,