Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Validate index name exists in the env

Rafi21443fe06ae8
diff --git a/apps/web/lib/api/partners/search/providers/upstash-redis.ts b/apps/web/lib/api/partners/search/providers/upstash-redis.ts
index 792583a0c7..74b6822838 100644
--- a/apps/web/lib/api/partners/search/providers/upstash-redis.ts
+++ b/apps/web/lib/api/partners/search/providers/upstash-redis.ts
@@ -58,9 +58,11 @@ function logPartnerSearchDebug(details: Record<string, unknown>) {
}
function getIndexName(indexName?: string): string {
+ // `||` rather than `??`: a blank value has to fall through to the default,
+ // otherwise an empty env var silently targets an index named "".
return (
- indexName ??
- process.env.PARTNER_SEARCH_INDEX_NAME?.trim() ??
+ indexName?.trim() ||
+ process.env.PARTNER_SEARCH_INDEX_NAME?.trim() ||
DEFAULT_INDEX_NAME
);
}
diff --git a/apps/web/lib/api/partners/search/providers/upstash-search.ts b/apps/web/lib/api/partners/search/providers/upstash-search.ts
index 6409315810..f2e96b831c 100644
--- a/apps/web/lib/api/partners/search/providers/upstash-search.ts
+++ b/apps/web/lib/api/partners/search/providers/upstash-search.ts
@@ -75,10 +75,12 @@ interface CreateUpstashSearchPartnerSearchProviderOptions {
}
function getIndexName(indexName?: string): string {
+ // `||` rather than `??`: a blank value has to fall through to the default,
+ // otherwise an empty env var silently targets an index named "".
return (
- indexName ??
- process.env.PARTNER_UPSTASH_SEARCH_INDEX_NAME?.trim() ??
- process.env.PARTNER_SEARCH_INDEX_NAME?.trim() ??
+ indexName?.trim() ||
+ process.env.PARTNER_UPSTASH_SEARCH_INDEX_NAME?.trim() ||
+ process.env.PARTNER_SEARCH_INDEX_NAME?.trim() ||
DEFAULT_INDEX_NAME
);
}
diff --git a/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts b/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts
index 8d8763f71e..f7674483e2 100644
--- a/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts
+++ b/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts
@@ -395,4 +395,26 @@ describe("Upstash Redis partner search provider", () => {
).resolves.toEqual({ documentIds: [], cursor: null });
expect(mocks.scan).toHaveBeenCalledWith("42", expect.anything());
});
+
+ it.each([
+ ["blank", ""],
+ ["whitespace", " "],
+ ])(
+ "falls back to the default index when the env var is %s",
+ async (_l, value) => {
+ vi.stubEnv("PARTNER_SEARCH_INDEX_NAME", value);
+ const provider = createUpstashRedisPartnerSearchProvider({
+ redisClient: createRedisMock(),
+ });
+ mocks.scan.mockResolvedValue(["0", []]);
+
+ await provider.listDocumentIds({ limit: 10 });
+
+ expect(mocks.scan).toHaveBeenCalledWith(
+ "0",
+ expect.objectContaining({ match: "partner-search-v1:partner:*" }),
+ );
+ vi.unstubAllEnvs();
+ },
+ );
});
diff --git a/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts b/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts
index 0d5141ffd4..50be76b5ac 100644
--- a/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts
+++ b/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts
@@ -256,4 +256,27 @@ describe("Upstash Search partner search provider", () => {
).resolves.toEqual({ documentIds: ["pge_one"], cursor: "next" });
expect(mocks.range).toHaveBeenCalledWith({ cursor: "prev", limit: 10 });
});
+
+ it.each([
+ ["blank", ""],
+ ["whitespace", " "],
+ ])(
+ "falls back to the default index when the env var is %s",
+ async (_l, value) => {
+ vi.stubEnv("PARTNER_UPSTASH_SEARCH_INDEX_NAME", value);
+ vi.stubEnv("PARTNER_SEARCH_INDEX_NAME", value);
+ mocks.info.mockResolvedValue({
+ documentCount: 0,
+ pendingDocumentCount: 0,
+ });
+ mocks.deleteIndex.mockResolvedValue("Success");
+
+ const { indexName } = await deleteUpstashSearchPartnerSearchIndex({
+ searchIndex: createSearchIndexMock(),
+ });
+
+ expect(indexName).toBe("partner-search-v1");
+ vi.unstubAllEnvs();
+ },
+ );
});