Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

disable gitlab "add all repositories" in account scope and layout changes

Matheus Nogueira8beed1237900
diff --git a/DESIGN.md b/DESIGN.md
index 40adc35eb2..05c3cdba70 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -62,11 +62,11 @@ Used to signal the scope a surface, badge, or action belongs to.
| Project | `--color-project` |
| Admin | `--color-admin` |
-PAM and Agent Vault are product identities rather than additional levels in
-the org/project hierarchy. Use `--color-product-pam` and `--color-product-av`
-when the current product calls for them; `PageHeader` maps the PAM and Agent
-Vault project types to these accents, while `Button` exposes `pam` and `av`
-variants. Check each component's supported variants instead of treating all
+PAM, Agent Vault and Secret Scanning are product identities rather than
+additional levels in the org/project hierarchy. Use `--color-product-pam`,
+`--color-product-av` and `--color-product-ss` when the current product calls
+for them; `PageHeader` and the org sidebar map those project types to these
+accents, while `Button` exposes `pam`, `av` and `ss` variants. Check each component's supported variants instead of treating all
scope and product variants as interchangeable.
### Semantic colors
diff --git a/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-factory.ts b/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-factory.ts
index 5f9d071830..eefc71ee8c 100644
--- a/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-factory.ts
+++ b/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-factory.ts
@@ -1,4 +1,5 @@
import { Camelize, GitbeakerRequestError, GroupHookSchema, ProjectHookSchema } from "@gitbeaker/rest";
+import pLimit from "p-limit";
import { join } from "path";
import { scanContentAndGetFindings } from "@app/ee/services/secret-scanning/secret-scanning-queue/secret-scanning-fns";
@@ -22,10 +23,12 @@ import {
TSecretScanningFactoryPostInitialization,
TSecretScanningFactorySetupWebhook,
TSecretScanningFactoryTeardown,
+ TSecretScanningFactoryUpdateWebhook,
TSecretScanningFactoryValidateConfigUpdate
} from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-types";
import { getConfig } from "@app/lib/config/env";
import { BadRequestError } from "@app/lib/errors";
+import { logger } from "@app/lib/logger";
import { alphaNumericNanoId } from "@app/lib/nanoid";
import { GitLabProjectRegex } from "@app/lib/regex";
import { TGitLabConnection } from "@app/services/app-connection/gitlab";
@@ -33,6 +36,7 @@ import {
getGitLabConnectionClient,
getGitLabInstanceUrl
} from "@app/services/app-connection/gitlab/gitlab-connection-fns";
+import { KmsDataKey } from "@app/services/kms/kms-types";
import { GitLabDataSourceScope } from "./gitlab-secret-scanning-enums";
import {
@@ -42,12 +46,86 @@ import {
TQueueGitLabResourceDiffScan
} from "./gitlab-secret-scanning-types";
+const PROJECT_HOOK_CONCURRENCY = 5;
+
+type TGitLabProjectHook = { projectId: number; projectName: string; hookId: number };
+
+// Including every project (`*`) would mean a hook on each project the connection can see, possibly thousands,
+// so only an explicit list gets project hooks.
+const getHookedProjectNames = (config: TGitLabDataSourceInput["config"]) => {
+ if (config.scope !== GitLabDataSourceScope.Account || config.includeProjects.includes("*")) return [];
+ return config.includeProjects;
+};
+
export const GitLabSecretScanningFactory = ({ appConnectionDAL, kmsService }: TSecretScanningFactoryParams) => {
type TGitLabClient = Awaited<ReturnType<typeof getGitLabConnectionClient>>;
type THookableConfig = Exclude<TGitLabDataSourceInput["config"], { scope: GitLabDataSourceScope.Account }>;
const getHookUrl = () => `${getConfig().SITE_URL}/secret-scanning/webhooks/gitlab`;
+ const removeProjectHooks = async (client: TGitLabClient, hooks: TGitLabProjectHook[]) => {
+ const limit = pLimit(PROJECT_HOOK_CONCURRENCY);
+ await Promise.all(
+ hooks.map((hook) =>
+ limit(async () => {
+ try {
+ await client.ProjectHooks.remove(hook.projectId, hook.hookId);
+ } catch (error) {
+ logger.warn(
+ error,
+ `secretScanningV2: GitLab - Failed to remove project webhook [projectId=${hook.projectId}] [hookId=${hook.hookId}]`
+ );
+ }
+ })
+ )
+ );
+ };
+
+ // All or nothing: a project left without a hook would silently miss new commit scans.
+ const addProjectHooks = async (
+ client: TGitLabClient,
+ projectNames: string[],
+ token: string,
+ dataSourceId: string
+ ): Promise<TGitLabProjectHook[]> => {
+ const limit = pLimit(PROJECT_HOOK_CONCURRENCY);
+ const added: TGitLabProjectHook[] = [];
+ const failed: string[] = [];
+
+ await Promise.all(
+ projectNames.map((projectName) =>
+ limit(async () => {
+ try {
+ const hook: Camelize<ProjectHookSchema> = await client.ProjectHooks.add(projectName, getHookUrl(), {
+ token,
+ pushEvents: true,
+ enableSslVerification: true,
+ // @ts-expect-error gitbeaker is outdated, and the types don't support these fields yet
+ name: `Infisical Secret Scanning - ${dataSourceId}`,
+ custom_headers: [{ key: "x-data-source-id", value: dataSourceId }]
+ });
+ added.push({ projectId: hook.projectId, projectName, hookId: hook.id });
+ } catch (error) {
+ const reason =
+ error instanceof GitbeakerRequestError
+ ? (error.cause?.description ?? error.message)
+ : (error as Error)?.message || "Unknown error";
+ failed.push(`"${projectName}" (${reason})`);
+ }
+ })
+ )
+ );
+
+ if (failed.length) {
+ await removeProjectHooks(client, added);
+ throw new BadRequestError({
+ message: `Could not add a webhook to ${failed.length} GitLab project(s): ${failed.join(", ")}. Scanning new commits needs the connection to have at least the Maintainer role on every included project. Grant that role, remove these projects, or turn off Scan New Commits.`
+ });
+ }
+
+ return added;
+ };
+
const removeHook = async (client: TGitLabClient, config: THookableConfig, hookId: number) => {
try {
if (config.scope === GitLabDataSourceScope.Project) {
@@ -133,11 +211,41 @@ export const GitLabSecretScanningFactory = ({ appConnectionDAL, kmsService }: TS
TGitLabDataSourceInput,
TGitLabConnection,
TGitLabDataSourceCredentials
- > = async ({ payload, connection }, callback) => {
+ > = async ({ payload, connection, secretScanningV2DAL }, callback) => {
const { config, name } = payload;
- if (config.scope === GitLabDataSourceScope.Account || !isDataSourceWebhookRequired(payload)) {
- return callback({});
+ if (!isDataSourceWebhookRequired(payload)) return callback({});
+
+ if (config.scope === GitLabDataSourceScope.Account) {
+ const projectNames = getHookedProjectNames(config);
+ if (!projectNames.length) return callback({});
+
+ // Project hooks are created with the data source ID already set, so they are added once the row exists
+ // rather than in a second call inside the create transaction.
+ const accountClient = await getGitLabConnectionClient(connection, appConnectionDAL, kmsService);
+ const dataSource = await callback({});
+ const accountToken = alphaNumericNanoId(64);
+ let projectHooks: TGitLabProjectHook[] = [];
+
+ try {
+ projectHooks = await addProjectHooks(accountClient, projectNames, accountToken, dataSource.id);
+
+ const credentials: TGitLabDataSourceCredentials = { token: accountToken, projectHooks };
+ const { encryptor } = await kmsService.createCipherPairWithDataKey({
+ type: KmsDataKey.SecretManager,
+ projectId: dataSource.projectId
+ });
+ const { cipherTextBlob: encryptedCredentials } = encryptor({
+ plainText: Buffer.from(JSON.stringify(credentials))
+ });
+
+ await secretScanningV2DAL.dataSources.updateById(dataSource.id, { encryptedCredentials });
+ return { ...dataSource, encryptedCredentials };
+ } catch (error) {
+ await removeProjectHooks(accountClient, projectHooks);
+ await secretScanningV2DAL.dataSources.deleteById(dataSource.id);
+ throw error;
+ }
}
const client = await getGitLabConnectionClient(connection, appConnectionDAL, kmsService);
@@ -157,7 +265,7 @@ export const GitLabSecretScanningFactory = ({ appConnectionDAL, kmsService }: TS
TGitLabConnection,
TGitLabDataSourceCredentials
> = async ({ connection, dataSourceId, credentials, payload: { config } }) => {
- if (!credentials || config.scope === GitLabDataSourceScope.Account) return;
+ if (!credentials || !("hookId" in credentials) || config.scope === GitLabDataSourceScope.Account) return;
const client = await getGitLabConnectionClient(connection, appConnectionDAL, kmsService);
await bindHookToDataSource(client, config, credentials.hookId, dataSourceId);
@@ -167,7 +275,16 @@ export const GitLabSecretScanningFactory = ({ appConnectionDAL, kmsService }: TS
TGitLabDataSourceWithConnection,
TGitLabDataSourceCredentials
> = async ({ dataSource: { id, name, connection, config } }) => {
- if (config.scope === GitLabDataSourceScope.Account) return undefined;
+ if (config.scope === GitLabDataSourceScope.Account) {
+ const projectNames = getHookedProjectNames(config);
+ if (!projectNames.length) return undefined;
+
+ const accountClient = await getGitLabConnectionClient(connection, appConnectionDAL, kmsService);
+ const accountToken = alphaNumericNanoId(64);
+ const projectHooks = await addProjectHooks(accountClient, projectNames, accountToken, id);
+
+ return { token: accountToken, projectHooks };
+ }
const client = await getGitLabConnectionClient(connection, appConnectionDAL, kmsService);
const token = alphaNumericNanoId(64);
@@ -177,6 +294,29 @@ export const GitLabSecretScanningFactory = ({ appConnectionDAL, kmsService }: TS
return { token, hookId };
};
+ const updateWebhook: TSecretScanningFactoryUpdateWebhook<
+ TGitLabDataSourceWithConnection,
+ TGitLabDataSourceCredentials
+ > = async ({ dataSource: { id, connection }, config, credentials }) => {
+ if (config.scope !== GitLabDataSourceScope.Account || !("projectHooks" in credentials)) return undefined;
+
+ const projectNames = getHookedProjectNames(config);
+ const kept = credentials.projectHooks.filter((hook) => projectNames.includes(hook.projectName));
+ const stale = credentials.projectHooks.filter((hook) => !projectNames.includes(hook.projectName));
+ const missing = projectNames.filter((projectName) => !kept.some((hook) => hook.projectName === projectName));
+
+ if (!stale.length && !missing.length) return undefined;
+
+ const client = await getGitLabConnectionClient(connection, appConnectionDAL, kmsService);
+ const added = await addProjectHooks(client, missing, credentials.token, id);
+
+ return {
+ credentials: { token: credentials.token, projectHooks: [...kept, ...added] },
+ finalize: () => removeProjectHooks(client, stale),
+ revert: () => removeProjectHooks(client, added)
+ };
+ };
+
const listRawResources: TSecretScanningFactoryListRawResources<TGitLabDataSourceWithConnection> = async (
dataSource
) => {
@@ -260,9 +400,17 @@ export const GitLabSecretScanningFactory = ({ appConnectionDAL, kmsService }: TS
TGitLabDataSourceWithConnection,
TGitLabDataSourceCredentials
> = async ({ dataSource: { connection, config }, credentials }) => {
- if (!credentials || config.scope === GitLabDataSourceScope.Account) return;
+ if (!credentials) return;
const client = await getGitLabConnectionClient(connection, appConnectionDAL, kmsService);
+
+ if ("projectHooks" in credentials) {
+ await removeProjectHooks(client, credentials.projectHooks);
+ return;
+ }
+
+ if (config.scope === GitLabDataSourceScope.Account) return;
+
await removeHook(client, config, credentials.hookId);
};
@@ -360,6 +508,7 @@ export const GitLabSecretScanningFactory = ({ appConnectionDAL, kmsService }: TS
postInitialization,
teardown,
setupWebhook,
+ updateWebhook,
getDiffScanResourcePayload,
getDiffScanFindingsPayload,
validateConfigUpdate
diff --git a/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-schemas.ts b/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-schemas.ts
index b5ea89ed6e..fd894e8b86 100644
--- a/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-schemas.ts
+++ b/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-schemas.ts
@@ -96,7 +96,15 @@ export const GitLabFindingSchema = BaseSecretScanningFindingSchema.extend({
details: GitRepositoryScanFindingDetailsSchema
});
-export const GitLabDataSourceCredentialsSchema = z.object({
- token: z.string(),
- hookId: z.number()
-});
+// A group or project data source has one hook. GitLab has no account-level hook, so an account data source
+// has one on each included project.
+export const GitLabDataSourceCredentialsSchema = z.union([
+ z.object({
+ token: z.string(),
+ hookId: z.number()
+ }),
+ z.object({
+ token: z.string(),
+ projectHooks: z.array(z.object({ projectId: z.number(), projectName: z.string(), hookId: z.number() }))
+ })
+]);
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts
index 4d22a6dab8..c230764926 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts
@@ -448,6 +448,10 @@ export const secretScanningV2ServiceFactory = ({
}
const dataSourceWithConnection = { ...dataSource, connection } as TSecretScanningDataSourceWithConnection;
+ // Hooks are placed from the include list, so creating them has to see the config this update saves.
+ const nextDataSourceWithConnection = (
+ payload.config ? { ...dataSourceWithConnection, config: payload.config } : dataSourceWithConnection
+ ) as TSecretScanningDataSourceWithConnection;
const { encryptor, decryptor } = await kmsService.createCipherPairWithDataKey({
type: KmsDataKey.SecretManager,
projectId: dataSource.projectId
@@ -461,9 +465,10 @@ export const secretScanningV2ServiceFactory = ({
// Stored credentials are what tells us a webhook exists, so they are added or cleared alongside it.
let createdCredentials: TSecretScanningDataSourceCredentials;
let encryptedCredentials: Buffer | null | undefined;
+ let webhookUpdate: Awaited<ReturnType<NonNullable<typeof factory.updateWebhook>>>;
if (isWebhookRequired && !dataSource.encryptedCredentials) {
- createdCredentials = await factory.setupWebhook({ dataSource: dataSourceWithConnection });
+ createdCredentials = await factory.setupWebhook({ dataSource: nextDataSourceWithConnection });
if (createdCredentials) {
encryptedCredentials = encryptor({ plainText: Buffer.from(JSON.stringify(createdCredentials)) }).cipherTextBlob;
@@ -476,6 +481,20 @@ export const secretScanningV2ServiceFactory = ({
) as TSecretScanningDataSourceCredentials
});
encryptedCredentials = null;
+ } else if (isWebhookRequired && dataSource.encryptedCredentials && payload.config && factory.updateWebhook) {
+ webhookUpdate = await factory.updateWebhook({
+ dataSource: dataSourceWithConnection,
+ config: nextDataSourceWithConnection.config,
+ credentials: JSON.parse(
+ decryptor({ cipherTextBlob: dataSource.encryptedCredentials }).toString()
+ ) as TSecretScanningDataSourceCredentials
+ });
+
+ if (webhookUpdate) {
+ encryptedCredentials = encryptor({
+ plainText: Buffer.from(JSON.stringify(webhookUpdate.credentials))
+ }).cipherTextBlob;
+ }
}
let updatedDataSource: TSecretScanningDataSource;
@@ -487,9 +506,11 @@ export const secretScanningV2ServiceFactory = ({
})) as TSecretScanningDataSource;
} catch (err) {
if (createdCredentials) {
- await factory.teardown({ dataSource: dataSourceWithConnection, credentials: createdCredentials });
+ await factory.teardown({ dataSource: nextDataSourceWithConnection, credentials: createdCredentials });
}
+ await webhookUpdate?.revert();
+
if (err instanceof DatabaseError && (err.error as { code: string })?.code === DatabaseErrorCode.UniqueViolation) {
throw new BadRequestError({
message: `A Secret Scanning Data Source with the name "${payload.name}" already exists for the project with ID "${dataSource.projectId}"`
@@ -499,6 +520,8 @@ export const secretScanningV2ServiceFactory = ({
throw err;
}
+ await webhookUpdate?.finalize();
+
if (
doesConfigUpdateIncludeNewResources(
dataSource as TSecretScanningDataSourceInput,
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts
index f08a539cd9..25f342519c 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts
@@ -228,6 +228,20 @@ export type TSecretScanningFactorySetupWebhook<
C extends TSecretScanningDataSourceCredentials = undefined
> = (params: { dataSource: T }) => Promise<C | undefined>;
+// Brings existing webhooks in line with a new config. Hooks it adds exist before the data source is saved, so
+// revert removes them if the save fails; hooks it drops are only removed by finalize, after the save.
+export type TSecretScanningFactoryUpdateWebhook<
+ T extends TSecretScanningDataSourceWithConnection,
+ C extends TSecretScanningDataSourceCredentials = undefined
+> = (params: { dataSource: T; config: T["config"]; credentials: C }) => Promise<
+ | {
+ credentials: C;
+ finalize: () => Promise<void>;
+ revert: () => Promise<void>;
+ }
+ | undefined
+>;
+
export type TSecretScanningFactoryParams = {
appConnectionDAL: Pick<TAppConnectionDALFactory, "updateById">;
kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
@@ -245,6 +259,7 @@ export type TSecretScanningFactory<
postInitialization: TSecretScanningFactoryPostInitialization<I, T["connection"] | undefined, C>;
teardown: TSecretScanningFactoryTeardown<T, C>;
setupWebhook: TSecretScanningFactorySetupWebhook<T, C>;
+ updateWebhook?: TSecretScanningFactoryUpdateWebhook<T, C>;
validateConfigUpdate: TSecretScanningFactoryValidateConfigUpdate<I["config"], T>;
getDiffScanResourcePayload: TSecretScanningFactoryGetDiffScanResourcePayload<P>;
getDiffScanFindingsPayload: TSecretScanningFactoryGetDiffScanFindingsPayload<T, P>;
diff --git a/frontend/src/components/secret-scanning/forms/CreateSecretScanningDataSourceForm.tsx b/frontend/src/components/secret-scanning/forms/CreateSecretScanningDataSourceForm.tsx
index 04651b04b6..357a9feb9a 100644
--- a/frontend/src/components/secret-scanning/forms/CreateSecretScanningDataSourceForm.tsx
+++ b/frontend/src/components/secret-scanning/forms/CreateSecretScanningDataSourceForm.tsx
@@ -362,7 +362,7 @@ export const CreateSecretScanningDataSourceForm = ({
</Button>
{step !== FormStep.Provider && (
<Button
- variant="project"
+ variant="ss"
type="submit"
form="create-secret-scanning-data-source-form"
isPending={isSubmitting}
diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsx
index 92bda71fd8..3ead03b137 100644
--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsx
+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsx
@@ -70,7 +70,7 @@ const ScanToggleField = ({
ref={ref}
name={name}
id={name}
- variant="project"
+ variant="ss"
checked={value && !isDisabled}
onCheckedChange={onChange}
onBlur={onBlur}
diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx
index 73fad33035..aab479ab1b 100644
--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx
+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx
@@ -187,7 +187,7 @@ export const SecretScanningDataSourceForm = ({
type="button"
isPending={isSubmitting}
isDisabled={isSubmitting}
- variant="project"
+ variant="ss"
>
{isFinalStep ? `${dataSource ? "Update" : "Create"} Data Source` : "Next"}
</Button>
diff --git a/frontend/src/components/v3/generic/Badge/Badge.tsx b/frontend/src/components/v3/generic/Badge/Badge.tsx
index f18ec32a2a..049d3fc5bd 100644
--- a/frontend/src/components/v3/generic/Badge/Badge.tsx
+++ b/frontend/src/components/v3/generic/Badge/Badge.tsx
@@ -43,7 +43,8 @@ const badgeVariants = cva(
org: "bg-org/15 border border-org/10 text-org [a&,button&]:hover:bg-org/35",
"sub-org": "bg-sub-org/15 border-sub-org/10 text-sub-org [a&,button&]:hover:bg-sub-org/35",
pam: "bg-product-pam/15 border-product-pam/10 text-product-pam [a&,button&]:hover:bg-product-pam/35",
- av: "bg-product-av/15 border-product-av/10 text-product-av [a&,button&]:hover:bg-product-av/35"
+ av: "bg-product-av/15 border-product-av/10 text-product-av [a&,button&]:hover:bg-product-av/35",
+ ss: "bg-product-ss/15 border-product-ss/10 text-product-ss [a&,button&]:hover:bg-product-ss/35"
}
},
defaultVariants: {
diff --git a/frontend/src/components/v3/generic/Button/Button.tsx b/frontend/src/components/v3/generic/Button/Button.tsx
index b0fe6ee9b6..ec6bb5286d 100644
--- a/frontend/src/components/v3/generic/Button/Button.tsx
+++ b/frontend/src/components/v3/generic/Button/Button.tsx
@@ -41,6 +41,7 @@ const buttonVariants = cva(
"border-danger/25 bg-danger/10 text-foreground hover:bg-danger/15 hover:border-danger/30 data-[state=open]:bg-danger/15 data-[state=open]:border-danger/30 [--control-variant-color:var(--color-danger)] [--control-variant-border-color:color-mix(in_oklab,var(--color-danger)_25%,transparent)] hover:[--control-variant-border-color:color-mix(in_oklab,var(--color-danger)_30%,transparent)] data-[state=open]:[--control-variant-border-color:color-mix(in_oklab,var(--color-danger)_30%,transparent)]",
pam: "border-product-pam/30 bg-product-pam/25 text-foreground hover:bg-product-pam/30 hover:border-product-pam/35 data-[state=open]:bg-product-pam/30 data-[state=open]:border-product-pam/35 [--control-variant-color:var(--color-product-pam)] [--control-variant-border-color:color-mix(in_oklab,var(--color-product-pam)_30%,transparent)] hover:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-pam)_35%,transparent)] data-[state=open]:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-pam)_35%,transparent)]",
av: "border-product-av/30 bg-product-av/25 text-foreground hover:bg-product-av/30 hover:border-product-av/35 data-[state=open]:bg-product-av/30 data-[state=open]:border-product-av/35 [--control-variant-color:var(--color-product-av)] [--control-variant-border-color:color-mix(in_oklab,var(--color-product-av)_30%,transparent)] hover:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-av)_35%,transparent)] data-[state=open]:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-av)_35%,transparent)]",
+ ss: "border-product-ss/30 bg-product-ss/25 text-foreground hover:bg-product-ss/30 hover:border-product-ss/35 data-[state=open]:bg-product-ss/30 data-[state=open]:border-product-ss/35 [--control-variant-color:var(--color-product-ss)] [--control-variant-border-color:color-mix(in_oklab,var(--color-product-ss)_30%,transparent)] hover:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-ss)_35%,transparent)] data-[state=open]:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-ss)_35%,transparent)]",
// Tinted from --product-color, which the caller must set inline (e.g. a billing catalog
// product's color) since the palette isn't knowable at build time.
product:
diff --git a/frontend/src/components/v3/generic/Button/ButtonBadge.tsx b/frontend/src/components/v3/generic/Button/ButtonBadge.tsx
index 062a6e6cdf..6a329cd84b 100644
--- a/frontend/src/components/v3/generic/Button/ButtonBadge.tsx
+++ b/frontend/src/components/v3/generic/Button/ButtonBadge.tsx
@@ -14,7 +14,8 @@ const buttonBadgeBackgrounds: Partial<Record<NonNullable<TBadgeProps["variant"]>
org: "bg-[color-mix(in_srgb,var(--color-org)_15%,var(--color-card))]",
"sub-org": "bg-[color-mix(in_srgb,var(--color-sub-org)_15%,var(--color-card))]",
pam: "bg-[color-mix(in_srgb,var(--color-product-pam)_15%,var(--color-card))]",
- av: "bg-[color-mix(in_srgb,var(--color-product-av)_15%,var(--color-card))]"
+ av: "bg-[color-mix(in_srgb,var(--color-product-av)_15%,var(--color-card))]",
+ ss: "bg-[color-mix(in_srgb,var(--color-product-ss)_15%,var(--color-card))]"
};
const buttonBadgeVariants = cva("pointer-events-none absolute z-10", {
diff --git a/frontend/src/components/v3/generic/Field/Field.tsx b/frontend/src/components/v3/generic/Field/Field.tsx
index 9ef69fdf3d..60f1017856 100644
--- a/frontend/src/components/v3/generic/Field/Field.tsx
+++ b/frontend/src/components/v3/generic/Field/Field.tsx
@@ -132,7 +132,8 @@ const fieldLabelVariants = cva(
"sub-org":
"has-[[data-state=checked]]:border-sub-org/30 has-[[data-state=checked]]:bg-sub-org/5! [--control-variant-color:var(--color-sub-org)] has-[[data-state=checked]]:[--control-variant-border-color:color-mix(in_oklab,var(--color-sub-org)_30%,transparent)]",
pam: "has-[[data-state=checked]]:border-product-pam/30 has-[[data-state=checked]]:bg-product-pam/5! [--control-variant-color:var(--color-product-pam)] has-[[data-state=checked]]:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-pam)_30%,transparent)]",
- av: "has-[[data-state=checked]]:border-product-av/30 has-[[data-state=checked]]:bg-product-av/5! [--control-variant-color:var(--color-product-av)] has-[[data-state=checked]]:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-av)_30%,transparent)]"
+ av: "has-[[data-state=checked]]:border-product-av/30 has-[[data-state=checked]]:bg-product-av/5! [--control-variant-color:var(--color-product-av)] has-[[data-state=checked]]:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-av)_30%,transparent)]",
+ ss: "has-[[data-state=checked]]:border-product-ss/30 has-[[data-state=checked]]:bg-product-ss/5! [--control-variant-color:var(--color-product-ss)] has-[[data-state=checked]]:[--control-variant-border-color:color-mix(in_oklab,var(--color-product-ss)_30%,transparent)]"
},
size: {
default: "text-xs",
diff --git a/frontend/src/components/v3/generic/IconButton/IconButton.tsx b/frontend/src/components/v3/generic/IconButton/IconButton.tsx
index ed98ade604..8ef2b972c0 100644
--- a/frontend/src/components/v3/generic/IconButton/IconButton.tsx
+++ b/frontend/src/components/v3/generic/IconButton/IconButton.tsx
@@ -40,7 +40,8 @@ const iconButtonVariants = cva(
danger:
"border-danger/25 bg-danger/10 text-foreground hover:bg-danger/15 hover:border-danger/30 data-[state=open]:bg-danger/15 data-[state=open]:border-danger/30",
pam: "border-product-pam/30 bg-product-pam/25 text-foreground hover:bg-product-pam/30 hover:border-product-pam/35 data-[state=open]:bg-product-pam/30 data-[state=open]:border-product-pam/35",
- av: "border-product-av/30 bg-product-av/25 text-foreground hover:bg-product-av/30 hover:border-product-av/35 data-[state=open]:bg-product-av/30 data-[state=open]:border-product-av/35"
+ av: "border-product-av/30 bg-product-av/25 text-foreground hover:bg-product-av/30 hover:border-product-av/35 data-[state=open]:bg-product-av/30 data-[state=open]:border-product-av/35",
+ ss: "border-product-ss/30 bg-product-ss/25 text-foreground hover:bg-product-ss/30 hover:border-product-ss/35 data-[state=open]:bg-product-ss/30 data-[state=open]:border-product-ss/35"
},
size: {
"2xs": "h-6 w-6 [&>svg]:size-3 rounded-sm [&>svg]:stroke-[1.75]",
diff --git a/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx b/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx
index af9b5191a1..5e1d4e0b36 100644
--- a/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx
+++ b/frontend/src/components/v3/generic/Sidebar/Sidebar.tsx
@@ -36,13 +36,21 @@ const SIDEBAR_WIDTH_MOBILE = "18rem";
const SIDEBAR_WIDTH_ICON = "3rem";
const SIDEBAR_KEYBOARD_SHORTCUT = "b";
-type SidebarScope = "org" | "sub-org" | "project" | "pam" | "agent-vault" | "admin";
+type SidebarScope =
+ | "org"
+ | "sub-org"
+ | "project"
+ | "pam"
+ | "agent-vault"
+ | "secret-scanning"
+ | "admin";
// Products that own a colour repoint the shared --color-project variable rather than adding a parallel
// set of scope classes.
const SIDEBAR_SCOPE_COLOR_OVERRIDE: Partial<Record<SidebarScope, Record<string, string>>> = {
pam: { "--color-project": "#ed3453" },
- "agent-vault": { "--color-project": "var(--color-product-av)" }
+ "agent-vault": { "--color-project": "var(--color-product-av)" },
+ "secret-scanning": { "--color-project": "var(--color-product-ss)" }
};
const SidebarScopeContext = React.createContext<SidebarScope>("org");
@@ -203,7 +211,10 @@ function Sidebar({
data-mobile="true"
className={cn(
"w-(--sidebar-width) bg-gradient-to-r to-transparent p-0 text-foreground in-data-[theme=light]:bg-none [&>button]:hidden",
- (scope === "project" || scope === "pam" || scope === "agent-vault") &&
+ (scope === "project" ||
+ scope === "pam" ||
+ scope === "agent-vault" ||
+ scope === "secret-scanning") &&
"from-project/5",
scope === "sub-org" && "from-sub-org/5",
scope === "org" && "from-org/5",
@@ -240,7 +251,10 @@ function Sidebar({
className={cn(
"flex h-full flex-col overflow-hidden border-r border-border-soft bg-gradient-to-r to-transparent text-foreground transition-[width] duration-200 ease-linear in-data-[theme=light]:bg-none",
state === "collapsed" ? "w-(--sidebar-width-icon)" : "w-(--sidebar-width)",
- (scope === "project" || scope === "pam" || scope === "agent-vault") &&
+ (scope === "project" ||
+ scope === "pam" ||
+ scope === "agent-vault" ||
+ scope === "secret-scanning") &&
"from-project/5",
scope === "sub-org" && "from-sub-org/5",
scope === "org" && "from-org/5",
@@ -654,6 +668,7 @@ const sidebarMenuButtonVariants = cva(
project: "data-active:border-l-project data-active:[&_svg]:text-project",
pam: "data-active:border-l-project data-active:[&_svg]:text-project",
"agent-vault": "data-active:border-l-project data-active:[&_svg]:text-project",
+ "secret-scanning": "data-active:border-l-project data-active:[&_svg]:text-project",
admin: "data-active:border-l-admin data-active:[&_svg]:text-admin"
}
},
diff --git a/frontend/src/components/v3/generic/Tabs/Tabs.tsx b/frontend/src/components/v3/generic/Tabs/Tabs.tsx
index 69c6095c24..5a050fc53a 100644
--- a/frontend/src/components/v3/generic/Tabs/Tabs.tsx
+++ b/frontend/src/components/v3/generic/Tabs/Tabs.tsx
@@ -50,7 +50,7 @@ const Tabs = React.forwardRef<
);
});
-type TabsVariant = "filled" | "project" | "org" | "sub-org" | "pam" | "av";
+type TabsVariant = "filled" | "project" | "org" | "sub-org" | "pam" | "av" | "ss";
const tabsListVariants: Record<"filled" | "underline", string> = {
filled: "border p-1 border-border",
@@ -64,7 +64,8 @@ const tabsListStyleByVariant: Record<TabsVariant, "filled" | "underline"> = {
org: "underline",
"sub-org": "underline",
pam: "underline",
- av: "underline"
+ av: "underline",
+ ss: "underline"
};
const tabsListAriaLabelByVariant: Record<TabsVariant, string> = {
@@ -73,7 +74,8 @@ const tabsListAriaLabelByVariant: Record<TabsVariant, string> = {
org: "Organization sections",
"sub-org": "Sub-organization sections",
pam: "PAM sections",
- av: "Agent Vault sections"
+ av: "Agent Vault sections",
+ ss: "Secret Scanning sections"
};
const TabsList = React.forwardRef<
@@ -133,6 +135,7 @@ const TabsTrigger = React.forwardRef<
"group-data-[variant=sub-org]/tabs-list:after:bg-sub-org",
"group-data-[variant=pam]/tabs-list:after:bg-product-pam",
"group-data-[variant=av]/tabs-list:after:bg-product-av",
+ "group-data-[variant=ss]/tabs-list:after:bg-product-ss",
className
)}
ref={ref}
diff --git a/frontend/src/components/v3/generic/Toggle/Toggle.tsx b/frontend/src/components/v3/generic/Toggle/Toggle.tsx
index 02036968af..1c8cf76c86 100644
--- a/frontend/src/components/v3/generic/Toggle/Toggle.tsx
+++ b/frontend/src/components/v3/generic/Toggle/Toggle.tsx
@@ -36,7 +36,8 @@ const toggleVariants = cva(
danger:
"data-[state=checked]:border-danger/10 data-[state=checked]:bg-danger/25 data-[state=checked]:hover:border-danger/15 data-[state=checked]:hover:bg-danger/30",
pam: "data-[state=checked]:border-product-pam/10 data-[state=checked]:bg-product-pam/25 data-[state=checked]:hover:border-product-pam/15 data-[state=checked]:hover:bg-product-pam/30",
- av: "data-[state=checked]:border-product-av/10 data-[state=checked]:bg-product-av/25 data-[state=checked]:hover:border-product-av/15 data-[state=checked]:hover:bg-product-av/30"
+ av: "data-[state=checked]:border-product-av/10 data-[state=checked]:bg-product-av/25 data-[state=checked]:hover:border-product-av/15 data-[state=checked]:hover:bg-product-av/30",
+ ss: "data-[state=checked]:border-product-ss/10 data-[state=checked]:bg-product-ss/25 data-[state=checked]:hover:border-product-ss/15 data-[state=checked]:hover:bg-product-ss/30"
}
},
defaultVariants: {
diff --git a/frontend/src/components/v3/platform/PageHeader/PageHeader.tsx b/frontend/src/components/v3/platform/PageHeader/PageHeader.tsx
index db69bc47cd..b209d827b5 100644
--- a/frontend/src/components/v3/platform/PageHeader/PageHeader.tsx
+++ b/frontend/src/components/v3/platform/PageHeader/PageHeader.tsx
@@ -56,8 +56,8 @@ const PAGE_HEADER_SCOPE_CONFIG: Record<NonNullable<TPageHeaderScope>, TPageHeade
},
[ProjectType.SecretScanning]: {
icon: ProjectIcon,
- iconClassName: "text-project",
- titleClassName: "decoration-project/90"
+ iconClassName: "text-product-ss",
+ titleClassName: "decoration-product-ss/90"
},
[ProjectType.PAM]: {
icon: ProjectIcon,
diff --git a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx
index b956b81da4..7db5a23275 100644
--- a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx
@@ -37,9 +37,10 @@ export const OrgSidebar = () => {
(hasIntermediateProjectsView(projectType!) || pathname.includes("/product-settings"));
const { isSubOrganization } = useOrganization();
- let scope: "project" | "sub-org" | "org" | "pam" | "agent-vault" = "org";
+ let scope: "project" | "sub-org" | "org" | "pam" | "agent-vault" | "secret-scanning" = "org";
if (orgScopedProduct === ProjectType.PAM) scope = "pam";
else if (orgScopedProduct === ProjectType.AgentVault) scope = "agent-vault";
+ else if (orgScopedProduct === ProjectType.SecretScanning) scope = "secret-scanning";
else if (isInsideProject || isOnProjectTypeListing) scope = "project";
else if (isSubOrganization) scope = "sub-org";
diff --git a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx
index d46d344248..f9271adb26 100644
--- a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx
@@ -47,7 +47,8 @@ export const SecretScanningNav = ({
label: "Findings",
icon: Search,
pathSuffix: "findings",
- badgeCount: unresolvedFindings || undefined
+ badgeCount: unresolvedFindings || undefined,
+ badgeVariant: "danger" as const
},
{ label: "App Connections", icon: Cable, pathSuffix: "app-connections" },
{
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx
index 5e0ada0ae3..e73529b4c8 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx
@@ -227,10 +227,10 @@ const PageContent = () => {
handleTabChange(tab as DataSourceTab);
}}
>
- <TabsList variant="project" aria-label="Data source sections">
+ <TabsList variant="ss" aria-label="Data source sections">
<TabsTrigger value={DataSourceTab.Findings}>
Findings
- {unresolvedCount > 0 && <Badge variant="neutral">{unresolvedCount}</Badge>}
+ {unresolvedCount > 0 && <Badge variant="danger">{unresolvedCount}</Badge>}
</TabsTrigger>
<TabsTrigger value={DataSourceTab.Resources}>
{resourceDetails.pluralTitle}
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourcesButton.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourcesButton.tsx
index 20cb51a376..53045377e0 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourcesButton.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourcesButton.tsx
@@ -16,7 +16,10 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuTrigger
+ DropdownMenuTrigger,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger
} from "@app/components/v3";
import { ProjectPermissionSub } from "@app/context";
import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
@@ -28,9 +31,11 @@ import {
SECRET_SCANNING_DATA_SOURCE_MAP
} from "@app/helpers/secretScanningV2";
import {
+ SecretScanningDataSource,
TSecretScanningDataSource,
useUpdateSecretScanningDataSource
} from "@app/hooks/api/secretScanningV2";
+import { GitLabDataSourceScope } from "@app/hooks/api/secretScanningV2/types/gitlab-data-source";
import { AddSecretScanningResourceSheet } from "./AddSecretScanningResourceSheet";
@@ -47,6 +52,11 @@ export const AddSecretScanningResourcesButton = ({ dataSource }: Props) => {
const { singularTitle, singularNoun, pluralTitle, pluralNoun } =
RESOURCE_DESCRIPTION_HELPER[dataSource.type];
const isEverythingIncluded = areAllSecretScanningResourcesIncluded(dataSource);
+ // GitLab has no account-level webhook, so new commits are only reported for projects added one by one;
+ // hooking every project the connection can access could mean thousands of them.
+ const isAddAllUnsupported =
+ dataSource.type === SecretScanningDataSource.GitLab &&
+ dataSource.config.scope === GitLabDataSourceScope.Account;
const handleAddAll = async () => {
const config = getConfigWithAllResourcesIncluded(dataSource);
@@ -75,7 +85,7 @@ export const AddSecretScanningResourcesButton = ({ dataSource }: Props) => {
{(isAllowed) => (
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Button variant="project" isDisabled={!isAllowed || dataSource.isDisconnected}>
+ <Button variant="ss" isDisabled={!isAllowed || dataSource.isDisconnected}>
<ChevronDownIcon />
Add {singularTitle}
</Button>
@@ -88,13 +98,26 @@ export const AddSecretScanningResourcesButton = ({ dataSource }: Props) => {
<PlusIcon />
Add {singularTitle}
</DropdownMenuItem>
- <DropdownMenuItem
- isDisabled={isEverythingIncluded}
- onClick={() => setIsAddAllOpen(true)}
+ <Tooltip
+ hoverable
+ delayDuration={50}
+ open={isAddAllUnsupported && !isEverythingIncluded ? undefined : false}
>
- <ListPlusIcon />
- Add All {pluralTitle}
- </DropdownMenuItem>
+ <TooltipTrigger asChild>
+ <DropdownMenuItem
+ isDisabled={isEverythingIncluded || isAddAllUnsupported}
+ isDisabledFocusable={isAddAllUnsupported}
+ onClick={() => setIsAddAllOpen(true)}
+ >
+ <ListPlusIcon />
+ Add All {pluralTitle}
+ </DropdownMenuItem>
+ </TooltipTrigger>
+ <TooltipContent side="left">
+ Without a group, add projects individually so each one gets a webhook for new
+ commits.
+ </TooltipContent>
+ </Tooltip>
</DropdownMenuContent>
</DropdownMenu>
)}
@@ -118,7 +141,7 @@ export const AddSecretScanningResourcesButton = ({ dataSource }: Props) => {
<AlertDialogFooter>
<AlertDialogCancel isDisabled={updateDataSource.isPending}>Cancel</AlertDialogCancel>
<AlertDialogAction
- variant="project"
+ variant="ss"
isPending={updateDataSource.isPending}
onClick={(event) => {
event.preventDefault();
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningDataSourceSettings.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningDataSourceSettings.tsx
index ea1da2b58d..129e19b857 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningDataSourceSettings.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningDataSourceSettings.tsx
@@ -225,7 +225,7 @@ export const SecretScanningDataSourceSettings = ({ dataSource, onDeleted }: Prop
<Button
type="submit"
form="data-source-general-form"
- variant="project"
+ variant="ss"
isPending={isSubmitting}
isDisabled={!canEdit || !isDirty || isSubmitting}
>
@@ -254,7 +254,7 @@ export const SecretScanningDataSourceSettings = ({ dataSource, onDeleted }: Prop
</FieldContent>
<Toggle
id={`data-source-${name}`}
- variant="project"
+ variant="ss"
checked={dataSource[name] && !isDisabled}
onCheckedChange={(checked) => handleToggle(name, label, checked)}
disabled={!canEdit || isDisabled || updateDataSource.isPending}
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningScanRow.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningScanRow.tsx
index 4d4ffa0803..601ac868db 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningScanRow.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningScanRow.tsx
@@ -119,7 +119,7 @@ export const SecretScanningScanRow = ({ scan }: Props) => {
</TableCell>
<TableCell>
{status === SecretScanningScanStatus.Completed ? (
- <span className={unresolvedFindings ? "text-warning" : undefined}>{totalFindings}</span>
+ <span className={unresolvedFindings ? "text-danger" : undefined}>{totalFindings}</span>
) : (
<span className="text-muted">-</span>
)}
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx
index ff0bed62ef..8552a119ab 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx
@@ -280,7 +280,7 @@ export const SecretScanningDataSourcesSection = () => {
>
{(isAllowed) => (
<Button
- variant="project"
+ variant="ss"
isDisabled={!isAllowed}
onClick={() => {
if (!subscription.secretScanning) {
diff --git a/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsx b/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsx
index 380f8c973a..f688492f00 100644
--- a/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsx
+++ b/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsx
@@ -124,7 +124,7 @@ export const FindingStatusDialog = ({ findings, status, onOpenChange, onComplete
</Button>
</DialogClose>
<Button
- variant="project"
+ variant="ss"
type="submit"
isPending={updateFindings.isPending}
isDisabled={updateFindings.isPending}
diff --git a/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx b/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx
index ba7e78e798..aa035cfb1f 100644
--- a/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx
+++ b/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx
@@ -8,6 +8,7 @@ import { ProjectPermissionCan } from "@app/components/permissions";
import {
Button,
Card,
+ CardAction,
CardContent,
CardDescription,
CardHeader,
@@ -356,7 +357,7 @@ export const SecretScanningFindingsTable = ({
<DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/secret-scanning/findings" />
</CardTitle>
<CardDescription>{description}</CardDescription>
- <div className="flex flex-wrap items-center gap-2">
+ <CardAction className="flex flex-wrap items-center justify-end gap-2">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline">
@@ -432,7 +433,7 @@ export const SecretScanningFindingsTable = ({
onChange={(value) => applyFilterChange(() => setResourceFilter(value))}
/>
)}
- </div>
+ </CardAction>
</CardHeader>
<CardContent>
{showEmpty ? (
@@ -555,7 +556,7 @@ export const SecretScanningFindingsTable = ({
{(isAllowed) => (
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Button variant="project" size="xs" isDisabled={!isAllowed || isPlaceholderData}>
+ <Button variant="ss" size="xs" isDisabled={!isAllowed || isPlaceholderData}>
Set Status
<ChevronDownIcon />
</Button>