Skip to content

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

fix lint

Matheus Nogueira0096f0595a5c
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts
index 515d402ddc..461ad0eac8 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts
@@ -33,8 +33,8 @@ import { SecretScanningDataSource, SecretScanningFindingSeverity } from "./secre
import {
TCloneRepository,
TGetFindingsPayload,
- TSecretScanningDataSourceInput,
- TSecretScanningDataSourceListItem
+ TSecretScanningDataSourceListItem,
+ TSecretScanningDataSourceTypeAndConfig
} from "./secret-scanning-v2-types";
const SECRET_SCANNING_SOURCE_LIST_OPTIONS: Record<SecretScanningDataSource, TSecretScanningDataSourceListItem> = {
@@ -47,7 +47,7 @@ export const listSecretScanningDataSourceOptions = () => {
return Object.values(SECRET_SCANNING_SOURCE_LIST_OPTIONS).sort((a, b) => a.name.localeCompare(b.name));
};
-export const doesDataSourceIncludeResources = (dataSource: TSecretScanningDataSourceInput) => {
+export const doesDataSourceIncludeResources = (dataSource: TSecretScanningDataSourceTypeAndConfig) => {
switch (dataSource.type) {
case SecretScanningDataSource.GitHub:
case SecretScanningDataSource.Bitbucket:
@@ -60,7 +60,7 @@ export const doesDataSourceIncludeResources = (dataSource: TSecretScanningDataSo
};
// null means the config includes every resource the connection can see
-const getIncludedResourceNames = (dataSource: Pick<TSecretScanningDataSourceInput, "type" | "config">) => {
+const getIncludedResourceNames = (dataSource: TSecretScanningDataSourceTypeAndConfig) => {
let names: string[] | undefined;
switch (dataSource.type) {
@@ -80,17 +80,17 @@ const getIncludedResourceNames = (dataSource: Pick<TSecretScanningDataSourceInpu
};
export const isResourceIncludedByConfig = (
- dataSource: Pick<TSecretScanningDataSourceInput, "type" | "config">,
+ dataSource: TSecretScanningDataSourceTypeAndConfig,
resourceName: string
) => {
const names = getIncludedResourceNames(dataSource);
return names === null || names.includes(resourceName);
};
-export const getConfigIncludingAllResources = <T extends Pick<TSecretScanningDataSourceInput, "type" | "config">>(
+export const getConfigIncludingAllResources = <T extends { type: SecretScanningDataSource; config: unknown }>(
dataSource: T
): T => {
- const { type, config } = dataSource as Pick<TSecretScanningDataSourceInput, "type" | "config">;
+ const { type, config } = dataSource as TSecretScanningDataSourceTypeAndConfig;
switch (type) {
case SecretScanningDataSource.GitHub:
@@ -105,8 +105,8 @@ export const getConfigIncludingAllResources = <T extends Pick<TSecretScanningDat
};
export const doesConfigUpdateIncludeNewResources = (
- current: Pick<TSecretScanningDataSourceInput, "type" | "config">,
- next: Pick<TSecretScanningDataSourceInput, "type" | "config">
+ current: TSecretScanningDataSourceTypeAndConfig,
+ next: TSecretScanningDataSourceTypeAndConfig
) => {
const currentNames = getIncludedResourceNames(current);
if (currentNames === null) return false;
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 c230764926..79694cfdd2 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
@@ -41,6 +41,7 @@ import {
TSecretScanningDataSource,
TSecretScanningDataSourceCredentials,
TSecretScanningDataSourceInput,
+ TSecretScanningDataSourceTypeAndConfig,
TSecretScanningDataSourceWithConnection,
TSecretScanningDataSourceWithDetails,
TSecretScanningFinding,
@@ -76,7 +77,7 @@ export type TSecretScanningV2ServiceFactoryDep = {
licenseService: Pick<TLicenseServiceFactory, "getPlan">;
secretScanningV2Queue: Pick<
TSecretScanningV2QueueServiceFactory,
- "queueDataSourceFullScan" | "queueResourceDiffScan"
+ "queueDataSourceFullScan" | "queueResourceDiffScan" | "handleResourcePushEvent"
>;
kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
};
@@ -339,7 +340,7 @@ export const secretScanningV2ServiceFactory = ({
// A data source created with an empty include list has nothing to scan yet; queueing would only fail.
if (
payload.isHistoricalScanEnabled &&
- doesDataSourceIncludeResources(payload as TSecretScanningDataSourceInput)
+ doesDataSourceIncludeResources(payload as TSecretScanningDataSourceTypeAndConfig)
) {
try {
await secretScanningV2Queue.queueDataSourceFullScan(
@@ -524,12 +525,12 @@ export const secretScanningV2ServiceFactory = ({
if (
doesConfigUpdateIncludeNewResources(
- dataSource as TSecretScanningDataSourceInput,
- updatedDataSource as TSecretScanningDataSourceInput
+ dataSource as TSecretScanningDataSourceTypeAndConfig,
+ updatedDataSource as TSecretScanningDataSourceTypeAndConfig
)
) {
const isNewlyIncluded = (resource: { name: string }) =>
- !isResourceIncludedByConfig(dataSource as TSecretScanningDataSourceInput, resource.name);
+ !isResourceIncludedByConfig(dataSource as TSecretScanningDataSourceTypeAndConfig, resource.name);
const updatedDataSourceWithConnection = {
...updatedDataSource,
connection
@@ -822,7 +823,7 @@ export const secretScanningV2ServiceFactory = ({
const resources = rawResources
.map((resource) => ({
...resource,
- isIncluded: isResourceIncludedByConfig(dataSource as TSecretScanningDataSourceInput, resource.name)
+ isIncluded: isResourceIncludedByConfig(dataSource as TSecretScanningDataSourceTypeAndConfig, resource.name)
}))
.sort((a, b) => a.name.localeCompare(b.name));
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 25f342519c..6b78f852b6 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
@@ -41,6 +41,13 @@ import { TKmsServiceFactory } from "@app/services/kms/kms-service";
export type TSecretScanningDataSource = TGitHubDataSource | TBitbucketDataSource | TGitLabDataSource;
+// The data source schemas type `type` as the whole enum rather than their own member, so this pairs each
+// literal with its config by hand to let a check on `type` narrow `config`.
+export type TSecretScanningDataSourceTypeAndConfig =
+ | { type: SecretScanningDataSource.GitHub; config: TGitHubDataSource["config"] }
+ | { type: SecretScanningDataSource.Bitbucket; config: TBitbucketDataSource["config"] }
+ | { type: SecretScanningDataSource.GitLab; config: TGitLabDataSource["config"] };
+
export type TSecretScanningDataSourceWithDetails = TSecretScanningDataSource & {
lastScannedAt?: Date | null;
lastScanStatus?: SecretScanningScanStatus | null;