From 46545c14626c9bfbaafaa484e51d9907621823bf Mon Sep 17 00:00:00 2001 From: Chukwunonso Frank Date: Wed, 26 Jul 2023 18:19:54 +0100 Subject: [PATCH] add secretGroup to integrationController.ts --- .../controllers/v1/integrationController.ts | 4 +++- backend/src/integrations/sync.ts | 1 + backend/src/models/integration.ts | 1 + backend/src/routes/v1/integration.ts | 1 + frontend/public/data/frequentConstants.ts | 3 ++- .../public/images/integrations/Northflank.png | Bin 0 -> 18106 bytes .../api/integrations/createIntegration.ts | 2 +- .../pages/integrations/northflank/create.tsx | 17 ++++++++++------- package.json | 1 - 9 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 frontend/public/images/integrations/Northflank.png diff --git a/backend/src/controllers/v1/integrationController.ts b/backend/src/controllers/v1/integrationController.ts index 91b32c805..431b9f80f 100644 --- a/backend/src/controllers/v1/integrationController.ts +++ b/backend/src/controllers/v1/integrationController.ts @@ -27,7 +27,8 @@ export const createIntegration = async (req: Request, res: Response) => { owner, path, region, - secretPath + secretPath, + secretGroup } = req.body; const folders = await Folder.findOne({ @@ -61,6 +62,7 @@ export const createIntegration = async (req: Request, res: Response) => { path, region, secretPath, + secretGroup, integration: req.integrationAuth.integration, integrationAuth: new Types.ObjectId(integrationAuthId) }).save(); diff --git a/backend/src/integrations/sync.ts b/backend/src/integrations/sync.ts index 2ba9ab60f..0d9a5cbd7 100644 --- a/backend/src/integrations/sync.ts +++ b/backend/src/integrations/sync.ts @@ -2109,6 +2109,7 @@ const syncSecretsCodefresh = async ({ } ); }; + /* Sync/push [secrets] to Northflank * @param {Object} obj * @param {IIntegration} obj.integration - integration details diff --git a/backend/src/models/integration.ts b/backend/src/models/integration.ts index 6e3e82694..8400ab819 100644 --- a/backend/src/models/integration.ts +++ b/backend/src/models/integration.ts @@ -168,6 +168,7 @@ const integrationSchema = new Schema( default: "/", }, secretGroup: { + // northflank-specific service type: String, default: null, }, diff --git a/backend/src/routes/v1/integration.ts b/backend/src/routes/v1/integration.ts index 1820f4bb8..f2685c3f6 100644 --- a/backend/src/routes/v1/integration.ts +++ b/backend/src/routes/v1/integration.ts @@ -37,6 +37,7 @@ router.post( body("owner").trim(), body("path").trim(), body("region").trim(), + body("secretGroup").isString().trim(), validateRequest, integrationController.createIntegration ); diff --git a/frontend/public/data/frequentConstants.ts b/frontend/public/data/frequentConstants.ts index d4c0aa729..c2c9e5c9a 100644 --- a/frontend/public/data/frequentConstants.ts +++ b/frontend/public/data/frequentConstants.ts @@ -22,7 +22,8 @@ const integrationSlugNameMapping: Mapping = { "hashicorp-vault": "Vault", "cloudflare-pages": "Cloudflare Pages", "codefresh": "Codefresh", - bitbucket: "BitBucket" + bitbucket: "BitBucket", + northflank: "Northflank" }; const envMapping: Mapping = { diff --git a/frontend/public/images/integrations/Northflank.png b/frontend/public/images/integrations/Northflank.png new file mode 100644 index 0000000000000000000000000000000000000000..f2d94060b44efe1140aed5a0824757bbfe19e4f0 GIT binary patch literal 18106 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 Z{~v{w^XL-N`egtB002ovPDHLkV1ix1nzsM| literal 0 HcmV?d00001 diff --git a/frontend/src/pages/api/integrations/createIntegration.ts b/frontend/src/pages/api/integrations/createIntegration.ts index 78e463f49..31a3a4288 100644 --- a/frontend/src/pages/api/integrations/createIntegration.ts +++ b/frontend/src/pages/api/integrations/createIntegration.ts @@ -4,7 +4,7 @@ interface Props { integrationAuthId: string; isActive: boolean; secretPath: string; - secretGroup: string; + secretGroup?: string; app: string | null; appId: string | null; sourceEnvironment: string; diff --git a/frontend/src/pages/integrations/northflank/create.tsx b/frontend/src/pages/integrations/northflank/create.tsx index d6c0d8905..7ffd7151a 100644 --- a/frontend/src/pages/integrations/northflank/create.tsx +++ b/frontend/src/pages/integrations/northflank/create.tsx @@ -33,7 +33,7 @@ export default function NorthflankCreateIntegrationPage() { const [secretPath, setSecretPath] = useState("/"); const [targetApp, setTargetApp] = useState(""); const [secretGroupList, setSecretGroupList] = useState([]); - const [targetSecretGroup, setTargetSecretGroup] = useState(""); + const [targetSecretGroup, setTargetSecretGroup] = useState(""); const [isLoading, setIsLoading] = useState(false); @@ -57,10 +57,13 @@ export default function NorthflankCreateIntegrationPage() { if (integrationAuthApps) { if (integrationAuthApps.length > 0) { const selectedApp = integrationAuthApps?.filter((integrationAuthApp) => integrationAuthApp.name === targetApp); - setSecretGroupList(selectedApp[0].secretGroups); - setTargetSecretGroup(selectedApp[0]?.secretGroups[0]); - } else { - setTargetSecretGroup("none"); + if (selectedApp.length > 0) { + setSecretGroupList(selectedApp[0].secretGroups); + setTargetSecretGroup(selectedApp[0]?.secretGroups[0]); + } else { + setSecretGroupList([]); + setTargetSecretGroup("none"); + } } } }, [targetApp]) @@ -169,7 +172,7 @@ export default function NorthflankCreateIntegrationPage() { )) ) : ( - + No secret groups found )} @@ -180,7 +183,7 @@ export default function NorthflankCreateIntegrationPage() { color="mineshaft" className="mt-4" isLoading={isLoading} - isDisabled={integrationAuthApps.length === 0} + isDisabled={integrationAuthApps.length === 0 && secretGroupList === 0} > Create Integration diff --git a/package.json b/package.json index e85b46477..80f12205e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ ] }, "devDependencies": { - "@types/picomatch": "^2.3.0", "eslint": "^8.29.0", "husky": "^8.0.2" }