From 49bcd8839f0baad0791aaaf8aeaea38c254d0c23 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Fri, 4 Aug 2023 18:15:07 -0400 Subject: [PATCH] move github scanning service to ee --- .../GithubSecretScanningService.ts | 14 +++++++------- backend/src/ee/services/index.ts | 2 ++ backend/src/index.ts | 4 ++-- backend/src/services/index.ts | 2 -- 4 files changed, 11 insertions(+), 11 deletions(-) rename backend/src/{ => ee}/services/GithubSecretScanning/GithubSecretScanningService.ts (94%) diff --git a/backend/src/services/GithubSecretScanning/GithubSecretScanningService.ts b/backend/src/ee/services/GithubSecretScanning/GithubSecretScanningService.ts similarity index 94% rename from backend/src/services/GithubSecretScanning/GithubSecretScanningService.ts rename to backend/src/ee/services/GithubSecretScanning/GithubSecretScanningService.ts index 7d7a0c03d..a8e374ba5 100644 --- a/backend/src/services/GithubSecretScanning/GithubSecretScanningService.ts +++ b/backend/src/ee/services/GithubSecretScanning/GithubSecretScanningService.ts @@ -3,13 +3,13 @@ import { exec } from "child_process"; import { mkdir, readFile, rm, writeFile } from "fs"; import { tmpdir } from "os"; import { join } from "path" -import GitRisks from "../../ee/models/gitRisks"; -import GitAppOrganizationInstallation from "../../ee/models/gitAppOrganizationInstallation"; -import MembershipOrg from "../../models/membershipOrg"; -import { ADMIN, OWNER } from "../../variables"; -import User from "../../models/user"; -import { sendMail } from "../../helpers"; -import TelemetryService from "../TelemetryService"; +import GitRisks from "../../models/gitRisks"; +import GitAppOrganizationInstallation from "../../models/gitAppOrganizationInstallation"; +import MembershipOrg from "../../../models/membershipOrg"; +import { ADMIN, OWNER } from "../../../variables"; +import User from "../../../models/user"; +import { sendMail } from "../../../helpers"; +import TelemetryService from "../../../services/TelemetryService"; type SecretMatch = { Description: string; diff --git a/backend/src/ee/services/index.ts b/backend/src/ee/services/index.ts index afc3fb80e..4cc27a383 100644 --- a/backend/src/ee/services/index.ts +++ b/backend/src/ee/services/index.ts @@ -1,9 +1,11 @@ import EELicenseService from "./EELicenseService"; import EESecretService from "./EESecretService"; import EELogService from "./EELogService"; +import GithubSecretScanningService from "./GithubSecretScanning/GithubSecretScanningService" export { EELicenseService, EESecretService, EELogService, + GithubSecretScanningService } \ No newline at end of file diff --git a/backend/src/index.ts b/backend/src/index.ts index e5c384f2a..3c6e82180 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -5,8 +5,8 @@ import express from "express"; require("express-async-errors"); import helmet from "helmet"; import cors from "cors"; -import { DatabaseService, GithubSecretScanningService } from "./services"; -import { EELicenseService } from "./ee/services"; +import { DatabaseService } from "./services"; +import { EELicenseService, GithubSecretScanningService} from "./ee/services"; import { setUpHealthEndpoint } from "./services/health"; import cookieParser from "cookie-parser"; import swaggerUi = require("swagger-ui-express"); diff --git a/backend/src/services/index.ts b/backend/src/services/index.ts index 537de95b1..781fb435c 100644 --- a/backend/src/services/index.ts +++ b/backend/src/services/index.ts @@ -7,7 +7,6 @@ import EventService from "./EventService"; import IntegrationService from "./IntegrationService"; import TokenService from "./TokenService"; import SecretService from "./SecretService"; -import GithubSecretScanningService from "./GithubSecretScanning/GithubSecretScanningService" export { TelemetryService, @@ -18,5 +17,4 @@ export { IntegrationService, TokenService, SecretService, - GithubSecretScanningService }