awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement: add secret tag/metadata search functionality to single env view dashboard

Browse Source
This commit is contained in:
Scott Wilson
2025-07-18 18:22:11 -07:00
parent b7b059bb50
commit 90c341cf53
6 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/server/routes/v1/dashboard-router.ts
View File

@@ -904,7 +904,9 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
projectId,
path: secretPath,
search,
tagSlugs: tags
tagSlugs: tags,
includeTagsInSearch: true,
includeMetadataInSearch: true
});
if (remainingLimit > 0 && totalSecretCount > adjustedOffset) {
@@ -924,7 +926,9 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
search,
limit: remainingLimit,
offset: adjustedOffset,
tagSlugs: tags
tagSlugs: tags,
includeTagsInSearch: true,
includeMetadataInSearch: true
})
).secrets;
}

46
backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.ts
View File

@@ -415,6 +415,8 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {
filters?: {
search?: string;
tagSlugs?: string[];
includeTagsInSearch?: boolean;
includeMetadataInSearch?: boolean;
}
) => {
try {
@@ -433,17 +435,27 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {
.whereIn("folderId", folderIds)
.where((bd) => {
if (filters?.search) {
void bd.whereILike("key", `%${filters?.search}%`);
void bd.whereILike(`${TableName.SecretV2}.key`, `%${filters?.search}%`);
if (filters?.includeTagsInSearch) {
void bd.orWhereILike(`${TableName.SecretTag}.slug`, `%${filters?.search}%`);
}
if (filters?.includeMetadataInSearch) {
void bd
.orWhereILike(`${TableName.ResourceMetadata}.key`, `%${filters?.search}%`)
.orWhereILike(`${TableName.ResourceMetadata}.value`, `%${filters?.search}%`);
}
}
})
.where((bd) => {
void bd.whereNull("userId").orWhere({ userId: userId || null });
void bd
.whereNull(`${TableName.SecretV2}.userId`)
.orWhere({ [`${TableName.SecretV2}.userId` as "userId"]: userId || null });
})
.countDistinct("key");
.countDistinct(`${TableName.SecretV2}.key`);
// only need to join tags if filtering by tag slugs
const slugs = filters?.tagSlugs?.filter(Boolean);
if (slugs && slugs.length > 0) {
if ((slugs && slugs.length > 0) || filters?.includeTagsInSearch) {
void query
.leftJoin(
TableName.SecretV2JnTag,
@@ -454,12 +466,24 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {
TableName.SecretTag,
`${TableName.SecretV2JnTag}.${TableName.SecretTag}Id`,
`${TableName.SecretTag}.id`
)
.whereIn("slug", slugs);
);
if (slugs?.length) {
void query.whereIn("slug", slugs);
}
}
if (filters?.includeMetadataInSearch) {
void query.leftJoin(
TableName.ResourceMetadata,
`${TableName.SecretV2}.id`,
`${TableName.ResourceMetadata}.secretId`
);
}
const secrets = await query;
// @ts-expect-error not inferred by knex
return Number(secrets[0]?.count ?? 0);
} catch (error) {
throw new DatabaseError({ error, name: "get folder secret count" });
@@ -485,12 +509,14 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {
.whereIn(`${TableName.SecretV2}.folderId`, folderIds)
.where((bd) => {
if (filters?.search) {
void bd.whereILike(`${TableName.SecretV2}.key`, `%${filters?.search}%`);
if (filters?.includeTagsInSearch) {
void bd.orWhereILike(`${TableName.SecretTag}.slug`, `%${filters?.search}%`);
}
if (filters?.includeMetadataInSearch) {
void bd
.whereILike(`${TableName.SecretV2}.key`, `%${filters?.search}%`)
.orWhereILike(`${TableName.SecretTag}.slug`, `%${filters?.search}%`);
} else {
void bd.whereILike(`${TableName.SecretV2}.key`, `%${filters?.search}%`);
.orWhereILike(`${TableName.ResourceMetadata}.key`, `%${filters?.search}%`)
.orWhereILike(`${TableName.ResourceMetadata}.value`, `%${filters?.search}%`);
}
}

1
backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts
View File

@@ -355,6 +355,7 @@ export type TFindSecretsByFolderIdsFilter = {
tagSlugs?: string[];
metadataFilter?: { key?: string; value?: string }[];
includeTagsInSearch?: boolean;
includeMetadataInSearch?: boolean;
keys?: string[];
};

2
backend/src/services/secret/secret-service.ts
View File

@@ -1128,6 +1128,8 @@ export const secretServiceFactory = ({
| "environment"
| "tagSlugs"
| "search"
| "includeTagsInSearch"
| "includeMetadataInSearch"
>) => {
const { shouldUseSecretV2Bridge } = await projectBotService.getBotKey(projectId);

2
backend/src/services/secret/secret-types.ts
View File

@@ -212,6 +212,8 @@ export type TGetSecretsRawDTO = {
limit?: number;
search?: string;
keys?: string[];
includeTagsInSearch?: boolean;
includeMetadataInSearch?: boolean;
} & TProjectPermission;
export type TGetSecretAccessListDTO = {

2
frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/SecretSearchInput.tsx
View File

@@ -53,7 +53,7 @@ export const SecretSearchInput = ({
}}
autoComplete="off"
className="input text-md h-[2.3rem] w-full rounded-md rounded-l-none bg-mineshaft-800 py-[0.375rem] pl-2.5 pr-8 text-gray-400 placeholder-mineshaft-50 placeholder-opacity-50 outline-none duration-200 placeholder:text-sm hover:ring-bunker-400/60 focus:bg-mineshaft-700/80 focus:ring-1 focus:ring-primary-400/50"
placeholder="Search by secret/folder name..."
placeholder="Search by secret, folder, tag or metadata..."
value={value}
onChange={(e) => onChange(e.target.value)}
/>